19 files changed, 28 insertions, 50 deletions
diff --git a/libs/ardour/ardour/audio_buffer.h b/libs/ardour/ardour/audio_buffer.h
index 57c5de6124..faa3de7685 100644
--- a/libs/ardour/ardour/audio_buffer.h
+++ b/libs/ardour/ardour/audio_buffer.h
@@ -20,7 +20,9 @@
 #define __ardour_audio_buffer_h__
 
 #include <cstring>
+
 #include "ardour/buffer.h"
+#include "ardour/runtime_functions.h"
 
 namespace ARDOUR {
 
diff --git a/libs/ardour/ardour/audio_playlist_importer.h b/libs/ardour/ardour/audio_playlist_importer.h
index 9b3abfc33d..011bfe39b8 100644
--- a/libs/ardour/ardour/audio_playlist_importer.h
+++ b/libs/ardour/ardour/audio_playlist_importer.h
@@ -30,13 +30,13 @@
 
 #include "ardour/element_importer.h"
 #include "ardour/element_import_handler.h"
-#include "ardour/types.h"
 
 namespace ARDOUR {
 
 class AudioRegionImportHandler;
 class AudioRegionImporter;
 class AudioPlaylistImporter;
+class Session;
 
 class AudioPlaylistImportHandler : public ElementImportHandler
 {
diff --git a/libs/ardour/ardour/audio_region_importer.h b/libs/ardour/ardour/audio_region_importer.h
index 2187d92148..5aee017c51 100644
--- a/libs/ardour/ardour/audio_region_importer.h
+++ b/libs/ardour/ardour/audio_region_importer.h
@@ -30,7 +30,6 @@
 #include "pbd/xml++.h"
 #include "pbd/id.h"
 #include "pbd/filesystem.h"
-#include "ardour/types.h"
 #include "ardour/element_importer.h"
 #include "ardour/element_import_handler.h"
 #include "ardour/import_status.h"
@@ -38,6 +37,8 @@
 namespace ARDOUR {
 
 class Region;
+class Session;
+class Source;
 
 class AudioRegionImportHandler : public ElementImportHandler
 {
diff --git a/libs/ardour/ardour/broadcast_info.h b/libs/ardour/ardour/broadcast_info.h
index 991a3bbbcc..0e87d6e6df 100644
--- a/libs/ardour/ardour/broadcast_info.h
+++ b/libs/ardour/ardour/broadcast_info.h
@@ -22,12 +22,8 @@
 #define __ardour_broadcast_info_h__
 
 #include <string>
-#include <ctime>
-
-#include <sndfile.h>
 
 #include "audiographer/broadcast_info.h"
-#include "ardour/types.h"
 
 namespace ARDOUR
 {
diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h
index c6f6822519..cbb92e7c4a 100644
--- a/libs/ardour/ardour/buffer.h
+++ b/libs/ardour/ardour/buffer.h
@@ -19,15 +19,12 @@
 #ifndef __ardour_buffer_h__
 #define __ardour_buffer_h__
 
-#include <cstdlib>
-#include <cassert>
-#include <cstring>
-#include <iostream>
+#include <stddef.h>
+
 #include <boost/utility.hpp>
 
 #include "ardour/types.h"
 #include "ardour/data_type.h"
-#include "ardour/runtime_functions.h"
 
 namespace ARDOUR {
 
diff --git a/libs/ardour/ardour/directory_names.h b/libs/ardour/ardour/directory_names.h
index a4235dd9c0..a377d351f6 100644
--- a/libs/ardour/ardour/directory_names.h
+++ b/libs/ardour/ardour/directory_names.h
@@ -2,9 +2,6 @@
 #ifndef __ardour_directory_names_h__
 #define __ardour_directory_names_h__
 
-#include <string>
-#include <stdint.h>
-
 namespace ARDOUR {
 
 extern const char* const old_sound_dir_name;
diff --git a/libs/ardour/ardour/export_channel_configuration.h b/libs/ardour/ardour/export_channel_configuration.h
index a950cecc65..b625be9dc3 100644
--- a/libs/ardour/ardour/export_channel_configuration.h
+++ b/libs/ardour/ardour/export_channel_configuration.h
@@ -28,21 +28,13 @@
 #include <boost/enable_shared_from_this.hpp>
 
 #include "ardour/export_channel.h"
-#include "ardour/export_status.h"
-#include "ardour/ardour.h"
+#include "ardour/export_pointers.h"
 
 #include "pbd/xml++.h"
 
 namespace ARDOUR
 {
 
-class ExportHandler;
-class AudioPort;
-class ExportChannel;
-class ExportFormatSpecification;
-class ExportFilename;
-class ExportProcessor;
-class ExportTimespan;
 class Session;
 
 class ExportChannelConfiguration : public boost::enable_shared_from_this<ExportChannelConfiguration>
diff --git a/libs/ardour/ardour/export_format_base.h b/libs/ardour/ardour/export_format_base.h
index 0ba5f73e8d..46b44e2252 100644
--- a/libs/ardour/ardour/export_format_base.h
+++ b/libs/ardour/ardour/export_format_base.h
@@ -22,22 +22,21 @@
 #define __ardour_export_format_base_h__
 
 #include <set>
-#include <algorithm>
-#include <boost/shared_ptr.hpp>
 #include <string>
 
+#include <boost/shared_ptr.hpp>
+
 #include <sndfile.h>
 #include <samplerate.h>
 
-#include "ardour/ardour.h"
+#include "pbd/signals.h"
+#include "ardour/types.h"
 
 #include "audiographer/general/sample_format_converter.h"
 
 namespace ARDOUR
 {
 
-class HasSampleFormat;
-
 class ExportFormatBase {
   public:
 
diff --git a/libs/ardour/ardour/export_graph_builder.h b/libs/ardour/ardour/export_graph_builder.h
index 18aa8db519..f565fd4134 100644
--- a/libs/ardour/ardour/export_graph_builder.h
+++ b/libs/ardour/ardour/export_graph_builder.h
@@ -21,10 +21,7 @@
 #ifndef __ardour_export_graph_builder_h__
 #define __ardour_export_graph_builder_h__
 
-#include "ardour/ardour.h"
 #include "ardour/export_handler.h"
-#include "ardour/export_channel.h"
-#include "ardour/export_format_base.h"
 
 #include "audiographer/utils/identity_vertex.h"
 
@@ -47,6 +44,9 @@ namespace AudioGrapher {
 namespace ARDOUR
 {
 
+class ExportTimespan;
+class Session;
+
 class ExportGraphBuilder
 {
   private:
diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h
index c4061684eb..eb8ffc2333 100644
--- a/libs/ardour/ardour/export_handler.h
+++ b/libs/ardour/ardour/export_handler.h
@@ -22,13 +22,11 @@
 #define __ardour_export_handler_h__
 
 #include <map>
-#include <list>
 #include <fstream>
 
 #include <boost/operators.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "ardour/ardour.h"
 #include "ardour/export_pointers.h"
 #include "ardour/session.h"
 #include "ardour/types.h"
@@ -45,7 +43,7 @@ class ExportChannelConfiguration;
 class ExportFormatSpecification;
 class ExportFilename;
 class ExportGraphBuilder;
-
+class Location;
 
 class ExportElementFactory
 {
diff --git a/libs/ardour/ardour/export_status.h b/libs/ardour/ardour/export_status.h
index 164b348c37..cb24cb55f5 100644
--- a/libs/ardour/ardour/export_status.h
+++ b/libs/ardour/ardour/export_status.h
@@ -21,7 +21,6 @@
 #ifndef __ardour_export_status_h__
 #define __ardour_export_status_h__
 
-#include <list>
 #include <stdint.h>
 
 #include "ardour/types.h"
diff --git a/libs/ardour/ardour/export_timespan.h b/libs/ardour/ardour/export_timespan.h
index 9273aab6c7..5cb32dbb1a 100644
--- a/libs/ardour/ardour/export_timespan.h
+++ b/libs/ardour/ardour/export_timespan.h
@@ -21,17 +21,16 @@
 #ifndef __ardour_export_timespan_h__
 #define __ardour_export_timespan_h__
 
-#include <map>
-#include <list>
 #include <string>
 
-#include "ardour/export_status.h"
-#include "ardour/export_channel.h"
-#include "ardour/ardour.h"
+#include <boost/shared_ptr.hpp>
+
+#include "ardour/types.h"
 
 namespace ARDOUR
 {
 
+class ExportStatus;
 class ExportChannel;
 class ExportTempFile;
 
diff --git a/libs/ardour/ardour/location_importer.h b/libs/ardour/ardour/location_importer.h
index 2b6f1ec1c2..332c5ae685 100644
--- a/libs/ardour/ardour/location_importer.h
+++ b/libs/ardour/ardour/location_importer.h
@@ -27,11 +27,12 @@
 #include <boost/shared_ptr.hpp>
 
 #include "pbd/xml++.h"
-#include "ardour/location.h"
-#include "ardour/types.h"
 
 namespace ARDOUR {
 
+class Location;
+class Session;
+
 class LocationImportHandler : public ElementImportHandler
 {
   public:
diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 4a9f8305ad..773b04f386 100644
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -22,7 +22,6 @@
 #include <vector>
 #include "ardour/types.h"
 #include "ardour/processor.h"
-#include "pbd/signals.h"
 #include "pbd/fastlog.h"
 
 namespace ARDOUR {
diff --git a/libs/ardour/ardour/mtdm.h b/libs/ardour/ardour/mtdm.h
index 4948d844f4..9d67e1cd64 100644
--- a/libs/ardour/ardour/mtdm.h
+++ b/libs/ardour/ardour/mtdm.h
@@ -19,10 +19,7 @@
 #ifndef __libardour_mtdm_h__
 #define __libardour_mtdm_h__
 
-#include <cstdlib>
-#include <cstdio>
-#include <cmath>
-#include <unistd.h>
+#include <stddef.h>
 
 class MTDM {
 public:
diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h
index 20ca0d355d..80584e6859 100644
--- a/libs/ardour/ardour/region_factory.h
+++ b/libs/ardour/ardour/region_factory.h
@@ -25,6 +25,7 @@
 #include <glibmm/thread.h>
 
 #include "pbd/id.h"
+#include "pbd/property_list.h"
 #include "pbd/signals.h"
 
 #include "ardour/types.h"
diff --git a/libs/ardour/ardour/route_group_member.h b/libs/ardour/ardour/route_group_member.h
index 3cc8e2aaf8..2665c719e6 100644
--- a/libs/ardour/ardour/route_group_member.h
+++ b/libs/ardour/ardour/route_group_member.h
@@ -20,6 +20,7 @@
 #ifndef __libardour_route_group_member_h__
 #define __libardour_route_group_member_h__
 
+#include "pbd/signals.h"
 
 namespace ARDOUR  {
 
diff --git a/libs/ardour/ardour/sndfileimportable.h b/libs/ardour/ardour/sndfileimportable.h
index b146d3231c..8612e264c4 100644
--- a/libs/ardour/ardour/sndfileimportable.h
+++ b/libs/ardour/ardour/sndfileimportable.h
@@ -22,7 +22,6 @@
 
 #include <boost/shared_ptr.hpp>
 #include <sndfile.h>
-#include "pbd/failed_constructor.h"
 #include "ardour/types.h"
 #include "ardour/importable_source.h"
 
diff --git a/libs/ardour/ardour/tempo_map_importer.h b/libs/ardour/ardour/tempo_map_importer.h
index beacbc1e01..57c7402781 100644
--- a/libs/ardour/ardour/tempo_map_importer.h
+++ b/libs/ardour/ardour/tempo_map_importer.h
@@ -27,11 +27,11 @@
 
 #include "ardour/element_importer.h"
 #include "ardour/element_import_handler.h"
-#include "ardour/tempo.h"
-#include "ardour/types.h"
 
 namespace ARDOUR {
 
+class Session;
+
 class TempoMapImportHandler : public ElementImportHandler
 {
   public: