diff --git a/include/audacity/EffectAutomationParameters.h b/include/audacity/EffectAutomationParameters.h
index 71d3034ac..b9d20b81c 100644
--- a/include/audacity/EffectAutomationParameters.h
+++ b/include/audacity/EffectAutomationParameters.h
@@ -47,7 +47,6 @@
 
 #include <wx/cmdline.h>
 #include <wx/fileconf.h> // to inherit
-#include <wx/intl.h>
 #include <algorithm>
 
 #include "ComponentInterface.h"
diff --git a/src/AColor.h b/src/AColor.h
index 3269bc16f..3d4695328 100644
--- a/src/AColor.h
+++ b/src/AColor.h
@@ -15,7 +15,7 @@
 #define __AUDACITY_COLOR__
 
 #include "MemoryX.h"
-#include <wx/brush.h>
+#include <wx/brush.h> // member variable
 #include <wx/pen.h> // member variable
 
 class wxDC;
diff --git a/src/AboutDialog.h b/src/AboutDialog.h
index be41fc65c..ce2ec3b71 100644
--- a/src/AboutDialog.h
+++ b/src/AboutDialog.h
@@ -13,7 +13,6 @@
 
 #include "MemoryX.h"
 #include <vector>
-#include <wx/bitmap.h>
 #include "widgets/wxPanelWrapper.h"
 
 extern const wxString VerCheckArgs();
diff --git a/src/AdornedRulerPanel.h b/src/AdornedRulerPanel.h
index 4e638376d..7a04eff1e 100644
--- a/src/AdornedRulerPanel.h
+++ b/src/AdornedRulerPanel.h
@@ -15,7 +15,6 @@
 #include "widgets/Ruler.h"
 
 #include "MemoryX.h"
-#include <wx/bitmap.h>
 
 class ViewInfo;
 class AudacityProject;
diff --git a/src/AudacityApp.h b/src/AudacityApp.h
index 8d4a38669..b87ff158e 100644
--- a/src/AudacityApp.h
+++ b/src/AudacityApp.h
@@ -24,7 +24,6 @@
 #include <wx/cmdline.h>
 #include <wx/dir.h>
 #include <wx/docview.h>
-#include <wx/intl.h>
 #include <wx/snglinst.h>
 #include <wx/socket.h>
 #include <wx/timer.h>
diff --git a/src/Envelope.h b/src/Envelope.h
index ae6f81119..78afaf4e7 100644
--- a/src/Envelope.h
+++ b/src/Envelope.h
@@ -15,8 +15,6 @@
 #include <algorithm>
 #include <vector>
 
-#include <wx/brush.h>
-
 #include "xml/XMLTagHandler.h"
 #include "Internat.h"
 
diff --git a/src/FreqWindow.h b/src/FreqWindow.h
index 29cf16bbe..9bd810901 100644
--- a/src/FreqWindow.h
+++ b/src/FreqWindow.h
@@ -13,7 +13,6 @@
 
 #include "MemoryX.h"
 #include <vector>
-#include <wx/brush.h>
 #include <wx/panel.h>
 #include <wx/dialog.h>
 #include <wx/gdicmn.h>
diff --git a/src/LabelTrack.h b/src/LabelTrack.h
index 19614e80c..e0a19fd60 100644
--- a/src/LabelTrack.h
+++ b/src/LabelTrack.h
@@ -16,7 +16,6 @@
 #include "SelectedRegion.h"
 #include "Track.h"
 
-#include <wx/brush.h>
 #include <wx/clipbrd.h>
 
 
diff --git a/src/Project.h b/src/Project.h
index 0ae8c8b69..345c760ac 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -41,7 +41,6 @@ class wxMemoryDC;
 #include <wx/generic/dragimgg.h>
 
 #include <wx/frame.h> // to inherit
-#include <wx/intl.h>
 
 #include "import/ImportRaw.h" // defines TrackHolders
 
diff --git a/src/Resample.h b/src/Resample.h
index 0a376cb02..fe8109fd1 100644
--- a/src/Resample.h
+++ b/src/Resample.h
@@ -15,7 +15,6 @@
 #include "Audacity.h"
 
 #include "MemoryX.h"
-#include <wx/intl.h>
 
 #include "SampleFormat.h"
 
