Trim session.h include dependency tree.

git-svn-id: svn://localhost/ardour2/branches/3.0@5979 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 14 insertions, 10 deletions

diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc
index 60f5752a58..067941484c 100644
--- a/libs/surfaces/mackie/interface.cc
+++ b/libs/surfaces/mackie/interface.cc
@@ -18,7 +18,9 @@
 #include "control_protocol/control_protocol.h"
 #include "mackie_control_protocol.h"
 
-#include <pbd/error.h>
+#include "ardour/rc_configuration.h"
+
+#include "pbd/error.h"
 
 #include <stdexcept>
 
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index aba0cd565a..d93bf78d33 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -40,8 +40,8 @@
 #include "pbd/memento_command.h"
 #include "pbd/convert.h"
 
-#include "ardour/route.h"
 #include "ardour/session.h"
+#include "ardour/route.h"
 #include "ardour/location.h"
 #include "ardour/dB.h"
 #include "ardour/panner.h"
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 1a6412667a..d220213d2d 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -26,7 +26,6 @@
 #include <glibmm/thread.h>
 
 #include "ardour/types.h"
-#include "ardour/session.h"
 #include "midi++/types.h"
 
 #include "control_protocol/control_protocol.h"
diff --git a/libs/surfaces/mackie/mackie_control_protocol_poll.cc b/libs/surfaces/mackie/mackie_control_protocol_poll.cc
index d3401c7904..867a7d784a 100644
--- a/libs/surfaces/mackie/mackie_control_protocol_poll.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol_poll.cc
@@ -3,18 +3,19 @@
 #include "midi_byte_array.h"
 #include "surface_port.h"
 
-#include <pbd/pthread_utils.h>
-#include <pbd/error.h>
+#include "pbd/pthread_utils.h"
+#include "pbd/error.h"
 
-#include <midi++/types.h>
-#include <midi++/port.h>
-#include <midi++/manager.h>
+#include "midi++/types.h"
+#include "midi++/port.h"
+#include "midi++/manager.h"
 #include "i18n.h"
 
 #include <unistd.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <errno.h>
+#include <string.h>
 
 #include <iostream>
 #include <string>
diff --git a/libs/surfaces/mackie/mackie_jog_wheel.cc b/libs/surfaces/mackie/mackie_jog_wheel.cc
index 3cd9664fb1..8b01d7c89d 100644
--- a/libs/surfaces/mackie/mackie_jog_wheel.cc
+++ b/libs/surfaces/mackie/mackie_jog_wheel.cc
@@ -1,5 +1,7 @@
 #include <cmath>
 
+#include <ardour/session.h>
+
 #include "mackie_jog_wheel.h"
 
 #include "mackie_control_protocol.h"
@@ -24,7 +26,7 @@ JogWheel::State JogWheel::jog_wheel_state() const
 {
 	if ( !_jog_wheel_states.empty() )
 		return _jog_wheel_states.top();
-	else 
+	else
 		return scroll;
 }
 
diff --git a/libs/surfaces/mackie/mackie_port.cc b/libs/surfaces/mackie/mackie_port.cc
index 85e05fd1b4..4413d3fc34 100644
--- a/libs/surfaces/mackie/mackie_port.cc
+++ b/libs/surfaces/mackie/mackie_port.cc
@@ -30,7 +30,7 @@
 #include "midi++/types.h"
 #include "midi++/port.h"
 #include "sigc++/sigc++.h"
-#include "ardour/configuration.h"
+#include "ardour/rc_configuration.h"
 
 #include "i18n.h"