Remove over 500 unnecessary includes (including 54 of session.h).

It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff).  I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.

This commit only targets includes of ardour/*.h.  There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.

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

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 5ecc075c30d15789798db33bb6ed5819b4ae512c..571f602e714fc94fe5bcfa45f9e239a60f4e38a3 100644 (file)
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -28,7 +28,6 @@
 #include "pbd/file_utils.h"
 
 #include "ardour/svn_revision.h"
-#include "ardour/ardour.h"
 #include "ardour/version.h"
 #include "ardour/filesystem_paths.h"
 

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 0db4831e6fe3d8ba5a5aa29781d69b93651c1ec8..5391d58f42c22663c4586f98e03780fc7f64ac9e 100644 (file)
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -31,7 +31,6 @@
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
 
-#include "ardour/ardour.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/rc_configuration.h"
 

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index d54ae5e291c8d48333616b5ac5647c07c7d1cb3f..6236bcd5dc6d3522849138c27eba9e56d5d8587c 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -60,26 +60,18 @@
 #include "midi++/manager.h"
 
 #include "ardour/ardour.h"
-#include "ardour/callback.h"
+#include "ardour/audioengine.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/diskstream.h"
+#include "ardour/filename_extensions.h"
+#include "ardour/port.h"
+#include "ardour/process_thread.h"
 #include "ardour/profile.h"
-#include "ardour/plugin_manager.h"
+#include "ardour/recent_sessions.h"
 #include "ardour/session_directory.h"
 #include "ardour/session_route.h"
 #include "ardour/session_state_utils.h"
 #include "ardour/session_utils.h"
-#include "ardour/port.h"
-#include "ardour/audioengine.h"
-#include "ardour/playlist.h"
-#include "ardour/utils.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/audiofilesource.h"
-#include "ardour/recent_sessions.h"
-#include "ardour/port.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_track.h"
-#include "ardour/filesystem_paths.h"
-#include "ardour/filename_extensions.h"
-#include "ardour/process_thread.h"
 
 typedef uint64_t microseconds_t;
 
@@ -121,6 +113,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
+using namespace std;
 
 ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
 UIConfiguration *ARDOUR_UI::ui_config = 0;
@@ -130,7 +123,7 @@ sigc::signal<void>      ARDOUR_UI::RapidScreenUpdate;
 sigc::signal<void>      ARDOUR_UI::SuperRapidScreenUpdate;
 sigc::signal<void, framepos_t, bool, framepos_t> ARDOUR_UI::Clock;
 
-bool could_be_a_valid_path (const string& path);
+bool could_be_a_valid_path (const std::string& path);
 
 ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
@@ -335,7 +328,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
 /** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */
 bool
-ARDOUR_UI::run_startup (bool should_be_new, string load_template)
+ARDOUR_UI::run_startup (bool should_be_new, std::string load_template)
 {
        delete _startup;
        _startup = new ArdourStartup ();

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 05addb98e3addfc936fdf59444f675faef126c55..74353d21c021aaae32ade7617b7a3c6a24594e92 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -37,11 +37,9 @@
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/tearoff.h>
 
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
-#include "ardour/ardour.h"
 #include "ardour/profile.h"
-#include "ardour/route.h"
+#include "ardour/session.h"
+#include "ardour/types.h"
 
 #include "ardour_ui.h"
 #include "keyboard.h"

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 35100e940b0e47a3f787c9eeac9d87c91068e632..bd99be4ff27fb3b7fbffa72b60af04ba00fdcc44 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -61,7 +61,6 @@
 #include "ardour/session.h"
 #include "ardour/profile.h"
 #include "ardour/audioengine.h"
-#include "ardour/control_protocol_manager.h"
 
 #include "control_protocol/control_protocol.h"
 

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 6c8319e808924acaa3abb2620aa522ee82bb5075..19e7106378aacad447a43df3f21c188326eacffe 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -26,10 +26,8 @@
 
 #include <gtkmm2ext/utils.h>
 
-#include "ardour/configuration.h"
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
 #include "ardour/rc_configuration.h"
+#include "ardour/session.h"
 
 #ifdef HAVE_LIBLO
 #include "ardour/osc.h"

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 76abb9d6bbe1b3da7b5fc81dbf9a9bb93cc979a3..e20dfffcd8bb7985f2c25a96d533a8250493d011 100644 (file)
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -24,17 +24,16 @@
 #include "pbd/enumwriter.h"
 
 #include <gtkmm/style.h>
+#include <sigc++/bind.h>
 
 #include "gtkmm2ext/cairocell.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/rgb_macros.h"
 
-#include "ardour/ardour.h"
+#include "ardour/types.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"
 #include "ardour/profile.h"
-#include "ardour/slave.h"
-#include <sigc++/bind.h>
 
 #include "ardour_ui.h"
 #include "audio_clock.h"

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index e06e50f113558e363c312b2cb724890ce601a261..2aeb2dbe60aae44ffe7cfcd737c19cf5dd3d8691 100644 (file)
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -17,17 +17,17 @@
 
 */
 
+#include <cmath>
+
+#include <gtkmm2ext/utils.h>
+
 #include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
 #include "pbd/pthread_utils.h"
 
-#include "ardour/session.h"
 #include "ardour/audioregion.h"
-#include "ardour/playlist.h"
-#include "ardour/utils.h"
+#include "ardour/session_event.h"
 #include "ardour/dB.h"
-#include <gtkmm2ext/utils.h>
-#include <cmath>
 
 #include "audio_region_editor.h"
 #include "audio_region_view.h"

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index be8601170faf05ac2b2de6f39f5e76d5b4759549..22e07c0ec92e7a3b6925ff691f05f7633bf38368 100644 (file)
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -26,11 +26,9 @@
 
 #include "pbd/stacktrace.h"
 
-#include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
 #include "ardour/audiofilesource.h"
 #include "ardour/audio_track.h"
-#include "ardour/source.h"
 #include "ardour/region_factory.h"
 #include "ardour/profile.h"
 #include "ardour/rc_configuration.h"

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index a34d6421a25bcd1cbee552d2f3f3663355b59c7b..45204971e6029574f43bddebb0085f55846d6fb8 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -36,19 +36,10 @@
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 
-#include "ardour/amp.h"
-#include "ardour/audioplaylist.h"
 #include "ardour/event_type_map.h"
-#include "ardour/location.h"
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
 #include "ardour/panner_shell.h"
-#include "ardour/playlist.h"
-#include "ardour/processor.h"
-#include "ardour/profile.h"
-#include "ardour/session.h"
-#include "ardour/session_playlist.h"
-#include "ardour/utils.h"
 
 #include "ardour_button.h"
 #include "ardour_ui.h"
@@ -67,8 +58,6 @@
 #include "audio_streamview.h"
 #include "utils.h"
 
-#include "ardour/audio_track.h"
-
 #include "i18n.h"
 
 using namespace std;

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index d6c3d5b8241259964a0504f59dc9f1899531ee4e..bb51b94fc4269b7548145f1ba211d6907d8874c4 100644 (file)
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -23,12 +23,8 @@
 
 #include "pbd/error.h"
 
-#include "ardour/automation_list.h"
-#include "ardour/automation_control.h"
-#include "ardour/event_type_map.h"
 #include "ardour/automatable.h"
-#include "ardour/panner.h"
-#include "ardour/pan_controllable.h"
+#include "ardour/automation_control.h"
 #include "ardour/session.h"
 
 #include "ardour_ui.h"

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index ed1283e024d9cb12567246ef96fcdd213696a877..0fb22b05bc421d175a0367ba6d987fc4854384ae 100644 (file)
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -26,7 +26,6 @@
 #include "ardour/midi_automation_list_binder.h"
 #include "ardour/midi_region.h"
 #include "ardour/session.h"
-#include "ardour/source.h"
 
 #include "automation_region_view.h"
 #include "editing.h"

diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc
index ba3426678e5b59b1c549b0fc428371cf2098bf11..65df722e3c1c5a426617be36a7d4b3c2e7dad79e 100644 (file)
--- a/gtk2_ardour/automation_streamview.cc
+++ b/gtk2_ardour/automation_streamview.cc
@@ -26,7 +26,6 @@
 
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
-#include "ardour/region_factory.h"
 
 #include "automation_streamview.h"
 #include "region_view.h"

diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index 43763abcc37166e33f10d2c0520d4f6fc4429dca..7a449843e09055a306e6b9148eb7a9a6e5752c7b 100644 (file)
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -32,9 +32,6 @@
 #include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/gtk_ui.h>
 
-#include "ardour/session.h"
-#include "ardour/utils.h"
-
 #include "public_editor.h"
 #include "ardour_ui.h"
 #include "gui_object.h"

diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index 1c89f7b3cdfb28ce68364e1a842424e8983dac65..9dff8f82d2d5570aaa38f992807994a996ab8a16 100644 (file)
--- a/gtk2_ardour/bundle_manager.cc
+++ b/gtk2_ardour/bundle_manager.cc
@@ -27,7 +27,6 @@
 
 #include "ardour/session.h"
 #include "ardour/user_bundle.h"
-#include "ardour/audioengine.h"
 #include "bundle_manager.h"
 #include "gui_thread.h"
 #include "i18n.h"

diff --git a/gtk2_ardour/canvas-flag.h b/gtk2_ardour/canvas-flag.h
index ef78221803a5eb120122441d64fb802320184533..c8b32c72a5abfdfd749586f3091c89a7abb14faf 100644 (file)
--- a/gtk2_ardour/canvas-flag.h
+++ b/gtk2_ardour/canvas-flag.h
@@ -6,8 +6,6 @@
 #include <libgnomecanvasmm/widget.h>
 #include <libgnomecanvasmm/text.h>
 
-#include "ardour/midi_model.h"
-
 #include "simplerect.h"
 #include "simpleline.h"
 
@@ -20,19 +18,19 @@ class CanvasFlag : public Group
 {
 public:
        CanvasFlag(MidiRegionView& region,
-                   Group&          parent,
-                   double          height,
-                   guint           outline_color_rgba = 0xc0c0c0ff,
-                   guint           fill_color_rgba = 0x07070707,
-                   double          x = 0.0,
-                   double          y = 0.0);
+                  Group&          parent,
+                  double          height,
+                  guint           outline_color_rgba = 0xc0c0c0ff,
+                  guint           fill_color_rgba = 0x07070707,
+                  double          x = 0.0,
+                  double          y = 0.0);
 
        virtual ~CanvasFlag();
 
        virtual bool on_event(GdkEvent* ev);
 
        virtual void set_text(const std::string& a_text);
-        virtual void set_height (double);
+       virtual void set_height (double);
 
 protected:
        Text*            _text;

diff --git a/gtk2_ardour/canvas-sysex.h b/gtk2_ardour/canvas-sysex.h
index 281cbb557a96ad35334f1d322055ea75abf49f53..718f81fd6a23f87fbfa2657f97de08133ed65bce 100644 (file)
--- a/gtk2_ardour/canvas-sysex.h
+++ b/gtk2_ardour/canvas-sysex.h
@@ -20,6 +20,8 @@
 #ifndef CANVAS_SYSEX_H_
 #define CANVAS_SYSEX_H_
 
+#include <string>
+
 #include "canvas-flag.h"
 
 class MidiRegionView;
@@ -33,7 +35,7 @@ public:
        CanvasSysEx(
                        MidiRegionView& region,
                        Group&          parent,
-                       string&         text,
+                       std::string&    text,
                        double          height,
                        double          x,
                        double          y);

diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc
index 5f3cb16502514a4d374dcfce769c04ac90ae0a28..4195ab8962e4c58fc3d2a56f7e973774336caf14 100644 (file)
--- a/gtk2_ardour/edit_note_dialog.cc
+++ b/gtk2_ardour/edit_note_dialog.cc
@@ -19,11 +19,11 @@
 
 #include <gtkmm/stock.h>
 #include <gtkmm/table.h>
-#include "ardour/midi_model.h"
-#include "ardour/midi_region.h"
-#include "edit_note_dialog.h"
+
 #include "canvas-note-event.h"
+#include "edit_note_dialog.h"
 #include "midi_region_view.h"
+
 #include "i18n.h"
 
 using namespace Gtk;

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 0ba5f4054c46375a69c5160b6fadc1b486e5af51..d19359a0f3e9d2d17d5c127ab197e6c7a5048f09 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -60,20 +60,14 @@
 #include "gtkmm2ext/cell_renderer_pixbuf_toggle.h"
 
 #include "ardour/audio_track.h"
-#include "ardour/audioplaylist.h"
+#include "ardour/audioengine.h"
 #include "ardour/audioregion.h"
 #include "ardour/location.h"
-#include "ardour/midi_region.h"
-#include "ardour/plugin_manager.h"
 #include "ardour/profile.h"
 #include "ardour/route_group.h"
-#include "ardour/session_directory.h"
-#include "ardour/session_route.h"
-#include "ardour/session_state_utils.h"
+#include "ardour/session_playlists.h"
 #include "ardour/tempo.h"
 #include "ardour/utils.h"
-#include "ardour/session_playlists.h"
-#include "ardour/audioengine.h"
 
 #include "control_protocol/control_protocol.h"
 

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index e544f7d8c3fb48e350dab1fbce3d64ed957e6d89..074d51428e10fea75d396f5b4caa7b2288a3f86f 100644 (file)
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -20,17 +20,16 @@
 #include <gio/gio.h>
 #include <gtk/gtkiconfactory.h>
 
-
 #include "pbd/filesystem.h"
 #include "pbd/file_utils.h"
 #include "pbd/search_path.h"
 
 #include "gtkmm2ext/tearoff.h"
 
-#include "ardour/ardour.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/profile.h"
 #include "ardour/session.h"
+#include "ardour/types.h"
 
 #include "actions.h"
 #include "ardour_ui.h"

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 8bd17c92f6db0939f3bb5b0eab276e76209ae58e..aaf587a464c93aabcba63594a990aaa67ff0fb1a 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -33,22 +33,16 @@
 
 #include <gtkmm2ext/choice.h>
 
-#include "ardour/session.h"
-#include "ardour/session_directory.h"
-#include "ardour/audioplaylist.h"
-#include "ardour/audioregion.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/midi_track.h"
-#include "ardour/midi_region.h"
-#include "ardour/utils.h"
 #include "ardour/audio_track.h"
-#include "ardour/audioplaylist.h"
 #include "ardour/audiofilesource.h"
+#include "ardour/audioregion.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_track.h"
+#include "ardour/operations.h"
 #include "ardour/region_factory.h"
-#include "ardour/source_factory.h"
-#include "ardour/session.h"
 #include "ardour/smf_source.h"
-#include "ardour/operations.h"
+#include "ardour/source_factory.h"
+#include "ardour/utils.h"
 #include "pbd/memento_command.h"
 
 #include "ardour_ui.h"

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 5eadac1ca5db595bab7913499803b7b7a792a846..df88f7b65f5481c386176584a36b95e6e5f273b5 100644 (file)
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -17,8 +17,6 @@
 
 */
 
-#include "ardour/location.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/rc_configuration.h"
 
 #include "ardour_ui.h"

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 77bc5ec27b0f172e63c7630c49ff0daa3196bb1a..e6b0b8ec9e27a7251d73a1de2914eed7672cc31e 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -24,10 +24,8 @@
 
 #include "pbd/stacktrace.h"
 
-#include "ardour/audioplaylist.h"
-#include "ardour/audioregion.h"
-#include "ardour/region_factory.h"
 #include "ardour/midi_region.h"
+#include "ardour/region_factory.h"
 
 #include "editor.h"
 #include "keyboard.h"

diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index dbe95c229ff5ed28313fcfc935d28299957e1958..509e629aeeb80be3787c038553af83e3c2240d61 100644 (file)
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -29,10 +29,8 @@
 
 #include "pbd/pthread_utils.h"
 
-#include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
 #include "ardour/audiofilesource.h"
-#include "ardour/audiofilesource.h"
 #include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
 #include "ardour/chan_count.h"

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 2da3122d48d8c324acc4b767477d97543bf20aff..d887697d637510ba90e1e7c25c57dd6b7f9cf632 100644 (file)
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -21,17 +21,17 @@
 #include <cmath>
 #include <string>
 
+#include <gtkmm/treeview.h>
+
 #include "pbd/error.h"
 
 #include "ardour/session.h"
-#include "ardour/region.h"
-#include <gtkmm/treeview.h>
 
 #include "ardour_ui.h"
 #include "editor.h"
-#include "time_axis_view.h"
 #include "region_view.h"
 #include "selection.h"
+#include "time_axis_view.h"
 
 #include "i18n.h"
 

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 7f4445652a3aa3a36c314eab6f8e40a84bd712c7..b5c7635265090fc8f0805f282e643608475ce0d0 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -62,20 +62,14 @@
 #include "editor_cursors.h"
 #include "verbose_cursor.h"
 
-#include "ardour/types.h"
-#include "ardour/profile.h"
-#include "ardour/route.h"
-#include "ardour/audio_track.h"
-#include "ardour/playlist.h"
-#include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
-#include "ardour/midi_region.h"
-#include "ardour/dB.h"
-#include "ardour/utils.h"
+#include "ardour/operations.h"
+#include "ardour/playlist.h"
+#include "ardour/profile.h"
 #include "ardour/region_factory.h"
-#include "ardour/source_factory.h"
+#include "ardour/route.h"
 #include "ardour/session.h"
-#include "ardour/operations.h"
+#include "ardour/types.h"
 
 #include <bitset>
 

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index d6cae9a8e29f85eb5087e6a9bf09ff103bb87248..7f4c22616ec0ac6a4a818962974d7a1a211e8c0a 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -49,12 +49,10 @@
 #include "ardour/quantize.h"
 #include "ardour/region_factory.h"
 #include "ardour/reverse.h"
-#include "ardour/route_group.h"
 #include "ardour/session.h"
 #include "ardour/session_playlists.h"
 #include "ardour/strip_silence.h"
 #include "ardour/transient_detector.h"
-#include "ardour/utils.h"
 
 #include "ardour_ui.h"
 #include "debug.h"

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index ab4f7afe3ccbea40813df71164eed48aa027db58..01b26705f51e4a2faf0161277f41b075654875b9 100644 (file)
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -28,10 +28,9 @@
 
 #include "ardour/audioregion.h"
 #include "ardour/audiofilesource.h"
+#include "ardour/silentfilesource.h"
 #include "ardour/region_factory.h"
 #include "ardour/session.h"
-#include "ardour/session_playlists.h"
-#include "ardour/silentfilesource.h"
 #include "ardour/profile.h"
 
 #include "gtkmm2ext/choice.h"

diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 8e2b668375e05fef8a489aff4e13a21aba1a9f81..6e12a03856769ddf5799871bd60bdbd1b54e68db 100644 (file)
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -22,12 +22,11 @@
 
 #include "pbd/stacktrace.h"
 
-#include "ardour/session.h"
+#include "ardour/midi_region.h"
 #include "ardour/playlist.h"
-#include "ardour/route_group.h"
 #include "ardour/profile.h"
-#include "ardour/midi_region.h"
-#include "ardour/audioplaylist.h"
+#include "ardour/route_group.h"
+#include "ardour/session.h"
 
 #include "control_protocol/control_protocol.h"
 

diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc
index c47c81598404882ee157bf1bebb409cb7ec40e1e..093e21952f1ca99bc68b890223a3f7b309368181 100644 (file)
--- a/gtk2_ardour/editor_snapshots.cc
+++ b/gtk2_ardour/editor_snapshots.cc
@@ -25,7 +25,6 @@
 #include "editor_snapshots.h"
 #include "ardour_ui.h"
 #include "i18n.h"
-#include "editor.h"
 #include "utils.h"
 #include "prompter.h"
 

diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index 34c974e102c1b8407eb9ed80b1dde12df4bcccab..b942f04ccab67c29e2a5354854e297e88195556a 100644 (file)
--- a/gtk2_ardour/editor_timefx.cc
+++ b/gtk2_ardour/editor_timefx.cc
@@ -37,14 +37,12 @@
 #include "region_selection.h"
 #include "time_fx_dialog.h"
 
-#include "ardour/session.h"
-#include "ardour/region.h"
-#include "ardour/audioplaylist.h"
-#include "ardour/audio_track.h"
 #include "ardour/audioregion.h"
-#include "ardour/stretch.h"
 #include "ardour/midi_stretch.h"
 #include "ardour/pitch.h"
+#include "ardour/region.h"
+#include "ardour/session.h"
+#include "ardour/stretch.h"
 
 #ifdef USE_RUBBERBAND
 #include "rubberband/RubberBandStretcher.h"

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 712871fcef2444319f472bd4d1e8765d194e716b..de613f3cf46065669ddfefb43d0ba60aa2affb41 100644 (file)
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -39,7 +39,6 @@
 #include <alsa/asoundlib.h>
 #endif
 
-#include "ardour/profile.h"
 #include <jack/jack.h>
 
 #include <gtkmm/stock.h>

diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc
index b9c2dd5a787c9616bcc24462a9b8e7d71dda755f..78dd8d20f853514b7358025cdf325507efb24656 100644 (file)
--- a/gtk2_ardour/export_channel_selector.cc
+++ b/gtk2_ardour/export_channel_selector.cc
@@ -24,12 +24,9 @@
 
 #include "pbd/convert.h"
 
-#include "ardour/audio_port.h"
 #include "ardour/audio_track.h"
-#include "ardour/audioengine.h"
 #include "ardour/audioregion.h"
 #include "ardour/export_channel_configuration.h"
-#include "ardour/export_handler.h"
 #include "ardour/io.h"
 #include "ardour/route.h"
 #include "ardour/session.h"

diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h
index 511ccd5b784eeb26f3d3383add501ae8a7c36220..4cb9902ed08d6b31ae7cf14474633e34356573c8 100644 (file)
--- a/gtk2_ardour/export_channel_selector.h
+++ b/gtk2_ardour/export_channel_selector.h
@@ -24,7 +24,6 @@
 #include <list>
 
 #include "ardour/export_profile_manager.h"
-#include "ardour/export_channel.h"
 
 #include <gtkmm.h>
 #include <sigc++/signal.h>

diff --git a/gtk2_ardour/export_filename_selector.cc b/gtk2_ardour/export_filename_selector.cc
index e2d360984c84054c1f8f4a6cf11b60ae7ea3a553..1b85d6585cfb5a5cf1e4c9b135a976234225e24c 100644 (file)
--- a/gtk2_ardour/export_filename_selector.cc
+++ b/gtk2_ardour/export_filename_selector.cc
@@ -22,10 +22,6 @@
 
 #include "export_filename_selector.h"
 
-#include "ardour/export_handler.h"
-#include "ardour/session.h"
-#include "ardour/session_directory.h"
-
 #include "i18n.h"
 
 using namespace ARDOUR;

diff --git a/gtk2_ardour/export_format_selector.cc b/gtk2_ardour/export_format_selector.cc
index 146b31ab51c3fbc1bb413df1b8d0c4417d973f80..f66d13d62e67bd24644445797118f8ecfca48eee 100644 (file)
--- a/gtk2_ardour/export_format_selector.cc
+++ b/gtk2_ardour/export_format_selector.cc
@@ -24,7 +24,6 @@
 
 #include "ardour/export_format_specification.h"
 #include "ardour/export_profile_manager.h"
-#include "ardour/session.h"
 
 #include "i18n.h"
 

diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc
index 41257e12484fe82d1dd6a060b138a7a0b75bc9fa..a96ea69b6d6f0c9ddbb3fd38299945c66188b59f 100644 (file)
--- a/gtk2_ardour/export_timespan_selector.cc
+++ b/gtk2_ardour/export_timespan_selector.cc
@@ -22,7 +22,6 @@
 
 #include "ardour_ui.h"
 
-#include "ardour/tempo.h"
 #include "ardour/location.h"
 #include "ardour/types.h"
 #include "ardour/session.h"

diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h
index 420baa5806cb99c8124244b5f34bfd2721b416f5..2118a57b836f23353203524b41acdc4f25f7374e 100644 (file)
--- a/gtk2_ardour/export_timespan_selector.h
+++ b/gtk2_ardour/export_timespan_selector.h
@@ -21,7 +21,6 @@
 #ifndef __export_timespan_selector_h__
 #define __export_timespan_selector_h__
 
-#include "public_editor.h"
 #include "audio_clock.h"
 
 #include <list>
@@ -40,6 +39,7 @@ namespace ARDOUR {
 }
 
 using ARDOUR::CDMarkerFormat;
+using ARDOUR::framecnt_t;
 
 /// Timespan Selector base
 class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr

diff --git a/gtk2_ardour/fft_result.h b/gtk2_ardour/fft_result.h
index 2873138dfd93a09a8a1c015f9a3eeceaaf6cd3a5..ddf2bb18424fdd04568b4b817960dbb013685fde 100644 (file)
--- a/gtk2_ardour/fft_result.h
+++ b/gtk2_ardour/fft_result.h
@@ -21,7 +21,6 @@
 #ifndef __ardour_fft_result_h
 #define __ardour_fft_result_h
 
-#include "ardour/types.h"
 #include <fftw3.h>
 
 #include <gdkmm/color.h>

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index b571ed52c785487b5170648624205ed90d0a2bbb..9f4e286f3aded77c2209eb2c931440e9b6930006 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -20,10 +20,7 @@
 #include <limits.h>
 
 #include "ardour/amp.h"
-#include "ardour/io.h"
-#include "ardour/route.h"
 #include "ardour/route_group.h"
-#include "ardour/session.h"
 #include "ardour/session_route.h"
 #include "ardour/dB.h"
 #include "ardour/utils.h"

diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index 19f25dcf1cbfc07f06a4e8547c8affcac56b6042..db165b8b3c760375aab9091653be55d1ff3d9820 100644 (file)
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -17,21 +17,18 @@
 
 */
 
+#include <stdint.h>
+
 #include <glibmm/objectbase.h>
 
 #include <gtkmm2ext/doi.h>
 
-#include "ardour/port_insert.h"
-#include "ardour/session.h"
-#include "ardour/io.h"
 #include "ardour/audioengine.h"
-#include "ardour/track.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_track.h"
-#include "ardour/mtdm.h"
+#include "ardour/bundle.h"
 #include "ardour/data_type.h"
+#include "ardour/io.h"
 #include "ardour/port.h"
-#include "ardour/bundle.h"
+#include "ardour/session.h"
 
 #include "io_selector.h"
 #include "utils.h"
@@ -207,13 +204,13 @@ IOSelector::list_is_global (int dim) const
        return (dim == _other);
 }
 