diff --git a/src/Theme.h b/src/Theme.h
index 42de50d97..655d6ed72 100644
--- a/src/Theme.h
+++ b/src/Theme.h
@@ -17,11 +17,11 @@
 #include "Audacity.h"
 
 #include <vector>
-#include <wx/bitmap.h>
 #include <wx/defs.h>
 #include <wx/window.h> // to inherit
 
 class wxArrayString;
+class wxBitmap;
 class wxColour;
 class wxFont;
 class wxImage;
diff --git a/src/TimeTrack.h b/src/TimeTrack.h
index f9d73f0f0..a2ce43d98 100644
--- a/src/TimeTrack.h
+++ b/src/TimeTrack.h
@@ -12,7 +12,6 @@
 #define __AUDACITY_TIMETRACK__
 
 #include "Track.h"
-#include <wx/brush.h>
 
 #include <algorithm>
 
diff --git a/src/TrackArtist.h b/src/TrackArtist.h
index e8d7cc6fb..7604fe110 100644
--- a/src/TrackArtist.h
+++ b/src/TrackArtist.h
@@ -22,7 +22,7 @@
 #include "Experimental.h"
 
 #include "MemoryX.h"
-#include <wx/brush.h>
+#include <wx/brush.h> // member variable
 #include <wx/pen.h> // member variables
 #include "audacity/Types.h"
 
diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h
index 36e995029..e2ca413c7 100644
--- a/src/commands/AudacityCommand.h
+++ b/src/commands/AudacityCommand.h
@@ -19,7 +19,6 @@
 #include "../MemoryX.h"
 #include <wx/defs.h>
 #include <wx/dynarray.h>
-#include <wx/intl.h>
 
 class wxListBox;
 class wxWindow;
diff --git a/src/effects/AutoDuck.h b/src/effects/AutoDuck.h
index 08c5e6054..576eafcbd 100644
--- a/src/effects/AutoDuck.h
+++ b/src/effects/AutoDuck.h
@@ -11,12 +11,12 @@
 #ifndef __AUDACITY_EFFECT_AUTODUCK__
 #define __AUDACITY_EFFECT_AUTODUCK__
 
-#include <wx/bitmap.h>
 #include <wx/gdicmn.h>
 
 #include "Effect.h"
 #include "../widgets/wxPanelWrapper.h"
 
+class wxBitmap;
 class wxTextCtrl;
 class EffectAutoDuckPanel;
 class ShuttleGui;
diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h
index 4cfc9d16c..b8e311bc3 100644
--- a/src/effects/Compressor.h
+++ b/src/effects/Compressor.h
@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_EFFECT_COMPRESSOR__
 #define __AUDACITY_EFFECT_COMPRESSOR__
 
-#include <wx/bitmap.h>
 #include <wx/gdicmn.h>
 #include "../widgets/wxPanelWrapper.h"
 
diff --git a/src/effects/Effect.h b/src/effects/Effect.h
index 62ca5756a..b1c493116 100644
--- a/src/effects/Effect.h
+++ b/src/effects/Effect.h
@@ -21,7 +21,6 @@
 
 #include "../MemoryX.h"
 #include <wx/defs.h>
-#include <wx/intl.h>
 
 class wxButton;
 class wxCheckBox;
diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h
index ceb3c724a..b6bfb6bba 100644
--- a/src/effects/Equalization.h
+++ b/src/effects/Equalization.h
@@ -20,8 +20,6 @@
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/panel.h>
 #include <wx/dialog.h>
-#include <wx/intl.h>
-#include <wx/bitmap.h>
 #include <wx/radiobut.h>
 
 #if wxUSE_ACCESSIBILITY
@@ -48,6 +46,7 @@ const int kEqOptionCurve   =1<<1;
 // The legacy version offers both Graphic and curve on the same UI.
 const int kEqLegacy = kEqOptionGraphic + kEqOptionCurve;
 
+class wxBitmap;
 class wxBoxSizer;
 class wxButton;
 class wxCheckBox;
diff --git a/src/effects/ScienFilter.h b/src/effects/ScienFilter.h
index 957b345ea..f082a566b 100644
--- a/src/effects/ScienFilter.h
+++ b/src/effects/ScienFilter.h
@@ -15,13 +15,13 @@ Vaughan Johnson (Preview)
 
 #include <wx/setup.h> // for wxUSE_* macros
 
