diff --git a/src/FreqWindow.h b/src/FreqWindow.h
index bfa34d176..e3868b307 100644
--- a/src/FreqWindow.h
+++ b/src/FreqWindow.h
@@ -13,7 +13,6 @@
 
 #include "MemoryX.h"
 #include <vector>
-#include <wx/panel.h>
 #include <wx/font.h> // member variable
 #include <wx/statusbr.h> // to inherit
 #include "SampleFormat.h"
diff --git a/src/TrackPanelAx.h b/src/TrackPanelAx.h
index 47cd6b889..c99fe5bc9 100644
--- a/src/TrackPanelAx.h
+++ b/src/TrackPanelAx.h
@@ -12,14 +12,16 @@
 #define __AUDACITY_TRACK_PANEL_ACCESSIBILITY__
 
 #include <memory>
-#include <wx/panel.h>
 
 #include <wx/setup.h> // for wxUSE_* macros
 
+#include <wx/string.h> // member variable
+
 #if wxUSE_ACCESSIBILITY
 #include "widgets/WindowAccessible.h"
 #endif
 
+
 class Track;
 class TrackPanel;
 
diff --git a/src/effects/EffectRack.h b/src/effects/EffectRack.h
index 6caaca036..23d9eea55 100644
--- a/src/effects/EffectRack.h
+++ b/src/effects/EffectRack.h
@@ -20,12 +20,12 @@
 
 #include <wx/defs.h>
 #include <wx/frame.h> // to inherit
-#include <wx/panel.h>
 #include <wx/timer.h>
 
 #include "EffectManager.h"
 
 class wxFlexGridSizer;
+class wxPanel;
 class wxStaticText;
 
 class EffectRack final : public wxFrame
diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h
index 18861fd8b..8c4838dbf 100644
--- a/src/effects/Equalization.h
+++ b/src/effects/Equalization.h
@@ -18,7 +18,6 @@
 #define PANELBORDER 1   // only increase from '1' for testing purposes - MJS
 
 #include <wx/setup.h> // for wxUSE_* macros
-#include <wx/panel.h>
 
 #if wxUSE_ACCESSIBILITY
 #include "../widgets/WindowAccessible.h"
diff --git a/src/effects/ScienFilter.h b/src/effects/ScienFilter.h
index f082a566b..6827cdfa3 100644
--- a/src/effects/ScienFilter.h
+++ b/src/effects/ScienFilter.h
@@ -15,8 +15,6 @@ Vaughan Johnson (Preview)
 
 #include <wx/setup.h> // for wxUSE_* macros
 
-#include <wx/panel.h>
-
 #include "Biquad.h"
 
 #include "Effect.h"
diff --git a/src/effects/VST/VSTControl.h b/src/effects/VST/VSTControl.h
index a973b9c36..4e2c56254 100644
--- a/src/effects/VST/VSTControl.h
+++ b/src/effects/VST/VSTControl.h
@@ -12,7 +12,6 @@
 #define AUDACITY_VSTCONTROL_H
 
 #include <wx/control.h>
-#include <wx/panel.h>
 
 #include "aeffectx.h"
 
diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h
index a51be785b..bbd8752d6 100644
--- a/src/widgets/ASlider.h
+++ b/src/widgets/ASlider.h
@@ -16,7 +16,6 @@
 #include "../MemoryX.h"
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
-#include <wx/panel.h>
 #include <wx/timer.h>
 #include "widgets/wxPanelWrapper.h"
 
diff --git a/src/widgets/ExpandingToolBar.h b/src/widgets/ExpandingToolBar.h
index 9bb8f3071..5affebb40 100644
--- a/src/widgets/ExpandingToolBar.h
+++ b/src/widgets/ExpandingToolBar.h
@@ -15,7 +15,6 @@
 #include <vector>
 #include <wx/defs.h>
 #include <wx/dragimag.h> // use macros and typedefs in this header
-#include <wx/panel.h>
 #include <wx/timer.h>
 #include <wx/minifram.h>
 
diff --git a/src/widgets/NumericTextCtrl.h b/src/widgets/NumericTextCtrl.h
index 265f47a3a..7c17f5b8c 100644
--- a/src/widgets/NumericTextCtrl.h
+++ b/src/widgets/NumericTextCtrl.h
@@ -22,7 +22,6 @@
 #include <vector>
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
-#include <wx/panel.h>
 #include <wx/control.h> // to inherit
 
 #include "../Internat.h"
diff --git a/src/widgets/wxPanelWrapper.h b/src/widgets/wxPanelWrapper.h
index 0bc97ca57..4aacb5872 100644
--- a/src/widgets/wxPanelWrapper.h
+++ b/src/widgets/wxPanelWrapper.h
@@ -10,7 +10,7 @@
 #define __AUDACITY_WXPANEL_WRAPPER__
 
 #include "../MemoryX.h"
-#include <wx/panel.h>
+#include <wx/panel.h> // to inherit
 #include <wx/dialog.h> // to inherit
 
 #include "../Internat.h"