diff --git a/src/BatchCommandDialog.h b/src/BatchCommandDialog.h
index fa9355934..723bc3b16 100644
--- a/src/BatchCommandDialog.h
+++ b/src/BatchCommandDialog.h
@@ -25,7 +25,6 @@
 #include "BatchCommands.h"
 
 class wxWindow;
-class wxCheckBox;
 class wxTextCtrl;
 class wxRadioButton;
 class wxListCtrl;
diff --git a/src/BatchProcessDialog.h b/src/BatchProcessDialog.h
index ba2ef89b5..e63f6b49a 100644
--- a/src/BatchProcessDialog.h
+++ b/src/BatchProcessDialog.h
@@ -25,7 +25,6 @@
 #include "BatchCommands.h"
 
 class wxWindow;
-class wxCheckBox;
 class wxTextCtrl;
 class wxRadioButton;
 class wxListCtrl;
diff --git a/src/FreqWindow.cpp b/src/FreqWindow.cpp
index 2f25cd240..3a7190c1c 100644
--- a/src/FreqWindow.cpp
+++ b/src/FreqWindow.cpp
@@ -49,6 +49,7 @@ and in the spectrogram spectral selection.
 
 #include <wx/brush.h>
 #include <wx/button.h>
+#include <wx/checkbox.h>
 #include <wx/choice.h>
 #include <wx/font.h>
 #include <wx/image.h>
diff --git a/src/FreqWindow.h b/src/FreqWindow.h
index 005a58b96..e6b98e3a8 100644
--- a/src/FreqWindow.h
+++ b/src/FreqWindow.h
@@ -16,7 +16,6 @@
 #include <wx/brush.h>
 #include <wx/dcmemory.h>
 #include <wx/panel.h>
-#include <wx/checkbox.h>
 #include <wx/dialog.h>
 #include <wx/gdicmn.h>
 #include <wx/pen.h>
@@ -31,6 +30,7 @@ class wxSlider;
 class wxStatusBar;
 class wxTextCtrl;
 class wxButton;
+class wxCheckBox;
 class wxChoice;
 
 class AudacityProject;
diff --git a/src/SplashDialog.h b/src/SplashDialog.h
index e1712bc26..5a87cec09 100644
--- a/src/SplashDialog.h
+++ b/src/SplashDialog.h
@@ -19,7 +19,6 @@ class wxStaticBitmap;
 class wxBitmap;
 class ShuttleGui;
 class AudacityProject;