-#include <wx/bitmap.h>
 #include <wx/panel.h>
 
 #include "Biquad.h"
 
 #include "Effect.h"
 
+class wxBitmap;
 class wxChoice;
 class wxSlider;
 class wxStaticText;
diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h
index 95f5d706d..cef16a667 100644
--- a/src/effects/nyquist/Nyquist.h
+++ b/src/effects/nyquist/Nyquist.h
@@ -13,7 +13,6 @@
 
 #include <wx/datetime.h>
 #include <wx/dialog.h>
-#include <wx/intl.h>
 #include <wx/textbuf.h>
 
 #include "../Effect.h"
diff --git a/src/toolbars/SelectionBar.h b/src/toolbars/SelectionBar.h
index f2086ae83..070d88fb2 100644
--- a/src/toolbars/SelectionBar.h
+++ b/src/toolbars/SelectionBar.h
@@ -26,7 +26,6 @@
 
 #define SIZER_COLS 7
 
-class wxBitmap;
 class wxChoice;
 class wxComboBox;
 class wxCommandEvent;
diff --git a/src/toolbars/SpectralSelectionBar.h b/src/toolbars/SpectralSelectionBar.h
index b4850a111..645477685 100644
--- a/src/toolbars/SpectralSelectionBar.h
+++ b/src/toolbars/SpectralSelectionBar.h
@@ -16,7 +16,6 @@ Paul Licameli
 #include "ToolBar.h"
 #include "../widgets/NumericTextCtrl.h"
 
-class wxBitmap;
 class wxChoice;
 class wxComboBox;
 class wxCommandEvent;
diff --git a/src/toolbars/ToolManager.h b/src/toolbars/ToolManager.h
index c00bc604a..59cb54b3d 100644
--- a/src/toolbars/ToolManager.h
+++ b/src/toolbars/ToolManager.h
@@ -22,7 +22,6 @@
 #include "ToolDock.h"
 #include "ToolBar.h"
 
-class wxBitmap;
 class wxCommandEvent;
 class wxFrame;
 class wxMouseEvent;
diff --git a/src/toolbars/TranscriptionToolBar.cpp b/src/toolbars/TranscriptionToolBar.cpp
index 184816551..10653693f 100644
--- a/src/toolbars/TranscriptionToolBar.cpp
+++ b/src/toolbars/TranscriptionToolBar.cpp
@@ -107,8 +107,6 @@ void TranscriptionToolBar::Create(wxWindow * parent)
 {
    ToolBar::Create(parent);
 
-   mBackgroundBrush.SetColour(wxColour(204, 204, 204));
-
    mBackgroundHeight = 0;
    mBackgroundWidth = 0;
 
diff --git a/src/toolbars/TranscriptionToolBar.h b/src/toolbars/TranscriptionToolBar.h
index cfb396a13..c03f2c1e8 100644
--- a/src/toolbars/TranscriptionToolBar.h
+++ b/src/toolbars/TranscriptionToolBar.h
@@ -18,13 +18,11 @@
 #include "ToolBar.h"
 
 #include "../MemoryX.h"
-#include <wx/brush.h>
+#include <wx/brush.h> // member variable
 
 #include "audacity/Types.h"
 #include "../Theme.h"
 
-class wxBitmap;
-class wxBrush;
 class wxChoice;
 class wxCommandEvent;
 class wxImage;
@@ -150,7 +148,6 @@ class TranscriptionToolBar final : public ToolBar {
    wxChoice *mKeyTypeChoice;
 #endif
 
-   wxBrush mBackgroundBrush;
    int mBackgroundWidth;
    int mBackgroundHeight;
 
diff --git a/src/widgets/Meter.h b/src/widgets/Meter.h
index 2c665baf5..c3151a889 100644
--- a/src/widgets/Meter.h
+++ b/src/widgets/Meter.h
@@ -17,7 +17,7 @@
 #define __AUDACITY_METER__
 
 #include <wx/setup.h> // for wxUSE_* macros
-#include <wx/brush.h>
+#include <wx/brush.h> // member variable
 #include <wx/defs.h>
 #include <wx/gdicmn.h>
 #include <wx/timer.h>