diff --git a/src/Audacity.h b/src/Audacity.h
index fa37e3f18..d201985c8 100644
--- a/src/Audacity.h
+++ b/src/Audacity.h
@@ -213,52 +213,6 @@ void QuitAudacity();
 #define JUST_BELOW_MAX_AUDIO (1.f - 1.f/(1<<14))
 
 
-#ifndef IN_RC
-//#include <wx/defs.h>
-//#include <wx/string.h>
-class wxString;
-
-extern const wxString& GetCustomTranslation(const wxString& str1 );
-extern const wxString& GetCustomSubstitution(const wxString& str1 );
-
-// Marks strings for extraction only...must use wxGetTranslation() to translate.
-#define XO(s)  wxT(s)
-// Marks string for substitution only.
-#define _TS( s ) GetCustomSubstitution( s )
-
-
-//#define WXINTL_NO_GETTEXT_MACRO
-
-#ifdef wxPLURAL
-#undef wxPLURAL
-#endif
-
-// The two string arugments will go to the .pot file, as
-// msgid sing
-// msgid_plural plural
-//
-// (You must use plain string literals.  Do not use _() or wxT() or L prefix,
-//  which (inentionally) will fail to compile.  The macro inserts wxT).
-//
-// Note too:  it seems an i18n-hint comment is not extracted if it precedes
-// wxPLURAL directly.  A workaround:  after the comment, insert a line
-// _("dummyStringXXXX");
-// where for XXXX subsitute something making this dummy string unique in the
-// program.  Then check in your generated audacity.pot that the dummy is
-// immediately before the singular/plural entry.
-//
-// Your i18n-comment should therefore say something like,
-// "In the string after this one, ..."
-#define wxPLURAL(sing, plur, n)  wxGetTranslation( wxT(sing), wxT(plur), n)
-
-
-#ifdef _
-#undef _
-#endif
-
-#define _(s) GetCustomTranslation((s))
-#endif
-
 // This renames a good use of this C++ keyword that we don't need to review when hunting for leaks.
 #define PROHIBITED = delete
 
diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index 21b41142f..4dfd13fdb 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -80,7 +80,6 @@ It handles initialization and termination by subclassing wxApp.
 #include "Screenshot.h"
 #include "Sequence.h"
 #include "WaveTrack.h"
-#include "Internat.h"
 #include "prefs/PrefsDialog.h"
 #include "Theme.h"
 #include "PlatformCompatibility.h"
diff --git a/src/AudacityException.h b/src/AudacityException.h
index 061c5d0c7..278536878 100644
--- a/src/AudacityException.h
+++ b/src/AudacityException.h
@@ -19,6 +19,8 @@
 #include "MemoryX.h"
 #include <wx/app.h>
 
+#include "Internat.h"
+
 class wxString;
 
 class AudacityException /* not final */
diff --git a/src/AudacityLogger.cpp b/src/AudacityLogger.cpp
index 457199ba9..70d045958 100644
--- a/src/AudacityLogger.cpp
+++ b/src/AudacityLogger.cpp
@@ -28,6 +28,7 @@ Provides thread-safe logging based on the wxWidgets log facility.
 #include "../images/AudacityLogoAlpha.xpm"
 #include "Experimental.h"
 #include "widgets/ErrorDialog.h"
+#include "Internat.h"
 
 //
 // AudacityLogger class
diff --git a/src/FFT.cpp b/src/FFT.cpp
index e84cc7682..e93ffcd74 100644
--- a/src/FFT.cpp
+++ b/src/FFT.cpp
@@ -40,6 +40,8 @@
 */
 
 #include "Audacity.h"
+#include "Internat.h"
+
 #include "FFT.h"
 #include "MemoryX.h"
 #include "SampleFormat.h"
diff --git a/src/FFmpeg.h b/src/FFmpeg.h
index f485820f4..ebdcfd0b3 100644
--- a/src/FFmpeg.h
+++ b/src/FFmpeg.h
@@ -18,6 +18,8 @@ Describes shared object that is used to access FFmpeg libraries.
 
 #include "MemoryX.h"
 
