diff --git a/src/TrackPanel.h b/src/TrackPanel.h
index 9dd611223..8d8209bee 100644
--- a/src/TrackPanel.h
+++ b/src/TrackPanel.h
@@ -16,6 +16,7 @@
 #include "MemoryX.h"
 #include <vector>
 
+#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
 #include <wx/timer.h>
 
 #include "HitTestResult.h"
diff --git a/src/TrackPanelAx.h b/src/TrackPanelAx.h
index 6a56e6490..a9ac8de68 100644
--- a/src/TrackPanelAx.h
+++ b/src/TrackPanelAx.h
@@ -15,6 +15,8 @@
 #include <wx/window.h>
 #include <wx/panel.h>
 
+#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
+
 #if wxUSE_ACCESSIBILITY
 #include <wx/access.h>
 #include "widgets/WindowAccessible.h"
diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h
index 869eb850c..86a5125f0 100644
--- a/src/effects/Equalization.h
+++ b/src/effects/Equalization.h
@@ -18,6 +18,7 @@
 #define PANELBORDER 1   // only increase from '1' for testing purposes - MJS
 
 #include <wx/button.h>
+#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
 #include <wx/panel.h>
 #include <wx/dialog.h>
 #include <wx/intl.h>
diff --git a/src/effects/ScienFilter.h b/src/effects/ScienFilter.h
index 7071097f8..b143049c1 100644
--- a/src/effects/ScienFilter.h
+++ b/src/effects/ScienFilter.h
@@ -16,6 +16,7 @@ Vaughan Johnson (Preview)
 #include <wx/arrstr.h>
 #include <wx/bitmap.h>
 #include <wx/choice.h>
+#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
 #include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/slider.h>
diff --git a/src/widgets/AButton.h b/src/widgets/AButton.h
index 38c99715d..90d199241 100644
--- a/src/widgets/AButton.h
+++ b/src/widgets/AButton.h
@@ -15,6 +15,8 @@
 #include "../MemoryX.h"
 #include <vector>
 
+#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
+
 #if wxUSE_ACCESSIBILITY
 #include <wx/access.h>
 #include "WindowAccessible.h"
diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h
index ad8565923..b5d10d6ba 100644
--- a/src/widgets/ASlider.h
+++ b/src/widgets/ASlider.h
@@ -14,7 +14,7 @@
 #define __AUDACITY_SLIDER__
 
 #include "../MemoryX.h"
-#include <wx/defs.h>
+#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
 #include <wx/window.h>
 #include <wx/panel.h>
 #include <wx/timer.h>
diff --git a/src/widgets/Grid.h b/src/widgets/Grid.h
index a023d20e7..96a0c16cf 100644
--- a/src/widgets/Grid.h
+++ b/src/widgets/Grid.h
@@ -13,7 +13,7 @@
 
 #include "../MemoryX.h"
 #include <vector>
-#include <wx/defs.h>
+#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
 #include <wx/choice.h>
 #include <wx/event.h>
 #include <wx/grid.h>
diff --git a/src/widgets/HtmlWindow.h b/src/widgets/HtmlWindow.h
index 2dfb09dad..ab1d44a4e 100644
--- a/src/widgets/HtmlWindow.h
+++ b/src/widgets/HtmlWindow.h
@@ -25,7 +25,7 @@ around to NEW positions.
 
 #include "../Audacity.h"
 
-#include <wx/defs.h>
+#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
 #include <wx/html/htmlwin.h>
 
 #if wxUSE_ACCESSIBILITY
diff --git a/src/widgets/KeyView.h b/src/widgets/KeyView.h
index 9d3660df3..b798bfa43 100644
--- a/src/widgets/KeyView.h
+++ b/src/widgets/KeyView.h
@@ -13,7 +13,7 @@
 #include "audacity/Types.h"
 
 #include <vector>
-#include <wx/defs.h>
+#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
 #include <wx/arrstr.h>
 #include <wx/string.h>
 #include <wx/vlbox.h>
diff --git a/src/widgets/Meter.h b/src/widgets/Meter.h
index 12d2a573e..875ad95df 100644
--- a/src/widgets/Meter.h
+++ b/src/widgets/Meter.h
@@ -17,7 +17,7 @@
 #define __AUDACITY_METER__
 
 #include <wx/brush.h>
-#include <wx/defs.h>
+#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
 #include <wx/gdicmn.h>
 #include <wx/string.h>
 #include <wx/timer.h>
diff --git a/src/widgets/NumericTextCtrl.h b/src/widgets/NumericTextCtrl.h
index 1a4f3b9e0..b5d5e3a97 100644
--- a/src/widgets/NumericTextCtrl.h
+++ b/src/widgets/NumericTextCtrl.h
@@ -20,7 +20,7 @@
 #include "../MemoryX.h"
 #include "../../include/audacity/ComponentInterface.h"
 #include <vector>
-#include <wx/defs.h>
+#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
 #include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/stattext.h>
diff --git a/src/widgets/WindowAccessible.h b/src/widgets/WindowAccessible.h
index d24cdd8ae..cef09d8e4 100644
--- a/src/widgets/WindowAccessible.h
+++ b/src/widgets/WindowAccessible.h
@@ -11,6 +11,7 @@
 #ifndef __AUDACITY_WINDOW_ACCESSIBLE__
 #define __AUDACITY_WINDOW_ACCESSIBLE__
 
+#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
 #include <wx/setup.h>
 
 #if wxUSE_ACCESSIBILITY