-class wxCheckbox;
 class HtmlWindow;
 
 class SplashDialog final : public wxDialogWrapper {
diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp
index 8c1ce9f59..6f02d0114 100644
--- a/src/TimerRecordDialog.cpp
+++ b/src/TimerRecordDialog.cpp
@@ -26,6 +26,7 @@
 #include <wx/setup.h> // for wxUSE_* macros
 
 #include <wx/button.h>
+#include <wx/checkbox.h>
 #include <wx/choice.h>
 #include <wx/defs.h>
 #include <wx/dir.h>
diff --git a/src/TimerRecordDialog.h b/src/TimerRecordDialog.h
index ab4e7000b..0c800f18c 100644
--- a/src/TimerRecordDialog.h
+++ b/src/TimerRecordDialog.h
@@ -21,9 +21,9 @@
 #include <wx/datectrl.h>
 #include <wx/calctrl.h>
 #include <wx/timer.h>
-#include <wx/checkbox.h>
 #include "export/Export.h"
 
+class wxCheckBox;
 class wxTimerEvent;
 
 class NumericTextCtrl;
diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h
index 7378f05e6..3d001c606 100644
--- a/src/commands/AudacityCommand.h
+++ b/src/commands/AudacityCommand.h
@@ -22,7 +22,6 @@
 #include <wx/intl.h>
 #include <wx/tglbtn.h>
 
-class wxCheckBox;
 class wxListBox;
 class wxWindow;
 
diff --git a/src/effects/Amplify.h b/src/effects/Amplify.h
index 8b8948e95..ce106ac2c 100644
--- a/src/effects/Amplify.h
+++ b/src/effects/Amplify.h
@@ -15,13 +15,12 @@
 #ifndef __AUDACITY_EFFECT_AMPLIFY__
 #define __AUDACITY_EFFECT_AMPLIFY__
 
-#include <wx/checkbox.h>
-
 #include "Effect.h"
 
 #define AMPLIFY_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Amplify") }
 
 class wxSlider;
+class wxCheckBox;
 class wxTextCtrl;
 class ShuttleGui;
 
diff --git a/src/effects/BassTreble.cpp b/src/effects/BassTreble.cpp
index 37c443127..b0e4a8824 100644
--- a/src/effects/BassTreble.cpp
+++ b/src/effects/BassTreble.cpp
@@ -23,6 +23,7 @@
 #include <algorithm>
 
 #include <wx/button.h>
+#include <wx/checkbox.h>
 #include <wx/intl.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
diff --git a/src/effects/BassTreble.h b/src/effects/BassTreble.h
index 7ac4276d0..3ccb48c53 100644
--- a/src/effects/BassTreble.h
+++ b/src/effects/BassTreble.h
@@ -12,11 +12,10 @@
 #ifndef __AUDACITY_EFFECT_BASS_TREBLE__
 #define __AUDACITY_EFFECT_BASS_TREBLE__
 
-#include <wx/checkbox.h>
-
 #include "Effect.h"
 
 class wxSlider;
+class wxCheckBox;
 class wxTextCtrl;
 class ShuttleGui;
 
diff --git a/src/effects/ChangePitch.cpp b/src/effects/ChangePitch.cpp
index 95c9e8114..00898a101 100644
--- a/src/effects/ChangePitch.cpp
+++ b/src/effects/ChangePitch.cpp
@@ -27,6 +27,7 @@ the pitch without changing the tempo.
 #include <float.h>
 #include <math.h>
 
+#include <wx/checkbox.h>
 #include <wx/choice.h>
 #include <wx/intl.h>
 #include <wx/slider.h>
diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h
index cc159022f..3052c52fb 100644
--- a/src/effects/ChangePitch.h
+++ b/src/effects/ChangePitch.h
@@ -23,7 +23,6 @@ the pitch without changing the tempo.
 
 #if USE_SBSMS
 #include "SBSMSEffect.h"
-#include <wx/checkbox.h>
 #endif
 
 #include <wx/spinctrl.h>
@@ -32,6 +31,7 @@ the pitch without changing the tempo.
 
 class wxSlider;
 class wxChoice;
+class wxCheckBox;
 class wxTextCtrl;
 class ShuttleGui;
 
diff --git a/src/effects/ChangeTempo.cpp b/src/effects/ChangeTempo.cpp
index f77b959d9..c6daa34cb 100644
--- a/src/effects/ChangeTempo.cpp
+++ b/src/effects/ChangeTempo.cpp
@@ -28,6 +28,7 @@
 #include <math.h>
 
 #include <wx/intl.h>
+#include <wx/checkbox.h>
 #include <wx/slider.h>
 
 #include "../Shuttle.h"
diff --git a/src/effects/ChangeTempo.h b/src/effects/ChangeTempo.h
index d4dfc5721..ccb8c60e0 100644
--- a/src/effects/ChangeTempo.h
+++ b/src/effects/ChangeTempo.h
@@ -19,12 +19,12 @@
 
 #if USE_SBSMS
 #include "SBSMSEffect.h"
-#include <wx/checkbox.h>
 #endif
 
 #include "SoundTouchEffect.h"
 
 class wxSlider;
+class wxCheckBox;
 class wxTextCtrl;
 class ShuttleGui;
 
diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp
index 7bc0c2f39..ca80cf53d 100644
--- a/src/effects/Compressor.cpp
+++ b/src/effects/Compressor.cpp
@@ -30,6 +30,7 @@
 #include <math.h>
 
 #include <wx/brush.h>
+#include <wx/checkbox.h>
 #include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/intl.h>
diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h
index fcfa15488..4cfc9d16c 100644
--- a/src/effects/Compressor.h
+++ b/src/effects/Compressor.h
@@ -12,13 +12,13 @@
 #define __AUDACITY_EFFECT_COMPRESSOR__
 
 #include <wx/bitmap.h>
-#include <wx/checkbox.h>
 #include <wx/gdicmn.h>
 #include "../widgets/wxPanelWrapper.h"
 
 #include "TwoPassSimpleMono.h"
 #include "../SampleFormat.h"
 
+class wxCheckBox;
 class wxSlider;
 class wxStaticText;
 class EffectCompressorPanel;
diff --git a/src/effects/Distortion.cpp b/src/effects/Distortion.cpp
index 37eb6fb4b..8d54ef567 100644
--- a/src/effects/Distortion.cpp
+++ b/src/effects/Distortion.cpp
@@ -33,6 +33,7 @@
 #define M_PI_2 1.57079632679489661923132169163975 
 #endif
 
+#include <wx/checkbox.h>
 #include <wx/choice.h>
 #include <wx/intl.h>
 #include <wx/valgen.h>
diff --git a/src/effects/Distortion.h b/src/effects/Distortion.h
index 00e3ed684..f151e4723 100644
--- a/src/effects/Distortion.h
+++ b/src/effects/Distortion.h
@@ -11,14 +11,13 @@
 #ifndef __AUDACITY_EFFECT_DISTORTION__
 #define __AUDACITY_EFFECT_DISTORTION__
 
-#include <wx/checkbox.h>
-
 #include <queue>
 
 #include "Effect.h"
 
 class wxSlider;
 class wxStaticText;
+class wxCheckBox;
 class wxTextCtrl;
 class ShuttleGui;
 
diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h
index a1d9238ce..dbc8d9d98 100644
--- a/src/effects/Equalization.h
+++ b/src/effects/Equalization.h
@@ -24,7 +24,6 @@
 #include <wx/listctrl.h>
 #include <wx/bitmap.h>
 #include <wx/radiobut.h>
-#include <wx/checkbox.h>
 
 #if wxUSE_ACCESSIBILITY
 #include "../widgets/WindowAccessible.h"
@@ -52,6 +51,7 @@ const int kEqLegacy = kEqOptionGraphic + kEqOptionCurve;
 
 class wxBoxSizer;
 class wxButton;
+class wxCheckBox;
 class wxChoice;
 class wxSizer;
 class wxSizerItem;
diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp
index 22eaffad6..2688b7c58 100644
--- a/src/effects/Normalize.cpp
+++ b/src/effects/Normalize.cpp
@@ -23,6 +23,7 @@
 
 #include <math.h>
 
+#include <wx/checkbox.h>
 #include <wx/intl.h>
 #include <wx/stattext.h>
 #include <wx/valgen.h>
diff --git a/src/effects/Normalize.h b/src/effects/Normalize.h
index b2d2e3fe8..2e334f9b9 100644
--- a/src/effects/Normalize.h
+++ b/src/effects/Normalize.h
@@ -15,11 +15,10 @@
 
 #include "../Experimental.h"
 
-#include <wx/checkbox.h>
-
 #include "Effect.h"
 #include "Biquad.h"
 
+class wxCheckBox;
 class wxStaticText;
 class wxTextCtrl;
 class ShuttleGui;
diff --git a/src/effects/Reverb.cpp b/src/effects/Reverb.cpp
index 7ba8c0a1d..1e1426445 100644
--- a/src/effects/Reverb.cpp
+++ b/src/effects/Reverb.cpp
@@ -18,6 +18,7 @@
 #include "Reverb.h"
 
 #include <wx/arrstr.h>
+#include <wx/checkbox.h>
 #include <wx/intl.h>
 #include <wx/slider.h>
 
diff --git a/src/effects/Reverb.h b/src/effects/Reverb.h
index 6a765b207..e1f249774 100644
--- a/src/effects/Reverb.h
+++ b/src/effects/Reverb.h
@@ -12,11 +12,11 @@
 #ifndef __AUDACITY_EFFECT_REVERB__
 #define __AUDACITY_EFFECT_REVERB__
 
-#include <wx/checkbox.h>
 #include <wx/spinctrl.h>
 
 #include "Effect.h"
 
+class wxCheckBox;
 class wxSlider;
 class ShuttleGui;
 
diff --git a/src/effects/ScoreAlignDialog.h b/src/effects/ScoreAlignDialog.h
index 64742f749..2d8469c95 100644
--- a/src/effects/ScoreAlignDialog.h
+++ b/src/effects/ScoreAlignDialog.h
@@ -14,7 +14,6 @@
 #ifdef EXPERIMENTAL_SCOREALIGN
 
 #include <wx/dialog.h>
-#include <wx/checkbox.h>
 
 #if 1
 
@@ -54,6 +53,7 @@ extern int scorealign(
 #endif
 
 class wxButton;
+class wxCheckBox;
 class wxString;
 class wxSlider;
 class wxStaticText;
diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp
index c9fc2551e..2f2b703f4 100644
--- a/src/effects/lv2/LV2Effect.cpp
+++ b/src/effects/lv2/LV2Effect.cpp
@@ -17,6 +17,7 @@
 #include <cmath>
 
 #include <wx/button.h>
+#include <wx/checkbox.h>
 #include <wx/choice.h>
 #include <wx/dcbuffer.h>
 #include <wx/dialog.h>
diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h
index 66a99405e..09e5d2c78 100644
--- a/src/effects/lv2/LV2Effect.h
+++ b/src/effects/lv2/LV2Effect.h
@@ -17,7 +17,6 @@ class wxArrayString;
 
 #include "../../MemoryX.h"
 #include <vector>
-#include <wx/checkbox.h>
 #include <wx/dialog.h>
 
 #include "lv2/lv2plug.in/ns/ext/atom/forge.h"
diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h
index cbb26cf56..b7dd59fb3 100644
--- a/src/effects/nyquist/Nyquist.h
+++ b/src/effects/nyquist/Nyquist.h
@@ -23,6 +23,7 @@
 
 class wxArrayString;
 class wxFileName;
+class wxCheckBox;
 class wxTextCtrl;
 
 #define NYQUISTEFFECTS_VERSION wxT("1.0.0.0")
diff --git a/src/effects/vamp/VampEffect.h b/src/effects/vamp/VampEffect.h
index 018864ddf..9504a5851 100644
--- a/src/effects/vamp/VampEffect.h
+++ b/src/effects/vamp/VampEffect.h
@@ -15,8 +15,6 @@
 
 #if defined(USE_VAMP)
 
-#include <wx/checkbox.h>
-
 #include <vamp-hostsdk/PluginLoader.h>
 
 #include "../../SampleFormat.h"
@@ -25,6 +23,7 @@
 class wxStaticText;
 class wxSlider;
 class wxChoice;
+class wxCheckBox;
 class wxTextCtrl;
 class LabelTrack;
 
diff --git a/src/export/ExportFFmpegDialogs.h b/src/export/ExportFFmpegDialogs.h
index df72dbfe8..f6f60d721 100644
--- a/src/export/ExportFFmpegDialogs.h
+++ b/src/export/ExportFFmpegDialogs.h
@@ -28,6 +28,7 @@ LRN
 class wxArrayStringEx;
 
 class wxArrayString;
+class wxCheckBox;
 class wxStaticText;
 class wxTextCtrl;
 
diff --git a/src/toolbars/SelectionBar.h b/src/toolbars/SelectionBar.h
index e54512e29..f2086ae83 100644
--- a/src/toolbars/SelectionBar.h
+++ b/src/toolbars/SelectionBar.h
@@ -27,7 +27,6 @@
 #define SIZER_COLS 7
 
 class wxBitmap;
-class wxCheckBox;
 class wxChoice;
 class wxComboBox;
 class wxCommandEvent;
diff --git a/src/toolbars/SpectralSelectionBar.h b/src/toolbars/SpectralSelectionBar.h
index fedfce210..b4850a111 100644
--- a/src/toolbars/SpectralSelectionBar.h
+++ b/src/toolbars/SpectralSelectionBar.h
@@ -17,7 +17,6 @@ Paul Licameli
 #include "../widgets/NumericTextCtrl.h"
 
 class wxBitmap;
-class wxCheckBox;
 class wxChoice;
 class wxComboBox;
 class wxCommandEvent;