-string
+std::string
 IOSelector::disassociation_verb () const
 {
        return _("Disconnect");
 }
 
-string
+std::string
 IOSelector::channel_noun () const
 {
        return _("port");
@@ -256,7 +253,7 @@ void
 IOSelectorWindow::on_show ()
 {
        Gtk::Window::on_show ();
-       pair<uint32_t, uint32_t> const pm_max = _selector.max_size ();
+       std::pair<uint32_t, uint32_t> const pm_max = _selector.max_size ();
        resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second);
 }
 
@@ -264,8 +261,8 @@ void
 IOSelectorWindow::io_name_changed (void*)
 {
        ENSURE_GUI_THREAD (*this, &IOSelectorWindow::io_name_changed, src)
-
-       string title;
+               
+       std::string title;
 
        if (!_selector.find_inputs_for_io_outputs()) {
                title = string_compose(_("%1 input"), _selector.io()->name());

diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index 055a9bcae06cb806a4f4a039e617f7f04fa40094..dbe374fcbcd4d7d8be1c9552af5e1f1be016a7e3 100644 (file)
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -23,8 +23,6 @@
 
 #include <map>
 
-#include "ardour/profile.h"
-
 #include <gtkmm/stock.h>
 #include <gtkmm/label.h>
 #include <gtkmm/accelkey.h>

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 7268e8a2f47ebb9e58cc8cb22dd07ab0dde47cbd..9ccff8d9c9351e7baeb517e18f711c0dc89c8ac2 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -19,9 +19,6 @@
 
 #include <limits.h>
 
-#include "ardour/session.h"
-#include "ardour/session_route.h"
-#include "ardour/dB.h"
 #include "ardour/meter.h"
 
 #include <gtkmm2ext/utils.h>
@@ -39,8 +36,6 @@
 #include "keyboard.h"
 #include "public_editor.h"
 
-#include "ardour/session.h"
-
 #include "i18n.h"
 
 using namespace ARDOUR;

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 4ef413aef7efeb41e5ada471d42042a2a8fa6f6a..ea6a3f544c24cbe9483ba538d302fcd66e02d15e 100644 (file)
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -22,8 +22,6 @@
 
 #include <gtkmm2ext/utils.h>
 
-#include "ardour/utils.h"
-#include "ardour/configuration.h"
 #include "ardour/session.h"
 #include "pbd/memento_command.h"
 

diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc
index ab3fe1b39dad6ce5795a8017996b64fe2470dfcc..e2120e112a784fa1ea9b4023c74618c5bb0dd91e 100644 (file)
--- a/gtk2_ardour/lv2_plugin_ui.cc
+++ b/gtk2_ardour/lv2_plugin_ui.cc
@@ -18,13 +18,10 @@
 */
 
 #include "ardour/lv2_plugin.h"
-#include "ardour/plugin_manager.h"
-#include "ardour/processor.h"
 #include "ardour/session.h"
 #include "pbd/error.h"
 
 #include "ardour_ui.h"
-#include "gui_thread.h"
 #include "lv2_plugin_ui.h"
 
 #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 142b6c6988b1901b595189f3d983579f3cba490b..299ca8ee507fa92fac615ba50b274e77a1f16c99 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -31,8 +31,6 @@
 #include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
 
-#include "ardour/playlist.h"
-#include "ardour/tempo.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
 #include "ardour/midi_model.h"

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 2c8c91ebcd8829efcad4079a8e89ba272b09c46c..676aa52028fe3eced0b6c33853198d92affddbea 100644 (file)
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -24,14 +24,12 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#include "ardour/midi_diskstream.h"
-#include "ardour/midi_playlist.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
 #include "ardour/midi_track.h"
 #include "ardour/region_factory.h"
-#include "ardour/smf_source.h"
 #include "ardour/session.h"
+#include "ardour/smf_source.h"
 
 #include "ardour_ui.h"
 #include "canvas-simplerect.h"

diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index f38913fe31af5fb6f99b35c9102a325d7bf85cf2..4df22c7c960e9e39fc889f9a3df3585be7b6a83e 100644 (file)
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -38,22 +38,22 @@
 #include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/utils.h"
 
-#include "ardour/file_source.h"
-#include "ardour/ladspa_plugin.h"
-#include "ardour/location.h"
-#include "ardour/midi_diskstream.h"
+#include "ardour/event_type_map.h"
 #include "ardour/midi_patch_manager.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
+#include "ardour/midi_track.h"
 #include "ardour/operations.h"
 #include "ardour/playlist.h"
-#include "ardour/processor.h"
+#include "ardour/region.h"
 #include "ardour/region_factory.h"
+#include "ardour/route.h"
 #include "ardour/session.h"
-#include "ardour/session_playlist.h"
-#include "ardour/tempo.h"
-#include "ardour/utils.h"
+#include "ardour/session_object.h"
+#include "ardour/source.h"
+#include "ardour/track.h"
+#include "ardour/types.h"
 
 #include "midi++/names.h"
 

diff --git a/gtk2_ardour/missing_plugin_dialog.cc b/gtk2_ardour/missing_plugin_dialog.cc
index d5edd4ca368974e3269eee2048adb95bb8d1f05b..ddbca3a5f4b5f8ac68d9db3d3543458eee5384fa 100755 (executable)
--- a/gtk2_ardour/missing_plugin_dialog.cc
+++ b/gtk2_ardour/missing_plugin_dialog.cc
@@ -17,7 +17,6 @@
 */
 
 #include <gtkmm/label.h>
-#include "ardour/session.h"
 #include "missing_plugin_dialog.h"
 #include "i18n.h"
 

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index 6482abebc2ad7f653b8200635824c4a4a987790e..db586eed7e15393a28213f516ad037acaa9aff29 100644 (file)
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -22,7 +22,6 @@
 #include "gtkmm2ext/utils.h"
 
 #include "ardour/route_group.h"
-#include "ardour/session.h"
 #include "mixer_group_tabs.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 542ab7b21f6d80cf3719b6a2b4abf465cca042ef..ff3fd54624da77830c388fb8872bb107c37d8d92 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -34,24 +34,21 @@
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/bindable_button.h>
 
-#include "ardour/ardour.h"
-#include "ardour/amp.h"
-#include "ardour/session.h"
+#include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/internal_send.h"
-#include "ardour/route.h"
-#include "ardour/route_group.h"
-#include "ardour/audio_track.h"
 #include "ardour/midi_track.h"
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
 #include "ardour/panner_shell.h"
-#include "ardour/send.h"
-#include "ardour/processor.h"
+#include "ardour/port.h"
 #include "ardour/profile.h"
-#include "ardour/ladspa_plugin.h"
+#include "ardour/route.h"
+#include "ardour/route_group.h"
+#include "ardour/send.h"
+#include "ardour/session.h"
+#include "ardour/types.h"
 #include "ardour/user_bundle.h"
-#include "ardour/port.h"
 
 #include "ardour_ui.h"
 #include "ardour_window.h"

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 3779f0c0420c4a9601baec1fd37e8db08629f0f9..779369aa900872f60670f1eb4d86f7bc2acb753d 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -36,11 +36,9 @@
 #include <gtkmm2ext/tearoff.h>
 #include <gtkmm2ext/window_title.h>
 
-#include "ardour/audio_track.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/route_group.h"
 #include "ardour/session.h"
-#include "ardour/session_route.h"
 
 #include "keyboard.h"
 #include "mixer_ui.h"

diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index 82519cc85eb99991ded03cdc4a8ad11dbf4171f7..359ce0c7963370814563f634211a359d84922ce3 100644 (file)
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -8,10 +8,8 @@
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/motionfeedback.h"
 
-#include "ardour/dB.h"
 #include "ardour/monitor_processor.h"
 #include "ardour/route.h"
-#include "ardour/utils.h"
 
 #include "ardour_ui.h"
 #include "gui_thread.h"

diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc
index e93dc838942ce36d17e8c9dbadbb34f746b82b68..8ba9c411bd1dd59d9065939e9b08169869793734 100644 (file)
--- a/gtk2_ardour/mono_panner.cc
+++ b/gtk2_ardour/mono_panner.cc
@@ -32,9 +32,8 @@
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/utils.h"
 
-#include "ardour/panner.h"
-#include "ardour/panner.h"
 #include "ardour/pannable.h"
+#include "ardour/panner.h"
 
 #include "ardour_ui.h"
 #include "global_signals.h"

diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc
index 8d9d75538ff300e0517340866af936e0b3c014fb..110a977716b4e347369811bf896f5abda088839e 100644 (file)
--- a/gtk2_ardour/nag.cc
+++ b/gtk2_ardour/nag.cc
@@ -7,7 +7,6 @@
 
 #include "pbd/openuri.h"
 
-#include "ardour/ardour.h"
 #include "ardour/filesystem_paths.h"
 
 #include "nag.h"

diff --git a/gtk2_ardour/note_player.cc b/gtk2_ardour/note_player.cc
index c9c9f9de0ebbf6690c81f6ab09bc4a981bde4a97..b9f480a6be41b10c3a7a912b6388322f7ba32e7a 100644 (file)
--- a/gtk2_ardour/note_player.cc
+++ b/gtk2_ardour/note_player.cc
@@ -20,7 +20,6 @@
 #include <glibmm/main.h>
 
 #include "ardour/midi_track.h"
-#include "ardour/session.h"
 
 #include "note_player.h"
 

diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 51255d329111cd4b11a8f3a82ee599c24cf9d975..14513ca8ad4817f3d2fa0cac5789d28cfc289b2a 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -18,13 +18,17 @@
 
 #include <limits.h>
 
-#include "ardour/io.h"
-#include "ardour/dB.h"
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/barcontroller.h>
+
 #include "midi++/manager.h"
 #include "pbd/fastlog.h"
 
+#include "ardour/pannable.h"
+#include "ardour/panner.h"
+#include "ardour/panner_shell.h"
+#include "ardour/session.h"
+
 #include "ardour_ui.h"
 #include "panner_ui.h"
 #include "panner2d.h"
@@ -33,12 +37,6 @@
 #include "stereo_panner.h"
 #include "mono_panner.h"
 
-#include "ardour/delivery.h"
-#include "ardour/session.h"
-#include "ardour/panner.h"
-#include "ardour/pannable.h"
-#include "ardour/panner_shell.h"
-#include "ardour/route.h"
 
 #include "i18n.h"
 

diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index 31710deb718e5b7811228e331534f8ccacebef8a..cda844ee898e28029256b19a5549dffa2de00ec7 100644 (file)
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -20,12 +20,10 @@
 
 #include <gtkmm/button.h>
 
-#include "ardour/session_playlist.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/playlist.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioplaylist.h"
-#include "ardour/configuration.h"
+#include "ardour/playlist.h"
+#include "ardour/session_playlist.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 

diff --git a/gtk2_ardour/plugin_eq_gui.h b/gtk2_ardour/plugin_eq_gui.h
index 145edb760eb46b416a43b706204983898bb4de57..5743152b15bd908398de8ec43f67c7845c3be455 100644 (file)
--- a/gtk2_ardour/plugin_eq_gui.h
+++ b/gtk2_ardour/plugin_eq_gui.h
@@ -21,15 +21,20 @@
 #ifndef __ardour_plugin_eq_gui_h
 #define __ardour_plugin_eq_gui_h
 
+#include "pbd/signals.h"
+
 #include "ardour/buffer_set.h"
-#include "ardour/plugin_insert.h"
-#include "ardour/plugin.h"
 
 #include <gtkmm/table.h>
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/combobox.h>
 #include <gtkmm/liststore.h>
 
+namespace ARDOUR {
+       class Plugin;
+       class PluginInsert;
+}
+
 namespace GTKArdour {
         class FFT;
 }

diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index 1ec07d1bbe4be83c8a5078ada4d31da65225ce99..77b8f26ca9533e6e4c63aa58ce00084199174b97 100644 (file)
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -37,8 +37,6 @@
 
 #include "ardour/plugin_manager.h"
 #include "ardour/plugin.h"
-#include "ardour/configuration.h"
-#include "ardour/session.h"
 
 #include "ardour_ui.h"
 #include "plugin_selector.h"

diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc
index 863c29f2437af8abd70f0a306db0e128c0819777..36b9ea1187254192533f57008ef75b3baccead06 100644 (file)
--- a/gtk2_ardour/port_group.cc
+++ b/gtk2_ardour/port_group.cc
@@ -24,16 +24,13 @@
 #include "midi++/manager.h"
 #include "midi++/mmc.h"
 
-#include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
+#include "ardour/auditioner.h"
 #include "ardour/bundle.h"
-#include "ardour/user_bundle.h"
+#include "ardour/control_protocol_manager.h"
 #include "ardour/io_processor.h"
-#include "ardour/midi_track.h"
-#include "ardour/port.h"
 #include "ardour/session.h"
-#include "ardour/auditioner.h"
-#include "ardour/control_protocol_manager.h"
+#include "ardour/user_bundle.h"
 #include "control_protocol/control_protocol.h"
 
 #include "gui_thread.h"

diff --git a/gtk2_ardour/port_insert_ui.cc b/gtk2_ardour/port_insert_ui.cc
index 4e9a3b1c1e0bec8ff42d4f54cc5f086b1d14e9b9..16beb75877d49ae9aed6440382a66a19ece73366 100644 (file)
--- a/gtk2_ardour/port_insert_ui.cc
+++ b/gtk2_ardour/port_insert_ui.cc
@@ -22,17 +22,10 @@
 
 #include <gtkmm2ext/doi.h>
 
-#include "ardour/port_insert.h"
-#include "ardour/session.h"
-#include "ardour/io.h"
 #include "ardour/audioengine.h"
-#include "ardour/track.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_track.h"
 #include "ardour/mtdm.h"
-#include "ardour/data_type.h"
-#include "ardour/port.h"
-#include "ardour/bundle.h"
+#include "ardour/port_insert.h"
+#include "ardour/session.h"
 
 #include "port_insert_ui.h"
 #include "utils.h"
@@ -170,7 +163,7 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD
 {
 
        set_name ("IOSelectorWindow");
-       string title = _("Port Insert ");
+       std::string title = _("Port Insert ");
        title += pi->name();
        set_title (title);
 

diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc
index 5496c40a491d4c4b0517101494edcb366bddfce1..1f5a21feec22daa38a9cef20161ce1340ca1522d 100644 (file)
--- a/gtk2_ardour/port_matrix_column_labels.cc
+++ b/gtk2_ardour/port_matrix_column_labels.cc
@@ -20,7 +20,6 @@
 #include <iostream>
 #include "gtkmm2ext/keyboard.h"
 #include "ardour/bundle.h"
-#include "ardour/types.h"
 #include "port_matrix_column_labels.h"
 #include "port_matrix.h"
 #include "port_matrix_body.h"

diff --git a/gtk2_ardour/port_matrix_grid.cc b/gtk2_ardour/port_matrix_grid.cc
index daa25139dc7f896532d091072fe6ca17254e63d2..c8699ece1e6bf5bffb1066106a8c9468a853dbe3 100644 (file)
--- a/gtk2_ardour/port_matrix_grid.cc
+++ b/gtk2_ardour/port_matrix_grid.cc
@@ -20,7 +20,6 @@
 #include <iostream>
 #include <cairo/cairo.h>
 #include "ardour/bundle.h"
-#include "ardour/types.h"
 #include "port_matrix_grid.h"
 #include "port_matrix.h"
 #include "port_matrix_body.h"

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 1bba2c8af1c9ff0dcf32f4ce292f9bc314f9bae3..d9c21dcc9ba776b593fec986e3bf031e707a7c8f 100644 (file)
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -40,13 +40,10 @@
 #include <gtkmm2ext/doi.h>
 
 #include "ardour/amp.h"
-#include "ardour/ardour.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
-#include "ardour/internal_send.h"
 #include "ardour/internal_return.h"
-#include "ardour/ladspa_plugin.h"
-#include "ardour/meter.h"
+#include "ardour/internal_send.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/port_insert.h"
 #include "ardour/profile.h"
@@ -54,7 +51,7 @@
 #include "ardour/route.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
-#include "ardour/dB.h"
+#include "ardour/types.h"
 
 #include "actions.h"
 #include "ardour_dialog.h"

diff --git a/gtk2_ardour/public_editor.cc b/gtk2_ardour/public_editor.cc
index 1b8b5c480155da25b1522fab64bb3221c564b078..dc468e4a83e237f05c7837a7d3b0d3224a7113e9 100644 (file)
--- a/gtk2_ardour/public_editor.cc
+++ b/gtk2_ardour/public_editor.cc
@@ -18,7 +18,6 @@
 */
 
 #include "public_editor.h"
-#include "editor.h"
 
 PublicEditor* PublicEditor::_instance = 0;
 

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 57e3c8dede058c7079b450ab2c70a9f5447a37b9..9f903b547cc0cc057ce58368f1fcd9389c651403 100644 (file)
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -36,7 +36,6 @@
 #include <sigc++/signal.h>
 
 #include "evoral/types.hpp"
-#include "ardour/route_group.h"
 
 #include "pbd/statefuldestructible.h"
 

diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
index 622223047a8a142a2d18293f8d4d0dae0e2547d2..cf1bfcfb62fbb1ea0fecf5bfbee3e45d70c49c77 100755 (executable)
--- a/gtk2_ardour/region_editor.cc
+++ b/gtk2_ardour/region_editor.cc
@@ -17,18 +17,16 @@
 
 */
 
+#include <cmath>
+
+#include <gtkmm/listviewtext.h>
+
 #include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
 
-#include "ardour/session.h"
 #include "ardour/region.h"
-#include "ardour/playlist.h"
-#include "ardour/utils.h"
-#include "ardour/dB.h"
+#include "ardour/session.h"
 #include "ardour/source.h"
-#include "gtkmm2ext/utils.h"
-#include <gtkmm/listviewtext.h>
-#include <cmath>
 
 #include "ardour_ui.h"
 #include "clock_group.h"

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 1c9b8fe67bf2e16a9ccc4d2fad54534b26a39cee..5c6a452b6137a0f725cf03cf2d3fb56736e8abd9 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -26,8 +26,6 @@
 #include <gtkmm2ext/gtk_ui.h>
 
 #include "ardour/playlist.h"
-#include "ardour/audioregion.h"
-#include "ardour/audiosource.h"
 #include "ardour/session.h"
 
 #include "ardour_ui.h"

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index eabb164785d75a5624a94343960714d8528c640f..8120534b7d0f1294ad9170bcceec68a06f76020b 100644 (file)
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -19,10 +19,9 @@
 
 #include <gtkmm2ext/doi.h>
 
-#include "ardour/amp.h"
 #include "ardour/io.h"
-#include "ardour/return.h"
 #include "ardour/rc_configuration.h"
+#include "ardour/return.h"
 
 #include "utils.h"
 #include "return_ui.h"

diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc
index bd9dd42f8750e21a0dc0a987c3a5eb41cb9deae8..9400d2fc204b08c41c45669dee7e06f4f47e5f0c 100644 (file)
--- a/gtk2_ardour/rhythm_ferret.cc
+++ b/gtk2_ardour/rhythm_ferret.cc
@@ -4,13 +4,10 @@
 #include "pbd/memento_command.h"
 #include "pbd/convert.h"
 
-#include "ardour/transient_detector.h"
-#include "ardour/onset_detector.h"
-#include "ardour/audiosource.h"
 #include "ardour/audioregion.h"
-#include "ardour/playlist.h"
-#include "ardour/region_factory.h"
+#include "ardour/onset_detector.h"
 #include "ardour/session.h"
+#include "ardour/transient_detector.h"
 
 #include "rhythm_ferret.h"
 #include "audio_region_view.h"

diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index e10fcb4139e0953d5b5e81d35a69298f61a6fba2..ca673954d45ad5dd77584f93ea9e97f8367bf0e7 100644 (file)
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -24,9 +24,7 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/window_title.h>
 
-#include "ardour/ardour.h"
 #include "ardour/audioengine.h"
-#include "ardour/audio_track.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/plugin_manager.h"
@@ -34,9 +32,6 @@
 #include "ardour/return.h"
 #include "ardour/route.h"
 #include "ardour/send.h"
-#include "ardour/session.h"
-#include "ardour/session.h"
-#include "ardour/session_route.h"
 
 #include "ardour_ui.h"
 #include "gui_thread.h"

diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc
index 1810ba674b40498ef838b595da8a66eac06b7893..e66eaf959e868f9d01d3654eb5af4007ab58a11d 100644 (file)
--- a/gtk2_ardour/route_processor_selection.cc
+++ b/gtk2_ardour/route_processor_selection.cc
@@ -21,10 +21,6 @@
 #include <sigc++/bind.h>
 #include "pbd/error.h"
 
-#include "ardour/playlist.h"
-#include "ardour/processor.h"
-#include "ardour/route.h"
-
 #include "gui_thread.h"
 #include "mixer_strip.h"
 #include "route_processor_selection.h"

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 8fc9b901406625a4d6cb0a64f909f7b6ed99d565..6b52e64572c32a9d14bee67e18f8f8c08b972ce8 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -43,22 +43,12 @@
 #include <gtkmm2ext/utils.h>
 
 #include "ardour/amp.h"
-#include "ardour/audioplaylist.h"
-#include "ardour/diskstream.h"
 #include "ardour/event_type_map.h"
-#include "ardour/ladspa_plugin.h"
-#include "ardour/location.h"
-#include "ardour/panner.h"
-#include "ardour/playlist.h"
-#include "ardour/playlist.h"
 #include "ardour/processor.h"
 #include "ardour/profile.h"
-#include "ardour/region_factory.h"
 #include "ardour/route_group.h"
 #include "ardour/session.h"
-#include "ardour/session_playlist.h"
-#include "ardour/debug.h"
-#include "ardour/utils.h"
+#include "ardour/session_playlists.h"
 #include "evoral/Parameter.hpp"
 
 #include "ardour_ui.h"

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 6fdd10d9ccca222546ff5035ba683c43aff7edf6..ff970bc5a1fb4bf8590544e8d315686497c70977 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -46,16 +46,13 @@
 #include "route_time_axis.h"
 #include "group_tabs.h"
 
-#include "ardour/route.h"
-#include "ardour/event_type_map.h"
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
 #include "ardour/audio_track.h"
+#include "ardour/audioengine.h"
+#include "ardour/filename_extensions.h"
 #include "ardour/midi_track.h"
+#include "ardour/route.h"
+#include "ardour/session.h"
 #include "ardour/template_utils.h"
-#include "ardour/filename_extensions.h"
-#include "ardour/directory_names.h"
-#include "ardour/profile.h"
 
 #include "i18n.h"
 using namespace Gtk;

diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index e1e3a8b7da07cfefb66e716ab991b3c837316ddb..e9699f2cfe3fd9ede94c92b27e829e8063b6c096 100644 (file)
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -19,7 +19,6 @@
 
 #include <gtkmm2ext/doi.h>
 
-#include "ardour/amp.h"
 #include "ardour/io.h"
 #include "ardour/send.h"
 #include "ardour/rc_configuration.h"

diff --git a/gtk2_ardour/session_import_dialog.h b/gtk2_ardour/session_import_dialog.h
index f4ba9cadf7e66059109a4ccb92f8ba2eb8f519f2..b31751115f4ede5d4641a45248209a14739517fc 100644 (file)
--- a/gtk2_ardour/session_import_dialog.h
+++ b/gtk2_ardour/session_import_dialog.h
@@ -29,12 +29,11 @@
 #include <gtkmm.h>
 
 #include "pbd/xml++.h"
-#include "ardour/element_importer.h"
-#include "ardour/element_import_handler.h"
 
 #include "ardour_dialog.h"
-
 namespace ARDOUR {
+       class ElementImportHandler;
+       class ElementImporter;
        class Session;
 }
 

diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc
index 5bac70610627b570f75a04094d673d15280f6e3e..1184a89cf537da68806823e98e5346a50e8d753b 100644 (file)
--- a/gtk2_ardour/session_metadata_dialog.cc
+++ b/gtk2_ardour/session_metadata_dialog.cc
@@ -24,10 +24,9 @@
 #include <gtkmm2ext/utils.h>
 
 #include "pbd/xml++.h"
+
 #include "ardour/session.h"
-#include "ardour/session_directory.h"
 #include "ardour/session_utils.h"
-#include "ardour/configuration.h"
 
 #include "i18n.h"
 

diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index b9f54f94e81aa3347234d791310cb1cbc6879f46..0f7483a8eb949c299c27b8e062ca42915a2a5759 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -18,10 +18,6 @@
 */
 
 #include "ardour/session.h"
-#include "ardour/io.h"
-#include "ardour/auditioner.h"
-#include "ardour/audioengine.h"
-#include "ardour/port.h"
 
 #include "gui_thread.h"
 #include "session_option_editor.h"

diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 5451fe180e5f5effe3a22eaf47f742791057c1dc..0e233e83d2eb45dd61cfc3372cd857998292aa14 100644 (file)
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -43,7 +43,6 @@
 
 #include "evoral/SMF.hpp"
 
-#include "ardour/amp.h"
 #include "ardour/audio_library.h"
 #include "ardour/auditioner.h"
 #include "ardour/audioregion.h"
@@ -53,7 +52,6 @@
 #include "ardour/source_factory.h"
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
-#include "ardour/profile.h"
 
 #include "ardour_ui.h"
 #include "editing.h"

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 5dd58deb2628721d21f088d7edf4e27479e8e9b8..f72b464d80a0a3b9dc64789e2a40c121b9e0de2f 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -25,7 +25,6 @@
 
 #include "ardour/playlist.h"
 #include "ardour/region.h"
-#include "ardour/source.h"
 #include "ardour/track.h"
 #include "ardour/session.h"
 

diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc
index 0049371a17764a9980e4a6f78342e9002de53b1f..32e7bc60545d81b562b8884be3a383de5042e7cb 100644 (file)
--- a/gtk2_ardour/strip_silence_dialog.cc
+++ b/gtk2_ardour/strip_silence_dialog.cc
@@ -22,12 +22,10 @@
 #include <gtkmm/table.h>
 #include <gtkmm/label.h>
 #include <gtkmm/stock.h>
-#include "ardour/audioregion.h"
-#include "ardour/audiosource.h"
 
+#include "ardour/audioregion.h"
 #include "ardour/dB.h"
 #include "ardour_ui.h"
-#include "ardour/session.h"
 
 #include "audio_clock.h"
 #include "gui_thread.h"

diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc
index 5fef5e46eee4a6bb5957cf9b30ca54ba4c0418fd..33731798d7bb3fd03a163a811f3799a0e6c42ef0 100644 (file)
--- a/gtk2_ardour/tape_region_view.cc
+++ b/gtk2_ardour/tape_region_view.cc
@@ -24,7 +24,6 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#include "ardour/playlist.h"
 #include "ardour/audioregion.h"
 #include "ardour/audiosource.h"
 

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 8c9d5594410c81cc559721dd9da2e400bc72c1f5..71300ad07d8bf91e6fa8218037fc5d1354a6d0af 100644 (file)
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -32,9 +32,7 @@
 
 #include "pbd/file_utils.h"
 
-#include "ardour/configuration.h"
 #include "ardour/filesystem_paths.h"
-#include "ardour/profile.h"
 
 #include "ardour_button.h"
 #include "theme_manager.h"

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 8c30772f0c2aa7484fa7056fa8a50070b0a1f923..229a7065a2099e4c0141e7bfe3c8bf9aba19760d 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -33,12 +33,6 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.h>
 
-#include "ardour/session.h"
-#include "ardour/utils.h"
-#include "ardour/ladspa_plugin.h"
-#include "ardour/processor.h"
-#include "ardour/location.h"
-
 #include "ardour_ui.h"
 #include "global_signals.h"
 #include "gui_thread.h"

diff --git a/gtk2_ardour/time_fx_dialog.cc b/gtk2_ardour/time_fx_dialog.cc
index 0958c20f2ea97f2016b61888b3f0471b01c66ef7..1fd52cebc3ab0ecc210a9e761dd216351b6aff54 100644 (file)
--- a/gtk2_ardour/time_fx_dialog.cc
+++ b/gtk2_ardour/time_fx_dialog.cc
@@ -36,15 +36,6 @@
 #include "audio_region_view.h"
 #include "region_selection.h"
 
-#include "ardour/session.h"
-#include "ardour/region.h"
-#include "ardour/audioplaylist.h"
-#include "ardour/audio_track.h"
-#include "ardour/audioregion.h"
-#include "ardour/stretch.h"
-#include "ardour/midi_stretch.h"
-#include "ardour/pitch.h"
-
 #ifdef USE_RUBBERBAND
 #include "rubberband/RubberBandStretcher.h"
 using namespace RubberBand;

diff --git a/gtk2_ardour/time_fx_dialog.h b/gtk2_ardour/time_fx_dialog.h
index d47ba4265f108e4c3826c47abab88a9fad1ef7d9..424bfe98139bdfecac78e52fb6b7ed69e911284d 100644 (file)
--- a/gtk2_ardour/time_fx_dialog.h
+++ b/gtk2_ardour/time_fx_dialog.h
@@ -22,11 +22,9 @@
 
 #include <gtkmm.h>
 
-#include "ardour/playlist.h"
 #include "ardour/timefx_request.h"
 
 #include "ardour_dialog.h"
-#include "region_selection.h"
 #include "progress_reporter.h"
 
 class Editor;

diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc
index 4bc0e2a96ab7c3c8754aa58095e148d43b3c4fe7..419d82dbccfde06c06c0c9788803f3ea573538f3 100644 (file)
--- a/gtk2_ardour/time_selection.cc
+++ b/gtk2_ardour/time_selection.cc
@@ -20,7 +20,7 @@
 #include <algorithm>
 
 #include "pbd/error.h"
-#include "ardour/ardour.h"
+#include "ardour/types.h"
 
 #include "time_selection.h"
 

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 0d41ade0a591be3fffcb06bb90b6986113845105..b17316e2dbf4b68f393e053c8ead706569e6f645 100644 (file)
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -31,7 +31,6 @@
 
 #include "gtkmm2ext/rgb_macros.h"
 
-#include "ardour/ardour.h"
 #include "ardour/filesystem_paths.h"
 
 #include "ui_config.h"

diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 988bd370ae7a3618391e2cd0092bfb9342fda65e..96bee1a87ba0b951067f2f7c8226f3fc73ce9065 100644 (file)
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -40,7 +40,6 @@
 #include "pbd/file_utils.h"
 
 #include <gtkmm2ext/utils.h>
-#include "ardour/configuration.h"
 #include "ardour/rc_configuration.h"
 
 #include "ardour/filesystem_paths.h"

diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc
index 24b2066ed5a2d55f8bcc8617a7254104d33647ec..1579b5dcea7b2f0e64b2283cfc7f1c01f1b4d9e3 100644 (file)
--- a/libs/ardour/amp.cc
+++ b/libs/ardour/amp.cc
@@ -26,8 +26,6 @@
 #include "ardour/amp.h"
 #include "ardour/audio_buffer.h"
 #include "ardour/buffer_set.h"
-#include "ardour/configuration.h"
-#include "ardour/io.h"
 #include "ardour/midi_buffer.h"
 #include "ardour/session.h"
 

diff --git a/libs/ardour/analyser.cc b/libs/ardour/analyser.cc
index c19657baaf40ce9988b4b1d8f23e335dcc7586c8..730ea4169ad73d234759267b1e1323cfd26de3c5 100644 (file)
--- a/libs/ardour/analyser.cc
+++ b/libs/ardour/analyser.cc
@@ -22,9 +22,6 @@
 #include "ardour/session_event.h"
 #include "ardour/transient_detector.h"
 
-#include "pbd/pthread_utils.h"
-#include "pbd/convert.h"
-
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/ardour/audio_buffer.h b/libs/ardour/ardour/audio_buffer.h
index 57c5de612482695692a9766cfb0cf44feda83ae2..faa3de768593785cb80e0a59c8928fe1c42ea715 100644 (file)
--- 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 9b3abfc33da043e0cb31f9d2d381b54d9be5649a..011bfe39b82d76392e84731bba04640466077624 100644 (file)
--- 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 2187d921485ca9fb06e2bdf1b22c9bda646b61f5..5aee017c51b23d04644dabed281fdcfb8e6b072e 100644 (file)
--- 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 991a3bbbcc76b0790cbb9687f95790d6e2a5de10..0e87d6e6dfeef075a4228ec6e835a0f1e5fc9f56 100644 (file)
--- 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 c6f6822519ca9a96f3a604b9025f15d5aeda80e9..cbb92e7c4ab988b5f8ba5d2c5825cac36d0b99b3 100644 (file)
--- 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 a4235dd9c0561f6321a50a4a707ebc8ecdbb0e56..a377d351f6af1ead8ca81aba5d174453fe69634f 100644 (file)
--- 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 a950cecc65194f1d6b6bd843ac84114645d88cd6..b625be9dc3417d4bf626d6a2a760b1d2e13936a6 100644 (file)
--- 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 0ba5f73e8df87267e4a4a62777a80d9d3a740f0e..46b44e2252d7cf6a486e0a962c3e697b56005968 100644 (file)
--- 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 18aa8db5198c56db566178c2fb053a065c90f219..f565fd4134ea29873c2db281aca53ef5f56ca413 100644 (file)
--- 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 c4061684eb3fbc3206bc7c29483784d50e445bde..eb8ffc233356e6c278220df4f79467eee8097ef2 100644 (file)
--- 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 164b348c373ce70f2162f2954acd7b7569b4d2f9..cb24cb55f514417aba2f6df905ce9c780fcdddf4 100644 (file)
--- 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 9273aab6c72cdad82e4704f3614cf17786d11d03..5cb32dbb1a0d0d433ef3117b3fb5441a86334927 100644 (file)
--- 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 2b6f1ec1c273aacbbf9118ef62bea98b5a3d4837..332c5ae685f839a796c42682adef71205f2615bf 100644 (file)
--- 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 4a9f8305ad3bb454fe096702bb22f93dd89c2ad4..773b04f38650ece90a569d8dd161f3872abe5ba9 100644 (file)
--- 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 4948d844f42c53278b45d521b6cb14c2d89a7824..9d67e1cd646e2465626ff02f54fb530080ee1587 100644 (file)
--- 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 20ca0d355d381fdcd100866a209ea16e827bd7fb..80584e68595ade9dffe8f14fa029afdceba6f7ff 100644 (file)
--- 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 3cc8e2aaf8b54b7cf6a1275ddeaf067665a4b606..2665c719e6df42af6b3fbd77a9f20e16da8564b8 100644 (file)
--- 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 b146d3231c404e2d161b4d4439b8bfdbffca8df9..8612e264c440a0582a6f1351b40c457b9bfddc3a 100644 (file)
--- 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 beacbc1e014e8643eabcb50e3d479910a7f5937d..57c7402781ac425120b5873007ee1e7a8fa29a3b 100644 (file)
--- 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:

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index c38901f4302a8273ed62a7d7bb2dfde3655fb326..8c5b6063884e1e8a1e40ce091e6d293512dcd18b 100644 (file)
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -37,29 +37,24 @@
 #include "pbd/stateful_diff_command.h"
 
 #include "ardour/analyser.h"
-#include "ardour/ardour.h"
 #include "ardour/audio_buffer.h"
 #include "ardour/audio_diskstream.h"
 #include "ardour/audio_port.h"
 #include "ardour/audioengine.h"
 #include "ardour/audiofilesource.h"
-
 #include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
 #include "ardour/butler.h"
-#include "ardour/configuration.h"
-#include "ardour/cycle_timer.h"
 #include "ardour/debug.h"
 #include "ardour/io.h"
 #include "ardour/playlist_factory.h"
 #include "ardour/region_factory.h"
-#include "ardour/send.h"
 #include "ardour/session.h"
+#include "ardour/session_playlists.h"
 #include "ardour/source_factory.h"
 #include "ardour/track.h"
+#include "ardour/types.h"
 #include "ardour/utils.h"
-#include "ardour/session_playlists.h"
-#include "ardour/route.h"
 
 #include "i18n.h"
 #include <locale.h>

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index da6f84a4ae969749d802875fee42241d94f75a48..25fad6122f72e2a3621e0432e6d23d1126f4d0c0 100644 (file)
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -23,12 +23,10 @@
 
 #include "ardour/types.h"
 #include "ardour/debug.h"
-#include "ardour/configuration.h"
 #include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
 #include "ardour/region_sorters.h"
 #include "ardour/session.h"
-#include "pbd/enumwriter.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/audio_playlist_importer.cc b/libs/ardour/audio_playlist_importer.cc
index 1c119e0ed7891030de3505dc37e492ffae1e087a..34d46915f188e6f21feaa9417b804fc709051b82 100644 (file)
--- a/libs/ardour/audio_playlist_importer.cc
+++ b/libs/ardour/audio_playlist_importer.cc
@@ -28,7 +28,6 @@
 
 #include "ardour/audio_region_importer.h"
 #include "ardour/session.h"
-#include "ardour/playlist.h"
 #include "ardour/playlist_factory.h"
 #include "ardour/session_playlists.h"
 

diff --git a/libs/ardour/audio_playlist_source.cc b/libs/ardour/audio_playlist_source.cc
index 141a8495f9eb75b326e1244615ed03e3db37ca2f..4ba820d7160ba2bf0c816655b87572992bf6937b 100644 (file)
--- a/libs/ardour/audio_playlist_source.cc
+++ b/libs/ardour/audio_playlist_source.cc
@@ -27,18 +27,13 @@
 #include <glibmm/miscutils.h>
 
 #include "pbd/error.h"
-#include "pbd/convert.h"
-#include "pbd/enumwriter.h"
 
 #include "ardour/audioplaylist.h"
 #include "ardour/audio_playlist_source.h"
 #include "ardour/audioregion.h"
-#include "ardour/debug.h"
 #include "ardour/filename_extensions.h"
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
-#include "ardour/session_playlists.h"
-#include "ardour/source_factory.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc
index ae64d797c9da5268d1a3c0b16e5f1b4697bfc8be..48a757fb42ca1d0143c2f314677e43a3eb174966 100644 (file)
--- a/libs/ardour/audio_port.cc
+++ b/libs/ardour/audio_port.cc
@@ -20,10 +20,9 @@
 
 #include "pbd/stacktrace.h"
 
+#include "ardour/audio_buffer.h"
 #include "ardour/audio_port.h"
-#include "ardour/audioengine.h"
 #include "ardour/data_type.h"
-#include "ardour/audio_buffer.h"
 
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/audio_region_importer.cc b/libs/ardour/audio_region_importer.cc
index 6f6bd8250136b12db62632f5aa31dea555b1e43c..91c362d042e8602fba3bda807aa4c799c604fad1 100644 (file)
--- a/libs/ardour/audio_region_importer.cc
+++ b/libs/ardour/audio_region_importer.cc
@@ -28,7 +28,6 @@
 
 #include "ardour/session.h"
 #include "ardour/region.h"
-#include "ardour/source_factory.h"
 #include "ardour/region_factory.h"
 #include "ardour/session_directory.h"
 

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index b548b3a4448953ccf091a1474015f30b6c0b6f19..293ca0d2c1c941b7d9afd90e67a923e8a350e54b 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -19,9 +19,9 @@
 
 #include <boost/scoped_array.hpp>
 
-#include "pbd/error.h"
-#include "pbd/enumwriter.h"
 #include "pbd/boost_debug.h"
+#include "pbd/enumwriter.h"
+#include "pbd/error.h"
 
 #include "evoral/Curve.hpp"
 
@@ -30,23 +30,18 @@
 #include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioplaylist.h"
-#include "ardour/audioregion.h"
-#include "ardour/audiosource.h"
 #include "ardour/buffer_set.h"
-#include "ardour/io_processor.h"
-#include "ardour/panner.h"
+#include "ardour/delivery.h"
 #include "ardour/meter.h"
 #include "ardour/playlist_factory.h"
-#include "ardour/plugin_insert.h"
-#include "ardour/port_insert.h"
 #include "ardour/processor.h"
+#include "ardour/region.h"
 #include "ardour/region_factory.h"
-#include "ardour/route_group_specialized.h"
 #include "ardour/session.h"
-#include "ardour/utils.h"
 #include "ardour/session_playlists.h"
-#include "ardour/delivery.h"
-#include "ardour/meter.h"
+#include "ardour/source.h"
+#include "ardour/utils.h"
+
 #include "i18n.h"
 
 using namespace std;

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 372581f4e637f5276c8b9a413682439f45ea1e47..7c3beb6c13d795bf8cd26a7b745e95c251766891 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -38,24 +38,16 @@
 #include "midi++/mmc.h"
 #include "midi++/manager.h"
 
-#include "ardour/amp.h"
 #include "ardour/audio_port.h"
 #include "ardour/audioengine.h"
 #include "ardour/buffer.h"
-#include "ardour/buffer_set.h"
 #include "ardour/cycle_timer.h"
-#include "ardour/event_type_map.h"
-#include "ardour/internal_return.h"
 #include "ardour/internal_send.h"
-#include "ardour/io.h"
 #include "ardour/meter.h"
 #include "ardour/midi_port.h"
-#include "ardour/process_thread.h"
 #include "ardour/port.h"
-#include "ardour/port_set.h"
+#include "ardour/process_thread.h"
 #include "ardour/session.h"
-#include "ardour/timestamps.h"
-#include "ardour/utils.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 3ae0db21019c11622e7095e62dd03e41d99847a4..e101f5b25b31710d2badb4a249283b6c7d8032d8 100644 (file)
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -46,11 +46,8 @@
 
 #include "ardour/audiofilesource.h"
 #include "ardour/debug.h"
-#include "ardour/sndfile_helpers.h"
 #include "ardour/sndfilesource.h"
 #include "ardour/session.h"
-#include "ardour/session_directory.h"
-#include "ardour/source_factory.h"
 #include "ardour/filename_extensions.h"
 
 // if these headers come before sigc++ is included

diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 9cbbdcfe4e271d2ba57a2107c92285e0c663c5f9..8a8f42165cce4431f2e35248b55011db26be7cab 100644 (file)
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -37,7 +37,6 @@
 #include "evoral/Curve.hpp"
 
 #include "ardour/audioregion.h"
-#include "ardour/debug.h"
 #include "ardour/session.h"
 #include "ardour/dB.h"
 #include "ardour/playlist.h"

diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index 8fe3b8d8c37acedab24f646334aa434971db8263..e33a3d30dee670352ea62318b07d59c866c7a26d 100644 (file)
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -35,13 +35,9 @@
 #include <glibmm/miscutils.h>
 
 #include "pbd/xml++.h"
-#include "pbd/pthread_utils.h"
 
 #include "ardour/audiosource.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/cycle_timer.h"
-#include "ardour/session.h"
-#include "ardour/transient_detector.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/runtime_functions.h"
 
 #include "i18n.h"

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 71730ad0bb415db50dd35cdd4166e7164738f6de..6c143568c43c30a37dc005ec562d86d6b27a4be7 100644 (file)
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -30,8 +30,6 @@
 #include "ardour/auditioner.h"
 #include "ardour/audioplaylist.h"
 #include "ardour/audio_port.h"
-#include "ardour/panner_shell.h"
-#include "ardour/panner.h"
 #include "ardour/data_type.h"
 #include "ardour/region_factory.h"
 

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 6d8114939de2c3d8130aa5ae112575cdf4b9bd8c..d0a605bcd9edbf80be131854d23ed37240a64eed 100644 (file)
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -17,27 +17,22 @@
 
 */
 
-#include "ardour/ardour.h"
 #include <fstream>
-#include <inttypes.h>
 #include <cstdio>
 #include <errno.h>
 
 #include <glibmm/miscutils.h>
 
 #include "pbd/error.h"
-#include "pbd/enumwriter.h"
-#include "pbd/stacktrace.h"
 
 #include "midi++/names.h"
 
-#include "ardour/automatable.h"
 #include "ardour/amp.h"
+#include "ardour/automatable.h"
 #include "ardour/event_type_map.h"
 #include "ardour/midi_track.h"
-#include "ardour/pannable.h"
-#include "ardour/panner.h"
 #include "ardour/pan_controllable.h"
+#include "ardour/pannable.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/session.h"
 

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index fd4a2280377418bbb65a80df8e60da8e1394feab..05463dcdd0ce79e5b40145181a1fc8734904804c 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -19,7 +19,7 @@
 */
 
 #include <iostream>
-#include "ardour/automatable.h"
+
 #include "ardour/automation_control.h"
 #include "ardour/event_type_map.h"
 #include "ardour/session.h"
@@ -28,7 +28,6 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-
 AutomationControl::AutomationControl(
                ARDOUR::Session& session,
                const Evoral::Parameter& parameter,

diff --git a/libs/ardour/broadcast_info.cc b/libs/ardour/broadcast_info.cc
index d31104d54586b91ed3ae88b4f5ff9c0ac4065d5b..436c30c797dab644c234cc225bd9ea1f0ed620fd 100644 (file)
--- a/libs/ardour/broadcast_info.cc
+++ b/libs/ardour/broadcast_info.cc
@@ -26,12 +26,9 @@
 #include <glibmm.h>
 
 #include "ardour/svn_revision.h"
-#include "ardour/ardour.h"
 #include "ardour/session.h"
 #include "ardour/session_metadata.h"
 
-#include "pbd/convert.h"
-
 using namespace PBD;
 
 namespace ARDOUR

diff --git a/libs/ardour/buffer_manager.cc b/libs/ardour/buffer_manager.cc
index 5a2d941eafc89ec4b6eca62f9a28f62094924444..b30fd6ebb683634a95b564194c7e4a97ef5211a7 100644 (file)
--- a/libs/ardour/buffer_manager.cc
+++ b/libs/ardour/buffer_manager.cc
@@ -22,7 +22,6 @@
 #include "pbd/compose.h"
 
 #include "ardour/buffer_manager.h"
-#include "ardour/debug.h"
 #include "ardour/thread_buffers.h"
 
 using namespace ARDOUR;

diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index 156cf4dd3fe583c68223ef5c9b6235d311c38c31..55356bdecba74d26dc284f2abd63a1b5af36efce 100644 (file)
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -33,7 +33,6 @@
 #include "ardour/midi_buffer.h"
 #include "ardour/port.h"
 #include "ardour/port_set.h"
-#include "ardour/audioengine.h"
 #ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
 #include "lv2_evbuf.h"

diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc
index 6180836bd2969d6380fe34626a05b2c4b16ee84f..5040882b7a32fc0e334a4516778e4ab6b10c9765 100644 (file)
--- a/libs/ardour/bundle.cc
+++ b/libs/ardour/bundle.cc
@@ -19,12 +19,9 @@
 
 #include <algorithm>
 
-#include "pbd/failed_constructor.h"
-#include "ardour/ardour.h"
 #include "ardour/bundle.h"
 #include "ardour/audioengine.h"
 #include "ardour/port.h"
-#include "pbd/xml++.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/callback.cc b/libs/ardour/callback.cc
index 85449dac03139ff80c477f32ff2f50b0e4bbefe2..37442fce0c5c91c19eeadbb0ad83b76afec5986d 100644 (file)
--- a/libs/ardour/callback.cc
+++ b/libs/ardour/callback.cc
@@ -16,7 +16,6 @@
 #include "pbd/strsplit.h"
 #include "pbd/convert.h"
 
-#include "ardour/callback.h"
 #include "ardour/filesystem_paths.h"
 
 using namespace std;

diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index 2931fe46e5ef3118ede67855c1e8e81eb495fb99..475781f3c57296287e050f9193d919f645c25f4c 100644 (file)
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -28,7 +28,6 @@
 #include "control_protocol/control_protocol.h"
 
 #include "ardour/debug.h"
-#include "ardour/session.h"
 #include "ardour/control_protocol_manager.h"
 #include "ardour/control_protocol_search_path.h"
 

diff --git a/libs/ardour/default_click.cc b/libs/ardour/default_click.cc
index 242e5c2918d386f332433dde1b50091b3a23b27f..fd23f0166de206d62cc8c0f932a380a0f8963a7a 100644 (file)
--- a/libs/ardour/default_click.cc
+++ b/libs/ardour/default_click.cc
@@ -18,8 +18,8 @@
 
 */
 
-#include "ardour/ardour.h"
 #include "ardour/session.h"
+#include "ardour/types.h"
 
 using namespace ARDOUR;
 

diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 86ce419340acfa781d01691e09378336d779f5b9..b58e7b4471e40d9cee627a86d2ea85363a2aa19f 100644 (file)
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -22,27 +22,22 @@
 #include "pbd/enumwriter.h"
 #include "pbd/convert.h"
 
-#include "ardour/midi_buffer.h"
-
-#include "ardour/debug.h"
-#include "ardour/delivery.h"
-#include "ardour/audio_buffer.h"
-#include "ardour/audio_port.h"
 #include "ardour/amp.h"
+#include "ardour/audioengine.h"
 #include "ardour/buffer_set.h"
-#include "ardour/configuration.h"
+#include "ardour/debug.h"
+#include "ardour/delivery.h"
 #include "ardour/io.h"
-#include "ardour/meter.h"
 #include "ardour/mute_master.h"
-#include "ardour/panner.h"
-#include "ardour/panner_shell.h"
 #include "ardour/pannable.h"
+#include "ardour/panner_shell.h"
 #include "ardour/port.h"
 #include "ardour/session.h"
-#include "ardour/audioengine.h"
 
 #include "i18n.h"
 
+namespace ARDOUR { class Panner; }
+
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 6e23eb81aacc534a68df54f9ad9b9f9afb310f1a..7a0b0a81b1bdc255a253fa06dd0fbd1f3cc533c5 100644 (file)
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -31,7 +31,6 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-
 #include <glibmm/thread.h>
 
 #include "pbd/error.h"
@@ -40,22 +39,12 @@
 #include "pbd/xml++.h"
 #include "pbd/stacktrace.h"
 
-#include "ardour/ardour.h"
-#include "ardour/audioengine.h"
 #include "ardour/debug.h"
 #include "ardour/diskstream.h"
-#include "ardour/utils.h"
-#include "ardour/configuration.h"
-#include "ardour/audiofilesource.h"
-#include "ardour/send.h"
+#include "ardour/io.h"
 #include "ardour/pannable.h"
-#include "ardour/panner_shell.h"
 #include "ardour/playlist.h"
-#include "ardour/cycle_timer.h"
-#include "ardour/region.h"
-#include "ardour/panner.h"
 #include "ardour/session.h"
-#include "ardour/io.h"
 #include "ardour/track.h"
 
 #include "i18n.h"

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index c0d6107639eb0218974889572e92fbfa1c46a9e3..afe92ed5f7babf961f327241d94aa5ded0a7dc56 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -20,22 +20,18 @@
 #include "pbd/enumwriter.h"
 #include "midi++/types.h"
 
-#include "ardour/audiofilesource.h"
-#include "ardour/audioregion.h"
 #include "ardour/delivery.h"
 #include "ardour/diskstream.h"
+#include "ardour/export_channel.h"
 #include "ardour/export_filename.h"
 #include "ardour/export_format_base.h"
 #include "ardour/export_profile_manager.h"
-#include "ardour/export_channel_configuration.h"
 #include "ardour/io.h"
 #include "ardour/location.h"
 #include "ardour/midi_model.h"
-#include "ardour/midi_track.h"
 #include "ardour/mute_master.h"
-#include "ardour/panner.h"
-#include "ardour/route_group.h"
 #include "ardour/session.h"
+#include "ardour/source.h"
 #include "ardour/track.h"
 #include "ardour/types.h"
 

diff --git a/libs/ardour/export_channel_configuration.cc b/libs/ardour/export_channel_configuration.cc
index 9487d021b49273f2292e26b6466917ecbaa7b379..77b56272d69ea1a4df986583ce012b1eb00528d0 100644 (file)
--- a/libs/ardour/export_channel_configuration.cc
+++ b/libs/ardour/export_channel_configuration.cc
@@ -20,16 +20,6 @@
 
 #include "ardour/export_channel_configuration.h"
 
-#include "ardour/export_handler.h"
-#include "ardour/export_filename.h"
-#include "ardour/export_timespan.h"
-
-#include "ardour/audio_port.h"
-#include "ardour/export_failed.h"
-#include "ardour/midi_port.h"
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
-
 #include "pbd/convert.h"
 #include "pbd/enumwriter.h"
 #include "pbd/pthread_utils.h"

diff --git a/libs/ardour/export_filename.cc b/libs/ardour/export_filename.cc
index d5309bd535d46a611a70b35e0f69b4933e693ded..f53dfbcbf6915583c3a04bb2d398c0391d2cb0fb 100644 (file)
--- a/libs/ardour/export_filename.cc
+++ b/libs/ardour/export_filename.cc
@@ -30,7 +30,6 @@
 #include "ardour/export_timespan.h"
 #include "ardour/export_format_specification.h"
 #include "ardour/export_channel_configuration.h"
-#include "ardour/export_failed.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/export_format_manager.cc b/libs/ardour/export_format_manager.cc
index 23a77925fe4f8ea199f8471c101fb53d53d88534..ff115d44470a6d6e8e34c8c8da1d3882858f2a98 100644 (file)
--- a/libs/ardour/export_format_manager.cc
+++ b/libs/ardour/export_format_manager.cc
@@ -20,7 +20,6 @@
 
 #include "ardour/export_format_manager.h"
 
-#include "ardour/types.h"
 #include "ardour/export_format_specification.h"
 #include "ardour/export_format_compatibility.h"
 

diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc
index 8152ff0c20d1700e54cfe98d35a49372cca5c553..fbb5d0f98aa8140cdabf038f6d8d86dc29df2951 100644 (file)
--- a/libs/ardour/export_graph_builder.cc
+++ b/libs/ardour/export_graph_builder.cc
@@ -17,7 +17,6 @@
 #include "ardour/export_format_specification.h"
 #include "ardour/export_timespan.h"
 #include "ardour/sndfile_helpers.h"
-#include "ardour/utils.h"
 
 #include "pbd/filesystem.h"
 #include "pbd/cpus.h"

diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index f44450d3f01b0f844d4e6744ddf54385e00144b3..fb65cebff0795db394866796912e32e4a892d019 100644 (file)
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -26,15 +26,12 @@
 #include "pbd/convert.h"
 #include "pbd/filesystem.h"
 
-#include "ardour/ardour.h"
-#include "ardour/configuration.h"
 #include "ardour/export_graph_builder.h"
 #include "ardour/export_timespan.h"
 #include "ardour/export_channel_configuration.h"
 #include "ardour/export_status.h"
 #include "ardour/export_format_specification.h"
 #include "ardour/export_filename.h"
-#include "ardour/export_failed.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/export_timespan.cc b/libs/ardour/export_timespan.cc
index 20b535836c94f50bfb1f01e7f52dfa99246f79e4..3b2021355e1f9ecf7ce8c1a4ccad70709a25c9fd 100644 (file)
--- a/libs/ardour/export_timespan.cc
+++ b/libs/ardour/export_timespan.cc
@@ -20,10 +20,6 @@
 
 #include "ardour/export_timespan.h"
 
-#include "ardour/export_channel_configuration.h"
-#include "ardour/export_filename.h"
-#include "ardour/export_failed.h"
-
 namespace ARDOUR
 {
 

diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index be4ded9a2c4e5a3bccf4234dfbc6103fe7066bd4..a7e3585e64113ccd6f05906a9a78ab4656ebf24c 100644 (file)
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -38,12 +38,11 @@
 #include <glibmm/fileutils.h>
 #include <glibmm/thread.h>
 
+#include "ardour/data_type.h"
 #include "ardour/file_source.h"
-#include "ardour/directory_names.h"
 #include "ardour/session.h"
-#include "ardour/session_directory.h"
-#include "ardour/source_factory.h"
-#include "ardour/filename_extensions.h"
+#include "ardour/source.h"
+#include "ardour/utils.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/filename_extensions.cc b/libs/ardour/filename_extensions.cc
index c09a8c481cb1e8e60cde287a5e0b39bc2d4be735..0684a1308300a1e0ca15ae0f29aed9d259f600f6 100644 (file)
--- a/libs/ardour/filename_extensions.cc
+++ b/libs/ardour/filename_extensions.cc
@@ -1,6 +1,5 @@
 #include "ardour/filename_extensions.h"
 
-#include <stdint.h>
 #include "i18n.h"
 
 namespace ARDOUR {

diff --git a/libs/ardour/filter.cc b/libs/ardour/filter.cc
index 8067edf14ec71fc69377d88a6077c24329dfb9dc..67aa840cad4b8da26ab5c3475596f952879b4254 100644 (file)
--- a/libs/ardour/filter.cc
+++ b/libs/ardour/filter.cc
@@ -21,15 +21,16 @@
 #include <cerrno>
 
 #include "pbd/basename.h"
-#include "ardour/sndfilesource.h"
-#include "ardour/smf_source.h"
-#include "ardour/session.h"
-#include "ardour/region.h"
+
+#include "ardour/analyser.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/audioregion.h"
 #include "ardour/filter.h"
+#include "ardour/region.h"
 #include "ardour/region_factory.h"
+#include "ardour/session.h"
+#include "ardour/smf_source.h"
 #include "ardour/source_factory.h"
-#include "ardour/analyser.h"
-#include "ardour/audioregion.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/find_session.cc b/libs/ardour/find_session.cc
index c635b86545ad442c457d76d6290f0c0e9fa76f91..4469b4e59de8a97f6061f340e53a5d67cdbfafb0 100644 (file)
--- a/libs/ardour/find_session.cc
+++ b/libs/ardour/find_session.cc
@@ -10,7 +10,6 @@
 #include "pbd/compose.h"
 #include "pbd/error.h"
 
-#include "ardour/session_utils.h"
 #include "ardour/filename_extensions.h"
 #include "ardour/utils.h"
 
@@ -19,8 +18,10 @@
 using namespace std;
 using namespace PBD;
 
+namespace ARDOUR {
+
 int
-ARDOUR::find_session (string str, string& path, string& snapshot, bool& isnew)
+find_session (string str, string& path, string& snapshot, bool& isnew)
 {
        struct stat statbuf;
        char buf[PATH_MAX+1];
@@ -164,3 +165,5 @@ ARDOUR::find_session (string str, string& path, string& snapshot, bool& isnew)
 
        return 0;
 }
+
+}  // namespace ARDOUR

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 0e0c508a5892ca24852d0d3526891edde887e56c..56aab1e12d12070a67b9fe36787565891e66f49e 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -62,31 +62,25 @@
 #include "midi++/mmc.h"
 
 #include "ardour/analyser.h"
-#include "ardour/ardour.h"
 #include "ardour/audio_library.h"
 #include "ardour/audioengine.h"
+#include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
-#include "ardour/audiosource.h"
 #include "ardour/buffer_manager.h"
 #include "ardour/control_protocol_manager.h"
-#include "ardour/dB.h"
-#include "ardour/debug.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/midi_region.h"
 #include "ardour/mix.h"
-#include "ardour/audioplaylist.h"
 #include "ardour/panner_manager.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/process_thread.h"
 #include "ardour/profile.h"
-#include "ardour/region.h"
 #include "ardour/rc_configuration.h"
+#include "ardour/region.h"
 #include "ardour/route_group.h"
 #include "ardour/runtime_functions.h"
-#include "ardour/session.h"
 #include "ardour/session_event.h"
 #include "ardour/source_factory.h"
-#include "ardour/utils.h"
 
 #include "audiographer/routines.h"
 

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 0c4256e1f40bde2da858bd3c3a076a13ff46aa69..17b396961aad80af14eabb8d59f7dc386065324b 100644 (file)
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -52,6 +52,7 @@
 #include "ardour/import_status.h"
 #include "ardour/region_factory.h"
 #include "ardour/resampled_source.h"
+#include "ardour/runtime_functions.h"
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
 #include "ardour/smf_source.h"

diff --git a/libs/ardour/internal_return.cc b/libs/ardour/internal_return.cc
index 6a3d20e5c9a17d94490345e4315620169c9be27d..ad2ed81194ece50b686f74c68aa0f1fda352ec43 100644 (file)
--- a/libs/ardour/internal_return.cc
+++ b/libs/ardour/internal_return.cc
@@ -18,14 +18,8 @@
 
 #include <glibmm/thread.h>
 
-#include "pbd/failed_constructor.h"
-
-#include "ardour/audio_buffer.h"
 #include "ardour/internal_return.h"
-#include "ardour/mute_master.h"
-#include "ardour/session.h"
 #include "ardour/internal_send.h"
-#include "ardour/audioengine.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index dfb0204c8cb5c63cd6af2a03dd630b50be7486a9..671936b0ffebe5ce7f51ae1fba63abbf4de73447 100644 (file)
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -25,7 +25,6 @@
 #include "ardour/internal_return.h"
 #include "ardour/internal_send.h"
 #include "ardour/meter.h"
-#include "ardour/panner.h"
 #include "ardour/panner_shell.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
@@ -33,6 +32,8 @@
 
 #include "i18n.h"
 
+namespace ARDOUR { class MuteMaster; class Pannable; }
+
 using namespace PBD;
 using namespace ARDOUR;
 using namespace std;

diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 26432c66ef2bb6fc8f94dfba719e1e16f92abfa8..da79301a311e1c42a46be611f782f50f9f202cb0 100644 (file)
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -34,17 +34,12 @@
 
 #include "ardour/audioengine.h"
 #include "ardour/buffer.h"
+#include "ardour/buffer_set.h"
 #include "ardour/debug.h"
 #include "ardour/io.h"
-#include "ardour/route.h"
 #include "ardour/port.h"
-#include "ardour/audio_port.h"
-#include "ardour/midi_port.h"
+#include "ardour/route.h"
 #include "ardour/session.h"
-#include "ardour/cycle_timer.h"
-#include "ardour/buffer_set.h"
-#include "ardour/meter.h"
-#include "ardour/amp.h"
 #include "ardour/user_bundle.h"
 
 #include "i18n.h"

diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc
index d5e0f3e0eb7b2ec432666b02b54dbb56ff30b641..fd47e1c06c188dd5b15e2b0b833edaa49bd383af 100644 (file)
--- a/libs/ardour/io_processor.cc
+++ b/libs/ardour/io_processor.cc
@@ -17,25 +17,20 @@
 
 */
 
-#include <fstream>
-#include <algorithm>
+#include <list>
 #include <string>
-#include <cerrno>
-#include <unistd.h>
-#include <sstream>
-
 
 #include "pbd/xml++.h"
 #include "pbd/enumwriter.h"
 
-#include "ardour/io_processor.h"
-#include "ardour/session.h"
-#include "ardour/utils.h"
-#include "ardour/send.h"
-#include "ardour/port_insert.h"
-#include "ardour/plugin_insert.h"
+#include "ardour/chan_count.h"
+#include "ardour/data_type.h"
 #include "ardour/io.h"
+#include "ardour/io_processor.h"
+#include "ardour/processor.h"
 #include "ardour/route.h"
+#include "ardour/session_object.h"
+#include "ardour/types.h"
 
 #include "i18n.h"
 
@@ -43,6 +38,8 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+namespace ARDOUR { class Session; }
+
 /* create an IOProcessor that proxies to a new IO object */
 
 IOProcessor::IOProcessor (Session& s, bool with_input, bool with_output,

diff --git a/libs/ardour/jack_slave.cc b/libs/ardour/jack_slave.cc
index 116ccdd145566cdf8401c8a0df8a584e074d1692..4c2da4c6c45287a7a57aea78dde464ed28ab641d 100644 (file)
--- a/libs/ardour/jack_slave.cc
+++ b/libs/ardour/jack_slave.cc
@@ -24,9 +24,6 @@
 #include <jack/transport.h>
 
 #include "ardour/slave.h"
-#include "ardour/session.h"
-
-#include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;

diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc
index 3a25eab384b758292ddc16e9c444db69a4fda277..1b3a5ea2e3d952597cb470451bff7582b9441aef 100644 (file)
--- a/libs/ardour/ladspa_plugin.cc
+++ b/libs/ardour/ladspa_plugin.cc
@@ -37,9 +37,7 @@
 
 #include "midi++/manager.h"
 
-#include "ardour/ardour.h"
 #include "ardour/session.h"
-#include "ardour/audioengine.h"
 #include "ardour/ladspa_plugin.h"
 #include "ardour/buffer_set.h"
 #include "ardour/audio_buffer.h"

diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 46c09a12277ae3b1119a70b329a00f11c87d3bdf..50552d2eb8de2ce585eb9562a01fa9570a27140c 100644 (file)
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -31,13 +31,11 @@
 
 #include "pbd/compose.h"
 #include "pbd/error.h"
-#include "pbd/pathscanner.h"
-#include "pbd/stl_delete.h"
 #include "pbd/xml++.h"
 
 #include "libardour-config.h"
 
-#include "ardour/ardour.h"
+#include "ardour/types.h"
 #include "ardour/audio_buffer.h"
 #include "ardour/audioengine.h"
 #include "ardour/debug.h"

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index 5957d570b9bd348117df767d31aeb5e0f1bd77d0..3b49c97d270c65c4cb0ea23a02850017d7e174c6 100644 (file)
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -16,15 +16,15 @@
     675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "ardour/meter.h"
 #include <algorithm>
 #include <cmath>
+
+#include "ardour/audio_buffer.h"
 #include "ardour/buffer_set.h"
-#include "ardour/peak.h"
 #include "ardour/dB.h"
-#include "ardour/session.h"
+#include "ardour/meter.h"
 #include "ardour/midi_buffer.h"
-#include "ardour/audio_buffer.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/runtime_functions.h"
 
 using namespace std;

diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc
index 87ea05738d6ca6c9e6ece1fc2080df8b39c83216..05c0e9e2ac866570b1396e46dc5a0526fe1cbc51 100644 (file)
--- a/libs/ardour/midi_clock_slave.cc
+++ b/libs/ardour/midi_clock_slave.cc
@@ -32,12 +32,8 @@
 
 #include "ardour/debug.h"
 #include "ardour/slave.h"
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
-#include "ardour/cycles.h"
 #include "ardour/tempo.h"
 
-
 #include "i18n.h"
 
 using namespace std;

diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 9b3b619d1ce4c33342e40264a2c5c5dec6378b6c..a8757d7575bd2dcf9372db63794032fcbd306c6d 100644 (file)
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -38,11 +38,8 @@
 #include "pbd/stateful_diff_command.h"
 #include "pbd/stacktrace.h"
 
-#include "ardour/ardour.h"
 #include "ardour/audioengine.h"
 #include "ardour/butler.h"
-#include "ardour/configuration.h"
-#include "ardour/cycle_timer.h"
 #include "ardour/debug.h"
 #include "ardour/io.h"
 #include "ardour/midi_diskstream.h"
@@ -52,11 +49,10 @@
 #include "ardour/midi_region.h"
 #include "ardour/playlist_factory.h"
 #include "ardour/region_factory.h"
-#include "ardour/route.h"
-#include "ardour/send.h"
 #include "ardour/session.h"
 #include "ardour/session_playlists.h"
 #include "ardour/smf_source.h"
+#include "ardour/types.h"
 #include "ardour/utils.h"
 
 #include "midi++/types.h"

diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index 40d2f600c881f0b0a34824e28c753fbe852432f4..a914a0d8873f55942942d93db825c600a9b6737f 100644 (file)
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -38,7 +38,6 @@
 #include "ardour/midi_source.h"
 #include "ardour/midi_state_tracker.h"
 #include "ardour/session.h"
-#include "ardour/smf_source.h"
 #include "ardour/types.h"
 
 #include "i18n.h"

diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index d3d080a179c3011243221788417f5088a70a658e..58e33d2d531ac70f4bf343e6993fb74dbcc5c77e 100644 (file)
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -20,7 +20,6 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "pbd/compose.h"
 #include "pbd/file_utils.h"
 #include "pbd/error.h"
 
@@ -29,8 +28,6 @@
 #include "ardour/midi_patch_manager.h"
 #include "ardour/midi_patch_search_path.h"
 
-#include "i18n.h"
-
 using namespace std;
 using namespace ARDOUR;
 using namespace MIDI;

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index 9aa36304a675cc930f61ddd5d853e3420328d61f..9c1e338b6c320e9ce9981df9e9e6c9695d1c3677 100644 (file)
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -25,17 +25,12 @@
 
 #include <stdlib.h>
 
-#include "pbd/error.h"
-
 #include "evoral/EventList.hpp"
 
-#include "ardour/configuration.h"
 #include "ardour/debug.h"
 #include "ardour/midi_model.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_region.h"
-#include "ardour/midi_ring_buffer.h"
-#include "ardour/session.h"
 #include "ardour/types.h"
 
 #include "i18n.h"

diff --git a/libs/ardour/midi_playlist_source.cc b/libs/ardour/midi_playlist_source.cc
index 957531f52007f5a1a78d0858c1cc48e406eb496b..5dfbf955c6cbf047069f39802796a91775f56d0c 100644 (file)
--- a/libs/ardour/midi_playlist_source.cc
+++ b/libs/ardour/midi_playlist_source.cc
@@ -20,25 +20,10 @@
 #include "libardour-config.h"
 #endif
 
-#include <vector>
-#include <cstdio>
-
-#include <glibmm/fileutils.h>
-#include <glibmm/miscutils.h>
-
 #include "pbd/error.h"
-#include "pbd/convert.h"
-#include "pbd/enumwriter.h"
 
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_playlist_source.h"
-#include "ardour/midi_region.h"
-#include "ardour/debug.h"
-#include "ardour/filename_extensions.h"
-#include "ardour/session.h"
-#include "ardour/session_directory.h"
-#include "ardour/session_playlists.h"
-#include "ardour/source_factory.h"
 
 #include "i18n.h"
 
@@ -46,6 +31,17 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+namespace ARDOUR {
+class MidiStateTracker;
+class Session;
+template <typename T> class MidiRingBuffer;
+}
+
+namespace Evoral {
+template <typename T> class EventSink;
+template <typename Time> class Event;
+}
+
 /*******************************************************************************
 As of May 2011, it appears too complex to support compound regions for MIDI
 because of the need to be able to edit the data represented by the region.  It
@@ -98,7 +94,6 @@ MidiPlaylistSource::get_state ()
        return node;
 }
 
-
 int
 MidiPlaylistSource::set_state (const XMLNode& node, int version)
 {

diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index f9f1867686227dd640d4cc62a964698bb58081ec..d52d661c1a5972b897f05e4ccd179cb6dded6611 100644 (file)
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -26,17 +26,13 @@
 
 #include <glibmm/thread.h>
 
-#include "pbd/basename.h"
 #include "pbd/xml++.h"
-#include "pbd/enumwriter.h"
 
 #include "ardour/automation_control.h"
-#include "ardour/dB.h"
 #include "ardour/midi_model.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_ring_buffer.h"
 #include "ardour/midi_source.h"
-#include "ardour/playlist.h"
 #include "ardour/region_factory.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"

diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index 4c854baf696e0fd03fa85686ee80fe0389737829..48d9cdf877b68142710c6bf02c9eb94aa5eeaa83 100644 (file)
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -34,19 +34,18 @@
 #include "pbd/pthread_utils.h"
 #include "pbd/basename.h"
 
-#include "ardour/audioengine.h"
 #include "ardour/debug.h"
 #include "ardour/midi_model.h"
-#include "ardour/midi_ring_buffer.h"
 #include "ardour/midi_state_tracker.h"
 #include "ardour/midi_source.h"
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
 #include "ardour/source_factory.h"
-#include "ardour/tempo.h"
 
 #include "i18n.h"
 
+namespace ARDOUR { template <typename T> class MidiRingBuffer; }
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/midi_state_tracker.cc b/libs/ardour/midi_state_tracker.cc
index 7bf23f93583fd2973908d795ea1e839ac0aed008..99a6cd991ddf624133df12f215b696460d945e5a 100644 (file)
--- a/libs/ardour/midi_state_tracker.cc
+++ b/libs/ardour/midi_state_tracker.cc
@@ -22,9 +22,10 @@
 #include "pbd/compose.h"
 #include "pbd/stacktrace.h"
 
+#include "evoral/EventSink.hpp"
+
 #include "ardour/debug.h"
 #include "ardour/event_type_map.h"
-#include "ardour/midi_ring_buffer.h"
 #include "ardour/midi_source.h"
 #include "ardour/midi_state_tracker.h"
 

diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc
index 83b845bbfcba1521e4684ba7422e28044a4a8e14..aa03def614bc60e544aa306e16a235a62e433516 100644 (file)
--- a/libs/ardour/midi_stretch.cc
+++ b/libs/ardour/midi_stretch.cc
@@ -24,7 +24,6 @@
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
 #include "ardour/midi_stretch.h"
-#include "ardour/session.h"
 #include "ardour/types.h"
 
 #include "i18n.h"

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 7291a41212094308d2b31959ce906d3d479a5232..64e61e79f9f6406d2af8f7ed9cef628884a87c41 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -17,35 +17,33 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "pbd/error.h"
-
 #include "pbd/enumwriter.h"
 #include "pbd/convert.h"
-#include "midi++/events.h"
 #include "evoral/midi_util.h"
 
-#include "ardour/amp.h"
 #include "ardour/buffer_set.h"
 #include "ardour/debug.h"
 #include "ardour/delivery.h"
-#include "ardour/io_processor.h"
 #include "ardour/meter.h"
 #include "ardour/midi_diskstream.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_port.h"
-#include "ardour/midi_region.h"
-#include "ardour/midi_source.h"
 #include "ardour/midi_track.h"
-#include "ardour/panner.h"
 #include "ardour/port.h"
 #include "ardour/processor.h"
-#include "ardour/route_group_specialized.h"
 #include "ardour/session.h"
 #include "ardour/session_playlists.h"
 #include "ardour/utils.h"
 
 #include "i18n.h"
 
+namespace ARDOUR {
+class InterThreadInfo;
+class MidiSource;
+class Region;
+class SMFSource;
+}
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index 5edb5583f71055e108ef6f6c798d9709c6f9d0b8..6c95730f24f6999d050b0ca5b886d5fcece66919 100644 (file)
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -23,9 +23,6 @@
 #include <unistd.h>
 
 #include "pbd/error.h"
-#include "pbd/enumwriter.h"
-#include "pbd/failed_constructor.h"
-#include "pbd/pthread_utils.h"
 
 #include "midi++/port.h"
 #include "ardour/debug.h"

diff --git a/libs/ardour/mtdm.cc b/libs/ardour/mtdm.cc
index dceb4f8406fb7c7951f18cfcc4b3a5e053b7cdd7..ba73025053fcd3a17386843243d22c82cb4f1c1d 100644 (file)
--- a/libs/ardour/mtdm.cc
+++ b/libs/ardour/mtdm.cc
@@ -16,6 +16,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <math.h>
+
 #include "ardour/mtdm.h"
 
 MTDM::MTDM (void)

diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index 0713e48fe50fd7d7b486ec954e3f98b5ac90a5b8..6f3aec4646931007ebdbf4bf462b161de67f7460 100644 (file)
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -17,15 +17,10 @@
 
 */
 
-#include "pbd/boost_debug.h"
-
-#include "ardour/audio_buffer.h"
 #include "ardour/buffer_set.h"
 #include "ardour/debug.h"
 #include "ardour/panner.h"
 #include "ardour/pannable.h"
-#include "ardour/session.h"
-#include "ardour/utils.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc
index fc72a27b09ea71b4b87c3d2fc8dc1cda1d01e87f..1aeb94eb7ee3cb050cefeee7410d09b991495312 100644 (file)
--- a/libs/ardour/panner_shell.cc
+++ b/libs/ardour/panner_shell.cc
@@ -43,18 +43,13 @@
 #include "evoral/Curve.hpp"
 
 #include "ardour/audio_buffer.h"
-#include "ardour/audio_buffer.h"
-#include "ardour/automatable.h"
 #include "ardour/buffer_set.h"
 #include "ardour/debug.h"
-#include "ardour/pannable.h"
 #include "ardour/panner.h"
 #include "ardour/panner_manager.h"
 #include "ardour/panner_shell.h"
-#include "ardour/runtime_functions.h"
 #include "ardour/session.h"
 #include "ardour/speakers.h"
-#include "ardour/utils.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 12490d02d7b7d4a9ce5da12a9ef882b1c9e5db5b..390f9fdaaddc0a879dd3fbe4b4eae9f57143994f 100644 (file)
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -19,20 +19,14 @@
 
 #include <stdint.h>
 #include <set>
-#include <fstream>
 #include <algorithm>
-#include <unistd.h>
-#include <cerrno>
 #include <string>
-#include <climits>
 
 #include <boost/lexical_cast.hpp>
 
 #include "pbd/convert.h"
-#include "pbd/failed_constructor.h"
 #include "pbd/stateful_diff_command.h"
 #include "pbd/xml++.h"
-#include "pbd/stacktrace.h"
 
 #include "ardour/debug.h"
 #include "ardour/playlist.h"

diff --git a/libs/ardour/playlist_source.cc b/libs/ardour/playlist_source.cc
index 7583a4e6ea1a2982a78043d8af755bb6b07dd270..ed8735b86530c06b866858baa8c4ae1af179a9c6 100644 (file)
--- a/libs/ardour/playlist_source.cc
+++ b/libs/ardour/playlist_source.cc
@@ -33,9 +33,6 @@
 #include "ardour/playlist.h"
 #include "ardour/playlist_source.h"
 #include "ardour/playlist_factory.h"
-#include "ardour/session.h"
-#include "ardour/session_playlists.h"
-#include "ardour/source_factory.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc
index cbcf9f7f7cad1675a93e7de1b54b89084c73163a..4afc39b4ecdb63abedd873169115262b92bf8307 100644 (file)
--- a/libs/ardour/plugin.cc
+++ b/libs/ardour/plugin.cc
@@ -38,12 +38,16 @@
 #include "pbd/error.h"
 #include "pbd/xml++.h"
 
-#include "ardour/ardour.h"
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
+#include "ardour/buffer_set.h"
+#include "ardour/chan_count.h"
+#include "ardour/chan_mapping.h"
+#include "ardour/data_type.h"
+#include "ardour/midi_buffer.h"
+#include "ardour/midi_state_tracker.h"
 #include "ardour/plugin.h"
-#include "ardour/ladspa_plugin.h"
 #include "ardour/plugin_manager.h"
+#include "ardour/session.h"
+#include "ardour/types.h"
 
 #ifdef AUDIOUNIT_SUPPORT
 #include "ardour/audio_unit.h"
@@ -62,6 +66,8 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+namespace ARDOUR { class AudioEngine; }
+
 bool
 PluginInfo::is_instrument () const
 {

diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index 20180b285b960eb2288e13c931208b522003c559..ba61e43e9ca9031a89ce89ae955bdea2e3be1c6d 100644 (file)
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -35,8 +35,6 @@
 #include "ardour/ladspa_plugin.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
-#include "ardour/port.h"
-#include "ardour/route.h"
 
 #ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
@@ -54,7 +52,6 @@
 #include "ardour/audio_unit.h"
 #endif
 
-#include "ardour/audioengine.h"
 #include "ardour/session.h"
 #include "ardour/types.h"
 

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 82d5b4748be82d712eb29172f0e30aa0ecc99260..a666e7b53ecab8372578342ba18aca1fe62097f3 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -53,7 +53,7 @@
 #include "ardour/ladspa_plugin.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_manager.h"
-#include "ardour/session.h"
+#include "ardour/rc_configuration.h"
 
 #ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index e9a3c09a100027e33f52549988d2dc88bc34143f..b0c4b43c06c7853f3401e53bbbc0b886f5770734 100644 (file)
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -21,17 +21,15 @@
 #include "libardour-config.h"
 #endif
 
-#include <stdexcept>
-
 #include <jack/weakjack.h> // so that we can test for new functions at runtime
 
-#include "pbd/error.h"
 #include "pbd/compose.h"
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
 
+#include "ardour/audioengine.h"
 #include "ardour/debug.h"
 #include "ardour/port.h"
-#include "ardour/audioengine.h"
-#include "pbd/failed_constructor.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc
index cc27c6887f32ca9a3ab2c387644300dd1a24d6db..46c4d7e9d5e6a296c8fba44946a394d5e75ea3e9 100644 (file)
--- a/libs/ardour/port_insert.cc
+++ b/libs/ardour/port_insert.cc
@@ -19,19 +19,14 @@
 
 #include <string>
 
-
-#include "pbd/failed_constructor.h"
 #include "pbd/xml++.h"
 
-#include "ardour/audioengine.h"
 #include "ardour/audio_port.h"
-#include "ardour/buffer_set.h"
+#include "ardour/audioengine.h"
 #include "ardour/delivery.h"
+#include "ardour/io.h"
 #include "ardour/mtdm.h"
-#include "ardour/plugin.h"
-#include "ardour/port.h"
 #include "ardour/port_insert.h"
-#include "ardour/route.h"
 #include "ardour/session.h"
 #include "ardour/types.h"
 

diff --git a/libs/ardour/port_set.cc b/libs/ardour/port_set.cc
index 7e9f0656c598a760886c541c5f3681ec18d10562..6096e356f5d69faf326977a3697a0ea54fe3ca23 100644 (file)
--- a/libs/ardour/port_set.cc
+++ b/libs/ardour/port_set.cc
@@ -18,9 +18,10 @@
 
 #include <string>
 
-#include "ardour/port_set.h"
-#include "ardour/midi_port.h"
 #include "ardour/audio_port.h"
+#include "ardour/midi_port.h"
+#include "ardour/port.h"
+#include "ardour/port_set.h"
 
 using std::string;
 

diff --git a/libs/ardour/process_thread.cc b/libs/ardour/process_thread.cc
index e910db1c789c35a37ded04a4333d0abbb1bbb104..55aa692001b667fca760a52b2c3db77f3c9ecc31 100644 (file)
--- a/libs/ardour/process_thread.cc
+++ b/libs/ardour/process_thread.cc
@@ -18,7 +18,7 @@
 */
 
 #include <iostream>
-#include "ardour/audioengine.h"
+
 #include "ardour/buffer.h"
 #include "ardour/buffer_manager.h"
 #include "ardour/buffer_set.h"

diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index 79384c701e833529d8a094c16f6ec13a57565653..3f8fdf509d08eed5767d0e48c44ddb569e4b8ec3 100644 (file)
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -23,20 +23,12 @@
 
 #include <string>
 
-
-#include "pbd/failed_constructor.h"
-#include "pbd/enumwriter.h"
 #include "pbd/xml++.h"
 
+#include "ardour/automatable.h"
+#include "ardour/chan_count.h"
 #include "ardour/processor.h"
-#include "ardour/plugin.h"
-#include "ardour/port.h"
-#include "ardour/route.h"
-#include "ardour/ladspa_plugin.h"
-#include "ardour/buffer_set.h"
-#include "ardour/send.h"
-#include "ardour/port_insert.h"
-#include "ardour/plugin_insert.h"
+#include "ardour/types.h"
 
 #ifdef WINDOWS_VST_SUPPORT
 #include "ardour/windows_vst_plugin.h"
@@ -56,6 +48,8 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+namespace ARDOUR { class Session; }
+
 // Always saved as Processor, but may be IOProcessor or Send in legacy sessions
 const string Processor::state_node_name = "Processor";
 

diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc
index 563b7bf4e761eb0629c16fa86da83d1fe38f5c26..a4543d773c75dd035fb3059171673561e837cb75 100644 (file)
--- a/libs/ardour/quantize.cc
+++ b/libs/ardour/quantize.cc
@@ -20,13 +20,8 @@
 
 #include "pbd/basename.h"
 
-#include "ardour/types.h"
 #include "ardour/quantize.h"
-#include "ardour/session.h"
-#include "ardour/smf_source.h"
 #include "ardour/midi_model.h"
-#include "ardour/midi_region.h"
-#include "ardour/tempo.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc
index d928377e2523aa38758d190941a128937a0f7021..7ff60e6912f0976f0369c462b8989c62d83b8e55 100644 (file)
--- a/libs/ardour/rb_effect.cc
+++ b/libs/ardour/rb_effect.cc
@@ -23,13 +23,13 @@
 #include "pbd/error.h"
 #include "rubberband/RubberBandStretcher.h"
 
-#include "ardour/types.h"
-#include "ardour/stretch.h"
-#include "ardour/pitch.h"
-#include "ardour/audiofilesource.h"
-#include "ardour/session.h"
 #include "ardour/audioregion.h"
+#include "ardour/audiosource.h"
+#include "ardour/pitch.h"
 #include "ardour/progress.h"
+#include "ardour/session.h"
+#include "ardour/stretch.h"
+#include "ardour/types.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index 1adde47b2aa62ad7aff33841c192249a83f8ce3b..d2290c73d59ed589259bed4bda0038db1b7ab595 100644 (file)
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -24,18 +24,16 @@
 #include <glib/gstdio.h> /* for g_stat() */
 #include <glibmm/miscutils.h>
 
-#include "pbd/failed_constructor.h"
 #include "pbd/xml++.h"
 #include "pbd/filesystem.h"
 #include "pbd/file_utils.h"
 
 #include "midi++/manager.h"
 
-#include "ardour/ardour.h"
-#include "ardour/rc_configuration.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/control_protocol_manager.h"
+#include "ardour/diskstream.h"
 #include "ardour/filesystem_paths.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/session_metadata.h"
 
 #include "i18n.h"

diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc
index 45c30b085ba6400b245c88b279d5f3dd504f29b5..b1bf49f7ad620f978ce1b123378375fe1457218a 100644 (file)
--- a/libs/ardour/recent_sessions.cc
+++ b/libs/ardour/recent_sessions.cc
@@ -19,19 +19,14 @@
 
 #include <cstring>
 #include <cerrno>
-#include <unistd.h>
 #include <fstream>
 #include <algorithm>
 
-#include <glibmm/miscutils.h>
-
 #include "pbd/error.h"
 
-#include "ardour/configuration.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/recent_sessions.h"
-#include "ardour/utils.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index a4a158479278eb529955c3a3c68423d599b55aa9..2166741ddad8e3cd7a6319d0c6e22194dd76c536 100644 (file)
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -25,11 +25,8 @@
 
 #include <glibmm/thread.h>
 #include "pbd/xml++.h"
-#include "pbd/stacktrace.h"
-#include "pbd/enumwriter.h"
 
 #include "ardour/debug.h"
-#include "ardour/file_source.h"
 #include "ardour/filter.h"
 #include "ardour/playlist.h"
 #include "ardour/playlist_source.h"
@@ -38,9 +35,7 @@
 #include "ardour/region_factory.h"
 #include "ardour/session.h"
 #include "ardour/source.h"
-#include "ardour/source_factory.h"
 #include "ardour/tempo.h"
-#include "ardour/utils.h"
 
 #include "i18n.h"
 
@@ -49,6 +44,7 @@ using namespace ARDOUR;
 using namespace PBD;
 
 namespace ARDOUR {
+       class Progress;
        namespace Properties {
                PBD::PropertyDescriptor<bool> muted;
                PBD::PropertyDescriptor<bool> opaque;

diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc
index 6af256f169ec356399893ed6694dc235cc5b4ed7..01860048f4e6c000156aeaac6bb2bfcd3276f8e7 100644 (file)
--- a/libs/ardour/region_factory.cc
+++ b/libs/ardour/region_factory.cc
@@ -20,17 +20,14 @@
 #include <inttypes.h>
 
 #include "pbd/error.h"
-#include "pbd/boost_debug.h"
 
-#include "ardour/session.h"
-
-#include "ardour/region_factory.h"
-#include "ardour/region.h"
 #include "ardour/audioregion.h"
 #include "ardour/audiosource.h"
-#include "ardour/midi_source.h"
 #include "ardour/midi_region.h"
-#include "ardour/utils.h"
+#include "ardour/midi_source.h"
+#include "ardour/region.h"
+#include "ardour/region_factory.h"
+#include "ardour/session.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc
index 0152155338f9401b045a470c09f807c28290b2c4..43a2e1bfd1e997246d3dfd7299af3cd6227aa7cd 100644 (file)
--- a/libs/ardour/return.cc
+++ b/libs/ardour/return.cc
@@ -22,16 +22,12 @@
 #include "pbd/xml++.h"
 
 #include "ardour/amp.h"
-#include "ardour/audio_port.h"
+#include "ardour/audioengine.h"
 #include "ardour/buffer_set.h"
 #include "ardour/io.h"
 #include "ardour/meter.h"
-#include "ardour/panner.h"
-#include "ardour/port.h"
 #include "ardour/return.h"
 #include "ardour/session.h"
-#include "ardour/mute_master.h"
-#include "ardour/audioengine.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/reverse.cc b/libs/ardour/reverse.cc
index 45d7c83051d7a54954ba37087d6d93179ee27700..06fafb0ca45c2ff97185c73f09f3afd0157a0b9a 100644 (file)
--- a/libs/ardour/reverse.cc
+++ b/libs/ardour/reverse.cc
@@ -19,19 +19,16 @@
 
 #include <algorithm>
 
-#include "pbd/basename.h"
-
-#include "ardour/types.h"
-#include "ardour/reverse.h"
-#include "ardour/audiofilesource.h"
-#include "ardour/session.h"
 #include "ardour/audioregion.h"
-
-#include "i18n.h"
+#include "ardour/audiosource.h"
+#include "ardour/reverse.h"
+#include "ardour/types.h"
 
 using namespace std;
 using namespace ARDOUR;
 
+namespace ARDOUR { class Progress; class Session; }
+
 Reverse::Reverse (Session& s)
        : Filter (s)
 {

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 3f68e266ebbacefcf6eb5ed28c0e74bd9f9d44d3..1948ba14aa63aa265f1f4e1d7cfaf1e403137fc6 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -33,40 +33,30 @@
 #include "pbd/convert.h"
 #include "pbd/boost_debug.h"
 
-#include "evoral/Curve.hpp"
-
 #include "ardour/amp.h"
-#include "ardour/audio_port.h"
+#include "ardour/audio_buffer.h"
 #include "ardour/audioengine.h"
 #include "ardour/buffer.h"
 #include "ardour/buffer_set.h"
-#include "ardour/configuration.h"
-#include "ardour/cycle_timer.h"
+#include "ardour/capturing_processor.h"
 #include "ardour/debug.h"
 #include "ardour/delivery.h"
-#include "ardour/dB.h"
-#include "ardour/internal_send.h"
 #include "ardour/internal_return.h"
-#include "ardour/ladspa_plugin.h"
+#include "ardour/internal_send.h"
 #include "ardour/meter.h"
-#include "ardour/mix.h"
 #include "ardour/monitor_processor.h"
 #include "ardour/pannable.h"
-#include "ardour/panner.h"
 #include "ardour/panner_shell.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/port.h"
 #include "ardour/port_insert.h"
 #include "ardour/processor.h"
-#include "ardour/profile.h"
 #include "ardour/route.h"
 #include "ardour/route_group.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
-#include "ardour/timestamps.h"
-#include "ardour/utils.h"
 #include "ardour/unknown_processor.h"
-#include "ardour/capturing_processor.h"
+#include "ardour/utils.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc
index ef7645e63f2ea68042f96ed412eec6255bbeb1f0..cb00df724a6f65a2dc3fe7e61f737bb4a7860c15 100644 (file)
--- a/libs/ardour/route_group.cc
+++ b/libs/ardour/route_group.cc
@@ -21,17 +21,14 @@
 
 #include <algorithm>
 
-
 #include "pbd/error.h"
 #include "pbd/enumwriter.h"
 #include "pbd/strsplit.h"
 
 #include "ardour/amp.h"
-#include "ardour/debug.h"
-#include "ardour/route_group.h"
 #include "ardour/audio_track.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/configuration.h"
+#include "ardour/route.h"
+#include "ardour/route_group.h"
 #include "ardour/session.h"
 
 #include "i18n.h"

diff --git a/libs/ardour/route_group_member.cc b/libs/ardour/route_group_member.cc
index 9e2682bbb9918b09f9c868121f5611b8a4012ae1..85d2f981d7a8c37c42575064ab70092ff2d622b2 100644 (file)
--- a/libs/ardour/route_group_member.cc
+++ b/libs/ardour/route_group_member.cc
@@ -14,15 +14,14 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
 */
 
-
-#include "ardour/route_group.h"
 #include "ardour/route_group_member.h"
 
 using namespace ARDOUR;
 
+namespace ARDOUR { class RouteGroup; }
+
 /** Set the route group; it can be set to 0 for `none' */
 void
 RouteGroupMember::set_route_group (RouteGroup *rg)

diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc
index 819165b35228c9997dc2c88d3ea2ba9c15025350..677b8c2e3b6f7e3f6fdf5e30cf3d291a35c38511 100644 (file)
--- a/libs/ardour/send.cc
+++ b/libs/ardour/send.cc
@@ -26,15 +26,18 @@
 #include "ardour/amp.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
-#include "ardour/port.h"
-#include "ardour/audio_port.h"
 #include "ardour/buffer_set.h"
 #include "ardour/meter.h"
-#include "ardour/panner.h"
 #include "ardour/io.h"
 
 #include "i18n.h"
 
+namespace ARDOUR {
+class AutomationControl;
+class MuteMaster;
+class Pannable;
+}
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace std;

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 1192e898f61ffa66a745db6c51a1355a37da9343..b09d67fb354b009a6b63e65afd2955f02a5dbd52 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -56,54 +56,38 @@
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/audiofilesource.h"
-#include "ardour/audioplaylist.h"
-#include "ardour/audioregion.h"
 #include "ardour/auditioner.h"
 #include "ardour/buffer_manager.h"
 #include "ardour/buffer_set.h"
 #include "ardour/bundle.h"
 #include "ardour/butler.h"
 #include "ardour/click.h"
-#include "ardour/configuration.h"
 #include "ardour/control_protocol_manager.h"
-#include "ardour/cycle_timer.h"
 #include "ardour/data_type.h"
 #include "ardour/debug.h"
 #include "ardour/filename_extensions.h"
-#include "ardour/internal_send.h"
-#include "ardour/io_processor.h"
-#include "ardour/midi_diskstream.h"
-#include "ardour/midi_playlist.h"
-#include "ardour/midi_region.h"
+#include "ardour/graph.h"
 #include "ardour/midi_track.h"
 #include "ardour/midi_ui.h"
 #include "ardour/named_selection.h"
-#include "ardour/process_thread.h"
+#include "ardour/operations.h"
 #include "ardour/playlist.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
-#include "ardour/port_insert.h"
-#include "ardour/processor.h"
+#include "ardour/process_thread.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/recent_sessions.h"
+#include "ardour/region.h"
 #include "ardour/region_factory.h"
-#include "ardour/return.h"
 #include "ardour/route_graph.h"
 #include "ardour/route_group.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
-#include "ardour/session_directory.h"
 #include "ardour/session_playlists.h"
-#include "ardour/slave.h"
 #include "ardour/smf_source.h"
 #include "ardour/source_factory.h"
-#include "ardour/tape_file_matcher.h"
-#include "ardour/tempo.h"
 #include "ardour/utils.h"
-#include "ardour/graph.h"
-#include "ardour/speakers.h"
-#include "ardour/operations.h"
 
 #include "midi++/port.h"
 #include "midi++/jack_midi_port.h"
@@ -112,6 +96,12 @@
 
 #include "i18n.h"
 
+namespace ARDOUR {
+class MidiSource;
+class Processor;
+class Speakers;
+}
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;

diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 87e3c34fb525565cf3e407a001edf66fba7e2828..88f61335e0e18861821a9441a7b705d16f306e58 100644 (file)
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -31,15 +31,12 @@
 #include "pbd/pthread_utils.h"
 #include "pbd/stacktrace.h"
 
-#include "ardour/audio_diskstream.h"
-#include "ardour/audioengine.h"
 #include "ardour/butler.h"
-#include "ardour/configuration.h"
-#include "ardour/io.h"
-#include "ardour/midi_diskstream.h"
+#include "ardour/route.h"
 #include "ardour/session.h"
-#include "ardour/timestamps.h"
+#include "ardour/session_event.h"
 #include "ardour/track.h"
+#include "ardour/types.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index e36c871faef8e323b102dac923d416d2756223ce..abfbaecfcd69f03b5da7e9ded5ad2df007722f60 100644 (file)
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -21,13 +21,13 @@
 #include <cerrno>
 
 #include "ardour/amp.h"
-#include "ardour/ardour.h"
 #include "ardour/audio_buffer.h"
 #include "ardour/buffer_set.h"
 #include "ardour/click.h"
 #include "ardour/io.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"
+#include "ardour/types.h"
 
 #include <sndfile.h>
 

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index 68aba1a689e3f631541fb2ddeb40af23a0c1799b..0246f5547957a0fdc49a58c294fe3d40ecad1405 100644 (file)
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -17,29 +17,28 @@
 
 */
 
-#include "ardour/session.h"
-#include "ardour/route.h"
-#include "pbd/memento_command.h"
-#include "ardour/diskstream.h"
+#include <string>
+
+#include "ardour/automation_list.h"
+#include "ardour/location.h"
+#include "ardour/midi_automation_list_binder.h"
 #include "ardour/playlist.h"
-#include "ardour/audioplaylist.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_playlist.h"
-#include "ardour/midi_track.h"
-#include "ardour/tempo.h"
-#include "ardour/audiosource.h"
-#include "ardour/audioregion.h"
-#include "ardour/midi_source.h"
-#include "ardour/midi_region.h"
-#include "ardour/session_playlists.h"
+#include "ardour/region.h"
 #include "ardour/region_factory.h"
-#include "ardour/midi_automation_list_binder.h"
+#include "ardour/route.h"
+#include "ardour/session.h"
+#include "ardour/session_playlists.h"
+#include "ardour/source.h"
+#include "ardour/tempo.h"
+#include "evoral/Curve.hpp"
 #include "pbd/error.h"
-#include "pbd/id.h"
-#include "pbd/statefuldestructible.h"
 #include "pbd/failed_constructor.h"
+#include "pbd/id.h"
+#include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
-#include "evoral/Curve.hpp"
+#include "pbd/statefuldestructible.h"
+
+class Command;
 
 using namespace PBD;
 using namespace ARDOUR;
@@ -90,7 +89,7 @@ Session::memento_command_factory(XMLNode *n)
     }
 
     /* create command */
-    string obj_T = n->property ("type-name")->value();
+    std::string obj_T = n->property ("type-name")->value();
 
     if (obj_T == "ARDOUR::AudioRegion" || obj_T == "ARDOUR::MidiRegion" || obj_T == "ARDOUR::Region") {
            boost::shared_ptr<Region> r = RegionFactory::region_by_id (id);
@@ -139,7 +138,7 @@ Session::memento_command_factory(XMLNode *n)
                            );
            }
 
-           cerr << "Alist " << id << " not found\n";
+           std::cerr << "Alist " << id << " not found\n";
 
     } else if (registry.count(id)) { // For Editor and AutomationLine which are off-limits herea
            return new MementoCommand<PBD::StatefulDestructible>(*registry[id], before, after);
@@ -156,7 +155,7 @@ Session::stateful_diff_command_factory (XMLNode* n)
 {
        PBD::ID const id (n->property("obj-id")->value ());
 
-       string const obj_T = n->property ("type-name")->value ();
+       std::string const obj_T = n->property ("type-name")->value ();
        if ((obj_T == "ARDOUR::AudioRegion" || obj_T == "ARDOUR::MidiRegion")) {
                boost::shared_ptr<Region> r = RegionFactory::region_by_id (id);
                if (r) {
@@ -164,13 +163,13 @@ Session::stateful_diff_command_factory (XMLNode* n)
                }
 
        } else if (obj_T == "ARDOUR::AudioPlaylist" ||  obj_T == "ARDOUR::MidiPlaylist") {
-                boost::shared_ptr<Playlist> p = playlists->by_id (id);
-                if (p) {
-                        return new StatefulDiffCommand (p, *n);
-                } else {
-                        cerr << "Playlist with ID = " << id << " not found\n";
-                }
-        }
+               boost::shared_ptr<Playlist> p = playlists->by_id (id);
+               if (p) {
+                       return new StatefulDiffCommand (p, *n);
+               } else {
+                       std::cerr << "Playlist with ID = " << id << " not found\n";
+               }
+       }
 
        /* we failed */
 

diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc
index 899b85e7701504aa0010b89113f857ddd278c86a..cfb6fb86686408734a3777e99390cd4260e99aad 100644 (file)
--- a/libs/ardour/session_configuration.cc
+++ b/libs/ardour/session_configuration.cc
@@ -20,7 +20,6 @@
 #include "ardour/types.h"
 #include "ardour/utils.h"
 #include "ardour/session_configuration.h"
-#include "ardour/ardour.h"
 #include "i18n.h"
 
 using namespace ARDOUR;

diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index 421c81d42cac7828793f8e7068a1074570fa9f80..84b1b75b125e6a6002a8311316975811bac126ab 100644 (file)
--- a/libs/ardour/session_events.cc
+++ b/libs/ardour/session_events.cc
@@ -20,15 +20,10 @@
 #include <cmath>
 #include <unistd.h>
 
-#include "ardour/timestamps.h"
-
 #include "pbd/error.h"
 #include "pbd/enumwriter.h"
 #include "pbd/stacktrace.h"
 
-#include "ardour/ardour.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/butler.h"
 #include "ardour/debug.h"
 #include "ardour/session_event.h"
 

diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc
index 4d2944aad54619ef129b96cf2001829da8664796..1d11dccbd05c2798c429dc7c0f449bb9b9dbf5c2 100644 (file)
--- a/libs/ardour/session_export.cc
+++ b/libs/ardour/session_export.cc
@@ -26,12 +26,11 @@
 
 #include "ardour/audioengine.h"
 #include "ardour/butler.h"
-#include "ardour/export_failed.h"
 #include "ardour/export_handler.h"
 #include "ardour/export_status.h"
+#include "ardour/process_thread.h"
 #include "ardour/session.h"
 #include "ardour/track.h"
-#include "ardour/process_thread.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 8b9da721f28df764af4481534f1bdc3df5d93efe..caceebf8535cb095ebfdf0c3f8e14a487999572a 100644 (file)
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -38,16 +38,13 @@
 
 #include "timecode/time.h"
 
-#include "ardour/configuration.h"
-#include "ardour/debug.h"
-#include "ardour/audioengine.h"
-#include "ardour/session.h"
 #include "ardour/audio_track.h"
+#include "ardour/audioengine.h"
+#include "ardour/debug.h"
 #include "ardour/midi_track.h"
 #include "ardour/midi_ui.h"
-#include "ardour/audio_diskstream.h"
+#include "ardour/session.h"
 #include "ardour/slave.h"
-#include "ardour/cycles.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/session_object.cc b/libs/ardour/session_object.cc
index 5ff28b59d0fa57f0fa27e2e91e3adf0b0dda0bf2..39b31550d916b53cc0246cf41984c570634b2f80 100644 (file)
--- a/libs/ardour/session_object.cc
+++ b/libs/ardour/session_object.cc
@@ -18,8 +18,9 @@
 */
 
 #include <iostream>
-#include "ardour/session_object.h"
+
 #include "ardour/debug.h"
+#include "ardour/session_object.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc
index 8e25cbfd9d737866bdaeeefdaee804c25fa97ddc..b833aea1f29df5af5c8436fedf0383e75c150361 100644 (file)
--- a/libs/ardour/session_playlists.cc
+++ b/libs/ardour/session_playlists.cc
@@ -18,17 +18,14 @@
 */
 #include <vector>
 
-#include "pbd/xml++.h"
-#include "pbd/compose.h"
 #include "ardour/debug.h"
-#include "ardour/session_playlists.h"
 #include "ardour/playlist.h"
-#include "ardour/region.h"
 #include "ardour/playlist_factory.h"
-#include "ardour/session.h"
-#include "ardour/source.h"
+#include "ardour/session_playlists.h"
 #include "ardour/track.h"
 #include "i18n.h"
+#include "pbd/compose.h"
+#include "pbd/xml++.h"
 
 using namespace std;
 using namespace PBD;

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index c002cc90084b6ea7ffed1df0710e0bfea3e24822..29ce370d7f35098b1337c7148dbb10b444c2edb6 100644 (file)
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -27,20 +27,18 @@
 
 #include <glibmm/thread.h>
 
-#include "ardour/ardour.h"
 #include "ardour/audioengine.h"
 #include "ardour/auditioner.h"
 #include "ardour/butler.h"
+#include "ardour/cycle_timer.h"
 #include "ardour/debug.h"
+#include "ardour/graph.h"
+#include "ardour/port.h"
 #include "ardour/process_thread.h"
 #include "ardour/session.h"
 #include "ardour/slave.h"
-#include "ardour/timestamps.h"
-#include "ardour/graph.h"
-#include "ardour/audio_port.h"
-#include "ardour/tempo.h"
 #include "ardour/ticker.h"
-#include "ardour/cycle_timer.h"
+#include "ardour/types.h"
 
 #include "midi++/manager.h"
 #include "midi++/mmc.h"

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index c21b492c8ff590729183adcea3927b3bc0a37fa3..4b40a80d80fc7ea2775f02d449e5e0c21147f191 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -57,6 +57,8 @@
 #include "midi++/port.h"
 #include "midi++/manager.h"
 
+#include "evoral/SMF.hpp"
+
 #include "pbd/boost_debug.h"
 #include "pbd/basename.h"
 #include "pbd/controllable_descriptor.h"
@@ -71,34 +73,26 @@
 
 #include "ardour/amp.h"
 #include "ardour/audio_diskstream.h"
-#include "ardour/audio_playlist_source.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/audiofilesource.h"
-#include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
-#include "ardour/auditioner.h"
 #include "ardour/automation_control.h"
-#include "ardour/buffer.h"
 #include "ardour/butler.h"
-#include "ardour/configuration.h"
 #include "ardour/control_protocol_manager.h"
-#include "ardour/cycle_timer.h"
 #include "ardour/directory_names.h"
 #include "ardour/filename_extensions.h"
-#include "ardour/io_processor.h"
 #include "ardour/location.h"
-#include "ardour/midi_diskstream.h"
 #include "ardour/midi_model.h"
 #include "ardour/midi_patch_manager.h"
-#include "ardour/midi_playlist.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
 #include "ardour/midi_track.h"
 #include "ardour/named_selection.h"
 #include "ardour/pannable.h"
-#include "ardour/processor.h"
+#include "ardour/playlist_factory.h"
 #include "ardour/port.h"
+#include "ardour/processor.h"
 #include "ardour/proxy_controllable.h"
 #include "ardour/recent_sessions.h"
 #include "ardour/region_factory.h"
@@ -107,13 +101,10 @@
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
 #include "ardour/session_metadata.h"
-#include "ardour/session_state_utils.h"
 #include "ardour/session_playlists.h"
+#include "ardour/session_state_utils.h"
 #include "ardour/session_utils.h"
 #include "ardour/silentfilesource.h"
-#include "ardour/slave.h"
-#include "ardour/smf_source.h"
-#include "ardour/sndfile_helpers.h"
 #include "ardour/sndfilesource.h"
 #include "ardour/source_factory.h"
 #include "ardour/speakers.h"
@@ -121,10 +112,6 @@
 #include "ardour/tempo.h"
 #include "ardour/ticker.h"
 #include "ardour/user_bundle.h"
-#include "ardour/utils.h"
-#include "ardour/utils.h"
-#include "ardour/version.h"
-#include "ardour/playlist_factory.h"
 
 #include "control_protocol/control_protocol.h"
 
@@ -782,7 +769,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
                } catch (Evoral::SMF::FileError& e) {
                        error << string_compose ("Could not write to MIDI file %1; MIDI data not saved.", e.file_name ()) << endmsg;
                }
-        }
+       }
 
        tree.set_root (&get_state());
 

diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index eef05e879a0f41cbb2534f8b022dca74639d5658..42ae3155978db9f559ccccac45c39131bb070d1d 100644 (file)
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -32,9 +32,6 @@
 #include "pbd/enumwriter.h"
 #include "pbd/stacktrace.h"
 
-#include "ardour/ardour.h"
-#include "ardour/configuration.h"
-#include "ardour/audioengine.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"
 

diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index ffcb7e8d2472aba73e46a2365bacc961fa29e51a..5fef402d9fc9597a50f0691d1a1a9e62652da98c 100644 (file)
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -17,14 +17,13 @@
 
 */
 
-#include <cmath>
-#include <cerrno>
-#include <unistd.h>
-
 #ifdef WAF_BUILD
 #include "libardour-config.h"
 #endif
 
+#include <cmath>
+#include <cerrno>
+#include <unistd.h>
 
 #include "pbd/undo.h"
 #include "pbd/error.h"
@@ -36,7 +35,6 @@
 #include "midi++/port.h"
 #include "midi++/manager.h"
 
-#include "ardour/ardour.h"
 #include "ardour/audioengine.h"
 #include "ardour/auditioner.h"
 #include "ardour/butler.h"

diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 52377ee9154c74a5af959af2499ef4443b7201f4..1fd058dbd84347be1d9dfe165afb646b80de098a 100644 (file)
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -34,7 +34,6 @@
 
 #include "evoral/Control.hpp"
 
-#include "ardour/audioengine.h"
 #include "ardour/event_type_map.h"
 #include "ardour/midi_model.h"
 #include "ardour/midi_ring_buffer.h"

diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index 07281e6901f42e3f73382745a68a0660992f642d..459890e82926d58a83e66ea43e563c8ac1088cea 100644 (file)
--- a/libs/ardour/sndfile_helpers.cc
+++ b/libs/ardour/sndfile_helpers.cc
@@ -19,9 +19,6 @@
 
 #include <strings.h>
 #include <map>
-#include <vector>
-
-#include "pbd/convert.h"
 
 #include <sndfile.h>
 #include "ardour/sndfile_helpers.h"

diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index f3f37fa2a131b1d273109abaea945fad4f9b6bfb..0ec318a0ac372e7cb4480d6a001aed71bc209782 100644 (file)
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -35,8 +35,6 @@
 #include "ardour/sndfilesource.h"
 #include "ardour/sndfile_helpers.h"
 #include "ardour/utils.h"
-#include "ardour/version.h"
-#include "ardour/rc_configuration.h"
 #include "ardour/session.h"
 
 #include "i18n.h"

diff --git a/libs/ardour/strip_silence.cc b/libs/ardour/strip_silence.cc
index a5b115205a750fc55d7ae2606e164aa740e8706a..3839b984bdf00b30bfe4b56c4f5b8db0979c0192 100644 (file)
--- a/libs/ardour/strip_silence.cc
+++ b/libs/ardour/strip_silence.cc
@@ -22,8 +22,6 @@
 #include "ardour/strip_silence.h"
 #include "ardour/audioregion.h"
 #include "ardour/region_factory.h"
-#include "ardour/session.h"
-#include "ardour/dB.h"
 #include "ardour/progress.h"
 
 using namespace ARDOUR;

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 798ced17b494a5743b50ddf650cedbdff4bfb461..e64a1169333023bf72021c3f86b144cbe549d6d4 100644 (file)
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -28,7 +28,6 @@
 #include "evoral/types.hpp"
 #include "ardour/debug.h"
 #include "ardour/tempo.h"
-#include "ardour/utils.h"
 
 #include "i18n.h"
 #include <locale.h>

diff --git a/libs/ardour/tempo_map_importer.cc b/libs/ardour/tempo_map_importer.cc
index b170aea8ea9a2bfb2389f227e383369335aafb4c..f0447b2f82cd060b62e2daf55d600bae9eb92e1b 100644 (file)
--- a/libs/ardour/tempo_map_importer.cc
+++ b/libs/ardour/tempo_map_importer.cc
@@ -23,9 +23,8 @@
 #include <sstream>
 
 #include "ardour/session.h"
+#include "ardour/tempo.h"
 #include "pbd/failed_constructor.h"
-#include "pbd/compose.h"
-#include "pbd/error.h"
 
 #include "i18n.h"
 

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index c2750ccf98c1a4dbefaae59fb1a3968ab669e4d1..9699558ff1469b566ebdbad531005187706bdf4f 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -18,14 +18,12 @@
 #include "pbd/error.h"
 
 #include "ardour/amp.h"
-#include "ardour/audioplaylist.h"
-#include "ardour/audioregion.h"
-#include "ardour/audiosource.h"
 #include "ardour/debug.h"
 #include "ardour/delivery.h"
 #include "ardour/diskstream.h"
 #include "ardour/io_processor.h"
 #include "ardour/meter.h"
+#include "ardour/playlist.h"
 #include "ardour/port.h"
 #include "ardour/processor.h"
 #include "ardour/route_group_specialized.h"

diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc
index b6c38e0eedf8b35084455fc233434bae719be992..de71a87d86b262943ad2ac9fe793247020a08570 100644 (file)
--- a/libs/ardour/user_bundle.cc
+++ b/libs/ardour/user_bundle.cc
@@ -1,13 +1,9 @@
-#include <cassert>
-#include "pbd/failed_constructor.h"
-#include "pbd/compose.h"
-#include "pbd/xml++.h"
 #include "ardour/user_bundle.h"
-#include "ardour/port_set.h"
-#include "ardour/io.h"
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
 #include "i18n.h"
+#include "pbd/compose.h"
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/xml++.h"
 
 ARDOUR::UserBundle::UserBundle (std::string const & n)
        : Bundle (n)

diff --git a/libs/midi++2/midi++/names.h b/libs/midi++2/midi++/names.h
index 9597de3928662773172c8b8284aca1eb39d1f02f..1a94e675e3f2c47301f481610ff98db8e2741145 100644 (file)
--- a/libs/midi++2/midi++/names.h
+++ b/libs/midi++2/midi++/names.h
@@ -20,8 +20,9 @@
 #ifndef __midinames_h__
 #define __midinames_h__
 
-#include "events.h"
+#include <stdint.h>
 
+#include "events.h"
 
 /** \group midi
  */