Trim the include tree.

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

5 files changed, 11 insertions, 13 deletions

diff --git a/libs/ardour/ardour/click.h b/libs/ardour/ardour/click.h
index b4c2f7d9cc..1047540a74 100644
--- a/libs/ardour/ardour/click.h
+++ b/libs/ardour/ardour/click.h
@@ -28,7 +28,8 @@
 
 namespace ARDOUR {
 
-struct Click {
+class Click {
+public:
 	framepos_t start;
 	framecnt_t duration;
 	framecnt_t offset;
@@ -48,8 +49,6 @@ private:
 	static Pool pool;
 };
 
-typedef std::list<Click*> Clicks;
-
 class ClickIO : public IO
 {
 public:
diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h
index a73d04aa36..c13580e25c 100644
--- a/libs/ardour/ardour/export_channel.h
+++ b/libs/ardour/ardour/export_channel.h
@@ -23,9 +23,8 @@
 
 #include <set>
 
-#include <boost/signals2.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/scoped_array.hpp>
+#include <boost/shared_ptr.hpp>
 
 #include "pbd/signals.h"
 
diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h
index 95e97c64ea..51e3ca2544 100644
--- a/libs/ardour/ardour/midi_ui.h
+++ b/libs/ardour/ardour/midi_ui.h
@@ -2,7 +2,7 @@
 #define __libardour_midi_ui_h__
 
 #include <list>
-#include <boost/signals2.hpp>
+
 #include "pbd/abstract_ui.h"
 #include "pbd/signals.h"
 
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index d6edaf6a0e..d96d8fc828 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -42,19 +42,19 @@
 #include "pbd/signals.h"
 #include "pbd/undo.h"
 
+#include "evoral/types.hpp"
+
 #include "midi++/types.h"
 
 #include "timecode/time.h"
 
 #include "ardour/ardour.h"
-#include "ardour/click.h"
 #include "ardour/chan_count.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/session_configuration.h"
 #include "ardour/session_event.h"
 #include "ardour/location.h"
 #include "ardour/interpolation.h"
-#include "ardour/speakers.h"
 
 #ifdef HAVE_JACK_SESSION
 #include <jack/session.h>
@@ -92,16 +92,18 @@ class AuxInput;
 class BufferSet;
 class Bundle;
 class Butler;
+class Click;
 class Diskstream;
 class ExportHandler;
 class ExportStatus;
+class Graph;
 class IO;
 class IOProcessor;
 class ImportStatus;
+class MidiControlUI;
 class MidiRegion;
 class MidiSource;
 class MidiTrack;
-class MidiControlUI;
 class NamedSelection;
 class Playlist;
 class PluginInsert;
@@ -122,9 +124,8 @@ class Slave;
 class Source;
 class Speakers;
 class TempoMap;
-class VSTPlugin;
-class Graph;
 class Track;
+class VSTPlugin;
 
 extern void setup_enum_writer ();
 
@@ -1369,7 +1370,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	XMLNode& state(bool);
 
 	/* click track */
-
+	typedef std::list<Click*> Clicks;
 	Clicks                 clicks;
 	bool                  _clicking;
 	boost::shared_ptr<IO> _click_io;
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 8400472921..9bd3124e23 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -23,7 +23,6 @@
 #include <vector>
 
 #include <glibmm/thread.h>
-#include <boost/signals2.hpp>
 
 #include <jack/jack.h>