Remove wx/{radiobut,ownerdrw,menuitem,menu,listbox}.h from *.h

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>

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;

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>

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;

src/Tags.h

@@ -45,7 +45,6 @@
 class wxArrayString;
 class wxComboBox;
 class wxGridCellChoiceEditor;
-class wxRadioButton;
 class wxTextCtrl;
 
 class Grid;

src/TrackPanel.h

@@ -29,7 +29,6 @@
 #include "commands/CommandManagerWindowClasses.h"
 
 
-class wxMenu;
 class wxRect;
 
 class LabelTrack;

src/commands/AudacityCommand.h

@@ -20,7 +20,6 @@
 #include <wx/defs.h>
 #include <wx/dynarray.h>
 
-class wxListBox;
 class wxWindow;
 
 #include "../SampleFormat.h"

src/commands/CommandManager.h

@@ -32,6 +32,8 @@
 class wxMenu;
 class wxMenuBar;
 class wxArrayString;
+class wxMenu;
+class wxMenuBar;
 class TranslatedInternalString;
 using CommandParameter = CommandID;
 

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>

src/effects/EffectManager.h

@@ -15,7 +15,6 @@
 #include "../Experimental.h"
 
 #include <vector>
-#include <wx/listbox.h>
 
 #include "audacity/EffectInterface.h"
 #include "Effect.h"

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;

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>

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;

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>
 

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;

src/toolbars/SelectionBar.h

@@ -30,7 +30,6 @@ class wxChoice;
 class wxComboBox;
 class wxCommandEvent;
 class wxDC;
-class wxRadioButton;
 class wxSizeEvent;
 class wxStaticText;
 

src/toolbars/SpectralSelectionBar.h

@@ -20,7 +20,6 @@ class wxChoice;
 class wxComboBox;
 class wxCommandEvent;
 class wxDC;
-class wxRadioButton;
 class wxSizeEvent;
 
 class SpectralSelectionBarListener;

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"