More i18n include order fixes

diff --git a/gtk2_ardour/ardour_http.cc b/gtk2_ardour/ardour_http.cc
index ebd2016f134848360e25f4230fd01cb56ce8a5b8..880d36578e600d94a090ab76c096345a2366b61b 100644 (file)
--- a/gtk2_ardour/ardour_http.cc
+++ b/gtk2_ardour/ardour_http.cc
@@ -27,11 +27,12 @@
 #include <glibmm.h>
 
 #include "pbd/compose.h"
-#include "pbd/i18n.h"
 #include "pbd/error.h"
 
 #include "ardour_http.h"
 
+#include "pbd/i18n.h"
+
 #ifdef WAF_BUILD
 #include "gtk2ardour-version.h"
 #endif

diff --git a/gtk2_ardour/ardour_ui3.cc b/gtk2_ardour/ardour_ui3.cc
index dc5716711cc5324c7d18f1b02218c3feb112b01a..7f81f88ab3ac739e676f4a075d7bca073f987208 100644 (file)
--- a/gtk2_ardour/ardour_ui3.cc
+++ b/gtk2_ardour/ardour_ui3.cc
@@ -36,8 +36,6 @@
 #include "gtk2ardour-version.h"
 #endif
 
-#include "pbd/i18n.h"
-
 #include "ardour/monitor_processor.h"
 #include "ardour/session.h"
 #include "ardour/route.h"
@@ -50,6 +48,8 @@
 #include "public_editor.h"
 #include "ui_config.h"
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;

diff --git a/gtk2_ardour/ardour_ui_engine.cc b/gtk2_ardour/ardour_ui_engine.cc
index 2ee03c13c08871752ac2295bd896398c786bee63..01e10205c001622aea72627bea45bed77c6fca48 100644 (file)
--- a/gtk2_ardour/ardour_ui_engine.cc
+++ b/gtk2_ardour/ardour_ui_engine.cc
@@ -36,7 +36,6 @@
 #include "gtk2ardour-version.h"
 #endif
 
-#include "pbd/i18n.h"
 #include "pbd/openuri.h"
 
 #include "ardour/audioengine.h"
@@ -45,6 +44,8 @@
 #include "engine_dialog.h"
 #include "gui_thread.h"
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;

diff --git a/gtk2_ardour/ardour_ui_plugins.cc b/gtk2_ardour/ardour_ui_plugins.cc
index b9c75ac0bd5c0c49b227658712ebbef8a37532d7..002ec535c935d6b900fc6cb0597842d4baed0855 100644 (file)
--- a/gtk2_ardour/ardour_ui_plugins.cc
+++ b/gtk2_ardour/ardour_ui_plugins.cc
@@ -38,13 +38,13 @@
 
 #include <gtkmm/progressbar.h>
 
-#include "pbd/i18n.h"
-
 #include "ardour/plugin_manager.h"
 
 #include "ardour_ui.h"
 #include "ui_config.h"
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;

diff --git a/gtk2_ardour/ardour_ui_startup.cc b/gtk2_ardour/ardour_ui_startup.cc
index 9ce89841facf36343af8f8e0949bbe951826bd39..e9875e93387050e9c2d31b7822ea441f417f29f7 100644 (file)
--- a/gtk2_ardour/ardour_ui_startup.cc
+++ b/gtk2_ardour/ardour_ui_startup.cc
@@ -52,7 +52,6 @@
 
 #include "pbd/basename.h"
 #include "pbd/file_utils.h"
-#include "pbd/i18n.h"
 
 #include "ardour/audioengine.h"
 #include "ardour/filename_extensions.h"
@@ -74,6 +73,8 @@
 #include "splash.h"
 #include "startup.h"
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;

diff --git a/gtk2_ardour/ardour_ui_video.cc b/gtk2_ardour/ardour_ui_video.cc
index e6e251a17696e01ea9cbdb374b4445790ddadf58..37418f6cae88f5156bba8bc4eacf0cef6bcd9734 100644 (file)
--- a/gtk2_ardour/ardour_ui_video.cc
+++ b/gtk2_ardour/ardour_ui_video.cc
@@ -41,7 +41,6 @@
 #include <gtkmm/stock.h>
 
 #include "pbd/error.h"
-#include "pbd/i18n.h"
 #include "pbd/openuri.h"
 
 #include "ardour/ltc_file_reader.h"
@@ -56,6 +55,8 @@
 #include "transcode_video_dialog.h"
 #include "video_server_dialog.h"
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;