diff --git a/lib-src/mod-nyq-bench/NyqBench.h b/lib-src/mod-nyq-bench/NyqBench.h
index db6c6a177..c5c8091c6 100755
--- a/lib-src/mod-nyq-bench/NyqBench.h
+++ b/lib-src/mod-nyq-bench/NyqBench.h
@@ -9,7 +9,7 @@
 #ifndef __NYQUIST_EFFECT_WORKBENCH__
 #define __NYQUIST_EFFECT_WORKBENCH__
 
-#include <wx/fdrepdlg.h> // wxFindReplaceData member variable below
+#include <wx/fdrepdlg.h> // wxFindReplaceData member variable
 #include <wx/string.h>
 
 #include <iostream>
diff --git a/src/AudacityApp.h b/src/AudacityApp.h
index abe7d6b57..1fe0fa5e2 100644
--- a/src/AudacityApp.h
+++ b/src/AudacityApp.h
@@ -21,14 +21,14 @@
 
 #include "MemoryX.h"
 #include <wx/app.h> // to inherit
-#include <wx/dir.h>
-#include <wx/timer.h>
+#include <wx/dir.h> // for wxDIR_FILES
+#include <wx/timer.h> // member variable
 
 #include "widgets/FileHistory.h"
 #include "ondemand/ODTaskThread.h"
 
 #if defined(EXPERIMENTAL_CRASH_REPORT)
-#include <wx/debugrpt.h>
+#include <wx/debugrpt.h> // for wxDebugReport::Context
 #endif
 
 class wxSingleInstanceChecker;
diff --git a/src/AudioIO.h b/src/AudioIO.h
index e4cdc713c..322361c61 100644
--- a/src/AudioIO.h
+++ b/src/AudioIO.h
@@ -23,8 +23,8 @@
 #include <atomic>
 #include <utility>
 #include <vector>
-#include <wx/atomic.h>
-#include <wx/weakref.h>
+#include <wx/atomic.h> // member variable
+#include <wx/weakref.h> // member variable
 
 #ifdef USE_MIDI
 
diff --git a/src/AutoRecovery.h b/src/AutoRecovery.h
index 2d444427d..cfc02d7b0 100644
--- a/src/AutoRecovery.h
+++ b/src/AutoRecovery.h
@@ -14,7 +14,7 @@
 #include "xml/XMLTagHandler.h"
 #include "xml/XMLWriter.h"
 
-#include <wx/mstream.h>
+#include <wx/mstream.h> // member variables
 
 #include <unordered_map>
 
diff --git a/src/BlockFile.h b/src/BlockFile.h
index 4f622d1e8..494bbb200 100644
--- a/src/BlockFile.h
+++ b/src/BlockFile.h
@@ -19,7 +19,7 @@
 
 #include "SampleFormat.h"
 
-#include "wxFileNameWrapper.h" // member variable below
+#include "wxFileNameWrapper.h" // member variable
 
 #include "ondemand/ODTaskThread.h"
 
diff --git a/src/Dependencies.h b/src/Dependencies.h
index 440bdf87f..430bb5a08 100644
--- a/src/Dependencies.h
+++ b/src/Dependencies.h
@@ -16,7 +16,7 @@
 
 #include <list>
 #include "MemoryX.h"
-#include "wxFileNameWrapper.h" // member variable below
+#include "wxFileNameWrapper.h" // member variable
 
 class AudacityProject;
 
diff --git a/src/DeviceChange.h b/src/DeviceChange.h
index c4cde10b3..a5a707ef8 100644
--- a/src/DeviceChange.h
+++ b/src/DeviceChange.h
@@ -25,7 +25,7 @@
 
 #if defined(HAVE_DEVICE_CHANGE)
 
