diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h
index 724c091b32..d9773bbeba 100644
--- a/libs/ardour/ardour/disk_reader.h
+++ b/libs/ardour/ardour/disk_reader.h
@@ -22,8 +22,6 @@
 
 #include <boost/optional.hpp>
 
-#include "pbd/i18n.h"
-
 #include "evoral/Curve.h"
 
 #include "ardour/disk_io.h"
@@ -46,10 +44,7 @@ public:
 
 	bool set_name (std::string const& str);
 
-	std::string display_name () const
-	{
-		return std::string (_("player"));
-	}
+	std::string display_name () const;
 
 	static samplecnt_t chunk_samples ()
 	{
diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h
index 2bd753a006..511b6bc4fc 100644
--- a/libs/ardour/ardour/disk_writer.h
+++ b/libs/ardour/ardour/disk_writer.h
@@ -23,8 +23,6 @@
 #include <list>
 #include <vector>
 
-#include "pbd/i18n.h"
-
 #include "ardour/disk_io.h"
 #include "ardour/midi_buffer.h"
 
@@ -42,7 +40,7 @@ public:
 	~DiskWriter ();
 
 	bool set_name (std::string const& str);
-	std::string display_name () const { return std::string (_ ("recorder")); }
+	std::string display_name () const;
 
 	bool recordable () const { return _flags & Recordable; }
 
diff --git a/libs/ardour/ardour/transport_master.h b/libs/ardour/ardour/transport_master.h
index d6b554ef84..af98c0b3a2 100644
--- a/libs/ardour/ardour/transport_master.h
+++ b/libs/ardour/ardour/transport_master.h
@@ -29,7 +29,6 @@
 
 #include <ltc.h>
 
-#include "pbd/i18n.h"
 #include "pbd/properties.h"
 #include "pbd/signals.h"
 #include "pbd/statefuldestructible.h"
@@ -123,7 +122,7 @@ struct LIBARDOUR_API SafeTime {
 
 		do {
 			if (tries == 10) {
-				std::cerr << X_("SafeTime: atomic read of current time failed, sleeping!") << std::endl;
+				std::cerr << "SafeTime: atomic read of current time failed, sleeping!" << std::endl;
 				Glib::usleep (20);
 				tries = 0;
 			}
diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index 252a84a658..5fa694485a 100644
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -76,6 +76,12 @@ DiskReader::~DiskReader ()
 	DEBUG_TRACE (DEBUG::Destruction, string_compose ("DiskReader %1 @ %2 deleted\n", _name, this));
 }
 
+std::string
+DiskReader::display_name () const
+{
+	return std::string (_("player"));
+}
+
 void
 DiskReader::ReaderChannelInfo::resize (samplecnt_t bufsize)
 {
diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc
index aee4f9301e..34aa3f1e9f 100644
--- a/libs/ardour/disk_writer.cc
+++ b/libs/ardour/disk_writer.cc
@@ -85,6 +85,12 @@ DiskWriter::default_chunk_samples ()
 	return 65536;
 }
 
+std::string
+DiskWriter::display_name () const
+{
+	return std::string (_ ("recorder"));
+}
+
 void
 DiskWriter::WriterChannelInfo::resize (samplecnt_t bufsize)
 {
diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index 9bc318a144..8be47efbd1 100644
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -26,7 +26,6 @@
 #include "pbd/compose.h"
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
-#include "pbd/i18n.h"
 
 #include "ardour/audioengine.h"
 #include "ardour/debug.h"
@@ -34,6 +33,8 @@
 #include "ardour/port_engine.h"
 #include "ardour/rc_configuration.h"
 
+#include "pbd/i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/libs/ardour/port_engine_shared.cc b/libs/ardour/port_engine_shared.cc
index f8ab0e2047..ad32762f0b 100644
--- a/libs/ardour/port_engine_shared.cc
+++ b/libs/ardour/port_engine_shared.cc
@@ -21,10 +21,11 @@
 #include <regex.h>
 
 #include "pbd/error.h"
-#include "pbd/i18n.h"
 
 #include "ardour/port_engine_shared.h"
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 
 BackendPort::BackendPort (PortEngineSharedImpl &b, const std::string& name, PortFlags flags)
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index cb42f1d2cb..ab6042af30 100644
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -30,7 +30,6 @@
 
 #include <glibmm/threads.h>
 
-#include "pbd/i18n.h"
 #include "pbd/types_convert.h"
 #include "pbd/xml++.h"
 
@@ -47,6 +46,8 @@
 #include "ardour/transient_detector.h"
 #include "ardour/types_convert.h"
 
+#include "pbd/i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/libs/ardour/transport_fsm.cc b/libs/ardour/transport_fsm.cc
index 4841067851..59de3d1de2 100644
--- a/libs/ardour/transport_fsm.cc
+++ b/libs/ardour/transport_fsm.cc
@@ -22,7 +22,6 @@
 #include <boost/none.hpp>
 
 #include "pbd/error.h"
-#include "pbd/i18n.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/stacktrace.h"
 
@@ -31,6 +30,8 @@
 #include "ardour/session.h"
 #include "ardour/transport_fsm.h"
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 
diff --git a/libs/ardour/transport_master.cc b/libs/ardour/transport_master.cc
index ea56a860ba..e76fd5eb66 100644
--- a/libs/ardour/transport_master.cc
+++ b/libs/ardour/transport_master.cc
@@ -21,7 +21,6 @@
 
 #include "pbd/boost_debug.h"
 #include "pbd/debug.h"
-#include "pbd/i18n.h"
 
 #include "ardour/audioengine.h"
 #include "ardour/debug.h"
@@ -32,6 +31,7 @@
 #include "ardour/types_convert.h"
 #include "ardour/utils.h"
 
+#include "pbd/i18n.h"
 
 namespace ARDOUR {
 	namespace Properties {
diff --git a/libs/surfaces/contourdesign/button_config_widget.cc b/libs/surfaces/contourdesign/button_config_widget.cc
index 785c8c6b16..f46f80f122 100644
--- a/libs/surfaces/contourdesign/button_config_widget.cc
+++ b/libs/surfaces/contourdesign/button_config_widget.cc
@@ -24,12 +24,13 @@
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/action_model.h"
 
-#include "pbd/i18n.h"
 #include "pbd/strsplit.h"
 #include "pbd/signals.h"
 
 #include "button_config_widget.h"
 
+#include "pbd/i18n.h"
+
 using namespace std;
 using namespace Gtk;
 using namespace ArdourSurface;
diff --git a/libs/surfaces/contourdesign/contourdesign_gui.cc b/libs/surfaces/contourdesign/contourdesign_gui.cc
index 3d061b060b..ed58c787d0 100644
--- a/libs/surfaces/contourdesign/contourdesign_gui.cc
+++ b/libs/surfaces/contourdesign/contourdesign_gui.cc
@@ -37,12 +37,12 @@
 
 #include "widgets/ardour_button.h"
 
-#include "pbd/i18n.h"
-
 #include "contourdesign.h"
 #include "jump_distance_widget.h"
 #include "button_config_widget.h"
 
+#include "pbd/i18n.h"
+
 using namespace ArdourSurface;
 
 class ContourDesignGUI : public Gtk::VBox, public PBD::ScopedConnectionList
diff --git a/libs/surfaces/contourdesign/jump_distance_widget.cc b/libs/surfaces/contourdesign/jump_distance_widget.cc
index 8469658a13..dacc3a7528 100644
--- a/libs/surfaces/contourdesign/jump_distance_widget.cc
+++ b/libs/surfaces/contourdesign/jump_distance_widget.cc
@@ -21,10 +21,10 @@
 #include <gtkmm/spinbutton.h>
 
 #include "gtkmm2ext/utils.h"
-#include "pbd/i18n.h"
 
 #include "jump_distance_widget.h"
 
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index c5ba0b7949..31e5383dcb 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -41,7 +41,6 @@
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
 #include "pbd/file_utils.h"
-#include "pbd/i18n.h"
 #include "pbd/strsplit.h"
 #include "pbd/types_convert.h"
 #include "pbd/xml++.h"
@@ -66,6 +65,8 @@
 
 #include "pbd/abstract_ui.cc" // instantiate template
 
+#include "pbd/i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Glib;