Don't include Project.h or ODTask.h needlessly in other header files

src/AutoRecovery.cpp

@@ -22,6 +22,7 @@ text or binary format to a file.
 #include "Audacity.h"
 #include "FileNames.h"
 #include "blockfile/SimpleBlockFile.h"
+#include "Project.h"
 #include "Sequence.h"
 #include "ShuttleGui.h"
 

src/AutoRecovery.h

@@ -11,8 +11,6 @@
 #ifndef __AUDACITY_AUTORECOVERY__
 #define __AUDACITY_AUTORECOVERY__
 
-#include "Project.h"
-
 #include "xml/XMLTagHandler.h"
 #include "xml/XMLWriter.h"
 
@@ -23,6 +21,8 @@
 
 #include <unordered_map>
 
+class AudacityProject;
+
 //
 // Show auto recovery dialog if there are projects to recover. Should be
 // called once at Audacity startup.

src/Menus.cpp

@@ -80,6 +80,7 @@ menu items.
 #include "HistoryWindow.h"
 #include "LyricsWindow.h"
 #include "MixerBoard.h"
+#include "Project.h"
 #include "Internat.h"
 #include "FileFormats.h"
 #include "ModuleManager.h"

src/ondemand/ODManager.h

@@ -20,7 +20,6 @@ number of threads.
 #define __AUDACITY_ODMANAGER__
 
 #include <vector>
-#include "ODTask.h"
 #include "ODTaskThread.h"
 #include <wx/thread.h>
 #include <wx/wx.h>
@@ -38,6 +37,7 @@ DECLARE_EXPORTED_EVENT_TYPE(AUDACITY_DLL_API, EVT_ODTASK_UPDATE, -1)
 int CompareNoCaseFileName(const wxString& first, const wxString& second);
 /// A singleton that manages currently running Tasks on an arbitrary
 /// number of threads.
+class Track;
 class WaveTrack;
 class ODWaveTrackTaskQueue;
 class ODManager final

src/ondemand/ODTask.h

@@ -25,11 +25,12 @@ in a background thread.
 
 #include "ODTaskThread.h"
 #include "../BlockFile.h"
-#include "../Project.h"
 
 #include "../MemoryX.h"
 #include <vector>
 #include <wx/wx.h>
+class AudacityProject;
+class Track;
 class WaveTrack;
 
 

src/toolbars/MeterToolBar.h

@@ -15,13 +15,13 @@
 #define __AUDACITY_METER_TOOLBAR__
 
 #include "ToolBar.h"
-#include "../Project.h"
 
 class wxDC;
 class wxGridBagSizer;
 class wxSizeEvent;
 class wxWindow;
 
+class AudacityProject;
 class MeterPanel;
 
 

src/toolbars/SelectionBar.h

@@ -39,6 +39,8 @@ class wxStaticText;
 class SelectionBarListener;
 class NumericTextCtrl;
 
+using NumericFormatId = IdentInterfaceSymbol;
+
 class SelectionBar final : public ToolBar {
 
  public: