diff --git a/src/BatchCommandDialog.h b/src/BatchCommandDialog.h
index c1f775933..2e2ce78b7 100644
--- a/src/BatchCommandDialog.h
+++ b/src/BatchCommandDialog.h
@@ -29,7 +29,6 @@ class wxWindow;
 class wxCheckBox;
 class wxChoice;
 class wxTextCtrl;
-class wxStaticText;
 class wxRadioButton;
 class wxListCtrl;
 class wxListEvent;
diff --git a/src/BatchProcessDialog.h b/src/BatchProcessDialog.h
index 6e2aec5c8..eca8d820c 100644
--- a/src/BatchProcessDialog.h
+++ b/src/BatchProcessDialog.h
@@ -29,7 +29,6 @@ class wxWindow;
 class wxCheckBox;
 class wxChoice;
 class wxTextCtrl;
-class wxStaticText;
 class wxRadioButton;
 class wxListCtrl;
 class wxListEvent;
diff --git a/src/Dependencies.cpp b/src/Dependencies.cpp
index 3690d64f5..be3420977 100644
--- a/src/Dependencies.cpp
+++ b/src/Dependencies.cpp
@@ -47,6 +47,7 @@ AliasedFile s.
 #include <wx/choice.h>
 #include <wx/clipbrd.h>
 #include <wx/dataobj.h>
+#include <wx/stattext.h>
 
 #include "BlockFile.h"
 #include "DirManager.h"
diff --git a/src/FreqWindow.h b/src/FreqWindow.h
index 179c6608c..9f1c058b7 100644
--- a/src/FreqWindow.h
+++ b/src/FreqWindow.h
@@ -24,7 +24,6 @@
 #include <wx/font.h>
 #include <wx/scrolbar.h>
 #include <wx/sizer.h>
-#include <wx/stattext.h>
 #include <wx/statusbr.h>
 #include <wx/textctrl.h>
 #include <wx/utils.h>
diff --git a/src/MixerBoard.h b/src/MixerBoard.h
index aeab2f86a..eafaafc28 100644
--- a/src/MixerBoard.h
+++ b/src/MixerBoard.h
@@ -20,7 +20,6 @@
 #include <wx/image.h>
 #include <wx/scrolwin.h>
 #include <wx/statbmp.h>
-#include <wx/stattext.h>
 
 #include "widgets/AButton.h"
 #include "widgets/ASlider.h"
diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp
index 28a8dce7d..31ceb88db 100644
--- a/src/ShuttleGui.cpp
+++ b/src/ShuttleGui.cpp
@@ -109,6 +109,7 @@ for registering for changes.
 #include <wx/notebook.h>
 #include <wx/treectrl.h>
 #include <wx/spinctrl.h>
+#include <wx/stattext.h>
 #include <wx/bmpbuttn.h>
 #include "../include/audacity/ComponentInterface.h"
 #include "Internat.h"
diff --git a/src/effects/BassTreble.h b/src/effects/BassTreble.h
index 7061b3ac9..fbb583825 100644
--- a/src/effects/BassTreble.h
+++ b/src/effects/BassTreble.h
@@ -12,7 +12,6 @@
 #ifndef __AUDACITY_EFFECT_BASS_TREBLE__
 #define __AUDACITY_EFFECT_BASS_TREBLE__
 
-#include <wx/stattext.h>
 #include <wx/textctrl.h>
 #include <wx/checkbox.h>
 
diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp
index a18caeabd..7bc0c2f39 100644
--- a/src/effects/Compressor.cpp
+++ b/src/effects/Compressor.cpp
@@ -34,6 +34,7 @@
 #include <wx/dcmemory.h>
 #include <wx/intl.h>
 #include <wx/slider.h>
+#include <wx/stattext.h>
 
 #include "../AColor.h"
 #include "../Prefs.h"
diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h
index 40ff970c8..368f43db6 100644
--- a/src/effects/Compressor.h
+++ b/src/effects/Compressor.h
@@ -14,7 +14,6 @@
 #include <wx/bitmap.h>
 #include <wx/checkbox.h>
 #include <wx/gdicmn.h>
