diff --git a/src/AudacityLogger.h b/src/AudacityLogger.h
index 3764c8bd9..afbd2dcee 100644
--- a/src/AudacityLogger.h
+++ b/src/AudacityLogger.h
@@ -21,7 +21,8 @@
 #include "MemoryX.h"
 #include <wx/log.h>
 #include <wx/frame.h>
-#include <wx/textctrl.h>
+
+class wxTextCtrl;
 
 class AudacityLogger final : public wxEvtHandler, public wxLog {
  public:
diff --git a/src/FFmpeg.h b/src/FFmpeg.h
index 9ab6cd807..5bc77f532 100644
--- a/src/FFmpeg.h
+++ b/src/FFmpeg.h
@@ -156,7 +156,6 @@ extern "C" {
 #include "widgets/LinkingHtmlWindow.h"
 #include "ShuttleGui.h"
 #include "Prefs.h"
-#include <wx/textctrl.h>
 
 #include "audacity/Types.h"
 
diff --git a/src/FreqWindow.h b/src/FreqWindow.h
index 9f1c058b7..1f1b9aed8 100644
--- a/src/FreqWindow.h
+++ b/src/FreqWindow.h
@@ -25,13 +25,13 @@
 #include <wx/scrolbar.h>
 #include <wx/sizer.h>
 #include <wx/statusbr.h>
-#include <wx/textctrl.h>
 #include <wx/utils.h>
 #include "SampleFormat.h"
 #include "widgets/wxPanelWrapper.h"
 
 class wxSlider;
 class wxStatusBar;
+class wxTextCtrl;
 class wxButton;
 class wxChoice;
 
diff --git a/src/HistoryWindow.h b/src/HistoryWindow.h
index 68a67ba10..651953bdc 100644
--- a/src/HistoryWindow.h
+++ b/src/HistoryWindow.h
@@ -15,10 +15,10 @@
 #include <wx/frame.h>
 #include <wx/listctrl.h>
 #include <wx/spinctrl.h>
-#include <wx/textctrl.h>
 
 #include "widgets/wxPanelWrapper.h"
 
+class wxTextCtrl;
 class AudacityProject;
 class ShuttleGui;
 class UndoManager;
diff --git a/src/Lyrics.h b/src/Lyrics.h
index c8d9d5248..33aa8e2fe 100644
--- a/src/Lyrics.h
+++ b/src/Lyrics.h
@@ -15,7 +15,7 @@
 #include "Audacity.h"
 
 #include <vector>
-#include <wx/textctrl.h>
+#include <wx/textctrl.h> // to inherit
 #include "commands/CommandManagerWindowClasses.h"
 #include "widgets/wxPanelWrapper.h"
 
diff --git a/src/TimerRecordDialog.h b/src/TimerRecordDialog.h
index 1e4a6c5c2..ab4e7000b 100644
--- a/src/TimerRecordDialog.h
+++ b/src/TimerRecordDialog.h
@@ -17,7 +17,7 @@
 #define __AUDACITY_TIMERRECORD_DIALOG__
 
 #include <wx/dialog.h>
-#include <wx/textctrl.h>
+#include <wx/textctrl.h> // to inherit
 #include <wx/datectrl.h>
 #include <wx/calctrl.h>
 #include <wx/timer.h>
diff --git a/src/commands/Demo.h b/src/commands/Demo.h
index 7aa66ba5a..cdad95c99 100644
--- a/src/commands/Demo.h
+++ b/src/commands/Demo.h
@@ -11,8 +11,6 @@
 #ifndef __AUDACITY_DEMO_COMMAND__
 #define __AUDACITY_DEMO_COMMAND__
 
-#include <wx/textctrl.h>
-
 #include "AudacityCommand.h"
 #include "../SampleFormat.h"
 
diff --git a/src/effects/Amplify.h b/src/effects/Amplify.h
index 88d1d0abf..8b8948e95 100644
--- a/src/effects/Amplify.h
+++ b/src/effects/Amplify.h
@@ -16,13 +16,13 @@
 #define __AUDACITY_EFFECT_AMPLIFY__
 
 #include <wx/checkbox.h>
-#include <wx/textctrl.h>
 
 #include "Effect.h"
 
 #define AMPLIFY_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Amplify") }
 
 class wxSlider;
+class wxTextCtrl;
 class ShuttleGui;
 
 class EffectAmplify final : public Effect
diff --git a/src/effects/AutoDuck.h b/src/effects/AutoDuck.h
index e85f5d031..08c5e6054 100644
--- a/src/effects/AutoDuck.h
+++ b/src/effects/AutoDuck.h
@@ -13,11 +13,11 @@
 
 #include <wx/bitmap.h>
 #include <wx/gdicmn.h>
-#include <wx/textctrl.h>
 
 #include "Effect.h"
 #include "../widgets/wxPanelWrapper.h"
 
+class wxTextCtrl;
 class EffectAutoDuckPanel;
 class ShuttleGui;
 
diff --git a/src/effects/BassTreble.h b/src/effects/BassTreble.h
index fbb583825..7ac4276d0 100644
--- a/src/effects/BassTreble.h
+++ b/src/effects/BassTreble.h
@@ -12,12 +12,12 @@
 #ifndef __AUDACITY_EFFECT_BASS_TREBLE__
 #define __AUDACITY_EFFECT_BASS_TREBLE__
 
-#include <wx/textctrl.h>
 #include <wx/checkbox.h>
 
 #include "Effect.h"
 
 class wxSlider;
+class wxTextCtrl;
 class ShuttleGui;
 
 #define BASSTREBLE_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Bass and Treble") }
diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h
index dd5b826b2..8922c3f2d 100644
--- a/src/effects/ChangePitch.h
+++ b/src/effects/ChangePitch.h
@@ -28,11 +28,11 @@ the pitch without changing the tempo.
 
 #include <wx/choice.h>
 #include <wx/spinctrl.h>
-#include <wx/textctrl.h>
 
 #include "SoundTouchEffect.h"
 
 class wxSlider;
+class wxTextCtrl;
 class ShuttleGui;
 
 #define CHANGEPITCH_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Change Pitch") }
diff --git a/src/effects/ChangeSpeed.h b/src/effects/ChangeSpeed.h
index 0ab24c795..797a6072c 100644
--- a/src/effects/ChangeSpeed.h
+++ b/src/effects/ChangeSpeed.h
@@ -14,13 +14,13 @@
 #define __AUDACITY_EFFECT_CHANGESPEED__
 
 #include <wx/choice.h>
-#include <wx/textctrl.h>
 
 #include "../widgets/NumericTextCtrl.h"
 
 #include "Effect.h"
 
 class wxSlider;
+class wxTextCtrl;
 class ShuttleGui;
 
 #define CHANGESPEED_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Change Speed") }
diff --git a/src/effects/ChangeTempo.h b/src/effects/ChangeTempo.h
index f00b834ee..d4dfc5721 100644
--- a/src/effects/ChangeTempo.h
+++ b/src/effects/ChangeTempo.h
@@ -22,11 +22,10 @@
 #include <wx/checkbox.h>
 #endif
 
-#include <wx/textctrl.h>
-
 #include "SoundTouchEffect.h"
 
 class wxSlider;
+class wxTextCtrl;
 class ShuttleGui;
 
 #define CHANGETEMPO_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Change Tempo") }
diff --git a/src/effects/ClickRemoval.h b/src/effects/ClickRemoval.h
index e805a74b0..39a5a6a4e 100644
--- a/src/effects/ClickRemoval.h
+++ b/src/effects/ClickRemoval.h
@@ -16,11 +16,10 @@
 #ifndef __AUDACITY_EFFECT_CLICK_REMOVAL__
 #define __AUDACITY_EFFECT_CLICK_REMOVAL__
 
-#include <wx/textctrl.h>
-
 #include "Effect.h"
 
 class wxSlider;
+class wxTextCtrl;
 class Envelope;
 class ShuttleGui;
 
diff --git a/src/effects/Distortion.h b/src/effects/Distortion.h
index 92bbb0905..00e3ed684 100644
--- a/src/effects/Distortion.h
+++ b/src/effects/Distortion.h
@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_EFFECT_DISTORTION__
 #define __AUDACITY_EFFECT_DISTORTION__
 
-#include <wx/textctrl.h>
 #include <wx/checkbox.h>
 
 #include <queue>
@@ -20,6 +19,7 @@
 
 class wxSlider;
 class wxStaticText;
+class wxTextCtrl;
 class ShuttleGui;
 
 #define DISTORTION_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Distortion") }
diff --git a/src/effects/DtmfGen.h b/src/effects/DtmfGen.h
index 9be325cc0..f9417463c 100644
--- a/src/effects/DtmfGen.h
+++ b/src/effects/DtmfGen.h
@@ -20,6 +20,7 @@
 
 class wxSlider;
 class wxStaticText;
+class wxTextCtrl;
 class ShuttleGui;
 
 #define DTMFTONES_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("DTMF Tones") }
diff --git a/src/effects/Echo.h b/src/effects/Echo.h
index 933fe5126..c0fc1dec0 100644
--- a/src/effects/Echo.h
+++ b/src/effects/Echo.h
@@ -12,8 +12,6 @@
 #ifndef __AUDACITY_EFFECT_ECHO__
 #define __AUDACITY_EFFECT_ECHO__
 
-#include <wx/textctrl.h>
-
 #include "Effect.h"
 #include "../SampleFormat.h"
 
diff --git a/src/effects/Normalize.h b/src/effects/Normalize.h
index 41f4f692e..b2d2e3fe8 100644
--- a/src/effects/Normalize.h
+++ b/src/effects/Normalize.h
@@ -16,12 +16,12 @@
 #include "../Experimental.h"
 
 #include <wx/checkbox.h>
-#include <wx/textctrl.h>
 
 #include "Effect.h"
 #include "Biquad.h"
 
 class wxStaticText;
+class wxTextCtrl;
 class ShuttleGui;
 
 #define NORMALIZE_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Normalize") }
diff --git a/src/effects/Phaser.h b/src/effects/Phaser.h
index b044a86f7..ecc48083a 100644
--- a/src/effects/Phaser.h
+++ b/src/effects/Phaser.h
@@ -16,11 +16,10 @@
 #ifndef __AUDACITY_EFFECT_PHASER__
 #define __AUDACITY_EFFECT_PHASER__
 
-#include <wx/textctrl.h>
-
 #include "Effect.h"
 
 class wxSlider;
+class wxTextCtrl;
 class ShuttleGui;
 
 #define NUM_STAGES 24
diff --git a/src/effects/Repeat.h b/src/effects/Repeat.h
index ffcd75036..447b8d492 100644
--- a/src/effects/Repeat.h
+++ b/src/effects/Repeat.h
@@ -11,10 +11,9 @@
 #ifndef __AUDACITY_EFFECT_REPEAT__
 #define __AUDACITY_EFFECT_REPEAT__
 
-#include <wx/textctrl.h>
-
 #include "Effect.h"
 
+class wxTextCtrl;
 class ShuttleGui;
 
 #define REPEAT_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Repeat") }
diff --git a/src/effects/TimeScale.h b/src/effects/TimeScale.h
index 9ab9d12d8..52bc7d4c2 100644
--- a/src/effects/TimeScale.h
+++ b/src/effects/TimeScale.h
@@ -15,11 +15,10 @@
 
 #if USE_SBSMS
 
-#include <wx/textctrl.h>
-
 #include "SBSMSEffect.h"
 
 class wxSlider;
+class wxTextCtrl;
 class ShuttleGui;
 
 // two strings here
diff --git a/src/effects/Wahwah.h b/src/effects/Wahwah.h
index 1bf9b426a..f8ae65395 100644
--- a/src/effects/Wahwah.h
+++ b/src/effects/Wahwah.h
@@ -16,11 +16,10 @@
 #ifndef __AUDACITY_EFFECT_WAHWAH__
 #define __AUDACITY_EFFECT_WAHWAH__
 
-#include <wx/textctrl.h>
-
 #include "Effect.h"
 
 class wxSlider;
+class wxTextCtrl;
 class ShuttleGui;
 
 #define WAHWAH_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Wahwah") }
diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h
index dd00f6d3a..66a99405e 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/textctrl.h>
 
 #include "lv2/lv2plug.in/ns/ext/atom/forge.h"
 #include "lv2/lv2plug.in/ns/ext/data-access/data-access.h"
@@ -39,6 +38,7 @@ class wxArrayString;
 #include <unordered_map>
 
 class wxSlider;
+class wxTextCtrl;
 
 #define LV2EFFECTS_VERSION wxT("1.0.0.0")
 /* i18n-hint: abbreviates
diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h
index 8cca9a579..ef3ce1b50 100644
--- a/src/effects/nyquist/Nyquist.h
+++ b/src/effects/nyquist/Nyquist.h
@@ -18,7 +18,6 @@
 #include <wx/intl.h>
 #include <wx/sizer.h>
 #include <wx/textbuf.h>
-#include <wx/textctrl.h>
 #include <wx/tokenzr.h>
 
 #include "../Effect.h"
@@ -26,6 +25,7 @@
 #include "nyx.h"
 
 class wxArrayString;
+class wxTextCtrl;
 
 #define NYQUISTEFFECTS_VERSION wxT("1.0.0.0")
 /* i18n-hint: "Nyquist" is an embedded interpreted programming language in
diff --git a/src/effects/vamp/VampEffect.h b/src/effects/vamp/VampEffect.h
index ce4787de5..0e8d2da8b 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/textctrl.h>
 
 #include <vamp-hostsdk/PluginLoader.h>
 
@@ -26,6 +25,7 @@
 
 class wxStaticText;
 class wxSlider;
+class wxTextCtrl;
 class LabelTrack;
 
 #define VAMPEFFECTS_VERSION wxT("1.0.0.0")
diff --git a/src/export/ExportFFmpegDialogs.h b/src/export/ExportFFmpegDialogs.h
index a9317f36f..df72dbfe8 100644
--- a/src/export/ExportFFmpegDialogs.h
+++ b/src/export/ExportFFmpegDialogs.h
@@ -29,6 +29,7 @@ class wxArrayStringEx;
 
 class wxArrayString;
 class wxStaticText;
+class wxTextCtrl;
 
 /// Identifiers for pre-set export types.
 enum FFmpegExposedFormat
diff --git a/src/prefs/DirectoriesPrefs.h b/src/prefs/DirectoriesPrefs.h
index 54a407f9b..3ebf3c08e 100644
--- a/src/prefs/DirectoriesPrefs.h
+++ b/src/prefs/DirectoriesPrefs.h
@@ -11,13 +11,12 @@
 #ifndef __AUDACITY_DIRECTORIES_PREFS__
 #define __AUDACITY_DIRECTORIES_PREFS__
 
-#include <wx/textctrl.h>
-
 #include "PrefsPanel.h"
 
 class ShuttleGui;
 
 class wxStaticText;
+class wxTextCtrl;
 
 class DirectoriesPrefs final : public PrefsPanel
 {
diff --git a/src/prefs/KeyConfigPrefs.h b/src/prefs/KeyConfigPrefs.h
index 2735c1255..328f8943b 100644
--- a/src/prefs/KeyConfigPrefs.h
+++ b/src/prefs/KeyConfigPrefs.h
@@ -20,7 +20,6 @@ class ShuttleGui;
 #include <wx/listctrl.h>
 #include <wx/radiobut.h>
 #include <wx/srchctrl.h>
-#include <wx/textctrl.h>
 #include <wx/timer.h>
 
 #include "../widgets/KeyView.h"
@@ -28,6 +27,7 @@ class ShuttleGui;
 #include "PrefsPanel.h"
 
 class wxStaticText;
+class wxTextCtrl;
 struct NormalizedKeyString;
 
 class KeyConfigPrefs final : public PrefsPanel
diff --git a/src/prefs/QualityPrefs.h b/src/prefs/QualityPrefs.h
index 6568f948d..c38c274f0 100644
--- a/src/prefs/QualityPrefs.h
+++ b/src/prefs/QualityPrefs.h
@@ -16,10 +16,10 @@
 #include <wx/defs.h>
 
 #include <wx/choice.h>
-#include <wx/textctrl.h>
 
 #include "PrefsPanel.h"
 
+class wxTextCtrl;
 class ShuttleGui;
 enum sampleFormat : unsigned;
 enum DitherType : unsigned;
diff --git a/src/prefs/RecordingPrefs.h b/src/prefs/RecordingPrefs.h
index 03c5afb38..a8328c763 100644
--- a/src/prefs/RecordingPrefs.h
+++ b/src/prefs/RecordingPrefs.h
@@ -13,10 +13,10 @@
 #define __AUDACITY_RECORDING_PREFS__
 
 #include <wx/defs.h>
-#include <wx/textctrl.h>
 
 #include "PrefsPanel.h"
 
+class wxTextCtrl;
 class ShuttleGui;
 
 class RecordingPrefs final : public PrefsPanel
diff --git a/src/widgets/NumericTextCtrl.h b/src/widgets/NumericTextCtrl.h
index 6d0948680..9829b41d3 100644
--- a/src/widgets/NumericTextCtrl.h
+++ b/src/widgets/NumericTextCtrl.h
@@ -23,7 +23,7 @@
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/panel.h>
-#include <wx/textctrl.h>
+#include <wx/control.h> // to inherit
 
 #include "../Internat.h"
 
diff --git a/src/widgets/valnum.h b/src/widgets/valnum.h
index 27f93ce95..04d6ff058 100644
--- a/src/widgets/valnum.h
+++ b/src/widgets/valnum.h
@@ -17,7 +17,7 @@
 
 #if wxUSE_VALIDATORS
 
-#include <wx/textctrl.h>
+#include <wx/textctrl.h> // complete type needed in template function
 #include <wx/validate.h>
 
 #include <limits>