diff --git a/src/BatchCommandDialog.cpp b/src/BatchCommandDialog.cpp
index d00740a9c..9c41a0a33 100644
--- a/src/BatchCommandDialog.cpp
+++ b/src/BatchCommandDialog.cpp
@@ -21,6 +21,10 @@ selected command.
 #include "Audacity.h"
 #include "BatchCommandDialog.h"
 
+#ifdef __WXMSW__
+    #include  <wx/ownerdrw.h>
+#endif
+
 //
 #include <wx/defs.h>
 #include <wx/checkbox.h>
diff --git a/src/BatchCommandDialog.h b/src/BatchCommandDialog.h
index 2211d2a71..f8664ccac 100644
--- a/src/BatchCommandDialog.h
+++ b/src/BatchCommandDialog.h
@@ -14,18 +14,12 @@
 
 #include <wx/defs.h>
 
-#ifdef __WXMSW__
-    #include  <wx/ownerdrw.h>
-#endif
-
-#include  <wx/menuitem.h>
 #include  <wx/checklst.h>
 
 #include "BatchCommands.h"
 
 class wxWindow;
 class wxTextCtrl;
-class wxRadioButton;
 class wxListCtrl;
 class wxListEvent;
 class wxButton;
diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp
index 3cc0fb99e..e82846f2a 100644
--- a/src/BatchProcessDialog.cpp
+++ b/src/BatchProcessDialog.cpp
@@ -18,6 +18,11 @@
 #include "BatchProcessDialog.h"
 
 #include <wx/setup.h> // for wxUSE_* macros
+
+#ifdef __WXMSW__
+    #include  <wx/ownerdrw.h>
+#endif
+
 #include <wx/defs.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
diff --git a/src/BatchProcessDialog.h b/src/BatchProcessDialog.h
index 269540590..04763e4aa 100644
--- a/src/BatchProcessDialog.h
+++ b/src/BatchProcessDialog.h
@@ -14,18 +14,12 @@
 
 #include <wx/defs.h>
 
-#ifdef __WXMSW__
-    #include  <wx/ownerdrw.h>
-#endif
-
-#include  <wx/menuitem.h>
 #include  <wx/checklst.h>
 
 #include "BatchCommands.h"
 
 class wxWindow;
 class wxTextCtrl;
-class wxRadioButton;
 class wxListCtrl;
 class wxListEvent;
 class wxButton;
diff --git a/src/Tags.h b/src/Tags.h
index 30b358c5b..241077ec2 100644
--- a/src/Tags.h
+++ b/src/Tags.h
@@ -45,7 +45,6 @@
 class wxArrayString;
 class wxComboBox;
 class wxGridCellChoiceEditor;
-class wxRadioButton;
 class wxTextCtrl;
 
 class Grid;
diff --git a/src/TrackPanel.h b/src/TrackPanel.h
index 41cc7ad95..4f5e2023b 100644
--- a/src/TrackPanel.h
+++ b/src/TrackPanel.h
@@ -29,7 +29,6 @@
 #include "commands/CommandManagerWindowClasses.h"
 
 
-class wxMenu;
 class wxRect;
 
 class LabelTrack;
diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h
index e2ca413c7..741c422c4 100644
--- a/src/commands/AudacityCommand.h
+++ b/src/commands/AudacityCommand.h
@@ -20,7 +20,6 @@
 #include <wx/defs.h>
 #include <wx/dynarray.h>
 
-class wxListBox;
 class wxWindow;
 
 #include "../SampleFormat.h"
diff --git a/src/commands/CommandManager.h b/src/commands/CommandManager.h
index 2f5afb0ae..55b37f895 100644
--- a/src/commands/CommandManager.h
+++ b/src/commands/CommandManager.h
@@ -32,6 +32,8 @@
 class wxMenu;
 class wxMenuBar;
 class wxArrayString;
+class wxMenu;
+class wxMenuBar;
 class TranslatedInternalString;
 using CommandParameter = CommandID;
 
diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp
index e6c0e6f66..fb9820502 100644
--- a/src/effects/Effect.cpp
+++ b/src/effects/Effect.cpp
@@ -34,6 +34,7 @@ greater use in future.
 #include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/defs.h>
+#include <wx/listbox.h>
 #include <wx/menu.h>
 #include <wx/settings.h>
 #include <wx/sizer.h>
diff --git a/src/effects/EffectManager.h b/src/effects/EffectManager.h
index 77842dbc5..8c99a0f6d 100644
--- a/src/effects/EffectManager.h
+++ b/src/effects/EffectManager.h
@@ -15,7 +15,6 @@
 #include "../Experimental.h"
 
 #include <vector>
