Rewrite #include directives in lib-src/FileDialog ...

... Removing one from the public header file

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

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
 //-------------------------------------------------------------------------

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>
 

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>