Keep EXPERIMENTAL_OD_FFMPEG and EXPERIMENTAL_OD_FLAC compilable

src/ProjectFileManager.cpp

@@ -47,6 +47,7 @@ Paul Licameli split from AudacityProject.cpp
 #include "import/Import.h"
 #include "commands/CommandContext.h"
 #include "ondemand/ODComputeSummaryTask.h"
+#include "ondemand/ODDecodeFlacTask.h"
 #include "ondemand/ODManager.h"
 #include "ondemand/ODTask.h"
 #include "toolbars/SelectionBar.h"

src/ondemand/ODDecodeFFmpegTask.cpp

@@ -14,6 +14,7 @@
 
 #include "../Experimental.h"
 
+#include <wx/crt.h>
 #include <wx/wxprec.h>
 // For compilers that support precompilation, includes "wx/wx.h".
 #ifndef WX_PRECOMP
@@ -28,7 +29,6 @@
 #include <functional>
 
 #include "../FFmpeg.h"      // which brings in avcodec.h, avformat.h
-#include "../import/ImportFFmpeg.h"
 
 
 extern FFmpegLibs *FFmpegLibsInst();