Remove wx/wx.h from headers

src/ondemand/ODDecodeFlacTask.cpp

@@ -15,6 +15,7 @@
 #include <wx/utils.h>
 #include <wx/file.h>
 #include <wx/ffile.h>
+#include <wx/wx.h>
 
 #ifdef USE_LIBID3TAG
 extern "C" {

src/ondemand/ODManager.h

@@ -21,8 +21,8 @@ number of threads.
 
 #include <vector>
 #include "ODTaskThread.h"
+#include <wx/event.h> // for DECLARE_EXPORTED_EVENT_TYPE
 #include <wx/thread.h>
-#include <wx/wx.h>
 
 #ifdef __WXMAC__
 // On Mac OS X, it's better not to use the wxThread class.

src/ondemand/ODTask.h

@@ -28,7 +28,6 @@ in a background thread.
 
 #include "../MemoryX.h"
 #include <vector>
-#include <wx/wx.h>
 class AudacityProject;
 class Track;
 class WaveTrack;

src/ondemand/ODWaveTrackTaskQueue.h

@@ -25,7 +25,6 @@ tasks associated with a WaveTrack.
 #include "../MemoryX.h"
 #include <vector>
 #include "ODTaskThread.h"
-#include <wx/wx.h>
 class Track;
 class WaveTrack;
 class ODTask;