+#include "Internat.h"
+
 // TODO: Determine whether the libav* headers come from the FFmpeg or libav
 // project and set IS_FFMPEG_PROJECT depending on it.
 #define IS_FFMPEG_PROJECT 1
diff --git a/src/FileException.cpp b/src/FileException.cpp
index a4e515f4e..21c63ef62 100644
--- a/src/FileException.cpp
+++ b/src/FileException.cpp
@@ -8,6 +8,7 @@
 
 #include "Audacity.h"
 #include "FileException.h"
+#include "Internat.h"
 #include "Prefs.h"
 
 FileException::~FileException()
diff --git a/src/HelpText.cpp b/src/HelpText.cpp
index 9479b58e7..1585a1ff2 100644
--- a/src/HelpText.cpp
+++ b/src/HelpText.cpp
@@ -20,6 +20,7 @@
 #include "FileNames.h"
 #include "AboutDialog.h"
 #include "AllThemeResources.h"
+#include "Internat.h"
 
 
 wxString HtmlColourOfIndex( int i ){
diff --git a/src/InconsistencyException.cpp b/src/InconsistencyException.cpp
index 6cf20a9b4..73db17a6b 100644
--- a/src/InconsistencyException.cpp
+++ b/src/InconsistencyException.cpp
@@ -8,6 +8,7 @@
 
 #include "Audacity.h"
 #include "InconsistencyException.h"
+#include "Internat.h"
 
 InconsistencyException::~InconsistencyException()
 {
diff --git a/src/Internat.cpp b/src/Internat.cpp
index f5a04478a..7a93104fd 100644
--- a/src/Internat.cpp
+++ b/src/Internat.cpp
@@ -27,10 +27,10 @@ and on Mac OS X for the filesystem.
 #include <locale.h>
 #include <math.h> // for pow()
 
-#include "Internat.h"
 #include "Experimental.h"
 #include "FileNames.h"
 #include "widgets/ErrorDialog.h"
+#include "Internat.h"
 
 // in order for the static member variables to exist, they must appear here
 // (_outside_) the class definition, in order to be allocated some storage.
diff --git a/src/Internat.h b/src/Internat.h
index e6c2e2a9a..fc5298536 100644
--- a/src/Internat.h
+++ b/src/Internat.h
@@ -16,6 +16,41 @@
 #include <wx/string.h>
 #include <wx/longlong.h>
 
+#ifndef IN_RC
+
+class wxString;
+
+extern const wxString& GetCustomTranslation(const wxString& str1 );
+extern const wxString& GetCustomSubstitution(const wxString& str1 );
+
+// Marks string for substitution only.
+#define _TS( s ) GetCustomSubstitution( s )
+
+// Marks strings for extraction only...must use wxGetTranslation() to translate.
+#define XO(s)  wxT(s)
+
+#define _(s) GetCustomTranslation((s))
+
+// The two string arugments will go to the .pot file, as
+// msgid sing
+// msgid_plural plural
+//
+// (You must use plain string literals.  Do not use _() or wxT() or L prefix,
+//  which (intentionally) will fail to compile.  The macro inserts wxT).
+//
+// Note too:  it seems an i18n-hint comment is not extracted if it precedes
+// wxPLURAL directly.  A workaround:  after the comment, insert a line
+// _("dummyStringXXXX");
+// where for XXXX subsitute something making this dummy string unique in the
+// program.  Then check in your generated audacity.pot that the dummy is
+// immediately before the singular/plural entry.
+//
+// Your i18n-comment should therefore say something like,
+// "In the string after this one, ..."
+#define wxPLURAL(sing, plur, n)  wxGetTranslation( wxT(sing), wxT(plur), n)
+
+#endif
+
 class Internat
 {
 public:
diff --git a/src/LangChoice.cpp b/src/LangChoice.cpp
index 52c55d294..8d3c52887 100644
--- a/src/LangChoice.cpp
+++ b/src/LangChoice.cpp
@@ -29,6 +29,7 @@ of languages for Audacity.
 #include "ShuttleGui.h"
 #include "widgets/wxPanelWrapper.h"
 #include "widgets/ErrorDialog.h"
+#include "Internat.h"
 
 class LangChoiceDialog final : public wxDialogWrapper {
 public:
diff --git a/src/PitchName.cpp b/src/PitchName.cpp
index ef8e62872..c2d3cca3b 100644
--- a/src/PitchName.cpp
+++ b/src/PitchName.cpp
@@ -22,6 +22,7 @@
 
 #include "Audacity.h"
 #include "PitchName.h"
+#include "Internat.h"
 
 
 double FreqToMIDInote(const double freq)
diff --git a/src/Prefs.cpp b/src/Prefs.cpp
index 858b45cc7..bde9908a7 100755
--- a/src/Prefs.cpp
+++ b/src/Prefs.cpp
@@ -66,6 +66,7 @@
 
 #include "Prefs.h"
 #include "widgets/ErrorDialog.h"
+#include "Internat.h"
 
 std::unique_ptr<wxFileConfig> ugPrefs {};
 wxFileConfig *gPrefs = NULL;
diff --git a/src/Printing.cpp b/src/Printing.cpp
index d61fa2f75..601cce556 100644
--- a/src/Printing.cpp
+++ b/src/Printing.cpp
@@ -33,6 +33,7 @@
 #include "Experimental.h"
 
 #include "TrackPanelDrawingContext.h"
+#include "Internat.h"
 
 // Globals, so that we remember settings from session to session
 wxPrintData &gPrintData()
diff --git a/src/Resample.cpp b/src/Resample.cpp
index e8d914fa5..c7317c379 100644
--- a/src/Resample.cpp
+++ b/src/Resample.cpp
@@ -25,6 +25,7 @@
 #include "Resample.h"
 #include "Prefs.h"
 #include "TranslatableStringArray.h"
+#include "Internat.h"
 
 #include <soxr.h>
 
diff --git a/src/SampleFormat.cpp b/src/SampleFormat.cpp
index 01ad23a25..ef1ca0c6d 100644
--- a/src/SampleFormat.cpp
+++ b/src/SampleFormat.cpp
@@ -43,6 +43,7 @@
 #include "SampleFormat.h"
 #include "Prefs.h"
 #include "Dither.h"
+#include "Internat.h"
 
 static Dither::DitherType gLowQualityDither = Dither::none;
 static Dither::DitherType gHighQualityDither = Dither::none;
diff --git a/src/SoundActivatedRecord.cpp b/src/SoundActivatedRecord.cpp
index 66e02573a..60ccbf160 100644
--- a/src/SoundActivatedRecord.cpp
+++ b/src/SoundActivatedRecord.cpp
@@ -25,6 +25,7 @@
 #include "ShuttlePrefs.h"
 #include "Prefs.h"
 #include "prefs/GUISettings.h"
+#include "Internat.h"
 
 BEGIN_EVENT_TABLE(SoundActivatedRecord, wxDialogWrapper)
    EVT_BUTTON(wxID_OK, SoundActivatedRecord::OnOK)
diff --git a/src/TimeDialog.h b/src/TimeDialog.h
index 4aadba509..f4908b0ca 100644
--- a/src/TimeDialog.h
+++ b/src/TimeDialog.h
@@ -16,6 +16,7 @@
 #include <wx/string.h>
 
 #include "widgets/wxPanelWrapper.h"
+#include "Internat.h"
 
 class NumericTextCtrl;
 class ShuttleGui;
diff --git a/src/TrackPanelAx.cpp b/src/TrackPanelAx.cpp
index 7e9127aa0..936f099fd 100644
--- a/src/TrackPanelAx.cpp
+++ b/src/TrackPanelAx.cpp
@@ -29,6 +29,7 @@
 #include <wx/intl.h>
 
 #include "Track.h"
+#include "Internat.h"
 
 TrackPanelAx::TrackPanelAx( wxWindow *window )
 #if wxUSE_ACCESSIBILITY
diff --git a/src/VoiceKey.cpp b/src/VoiceKey.cpp
index d93021537..9876bf7f6 100644
--- a/src/VoiceKey.cpp
+++ b/src/VoiceKey.cpp
@@ -32,6 +32,7 @@ or "OFF" point
 
 #include "WaveTrack.h"
 #include "widgets/ErrorDialog.h"
+#include "Internat.h"
 
 using std::cout;
 using std::endl;
diff --git a/src/blockfile/NotYetAvailableException.cpp b/src/blockfile/NotYetAvailableException.cpp
index 656c606a9..0d01275dc 100644
--- a/src/blockfile/NotYetAvailableException.cpp
+++ b/src/blockfile/NotYetAvailableException.cpp
@@ -8,6 +8,7 @@
 
 #include "../Audacity.h"
 #include "NotYetAvailableException.h"
+#include "../Internat.h"
 
 NotYetAvailableException::~NotYetAvailableException()
 {
diff --git a/src/effects/audiounits/AudioUnitEffect.cpp b/src/effects/audiounits/AudioUnitEffect.cpp
index 75bdefebd..36a3a92c4 100644
--- a/src/effects/audiounits/AudioUnitEffect.cpp
+++ b/src/effects/audiounits/AudioUnitEffect.cpp
@@ -42,6 +42,7 @@
 #include "../../widgets/wxPanelWrapper.h"
 
 #include "AudioUnitEffect.h"
+#include "../../Internat.h"
 
 struct CFReleaser
    { void operator () (const void *p) const { if (p) CFRelease(p); } };
diff --git a/src/import/ImportLOF.cpp b/src/import/ImportLOF.cpp
index 3545b1142..96cc4e56c 100644
--- a/src/import/ImportLOF.cpp
+++ b/src/import/ImportLOF.cpp
@@ -84,7 +84,6 @@
 #include "../WaveTrack.h"
 #include "ImportPlugin.h"
 #include "Import.h"
-#include "../Internat.h"
 #include "../NoteTrack.h"
 #include "../Project.h"
 #include "../FileFormats.h"
diff --git a/src/import/ImportPlugin.h b/src/import/ImportPlugin.h
index dbea5baae..386d79c49 100644
--- a/src/import/ImportPlugin.h
+++ b/src/import/ImportPlugin.h
@@ -56,9 +56,8 @@ but little else.
 #define __AUDACITY_IMPORTER__
 
 #include "../Audacity.h"
-#include <wx/arrstr.h>
+#include "../Internat.h"
 #include <wx/filename.h>
-#include <wx/string.h>
 #include "../MemoryX.h"
 
 #include "../widgets/ProgressDialog.h"
diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp
index 268a02259..4cd445eca 100644
--- a/src/prefs/EffectsPrefs.cpp
+++ b/src/prefs/EffectsPrefs.cpp
@@ -30,6 +30,7 @@
 #include "EffectsPrefs.h"
 
 #include "../Experimental.h"
+#include "../Internat.h"
 
 EffectsPrefs::EffectsPrefs(wxWindow * parent)
 :  PrefsPanel(parent, _("Effects"))
diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp
index 8864935e1..e94450b8f 100644
--- a/src/prefs/GUIPrefs.cpp
+++ b/src/prefs/GUIPrefs.cpp
@@ -34,6 +34,7 @@
 
 #include "ThemePrefs.h"
 #include "../AColor.h"
+#include "../Internat.h"
 
 GUIPrefs::GUIPrefs(wxWindow * parent)
 /* i18n-hint: refers to Audacity's user interface settings */
diff --git a/src/prefs/ImportExportPrefs.cpp b/src/prefs/ImportExportPrefs.cpp
index 46171dac0..08d24ea3f 100644
--- a/src/prefs/ImportExportPrefs.cpp
+++ b/src/prefs/ImportExportPrefs.cpp
@@ -23,6 +23,7 @@
 #include "../ShuttleGui.h"
 
 #include "ImportExportPrefs.h"
+#include "../Internat.h"
 
 ImportExportPrefs::ImportExportPrefs(wxWindow * parent)
 :   PrefsPanel(parent, _("Import / Export"))
diff --git a/src/prefs/ModulePrefs.cpp b/src/prefs/ModulePrefs.cpp
index a06931548..1d855a34a 100644
--- a/src/prefs/ModulePrefs.cpp
+++ b/src/prefs/ModulePrefs.cpp
@@ -24,6 +24,7 @@ with names like mnod-script-pipe that add NEW features.
 
 #include "ModulePrefs.h"
 #include "../Prefs.h"
+#include "../Internat.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/prefs/MousePrefs.cpp b/src/prefs/MousePrefs.cpp
index cd132c6b1..725c3206f 100644
--- a/src/prefs/MousePrefs.cpp
+++ b/src/prefs/MousePrefs.cpp
@@ -34,6 +34,7 @@
 
 #include "../Audacity.h"
 #include "../Experimental.h"
+#include "MousePrefs.h"
 
 #include <wx/defs.h>
 #include <wx/intl.h>
@@ -41,7 +42,7 @@
 
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
-#include "MousePrefs.h"
+#include "../Internat.h"
 
 // The numbers of the columns of the mList.
 enum
diff --git a/src/prefs/PlaybackPrefs.cpp b/src/prefs/PlaybackPrefs.cpp
index bb2765fd4..7e4262562 100644
--- a/src/prefs/PlaybackPrefs.cpp
+++ b/src/prefs/PlaybackPrefs.cpp
@@ -26,6 +26,7 @@
 
 #include "../ShuttleGui.h"
 #include "../Prefs.h"
+#include "../Internat.h"
 
 PlaybackPrefs::PlaybackPrefs(wxWindow * parent)
 :  PrefsPanel(parent, _("Playback"))
diff --git a/src/prefs/PrefsDialog.h b/src/prefs/PrefsDialog.h
index 3124b1e4a..cc3194385 100644
--- a/src/prefs/PrefsDialog.h
+++ b/src/prefs/PrefsDialog.h
@@ -20,6 +20,7 @@
 #include <wx/treebook.h>
 #include <wx/window.h>
 #include "../widgets/wxPanelWrapper.h"
+#include "../Internat.h"
 
 class PrefsPanel;
 class PrefsPanelFactory;
diff --git a/src/prefs/ProjectsPrefs.cpp b/src/prefs/ProjectsPrefs.cpp
index adacb4366..00d503bb0 100644
--- a/src/prefs/ProjectsPrefs.cpp
+++ b/src/prefs/ProjectsPrefs.cpp
@@ -25,6 +25,7 @@ handling.
 #include "../ShuttleGui.h"
 
 #include "ProjectsPrefs.h"
+#include "../Internat.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/prefs/QualityPrefs.cpp b/src/prefs/QualityPrefs.cpp
index 0a794e458..065944e25 100644
--- a/src/prefs/QualityPrefs.cpp
+++ b/src/prefs/QualityPrefs.cpp
@@ -26,6 +26,7 @@
 #include "../Resample.h"
 #include "../SampleFormat.h"
 #include "../ShuttleGui.h"
+#include "../Internat.h"
 
 #define ID_SAMPLE_RATE_CHOICE           7001
 
diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp
index 653c25eff..6b1df5669 100644
--- a/src/prefs/RecordingPrefs.cpp
+++ b/src/prefs/RecordingPrefs.cpp
@@ -31,6 +31,7 @@
 #include "../ShuttleGui.h"
 
 #include "../Experimental.h"
+#include "../Internat.h"
 
 using std::min;
 
diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp
index 480b42ef2..7b3f80057 100644
--- a/src/prefs/SpectrogramSettings.cpp
+++ b/src/prefs/SpectrogramSettings.cpp
@@ -28,6 +28,7 @@ Paul Licameli
 
 #include "../Experimental.h"
 #include "../widgets/ErrorDialog.h"
+#include "../Internat.h"
 
 SpectrogramSettings::Globals::Globals()
 {
diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp
index 8719fc859..79a79d6e0 100644
--- a/src/prefs/TracksBehaviorsPrefs.cpp
+++ b/src/prefs/TracksBehaviorsPrefs.cpp
@@ -20,6 +20,7 @@
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
 #include "../Experimental.h"
+#include "../Internat.h"
 
 TracksBehaviorsPrefs::TracksBehaviorsPrefs(wxWindow * parent)
 /* i18n-hint: two nouns */
diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp
index 438afb476..484d2d538 100644
--- a/src/prefs/TracksPrefs.cpp
+++ b/src/prefs/TracksPrefs.cpp
@@ -28,6 +28,7 @@
 #include "../WaveTrack.h"
 
 #include "../Experimental.h"
+#include "../Internat.h"
 
 int TracksPrefs::iPreferencePinned = -1;
 
diff --git a/src/prefs/WarningsPrefs.cpp b/src/prefs/WarningsPrefs.cpp
index 5b9e46909..f9531b4ba 100644
--- a/src/prefs/WarningsPrefs.cpp
+++ b/src/prefs/WarningsPrefs.cpp
@@ -24,6 +24,7 @@
 #include "../ShuttleGui.h"
 
 #include "WarningsPrefs.h"
+#include "../Internat.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/prefs/WaveformSettings.cpp b/src/prefs/WaveformSettings.cpp
index b989e1ace..677a14c73 100644
--- a/src/prefs/WaveformSettings.cpp
+++ b/src/prefs/WaveformSettings.cpp
@@ -23,6 +23,8 @@ Paul Licameli
 
 #include "../Prefs.h"
 #include "../TranslatableStringArray.h"
+#include "../Internat.h"
+
 
 WaveformSettings::Globals::Globals()
 {
diff --git a/src/toolbars/SpectralSelectionBar.cpp b/src/toolbars/SpectralSelectionBar.cpp
index a53509ab2..ad5666798 100644
--- a/src/toolbars/SpectralSelectionBar.cpp
+++ b/src/toolbars/SpectralSelectionBar.cpp
@@ -57,6 +57,7 @@ with changes in the SpectralSelectionBar.
 #include "../widgets/NumericTextCtrl.h"
 
 #include "../Experimental.h"
+#include "../Internat.h"
 
 #ifdef EXPERIMENTAL_SPECTRAL_EDITING
 
diff --git a/src/tracks/labeltrack/ui/LabelTrackControls.cpp b/src/tracks/labeltrack/ui/LabelTrackControls.cpp
index bfe14fd3a..a7a73030e 100644
--- a/src/tracks/labeltrack/ui/LabelTrackControls.cpp
+++ b/src/tracks/labeltrack/ui/LabelTrackControls.cpp
@@ -21,6 +21,7 @@ Paul Licameli split from TrackPanel.cpp
 #include <wx/fontenum.h>
 #include <wx/listbox.h>
 #include <wx/spinctrl.h>
+#include "../../../Internat.h"
 
 LabelTrackControls::~LabelTrackControls()
 {
diff --git a/src/widgets/FileHistory.cpp b/src/widgets/FileHistory.cpp
index 152c5597a..ed4b0f24f 100644
--- a/src/widgets/FileHistory.cpp
+++ b/src/widgets/FileHistory.cpp
@@ -20,6 +20,7 @@
 #include <wx/menu.h>
 
 #include "FileHistory.h"
+#include "../Internat.h"
 
 FileHistory::FileHistory(size_t maxfiles, wxWindowID base)
 {
diff --git a/src/widgets/Grabber.cpp b/src/widgets/Grabber.cpp
index 572bb1189..dd0786ecf 100644
--- a/src/widgets/Grabber.cpp
+++ b/src/widgets/Grabber.cpp
@@ -33,6 +33,7 @@ around to NEW positions.
 
 #include "../AColor.h"
 #include "../AllThemeResources.h"
+#include "../Internat.h"
 
 ////////////////////////////////////////////////////////////
 /// Methods for Grabber
diff --git a/src/widgets/Grid.cpp b/src/widgets/Grid.cpp
index 176c3d06c..d0aab59bb 100644
--- a/src/widgets/Grid.cpp
+++ b/src/widgets/Grid.cpp
@@ -26,6 +26,7 @@
 #include "Grid.h"
 #include "NumericTextCtrl.h"
 #include "../SelectedRegion.h"
+#include "../Internat.h"
 
 NumericEditor::NumericEditor
    (NumericConverter::Type type, const wxString &format, double rate)
diff --git a/src/widgets/KeyView.cpp b/src/widgets/KeyView.cpp
index 73b0eb881..2370bc8e0 100644
--- a/src/widgets/KeyView.cpp
+++ b/src/widgets/KeyView.cpp
@@ -25,6 +25,7 @@
 
 #include <wx/arrimpl.cpp>
 #include <wx/dc.h>
+#include "../Internat.h"
 
 // Various drawing constants
 #define KV_BITMAP_SIZE 16
diff --git a/src/widgets/ProgressDialog.cpp b/src/widgets/ProgressDialog.cpp
index 854c5799f..4fafd222d 100644
--- a/src/widgets/ProgressDialog.cpp
+++ b/src/widgets/ProgressDialog.cpp
@@ -51,6 +51,7 @@
 #include "ProgressDialog.h"
 #include "ErrorDialog.h"
 #include "../Prefs.h"
+#include "../Internat.h"
 
 // This really should be a Preferences setting
 static const unsigned char beep[] =
diff --git a/src/widgets/Warning.cpp b/src/widgets/Warning.cpp
index 2d989e0c4..16ea18869 100644
--- a/src/widgets/Warning.cpp
+++ b/src/widgets/Warning.cpp
@@ -30,6 +30,7 @@ the ability to not see similar warnings again for this session.
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include "wxPanelWrapper.h"
+#include "../Internat.h"
 
 class WarningDialog final : public wxDialogWrapper
 {
diff --git a/src/widgets/numformatter.cpp b/src/widgets/numformatter.cpp
index 2792f5f54..a309a6f52 100644
--- a/src/widgets/numformatter.cpp
+++ b/src/widgets/numformatter.cpp
@@ -30,6 +30,7 @@
 
 #include "../Audacity.h"
 #include "numformatter.h"
+#include "../Internat.h"
 #include <wx/intl.h>
 
 #include <locale.h> // for setlocale and LC_ALL
diff --git a/src/widgets/valnum.cpp b/src/widgets/valnum.cpp
index b3e3378ef..0ae6e1d1e 100644
--- a/src/widgets/valnum.cpp
+++ b/src/widgets/valnum.cpp
@@ -40,6 +40,7 @@
 #include <wx/dataobj.h>
 
 #include "numformatter.h"
+#include "../Internat.h"
 
 // ============================================================================
 // NumValidatorBase implementation
diff --git a/src/widgets/wxPanelWrapper.h b/src/widgets/wxPanelWrapper.h
index 1495f5a98..1e0934a99 100644
--- a/src/widgets/wxPanelWrapper.h
+++ b/src/widgets/wxPanelWrapper.h
@@ -13,6 +13,8 @@
 #include <wx/panel.h>
 #include <wx/dialog.h>
 
+#include "../Internat.h"
+
 void wxTabTraversalWrapperCharHook(wxKeyEvent &event);
 
 template <typename Base>
diff --git a/src/xml/XMLFileReader.cpp b/src/xml/XMLFileReader.cpp
index 87e857026..177857754 100644
--- a/src/xml/XMLFileReader.cpp
+++ b/src/xml/XMLFileReader.cpp
@@ -19,8 +19,8 @@
 
 #include <string.h>
 
-#include "../Internat.h"
 #include "XMLFileReader.h"
+#include "../Internat.h"
 
 XMLFileReader::XMLFileReader()
 {