Re-fix compile failure with --no-nls (#3111).

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

15 files changed, 19 insertions, 1 deletions

diff --git a/gtk2_ardour/ambiguous_file_dialog.cc b/gtk2_ardour/ambiguous_file_dialog.cc
index e14d33540e..fe17cde5b1 100644
--- a/gtk2_ardour/ambiguous_file_dialog.cc
+++ b/gtk2_ardour/ambiguous_file_dialog.cc
@@ -18,7 +18,9 @@
 */
 
 #include <gtkmm/label.h>
+#include "pbd/compose.h"
 #include "ambiguous_file_dialog.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
diff --git a/gtk2_ardour/ardour_ui_mixer.cc b/gtk2_ardour/ardour_ui_mixer.cc
index 3a1ae4e725..c969afa33f 100644
--- a/gtk2_ardour/ardour_ui_mixer.cc
+++ b/gtk2_ardour/ardour_ui_mixer.cc
@@ -25,6 +25,7 @@
 
 #include "ardour_ui.h"
 #include "mixer_ui.h"
+#include "i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc
index c4cfe11218..19e072cf4d 100644
--- a/gtk2_ardour/edit_note_dialog.cc
+++ b/gtk2_ardour/edit_note_dialog.cc
@@ -23,6 +23,7 @@
 #include "edit_note_dialog.h"
 #include "canvas-note-event.h"
 #include "midi_region_view.h"
+#include "i18n.h"
 
 using namespace Gtk;
 
diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index ccf95b797f..8839748110 100644
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -24,6 +24,7 @@
 #include "utils.h"
 #include "editor_route_groups.h"
 #include "editor_routes.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
diff --git a/gtk2_ardour/missing_file_dialog.cc b/gtk2_ardour/missing_file_dialog.cc
index 56139be32f..c73fc51512 100644
--- a/gtk2_ardour/missing_file_dialog.cc
+++ b/gtk2_ardour/missing_file_dialog.cc
@@ -23,6 +23,7 @@
 #include "ardour/session.h"
 
 #include "missing_file_dialog.h"
+#include "i18n.h"
 
 using namespace Gtk;
 using namespace std;
diff --git a/gtk2_ardour/missing_plugin_dialog.cc b/gtk2_ardour/missing_plugin_dialog.cc
index be413c41bc..971343cd9d 100755
--- a/gtk2_ardour/missing_plugin_dialog.cc
+++ b/gtk2_ardour/missing_plugin_dialog.cc
@@ -19,6 +19,7 @@
 #include <gtkmm/label.h>
 #include "ardour/session.h"
 #include "missing_plugin_dialog.h"
+#include "i18n.h"
 
 using namespace Gtk;
 using namespace std;
diff --git a/gtk2_ardour/new_plugin_preset_dialog.cc b/gtk2_ardour/new_plugin_preset_dialog.cc
index 7002d5d240..e21ad9d18b 100644
--- a/gtk2_ardour/new_plugin_preset_dialog.cc
+++ b/gtk2_ardour/new_plugin_preset_dialog.cc
@@ -20,6 +20,7 @@
 
 #include <gtkmm/stock.h>
 #include "new_plugin_preset_dialog.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace Gtk;
diff --git a/gtk2_ardour/normalize_dialog.cc b/gtk2_ardour/normalize_dialog.cc
index 28742931e9..a12732e99a 100644
--- a/gtk2_ardour/normalize_dialog.cc
+++ b/gtk2_ardour/normalize_dialog.cc
@@ -23,6 +23,7 @@
 #include <gtkmm/stock.h>
 #include <gtkmm/progressbar.h>
 #include "normalize_dialog.h"
+#include "i18n.h"
 
 using namespace Gtk;
 
diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc
index e4efdc2532..d2c23e7365 100644
--- a/gtk2_ardour/patch_change_dialog.cc
+++ b/gtk2_ardour/patch_change_dialog.cc
@@ -22,6 +22,7 @@
 #include <gtkmm/table.h>
 #include "ardour/beats_frames_converter.h"
 #include "patch_change_dialog.h"
+#include "i18n.h"
 
 using namespace Gtk;
 
diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc
index 43ee64c23f..013edd6197 100644
--- a/gtk2_ardour/plugin_eq_gui.cc
+++ b/gtk2_ardour/plugin_eq_gui.cc
@@ -35,6 +35,8 @@
 #include <iostream>
 #include <cmath>
 
+#include "i18n.h"
+
 using namespace ARDOUR;
 
 PluginEqGui::PluginEqGui(boost::shared_ptr<ARDOUR::PluginInsert> pluginInsert)
diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc
index 1abccade8a..6640d6d14a 100644
--- a/gtk2_ardour/region_layering_order_editor.cc
+++ b/gtk2_ardour/region_layering_order_editor.cc
@@ -4,11 +4,11 @@
 #include "ardour/region.h"
 
 #include "gui_thread.h"
-#include "i18n.h"
 #include "keyboard.h"
 #include "public_editor.h"
 #include "region_layering_order_editor.h"
 #include "utils.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace Gtk;
diff --git a/gtk2_ardour/search_path_option.cc b/gtk2_ardour/search_path_option.cc
index 84b02bf577..6716607383 100644
--- a/gtk2_ardour/search_path_option.cc
+++ b/gtk2_ardour/search_path_option.cc
@@ -17,7 +17,9 @@
 */
 
 #include "pbd/strsplit.h"
+#include "pbd/compose.h"
 #include "search_path_option.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace Gtk;
diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index c941336de5..1274dce6f8 100644
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -31,6 +31,8 @@
 #include "ardour_ui.h"
 #include "shuttle_control.h"
 
+#include "i18n.h"
+
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
diff --git a/gtk2_ardour/transpose_dialog.cc b/gtk2_ardour/transpose_dialog.cc
index 6a3c5bf119..0913102469 100644
--- a/gtk2_ardour/transpose_dialog.cc
+++ b/gtk2_ardour/transpose_dialog.cc
@@ -22,6 +22,7 @@
 #include <gtkmm/label.h>
 #include <gtkmm/stock.h>
 #include "transpose_dialog.h"
+#include "i18n.h"
 
 using namespace Gtk;
 
diff --git a/gtk2_ardour/window_proxy.cc b/gtk2_ardour/window_proxy.cc
index c37fd0e043..5731d3509d 100755
--- a/gtk2_ardour/window_proxy.cc
+++ b/gtk2_ardour/window_proxy.cc
@@ -19,6 +19,7 @@
 
 #include <gtkmm/window.h>
 #include "window_proxy.h"
+#include "i18n.h"
 
 using namespace std;