Remove some extraneous includes. reorder some others (fixes compilation on fedora...

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

diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index b2e6568a30503e427acd5970230bab61f4702870..2b3b9c21318d36805cea4f5b03760267e1d4f4b4 100644 (file)
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -20,12 +20,14 @@
 #include <gtkmm/image.h>
 #include <gtkmm/stock.h>
 #include "global_port_matrix.h"
-#include "i18n.h"
+
 #include "ardour/bundle.h"
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
 #include "ardour/port.h"
 
+#include "i18n.h"
+
 GlobalPortMatrix::GlobalPortMatrix (ARDOUR::Session& s, ARDOUR::DataType t)
        : PortMatrix (s, t)
 {

diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc
index 18d5eaf1aa01d140db56e1c12b8946356823e99f..064cc1bc9f0f5ea867cf323237ec47f4ab3a190b 100644 (file)
--- a/gtk2_ardour/session_metadata_dialog.cc
+++ b/gtk2_ardour/session_metadata_dialog.cc
@@ -24,12 +24,13 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/window_title.h>
 
-#include "i18n.h"
 #include "pbd/xml++.h"
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
 #include "ardour/session_utils.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace Glib;
 

diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc
index 529a4e3d9ff62b2b2f2d4aa04a43ad563b016da6..6e6d2ea290d360e6e010fc2f203d6d1773214982 100644 (file)
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -18,8 +18,6 @@
 
 */
 
-#include "ardour/export_profile_manager.h"
-
 #include <cassert>
 #include <stdexcept>
 
@@ -29,7 +27,7 @@
 #include "pbd/xml++.h"
 #include "pbd/convert.h"
 
-#include "ardour/export_failed.h"
+#include "ardour/export_profile_manager.h"
 #include "ardour/export_file_io.h"
 #include "ardour/export_format_specification.h"
 #include "ardour/export_timespan.h"

diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc
index 4266d71353d8afaefa8a73b3b4c7597386071849..7982f89507b0395ee83c98d11216f342d9104455 100644 (file)
--- a/libs/ardour/session_export.cc
+++ b/libs/ardour/session_export.cc
@@ -22,7 +22,7 @@
 #include "pbd/error.h"
 #include <glibmm/thread.h>
 
-#include "ardour/ardour.h"
+#include "ardour/session.h"
 #include "ardour/audio_diskstream.h"
 #include "ardour/audioengine.h"
 #include "ardour/export_failed.h"
@@ -30,10 +30,7 @@
 #include "ardour/export_handler.h"
 #include "ardour/export_status.h"
 #include "ardour/export_utilities.h"
-#include "ardour/panner.h"
 #include "ardour/route.h"
-#include "ardour/session.h"
-#include "ardour/timestamps.h"
 
 #include "i18n.h"