-#include <wx/listbox.h>
 
 #include "audacity/EffectInterface.h"
 #include "Effect.h"
diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h
index b0284fbd5..18861fd8b 100644
--- a/src/effects/Equalization.h
+++ b/src/effects/Equalization.h
@@ -19,7 +19,6 @@
 
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/panel.h>
-#include <wx/radiobut.h>
 
 #if wxUSE_ACCESSIBILITY
 #include "../widgets/WindowAccessible.h"
@@ -52,6 +51,7 @@ class wxCheckBox;
 class wxChoice;
 class wxListCtrl;
 class wxListEvent;
+class wxRadioButton;
 class wxSizer;
 class wxSizerItem;
 class wxSlider;
diff --git a/src/import/Import.cpp b/src/import/Import.cpp
index 81f5ee79e..400a68bc9 100644
--- a/src/import/Import.cpp
+++ b/src/import/Import.cpp
@@ -44,6 +44,7 @@ and ImportLOF.cpp.
 #include <wx/textctrl.h>
 #include <wx/string.h>
 #include <wx/intl.h>
+#include <wx/listbox.h>
 #include <wx/log.h>
 #include <wx/sizer.h>         //for wxBoxSizer
 #include <wx/listimpl.cpp>
diff --git a/src/import/Import.h b/src/import/Import.h
index a443afafa..9f3c18ed8 100644
--- a/src/import/Import.h
+++ b/src/import/Import.h
@@ -15,12 +15,12 @@
 #include "ImportForwards.h"
 #include "audacity/Types.h"
 #include <vector>
-#include <wx/listbox.h>
 #include <wx/tokenzr.h> // for enum wxStringTokenizerMode
 
 #include "../widgets/wxPanelWrapper.h"
 
 class wxArrayString;
+class wxListBox;
 class Tags;
 class TrackFactory;
 class Track;
diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp
index c26a13c2b..98ee98cf5 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/radiobut.h>
 #include <wx/stattext.h>
 #include <wx/statbox.h>
 
diff --git a/src/prefs/KeyConfigPrefs.h b/src/prefs/KeyConfigPrefs.h
index c1a8c9e64..8bab60828 100644
--- a/src/prefs/KeyConfigPrefs.h
+++ b/src/prefs/KeyConfigPrefs.h
@@ -17,7 +17,6 @@ class ShuttleGui;
 
 #include <wx/defs.h>
 #include <wx/imaglist.h>
-#include <wx/radiobut.h>
 #include <wx/srchctrl.h>
 #include <wx/timer.h>
 
@@ -25,6 +24,7 @@ class ShuttleGui;
 
 #include "PrefsPanel.h"
 
+class wxRadioButton;
 class wxStaticText;
 class wxTextCtrl;
 struct NormalizedKeyString;
diff --git a/src/toolbars/SelectionBar.h b/src/toolbars/SelectionBar.h
index 070d88fb2..f9b0b1a6a 100644
--- a/src/toolbars/SelectionBar.h
+++ b/src/toolbars/SelectionBar.h
@@ -30,7 +30,6 @@ class wxChoice;
 class wxComboBox;
 class wxCommandEvent;
 class wxDC;
-class wxRadioButton;
 class wxSizeEvent;
 class wxStaticText;
 
diff --git a/src/toolbars/SpectralSelectionBar.h b/src/toolbars/SpectralSelectionBar.h
index 645477685..27a423139 100644
--- a/src/toolbars/SpectralSelectionBar.h
+++ b/src/toolbars/SpectralSelectionBar.h
@@ -20,7 +20,6 @@ class wxChoice;
 class wxComboBox;
 class wxCommandEvent;
 class wxDC;
-class wxRadioButton;
 class wxSizeEvent;
 
 class SpectralSelectionBarListener;
diff --git a/src/widgets/PopupMenuTable.h b/src/widgets/PopupMenuTable.h
index af71cb84f..0389a4558 100644
--- a/src/widgets/PopupMenuTable.h
+++ b/src/widgets/PopupMenuTable.h
@@ -21,7 +21,7 @@ tables, and automatically attaches and detaches the event handlers.
 class wxCommandEvent;
 class wxString;
 #include <vector>
-#include <wx/menu.h>
+#include <wx/menu.h> // to inherit wxMenu
 #include "../MemoryX.h"
 
 #include "../TranslatableStringArray.h"