diff --git a/include/audacity/EffectAutomationParameters.h b/include/audacity/EffectAutomationParameters.h
index 34a9edc20..71d3034ac 100644
--- a/include/audacity/EffectAutomationParameters.h
+++ b/include/audacity/EffectAutomationParameters.h
@@ -46,7 +46,7 @@
 #include <locale.h>
 
 #include <wx/cmdline.h>
-#include <wx/fileconf.h>
+#include <wx/fileconf.h> // to inherit
 #include <wx/intl.h>
 #include <algorithm>
 
diff --git a/src/AdornedRulerPanel.cpp b/src/AdornedRulerPanel.cpp
index 7400a8ebd..43987e3e1 100644
--- a/src/AdornedRulerPanel.cpp
+++ b/src/AdornedRulerPanel.cpp
@@ -44,6 +44,7 @@
 #include "widgets/AButton.h"
 #include "widgets/Grabber.h"
 
+#include <wx/dcclient.h>
 #include <wx/menu.h>
 
 using std::min;
diff --git a/src/AutoRecovery.h b/src/AutoRecovery.h
index eb6d6dc68..2d444427d 100644
--- a/src/AutoRecovery.h
+++ b/src/AutoRecovery.h
@@ -14,7 +14,6 @@
 #include "xml/XMLTagHandler.h"
 #include "xml/XMLWriter.h"
 
-#include <wx/debug.h>
 #include <wx/mstream.h>
 
 #include <unordered_map>
diff --git a/src/FreqWindow.cpp b/src/FreqWindow.cpp
index 9307d50f3..749e3a48b 100644
--- a/src/FreqWindow.cpp
+++ b/src/FreqWindow.cpp
@@ -51,6 +51,7 @@ and in the spectrogram spectral selection.
 #include <wx/button.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
+#include <wx/dcclient.h>
 #include <wx/font.h>
 #include <wx/image.h>
 #include <wx/dcmemory.h>
diff --git a/src/Lyrics.cpp b/src/Lyrics.cpp
index 902a6ba2b..7c3a5ebd3 100644
--- a/src/Lyrics.cpp
+++ b/src/Lyrics.cpp
@@ -13,6 +13,7 @@
 
 #include <math.h>
 
+#include <wx/dcclient.h>
 #include <wx/defs.h>
 #include <wx/dcmemory.h>
 #include <wx/mimetype.h>
diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
index fac6ee9df..4dd3f0089 100644
--- a/src/MixerBoard.cpp
+++ b/src/MixerBoard.cpp
@@ -22,6 +22,7 @@
 #include <wx/setup.h> // for wxUSE_* macros
 
 #include <wx/bmpbuttn.h>
+#include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/icon.h>
 #include <wx/settings.h> // for wxSystemSettings::GetColour and wxSystemSettings::GetMetric
diff --git a/src/NumberScale.h b/src/NumberScale.h
index 513bae4f6..b8e0f9387 100644
--- a/src/NumberScale.h
+++ b/src/NumberScale.h
@@ -14,7 +14,6 @@ Paul Licameli
 #include <algorithm>
 #include <cmath>
 #include <wx/defs.h>
