diff --git a/lib-src/FileDialog/FileDialog.h b/lib-src/FileDialog/FileDialog.h
index 46e53d827..acd57cff8 100644
--- a/lib-src/FileDialog/FileDialog.h
+++ b/lib-src/FileDialog/FileDialog.h
@@ -17,9 +17,7 @@ custom controls.
 #ifndef _FILEDIALOG_H_
 #define _FILEDIALOG_H_
 
-#include <wx/defs.h>
-#include <wx/filectrl.h>
-#include <wx/filedlg.h>
+#include <wx/filedlg.h> // to inherit
 
 #ifndef AUDACITY_DLL_API
 #define AUDACITY_DLL_API
diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.h b/lib-src/FileDialog/mac/FileDialogPrivate.h
index 697969fd2..0e505d222 100644
--- a/lib-src/FileDialog/mac/FileDialogPrivate.h
+++ b/lib-src/FileDialog/mac/FileDialogPrivate.h
@@ -14,10 +14,10 @@
 #ifndef _MAC_FILEDIALOG_H_
 #define _MAC_FILEDIALOG_H_
 
-#include <wx/choice.h>
-
 #include "../FileDialog.h"
 
+class wxChoice;
+
 //-------------------------------------------------------------------------
 // wxFileDialog
 //-------------------------------------------------------------------------
diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.mm b/lib-src/FileDialog/mac/FileDialogPrivate.mm
index ca5990985..185d9858d 100644
--- a/lib-src/FileDialog/mac/FileDialogPrivate.mm
+++ b/lib-src/FileDialog/mac/FileDialogPrivate.mm
@@ -27,21 +27,22 @@
 #include "FileDialog.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/msgdlg.h"
-    #include "wx/app.h"
-    #include "wx/sizer.h"
-    #include "wx/stattext.h"
-    #include "wx/choice.h"
+    #include <wx/msgdlg.h>
+    #include <wx/app.h>
+    #include <wx/sizer.h>
+    #include <wx/stattext.h>
+    #include <wx/choice.h>
 #endif
 
-#include "wx/clipbrd.h"
-#include "wx/filename.h"
-#include "wx/tokenzr.h"
-#include "wx/evtloop.h"
+#include <wx/clipbrd.h>
+#include <wx/filectrl.h>
+#include <wx/filename.h>
+#include <wx/tokenzr.h>
+#include <wx/evtloop.h>
 
-#include "wx/osx/private.h"
-#include "wx/sysopt.h"
-#include "wx/modalhook.h"
+#include <wx/osx/private.h>
+#include <wx/sysopt.h>
+#include <wx/modalhook.h>
 
 #include <mach-o/dyld.h>
 
diff --git a/src/export/Export.cpp b/src/export/Export.cpp
index 29082ec96..bc50a1eff 100644
--- a/src/export/Export.cpp
+++ b/src/export/Export.cpp
@@ -32,6 +32,7 @@
 #include "Export.h"
 
 #include <wx/file.h>
+#include <wx/filectrl.h>
 #include <wx/filename.h>
 #include <wx/progdlg.h>
 #include <wx/sizer.h>