-#include <wx/stattext.h>
 #include <wx/window.h>
 #include "../widgets/wxPanelWrapper.h"
 
@@ -22,6 +21,7 @@
 #include "../SampleFormat.h"
 
 class wxSlider;
+class wxStaticText;
 class EffectCompressorPanel;
 class ShuttleGui;
 
diff --git a/src/effects/Distortion.cpp b/src/effects/Distortion.cpp
index 150cfa1b5..37eb6fb4b 100644
--- a/src/effects/Distortion.cpp
+++ b/src/effects/Distortion.cpp
@@ -38,6 +38,7 @@
 #include <wx/valgen.h>
 #include <wx/log.h>
 #include <wx/slider.h>
+#include <wx/stattext.h>
 
 #include "../Prefs.h"
 #include "../Shuttle.h"
diff --git a/src/effects/Distortion.h b/src/effects/Distortion.h
index d80f34b46..92bbb0905 100644
--- a/src/effects/Distortion.h
+++ b/src/effects/Distortion.h
@@ -19,6 +19,7 @@
 #include "Effect.h"
 
 class wxSlider;
+class wxStaticText;
 class ShuttleGui;
 
 #define DISTORTION_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Distortion") }
diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp
index 551ab21ef..160ef53bb 100644
--- a/src/effects/DtmfGen.cpp
+++ b/src/effects/DtmfGen.cpp
@@ -22,6 +22,7 @@
 #include <wx/slider.h>
 #include <wx/valgen.h>
 #include <wx/valtext.h>
+#include <wx/stattext.h>
 
 #include "../Prefs.h"
 #include "../Shuttle.h"
diff --git a/src/effects/DtmfGen.h b/src/effects/DtmfGen.h
index fd52e171c..9be325cc0 100644
--- a/src/effects/DtmfGen.h
+++ b/src/effects/DtmfGen.h
@@ -14,13 +14,12 @@
 #ifndef __AUDACITY_EFFECT_DTMF__
 #define __AUDACITY_EFFECT_DTMF__
 
-#include <wx/stattext.h>
-
 #include "../widgets/NumericTextCtrl.h"
 
 #include "Effect.h"
 
 class wxSlider;
+class wxStaticText;
 class ShuttleGui;
 
 #define DTMFTONES_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("DTMF Tones") }
diff --git a/src/effects/EffectRack.h b/src/effects/EffectRack.h
index ed0afcda3..870e7bb6b 100644
--- a/src/effects/EffectRack.h
+++ b/src/effects/EffectRack.h
@@ -25,11 +25,12 @@
 #include <wx/image.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
-#include <wx/stattext.h>
 #include <wx/timer.h>
 
 #include "EffectManager.h"
 