-#include <wx/debug.h>
 
 enum NumberScaleType {
    nstLinear,
diff --git a/src/PluginManager.h b/src/PluginManager.h
index 55a9c58fb..40d0f833f 100644
--- a/src/PluginManager.h
+++ b/src/PluginManager.h
@@ -12,7 +12,6 @@
 #define __AUDACITY_PLUGINMANAGER_H__
 
 #include <wx/defs.h>
-#include <wx/fileconf.h>
 
 #include "MemoryX.h"
 #include <map>
diff --git a/src/Prefs.h b/src/Prefs.h
index 7081d406d..b6610bb65 100644
--- a/src/Prefs.h
+++ b/src/Prefs.h
@@ -34,7 +34,6 @@
 #include "../include/audacity/ComponentInterface.h"
 
 #include <wx/config.h>
-#include <wx/fileconf.h>
 #include <wx/convauto.h>
 
 void InitPreferences();
diff --git a/src/Project.h b/src/Project.h
index 9a76ebcdc..3b56e308c 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -36,16 +36,15 @@
 #include <memory>
 #include <wx/defs.h>
 #include <wx/log.h>
-#include <wx/dragimag.h>
 #include <wx/generic/dragimgg.h>
 #include <wx/frame.h> // to inherit
 #include <wx/intl.h>
-#include <wx/dcclient.h>
 
 #include "import/ImportRaw.h" // defines TrackHolders
 
 const int AudacityProjectTimerID = 5200;
 
+class wxMemoryDC;
 class wxArrayString;
 class wxWindow;
 class wxDialog;
diff --git a/src/Theme.cpp b/src/Theme.cpp
index dad2866d9..8e3bac422 100644
--- a/src/Theme.cpp
+++ b/src/Theme.cpp
@@ -65,6 +65,7 @@ can't be.
 #include "Experimental.h"
 
 #include <wx/wxprec.h>
+#include <wx/dcclient.h>
 #include <wx/image.h>
 #include <wx/file.h>
 #include <wx/ffile.h>
diff --git a/src/TimeTrack.cpp b/src/TimeTrack.cpp
index 61fa5aa0b..5016ea5f5 100644
--- a/src/TimeTrack.cpp
+++ b/src/TimeTrack.cpp
@@ -20,6 +20,7 @@
 
 #include <cfloat>
 #include <wx/wxcrtvararg.h>
+#include <wx/dc.h>
 #include <wx/intl.h>
 #include "AColor.h"
 #include "widgets/Ruler.h"
diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 3d064002c..47353385c 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -99,6 +99,8 @@ is time to refresh some aspect of the screen.
 #include "widgets/ASlider.h"
 #include <algorithm>
 
+#include <wx/dcclient.h>
+
 wxDEFINE_EVENT(EVT_TRACK_PANEL_TIMER, wxCommandEvent);
 
 /**
diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp
index 8eb1c66d0..e6c0e6f66 100644
--- a/src/effects/Effect.cpp
+++ b/src/effects/Effect.cpp
@@ -31,6 +31,7 @@ greater use in future.
 #include <wx/bmpbuttn.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
+#include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/defs.h>
 #include <wx/menu.h>
diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp
index de4c28f2b..0403ec20a 100644
--- a/src/effects/Equalization.cpp
+++ b/src/effects/Equalization.cpp
@@ -66,6 +66,7 @@
 #include <wx/button.h>
 #include <wx/brush.h>
 #include <wx/button.h>  // not really needed here
+#include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/event.h>
 #include <wx/image.h>
diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp
index b861c6225..675a37973 100644
--- a/src/effects/ScienFilter.cpp
+++ b/src/effects/ScienFilter.cpp
@@ -42,6 +42,7 @@ a graph for EffectScienFilter.
 
 #include <wx/brush.h>
 #include <wx/choice.h>
+#include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/intl.h>
 #include <wx/settings.h>
diff --git a/src/export/Export.cpp b/src/export/Export.cpp
index 4eb98043f..7db7946f1 100644
--- a/src/export/Export.cpp
+++ b/src/export/Export.cpp
@@ -31,6 +31,7 @@
 #include "../Audacity.h" // for USE_* macros
 #include "Export.h"
 
+#include <wx/dcclient.h>
 #include <wx/file.h>
 #include <wx/filectrl.h>
 #include <wx/filename.h>
diff --git a/src/toolbars/ToolBar.cpp b/src/toolbars/ToolBar.cpp
index a3544a1ec..63d358a73 100644
--- a/src/toolbars/ToolBar.cpp
+++ b/src/toolbars/ToolBar.cpp
@@ -35,6 +35,7 @@ in which buttons can be placed.
 #include <wx/setup.h> // for wxUSE_* macros
 
 #ifndef WX_PRECOMP
+#include <wx/dcclient.h>
 #include <wx/defs.h>
 #include <wx/gdicmn.h>
 #include <wx/image.h>
diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp
index fc8364145..4a9d28b84 100644
--- a/src/toolbars/ToolDock.cpp
+++ b/src/toolbars/ToolDock.cpp
@@ -30,6 +30,7 @@
 #include <wx/wxprec.h>
 
 #ifndef WX_PRECOMP
+#include <wx/dcclient.h>
 #include <wx/defs.h>
 #include <wx/event.h>
 #include <wx/gdicmn.h>
diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
index ce85d7f67..6b17b0cbb 100644
--- a/src/toolbars/ToolManager.cpp
+++ b/src/toolbars/ToolManager.cpp
@@ -34,6 +34,7 @@
 
 #ifndef WX_PRECOMP
 #include <wx/app.h>
+#include <wx/dcclient.h>
 #include <wx/defs.h>
 #include <wx/event.h>
 #include <wx/frame.h>
diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp
index 91b4d7096..11b94122d 100644
--- a/src/tracks/ui/Scrubbing.cpp
+++ b/src/tracks/ui/Scrubbing.cpp
@@ -42,6 +42,7 @@ Paul Licameli split from TrackPanel.cpp
 
 #include <wx/app.h>
 #include <wx/dc.h>
+#include <wx/dcclient.h>
 #include <wx/menu.h>
 
 // Yet another experimental scrub would drag the track under a
diff --git a/src/widgets/ExpandingToolBar.h b/src/widgets/ExpandingToolBar.h
index 191d722cf..12e516f61 100644
--- a/src/widgets/ExpandingToolBar.h
+++ b/src/widgets/ExpandingToolBar.h
@@ -15,7 +15,7 @@
 #include <vector>
 #include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/dragimag.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/HtmlWindow.h b/src/widgets/HtmlWindow.h
index 8542dc627..15bfd6806 100644
--- a/src/widgets/HtmlWindow.h
+++ b/src/widgets/HtmlWindow.h
@@ -27,7 +27,7 @@ around to NEW positions.
 
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
-#include <wx/html/htmlwin.h>
+#include <wx/html/htmlwin.h> // to inherit
 
 #if wxUSE_ACCESSIBILITY
 #include "WindowAccessible.h"
diff --git a/src/widgets/ImageRoll.h b/src/widgets/ImageRoll.h
index 529a6e52b..f36a264ea 100644
--- a/src/widgets/ImageRoll.h
+++ b/src/widgets/ImageRoll.h
@@ -13,7 +13,7 @@
 #define __AUDACITY_IMAGE_ROLL__
 
 #include <vector>
-#include <wx/dcclient.h>
+#include <wx/dc.h> // for enum wxRasterOperationMode
 #include <wx/defs.h>
 #include <wx/version.h>
 #include "wxPanelWrapper.h"
diff --git a/src/widgets/LinkingHtmlWindow.h b/src/widgets/LinkingHtmlWindow.h
index 371865c48..30c1aa3ed 100644
--- a/src/widgets/LinkingHtmlWindow.h
+++ b/src/widgets/LinkingHtmlWindow.h
@@ -16,8 +16,6 @@
 #ifndef __AUDACITY_LINKINGHTMLWINDOW__
 #define __AUDACITY_LINKINGHTMLWINDOW__
 
-#include <wx/html/htmlwin.h>
-
 #include "HtmlWindow.h"
 #include "wxPanelWrapper.h"