-#include <wx/timer.h>
+#include <wx/timer.h> // member variable
 
 class DeviceChangeInterface /* not final */
 {
diff --git a/src/FileException.h b/src/FileException.h
index 3ad4145d2..e357dd9ea 100644
--- a/src/FileException.h
+++ b/src/FileException.h
@@ -10,7 +10,7 @@
 #define __AUDACITY_FILE_EXCEPTION__
 
 #include "AudacityException.h"
-#include <wx/filename.h> // wxFileName member variable below
+#include <wx/filename.h> // wxFileName member variable
 
 class FileException /* not final */ : public MessageBoxException
 {
diff --git a/src/MixerBoard.h b/src/MixerBoard.h
index a094a31d3..505092c68 100644
--- a/src/MixerBoard.h
+++ b/src/MixerBoard.h
@@ -15,7 +15,7 @@
 #define __AUDACITY_MIXER_BOARD__
 
 #include <wx/frame.h> // to inherit
-#include <wx/scrolwin.h>
+#include <wx/scrolwin.h> // to inherit
 
 #include "widgets/ASlider.h"
 #include "widgets/wxPanelWrapper.h"
diff --git a/src/Prefs.h b/src/Prefs.h
index c9908fd47..f6b8c85d0 100644
--- a/src/Prefs.h
+++ b/src/Prefs.h
@@ -33,7 +33,7 @@
 
 #include "../include/audacity/ComponentInterface.h"
 
-#include <wx/config.h>
+#include <wx/config.h> // to inherit wxFileConfig
 
 void InitPreferences();
 void FinishPreferences();
diff --git a/src/TimerRecordDialog.h b/src/TimerRecordDialog.h
index 33262a351..66fb86fec 100644
--- a/src/TimerRecordDialog.h
+++ b/src/TimerRecordDialog.h
@@ -17,7 +17,7 @@
 #define __AUDACITY_TIMERRECORD_DIALOG__
 
 #include <wx/textctrl.h> // to inherit
-#include <wx/timer.h>
+#include <wx/timer.h> // member variable
 #include "export/Export.h"
 
 class wxCheckBox;
diff --git a/src/TrackPanel.h b/src/TrackPanel.h
index 4f5e2023b..e4abaf31e 100644
--- a/src/TrackPanel.h
+++ b/src/TrackPanel.h
@@ -18,7 +18,7 @@
 #include <vector>
 
 #include <wx/setup.h> // for wxUSE_* macros
-#include <wx/timer.h>
+#include <wx/timer.h> // to inherit
 
 #include "HitTestResult.h"
 
diff --git a/src/TrackPanelDrawingContext.h b/src/TrackPanelDrawingContext.h
index aa08dd76b..b743fc465 100644
--- a/src/TrackPanelDrawingContext.h
+++ b/src/TrackPanelDrawingContext.h
@@ -17,7 +17,7 @@ class UIHandle;
 using UIHandlePtr = std::shared_ptr<UIHandle>;
 class wxDC;
 
-#include <wx/mousestate.h>
+#include <wx/mousestate.h> // member variable
 
 struct TrackPanelDrawingContext {
    wxDC &dc;
diff --git a/src/blockfile/ODDecodeBlockFile.h b/src/blockfile/ODDecodeBlockFile.h
index 98e2bb5e1..fd8840370 100644
--- a/src/blockfile/ODDecodeBlockFile.h
+++ b/src/blockfile/ODDecodeBlockFile.h
@@ -32,7 +32,7 @@ Also, see ODPCMAliasBlockFile for a similar file.
 #include "../ondemand/ODTaskThread.h"
 #include "../DirManager.h"
 #include "../ondemand/ODDecodeTask.h"
-#include <wx/atomic.h>
+#include <wx/atomic.h> // member variable
 
 /// An AliasBlockFile that references uncompressed data in an existing file
 class ODDecodeBlockFile final : public SimpleBlockFile
diff --git a/src/effects/EffectRack.h b/src/effects/EffectRack.h
index 23d9eea55..fb47a3e4c 100644
--- a/src/effects/EffectRack.h
+++ b/src/effects/EffectRack.h
@@ -20,7 +20,7 @@
 
 #include <wx/defs.h>
 #include <wx/frame.h> // to inherit
-#include <wx/timer.h>
+#include <wx/timer.h> // member variable
 
 #include "EffectManager.h"
 
diff --git a/src/effects/VST/VSTControl.h b/src/effects/VST/VSTControl.h
index 4e2c56254..0bebe0de6 100644
--- a/src/effects/VST/VSTControl.h
+++ b/src/effects/VST/VSTControl.h
@@ -11,7 +11,7 @@
 #ifndef AUDACITY_VSTCONTROL_H
 #define AUDACITY_VSTCONTROL_H
 
-#include <wx/control.h>
+#include <wx/control.h> // to inherit
 
 #include "aeffectx.h"
 
diff --git a/src/effects/VST/VSTControlOSX.h b/src/effects/VST/VSTControlOSX.h
index 25da35484..bff232d22 100644
--- a/src/effects/VST/VSTControlOSX.h
+++ b/src/effects/VST/VSTControlOSX.h
@@ -15,7 +15,7 @@
 #include <Carbon/Carbon.h>
 #endif
 
-#include <wx/osx/private.h>
+#include <wx/osx/private.h> // to inherit wxWidgetCocoaImpl
 
 #include "VSTControl.h"
 
diff --git a/src/effects/audiounits/AUControl.h b/src/effects/audiounits/AUControl.h
index 51b72c846..64e47f20f 100644
--- a/src/effects/audiounits/AUControl.h
+++ b/src/effects/audiounits/AUControl.h
@@ -22,8 +22,8 @@
 #include <Carbon/Carbon.h>
 #endif
 
-#include <wx/osx/private.h>
-#include <wx/control.h>
+#include <wx/osx/private.h> // to inherit wxWidgetCocoaImpl
+#include <wx/control.h> // to inherit
 
 #include <AudioUnit/AudioComponent.h>
 #include <AudioUnit/AudioUnit.h>
diff --git a/src/export/ExportMultiple.h b/src/export/ExportMultiple.h
index b257b99bf..9b92f54ef 100644
--- a/src/export/ExportMultiple.h
+++ b/src/export/ExportMultiple.h
@@ -13,7 +13,7 @@
 
 #include "Export.h"
 #include "../Tags.h"       // we need to know about the Tags class for metadata
-#include "../wxFileNameWrapper.h" // member variable below
+#include "../wxFileNameWrapper.h" // member variable
 
 class wxButton;
 class wxCheckBox;
diff --git a/src/prefs/ExtImportPrefs.h b/src/prefs/ExtImportPrefs.h
index d0badb4ef..3325f788c 100644
--- a/src/prefs/ExtImportPrefs.h
+++ b/src/prefs/ExtImportPrefs.h
@@ -12,7 +12,7 @@
 #define __AUDACITY_EXT_IMPORT_PREFS__
 
 #include <wx/defs.h>
-#include <wx/dnd.h>
+#include <wx/dnd.h> // to inherit wxDropTarget
 #include "../widgets/Grid.h"
 
 #include "PrefsPanel.h"
diff --git a/src/prefs/KeyConfigPrefs.h b/src/prefs/KeyConfigPrefs.h
index 3ba6bdb3d..668773d8b 100644
--- a/src/prefs/KeyConfigPrefs.h
+++ b/src/prefs/KeyConfigPrefs.h
@@ -16,7 +16,7 @@ class CommandManager;
 class ShuttleGui;
 
 #include <wx/defs.h>
-#include <wx/timer.h>
+#include <wx/timer.h> // member variable
 
 #include "../widgets/KeyView.h"
 
diff --git a/src/toolbars/ToolManager.h b/src/toolbars/ToolManager.h
index 59cb54b3d..c779fa065 100644
--- a/src/toolbars/ToolManager.h
+++ b/src/toolbars/ToolManager.h
@@ -15,9 +15,9 @@
 
 #include "../MemoryX.h"
 #include <wx/defs.h>
-#include <wx/eventfilter.h>
+#include <wx/eventfilter.h> // to inherit
 #include <wx/frame.h> // to inherit
-#include <wx/timer.h>
+#include <wx/timer.h> // member variable
 
 #include "ToolDock.h"
 #include "ToolBar.h"
diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h
index 5781016bb..79738b32d 100644
--- a/src/widgets/ASlider.h
+++ b/src/widgets/ASlider.h
@@ -16,7 +16,7 @@
 #include "../MemoryX.h"
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
-#include <wx/timer.h>
+#include <wx/timer.h> // member variable
 #include "widgets/wxPanelWrapper.h"
 
 #if wxUSE_ACCESSIBILITY
diff --git a/src/widgets/ErrorDialog.h b/src/widgets/ErrorDialog.h
index 81e37b07d..04b5e242d 100644
--- a/src/widgets/ErrorDialog.h
+++ b/src/widgets/ErrorDialog.h
@@ -15,7 +15,7 @@
 #include "../Audacity.h"
 
 #include <wx/defs.h>
-#include <wx/msgdlg.h>
+#include <wx/msgdlg.h> // to inherit
 #include "LinkingHtmlWindow.h"
 #include "wxPanelWrapper.h"
 
@@ -99,7 +99,7 @@ inline int AudacityMessageBox(const wxString& message,
 }
 
 
-#include <wx/textdlg.h>
+#include <wx/textdlg.h> // to inherit
 
 /**************************************************************************//**
 \class AudacityTextEntryDialog
diff --git a/src/widgets/ExpandingToolBar.h b/src/widgets/ExpandingToolBar.h
index 5affebb40..d4cc17686 100644
--- a/src/widgets/ExpandingToolBar.h
+++ b/src/widgets/ExpandingToolBar.h
@@ -15,8 +15,8 @@
 #include <vector>
 #include <wx/defs.h>
 #include <wx/dragimag.h> // use macros and typedefs in this header
-#include <wx/timer.h>
-#include <wx/minifram.h>
+#include <wx/timer.h> // member variable
+#include <wx/minifram.h> // to inherit
 
 #include "ImageRoll.h"
 #include "wxPanelWrapper.h"
diff --git a/src/widgets/FileHistory.h b/src/widgets/FileHistory.h
index e1bad424d..c79aec9d7 100644
--- a/src/widgets/FileHistory.h
+++ b/src/widgets/FileHistory.h
@@ -14,7 +14,7 @@
 #include <vector>
 #include <algorithm>
 #include <wx/defs.h>
-#include <wx/weakref.h>
+#include <wx/weakref.h> // member variable
 
 #include "audacity/Types.h"
 #include "../MemoryX.h"
diff --git a/src/widgets/KeyView.h b/src/widgets/KeyView.h
index ccb7ead2f..2e2a923b4 100644
--- a/src/widgets/KeyView.h
+++ b/src/widgets/KeyView.h
@@ -15,7 +15,7 @@
 #include <vector>
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
-#include <wx/vlbox.h>
+#include <wx/vlbox.h> // to inherit wxVListBox
 
 #include "../commands/Keyboard.h"
 
diff --git a/src/widgets/Meter.h b/src/widgets/Meter.h
index cc2f74d14..5568e5934 100644
--- a/src/widgets/Meter.h
+++ b/src/widgets/Meter.h
@@ -19,7 +19,7 @@
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/brush.h> // member variable
 #include <wx/defs.h>
-#include <wx/timer.h>
+#include <wx/timer.h> // member variable
 
 #include "../SampleFormat.h"
 #include "Ruler.h"
diff --git a/src/widgets/MultiDialog.h b/src/widgets/MultiDialog.h
index ea417b7fc..ed66a367e 100644
--- a/src/widgets/MultiDialog.h
+++ b/src/widgets/MultiDialog.h
@@ -16,7 +16,7 @@
 
 #include <wx/defs.h>
 
-#include <wx/chartype.h>
+#include <wx/chartype.h> // for typedef wxChar
 class wxString;
 
 const wxString &DefaultMultiDialogMessage();
diff --git a/src/widgets/ProgressDialog.h b/src/widgets/ProgressDialog.h
index 3b878e454..243c113d0 100644
--- a/src/widgets/ProgressDialog.h
+++ b/src/widgets/ProgressDialog.h
@@ -23,7 +23,7 @@
 #include "../MemoryX.h"
 #include <vector>
 #include <wx/defs.h>
-#include <wx/evtloop.h>
+#include <wx/evtloop.h> // member variable
 
 #include "wxPanelWrapper.h"
 
diff --git a/src/widgets/numformatter.h b/src/widgets/numformatter.h
index 2464d6376..7be041bba 100644
--- a/src/widgets/numformatter.h
+++ b/src/widgets/numformatter.h
@@ -15,7 +15,7 @@
 #define _WIDGETS_NUMFORMATTER_H_
 
 #include <cstddef> // for size_t
-#include <wx/chartype.h>
+#include <wx/chartype.h> // for typedef wxChar
 #include <wx/longlong.h>
 
 class wxString;
diff --git a/src/widgets/valnum.h b/src/widgets/valnum.h
index 04d6ff058..c9edd866c 100644
--- a/src/widgets/valnum.h
+++ b/src/widgets/valnum.h
@@ -18,7 +18,7 @@
 #if wxUSE_VALIDATORS
 
 #include <wx/textctrl.h> // complete type needed in template function
-#include <wx/validate.h>
+#include <wx/validate.h> // to inherit
 
 #include <limits>
 
diff --git a/src/widgets/wxPanelWrapper.h b/src/widgets/wxPanelWrapper.h
index 4aacb5872..44e5814af 100644
--- a/src/widgets/wxPanelWrapper.h
+++ b/src/widgets/wxPanelWrapper.h
@@ -105,7 +105,7 @@ public:
    }
 };
 
-#include <wx/dirdlg.h>
+#include <wx/dirdlg.h> // to inherit
 
 class AUDACITY_DLL_API wxDirDialogWrapper : public wxTabTraversalWrapper<wxDirDialog>
 {