+class wxStaticText;
+
 class EffectRack final : public wxFrame
 {
 public:
diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h
index c96741852..b7ed6a329 100644
--- a/src/effects/Equalization.h
+++ b/src/effects/Equalization.h
@@ -23,7 +23,6 @@
 #include <wx/dialog.h>
 #include <wx/intl.h>
 #include <wx/listctrl.h>
-#include <wx/stattext.h>
 #include <wx/sizer.h>
 #include <wx/bitmap.h>
 #include <wx/choice.h>
@@ -56,6 +55,7 @@ const int kEqOptionCurve   =1<<1;
 const int kEqLegacy = kEqOptionGraphic + kEqOptionCurve;
 
 class wxSlider;
+class wxStaticText;
 class Envelope;
 class EnvelopeEditor;
 class EqualizationPanel;
diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp
index 85ee2cb3c..22eaffad6 100644
--- a/src/effects/Normalize.cpp
+++ b/src/effects/Normalize.cpp
@@ -24,6 +24,7 @@
 #include <math.h>
 
 #include <wx/intl.h>
+#include <wx/stattext.h>
 #include <wx/valgen.h>
 
 #include "../Internat.h"
diff --git a/src/effects/Normalize.h b/src/effects/Normalize.h
index 72ae27b9a..41f4f692e 100644
--- a/src/effects/Normalize.h
+++ b/src/effects/Normalize.h
@@ -16,12 +16,12 @@
 #include "../Experimental.h"
 
 #include <wx/checkbox.h>
-#include <wx/stattext.h>
 #include <wx/textctrl.h>
 
 #include "Effect.h"
 #include "Biquad.h"
 
+class wxStaticText;
 class ShuttleGui;
 
 #define NORMALIZE_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Normalize") }
diff --git a/src/effects/Repeat.cpp b/src/effects/Repeat.cpp
index dcd656551..a368f2e58 100644
--- a/src/effects/Repeat.cpp
+++ b/src/effects/Repeat.cpp
@@ -27,6 +27,7 @@
 #include <math.h>
 
 #include <wx/intl.h>
+#include <wx/stattext.h>
 
 #include "../LabelTrack.h"
 #include "../Shuttle.h"
diff --git a/src/effects/Repeat.h b/src/effects/Repeat.h
index 5127b99f3..ffcd75036 100644
--- a/src/effects/Repeat.h
+++ b/src/effects/Repeat.h
@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_EFFECT_REPEAT__
 #define __AUDACITY_EFFECT_REPEAT__
 
-#include <wx/stattext.h>
 #include <wx/textctrl.h>
 
 #include "Effect.h"
@@ -20,6 +19,8 @@ class ShuttleGui;
 
 #define REPEAT_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Repeat") }
 
+class wxStaticText;
+
 class EffectRepeat final : public Effect
 {
 public:
diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp
index 30ab9391d..b3b672e69 100644
--- a/src/effects/ScienFilter.cpp
+++ b/src/effects/ScienFilter.cpp
@@ -45,6 +45,7 @@ a graph for EffectScienFilter.
 #include <wx/intl.h>
 #include <wx/settings.h>
 #include <wx/slider.h>
+#include <wx/stattext.h>
 #include <wx/utils.h>
 #include <wx/valgen.h>
 
diff --git a/src/effects/ScienFilter.h b/src/effects/ScienFilter.h
index 031d92b1d..320e16024 100644
--- a/src/effects/ScienFilter.h
+++ b/src/effects/ScienFilter.h
@@ -18,7 +18,6 @@ Vaughan Johnson (Preview)
 #include <wx/bitmap.h>
 #include <wx/choice.h>
 #include <wx/panel.h>
-#include <wx/stattext.h>
 #include <wx/window.h>
 
 #include "Biquad.h"
@@ -26,6 +25,7 @@ Vaughan Johnson (Preview)
 #include "Effect.h"
 
 class wxSlider;
+class wxStaticText;
 class wxTextCtrl;
 class RulerPanel;
 class ShuttleGui;
diff --git a/src/effects/ScoreAlignDialog.h b/src/effects/ScoreAlignDialog.h
index 94f1ccf38..6479f502b 100644
--- a/src/effects/ScoreAlignDialog.h
+++ b/src/effects/ScoreAlignDialog.h
@@ -57,6 +57,7 @@ class wxButton;
 class wxSizer;
 class wxString;
 class wxSlider;
+class wxStaticText;
 
 void CloseScoreAlignDialog();
 
diff --git a/src/effects/VST/VSTEffect.h b/src/effects/VST/VSTEffect.h
index 8dd06c40f..edc9277be 100644
--- a/src/effects/VST/VSTEffect.h
+++ b/src/effects/VST/VSTEffect.h
@@ -22,6 +22,7 @@
 
 class wxSizerItem;
 class wxSlider;
+class wxStaticText;
 
 class VSTControl;
 #include "VSTControl.h"
diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp
index cb381e2a9..c9fc2551e 100644
--- a/src/effects/lv2/LV2Effect.cpp
+++ b/src/effects/lv2/LV2Effect.cpp
@@ -28,6 +28,7 @@
 #include <wx/sizer.h>
 #include <wx/slider.h>
 #include <wx/statbox.h>
+#include <wx/stattext.h>
 #include <wx/tokenzr.h>
 #include <wx/intl.h>
 #include <wx/scrolwin.h>
diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h
index 6b7faf7df..dd00f6d3a 100644
--- a/src/effects/lv2/LV2Effect.h
+++ b/src/effects/lv2/LV2Effect.h
@@ -19,7 +19,6 @@ class wxArrayString;
 #include <vector>
 #include <wx/checkbox.h>
 #include <wx/dialog.h>
-#include <wx/stattext.h>
 #include <wx/textctrl.h>
 
 #include "lv2/lv2plug.in/ns/ext/atom/forge.h"
diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp
index 199560418..5f2de03f0 100644
--- a/src/effects/nyquist/Nyquist.cpp
+++ b/src/effects/nyquist/Nyquist.cpp
@@ -41,6 +41,7 @@ effects from this one class.
 #include <wx/log.h>
 #include <wx/slider.h>
 #include <wx/sstream.h>
+#include <wx/stattext.h>
 #include <wx/textdlg.h>
 #include <wx/txtstrm.h>
 #include <wx/valgen.h>
diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h
index b173a752e..8cca9a579 100644
--- a/src/effects/nyquist/Nyquist.h
+++ b/src/effects/nyquist/Nyquist.h
@@ -17,7 +17,6 @@
 #include <wx/filename.h>
 #include <wx/intl.h>
 #include <wx/sizer.h>
-#include <wx/stattext.h>
 #include <wx/textbuf.h>
 #include <wx/textctrl.h>
 #include <wx/tokenzr.h>
diff --git a/src/effects/vamp/VampEffect.h b/src/effects/vamp/VampEffect.h
index bd7e3121f..ce4787de5 100644
--- a/src/effects/vamp/VampEffect.h
+++ b/src/effects/vamp/VampEffect.h
@@ -17,7 +17,6 @@
 
 #include <wx/checkbox.h>
 #include <wx/choice.h>
-#include <wx/stattext.h>
 #include <wx/textctrl.h>
 
 #include <vamp-hostsdk/PluginLoader.h>
@@ -25,6 +24,7 @@
 #include "../../SampleFormat.h"
 #include "../Effect.h"
 
+class wxStaticText;
 class wxSlider;
 class LabelTrack;
 
diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp
index d1436c4ea..18a6f488a 100644
--- a/src/export/ExportFFmpegDialogs.cpp
+++ b/src/export/ExportFFmpegDialogs.cpp
@@ -53,6 +53,8 @@
 #include <wx/spinctrl.h>
 #include <wx/combobox.h>
 #include <wx/listimpl.cpp>
+#include <wx/stattext.h>
+
 #include <FileDialog.h>
 
 #include "../FileFormats.h"
diff --git a/src/export/ExportFFmpegDialogs.h b/src/export/ExportFFmpegDialogs.h
index 7de358339..a9317f36f 100644
--- a/src/export/ExportFFmpegDialogs.h
+++ b/src/export/ExportFFmpegDialogs.h
@@ -28,6 +28,7 @@ LRN
 class wxArrayStringEx;
 
 class wxArrayString;
+class wxStaticText;
 
 /// Identifiers for pre-set export types.
 enum FFmpegExposedFormat
diff --git a/src/export/ExportMultiple.h b/src/export/ExportMultiple.h
index 67aaedcd2..6ad8048e4 100644
--- a/src/export/ExportMultiple.h
+++ b/src/export/ExportMultiple.h
@@ -23,6 +23,7 @@ class wxButton;
 class wxCheckBox;
 class wxChoice;
 class wxRadioButton;
+class wxStaticText;
 class wxTextCtrl;
 
 class AudacityProject;
diff --git a/src/prefs/DirectoriesPrefs.h b/src/prefs/DirectoriesPrefs.h
index 96b383dd8..54a407f9b 100644
--- a/src/prefs/DirectoriesPrefs.h
+++ b/src/prefs/DirectoriesPrefs.h
@@ -11,13 +11,14 @@
 #ifndef __AUDACITY_DIRECTORIES_PREFS__
 #define __AUDACITY_DIRECTORIES_PREFS__
 
-#include <wx/stattext.h>
 #include <wx/textctrl.h>
 
 #include "PrefsPanel.h"
 
 class ShuttleGui;
 
+class wxStaticText;
+
 class DirectoriesPrefs final : public PrefsPanel
 {
  public:
diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp
index 272a92c3e..f2832400d 100644
--- a/src/prefs/KeyConfigPrefs.cpp
+++ b/src/prefs/KeyConfigPrefs.cpp
@@ -30,6 +30,7 @@ KeyConfigPrefs and MousePrefs use.
 #include <wx/filedlg.h>
 #include <wx/menu.h>
 #include <wx/button.h>
+#include <wx/stattext.h>
 
 #include "../Prefs.h"
 #include "../Project.h"
diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp
index 3455ba9e8..9d149333b 100644
--- a/src/prefs/LibraryPrefs.cpp
+++ b/src/prefs/LibraryPrefs.cpp
@@ -23,6 +23,7 @@ MP3 and FFmpeg encoding libraries.
 
 #include <wx/defs.h>
 #include <wx/button.h>
+#include <wx/stattext.h>
 
 #include "../FFmpeg.h"
 #include "../ShuttleGui.h"
diff --git a/src/prefs/LibraryPrefs.h b/src/prefs/LibraryPrefs.h
index 991d1dfee..d90e460b3 100644
--- a/src/prefs/LibraryPrefs.h
+++ b/src/prefs/LibraryPrefs.h
@@ -15,11 +15,11 @@
 
 #include <wx/defs.h>
 
-#include <wx/stattext.h>
 #include <wx/window.h>
 
 #include "PrefsPanel.h"
 
+class wxStaticText;
 class ShuttleGui;
 
 class LibraryPrefs final : public PrefsPanel
diff --git a/src/toolbars/DeviceToolBar.cpp b/src/toolbars/DeviceToolBar.cpp
index 529d945f4..5d5aa2b78 100644
--- a/src/toolbars/DeviceToolBar.cpp
+++ b/src/toolbars/DeviceToolBar.cpp
@@ -29,6 +29,7 @@
 #include <wx/settings.h>
 #include <wx/sizer.h>
 #include <wx/statbmp.h>
+#include <wx/stattext.h>
 #include <wx/tooltip.h>
 #endif
 
diff --git a/src/toolbars/DeviceToolBar.h b/src/toolbars/DeviceToolBar.h
index 07f88c821..b11e437d6 100644
--- a/src/toolbars/DeviceToolBar.h
+++ b/src/toolbars/DeviceToolBar.h
@@ -19,7 +19,6 @@ class wxImage;
 class wxSize;
 class wxPoint;
 class wxChoice;
-class wxStaticText;
 struct DeviceSourceMap;
 
 class DeviceToolBar final : public ToolBar {
diff --git a/src/widgets/NumericTextCtrl.h b/src/widgets/NumericTextCtrl.h
index 189cb66d0..6d0948680 100644
--- a/src/widgets/NumericTextCtrl.h
+++ b/src/widgets/NumericTextCtrl.h
@@ -23,7 +23,6 @@
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/panel.h>
-#include <wx/stattext.h>
 #include <wx/textctrl.h>
 
 #include "../Internat.h"
diff --git a/src/widgets/ProgressDialog.cpp b/src/widgets/ProgressDialog.cpp
index 325017bdb..67d56c694 100644
--- a/src/widgets/ProgressDialog.cpp
+++ b/src/widgets/ProgressDialog.cpp
@@ -48,6 +48,7 @@
 #include <wx/sound.h>
 #include <wx/stopwatch.h>
 #include <wx/window.h>
+#include <wx/stattext.h>
 
 #include "ErrorDialog.h"
 #include "../Prefs.h"
diff --git a/src/widgets/ProgressDialog.h b/src/widgets/ProgressDialog.h
index 7c413ce20..45a279204 100644
--- a/src/widgets/ProgressDialog.h
+++ b/src/widgets/ProgressDialog.h
@@ -25,11 +25,12 @@
 #include <wx/defs.h>
 #include <wx/evtloop.h>
 #include <wx/gauge.h>
-#include <wx/stattext.h>
 #include <wx/utils.h>
 
 #include "wxPanelWrapper.h"
 
+class wxStaticText;
+
 enum class ProgressResult : unsigned
 {
    Cancelled = 0, //<! User says that whatever is happening is undesirable and shouldn't have happened at all