Remove some unnecessary #include directives

src/AudacityApp.cpp

@@ -77,7 +77,6 @@ It handles initialization and termination by subclassing wxApp.
 #include "DirManager.h"
 #include "commands/CommandHandler.h"
 #include "commands/AppCommandEvent.h"
-#include "commands/CommandContext.h"
 #include "effects/Contrast.h"
 #include "widgets/ASlider.h"
 #include "FFmpeg.h"

src/AutoRecovery.cpp

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

src/BatchProcessDialog.cpp

@@ -45,7 +45,6 @@
 #include "Project.h"
 #include "Internat.h"
 #include "commands/CommandManager.h"
-#include "commands/CommandContext.h"
 #include "effects/Effect.h"
 #include "../images/Arrow.xpm"
 #include "../images/Empty9x16.xpm"

src/BlockFile.cpp

@@ -53,6 +53,7 @@ out.
 #include "Internat.h"
 #include "MemoryX.h"
 #include "sndfile.h"
+#include "FileException.h"
 #include "FileFormats.h"
 #include "AudacityApp.h"
 

src/BlockFile.h

@@ -14,15 +14,13 @@
 
 #include "MemoryX.h"
 
-#include "xml/XMLTagHandler.h"
-#include "xml/XMLWriter.h"
-
 #include "SampleFormat.h"
 
 #include "wxFileNameWrapper.h" // member variable
 
 #include "ondemand/ODTaskThread.h"
 
+class XMLWriter;
 
 class SummaryInfo {
  public:

src/Envelope.cpp

@@ -43,7 +43,6 @@ a draggable point type.
 #include <wx/log.h>
 
 #include "AColor.h"
-#include "DirManager.h"
 #include "TrackArtist.h"
 
 static const double VALUE_TOLERANCE = 0.001;
@@ -318,7 +317,6 @@ static void DrawPoint(wxDC & dc, const wxRect & r, int x, int y, bool top)
 }
 
 #include "TrackPanelDrawingContext.h"
-#include "tracks/ui/EnvelopeHandle.h"
 
 /// TODO: This should probably move to track artist.
 void Envelope::DrawPoints

src/LabelTrack.cpp

@@ -59,7 +59,6 @@ for drawing different aspects of the label and its text box.
 #include "AudioIO.h"
 #include "DirManager.h"
 #include "Internat.h"
-#include "Menus.h"
 #include "Prefs.h"
 #include "RefreshCode.h"
 #include "Theme.h"

src/Mix.cpp

@@ -32,10 +32,8 @@
 #include <wx/intl.h>
 
 #include "WaveTrack.h"
-#include "DirManager.h"
 #include "Internat.h"
 #include "Prefs.h"
-#include "Project.h"
 #include "Resample.h"
 #include "TimeTrack.h"
 #include "float_cast.h"

src/MixerBoard.cpp

@@ -14,8 +14,6 @@
 
 #include "Experimental.h"
 
-#include "Menus.h"
-
 #include <cfloat>
 #include <math.h>
 

src/Registrar.h

@@ -24,6 +24,7 @@ responsible for calling the appropriate callback functions.
 
 #include "MemoryX.h"
 
+class AudacityCommand;
 class LoadableModule;
 class ComponentInterface;
 class Effect;

src/Theme.cpp

@@ -75,7 +75,6 @@ can't be.
 #include "Project.h"
 #include "toolbars/ToolBar.h"
 #include "toolbars/ToolManager.h"
-#include "ImageManipulation.h"
 #include "AllThemeResources.h"  // can remove this later, only needed for 'XPMS_RETIRED'.
 #include "FileNames.h"
 #include "Prefs.h"

src/TimerRecordDialog.cpp

@@ -52,7 +52,6 @@
 #include "widgets/HelpSystem.h"
 #include "widgets/ErrorDialog.h"
 #include "widgets/ProgressDialog.h"
-#include "commands/CommandContext.h"
 
 #if wxUSE_ACCESSIBILITY
 #include "widgets/WindowAccessible.h"

src/WaveClip.cpp

@@ -34,7 +34,6 @@
 #include "Prefs.h"
 #include "Envelope.h"
 #include "Resample.h"
-#include "Project.h"
 #include "WaveTrack.h"
 #include "FFT.h"
 #include "Profiler.h"

src/blockfile/LegacyAliasBlockFile.cpp

@@ -19,6 +19,8 @@
 #include "LegacyBlockFile.h"
 #include "../FileFormats.h"
 #include "../Internat.h"
+#include "../xml/XMLTagHandler.h"
+#include "../xml/XMLWriter.h"
 
 LegacyAliasBlockFile::LegacyAliasBlockFile(wxFileNameWrapper &&fileName,
                                            wxFileNameWrapper &&aliasedFileName,

src/blockfile/LegacyBlockFile.cpp

@@ -33,6 +33,8 @@
 #include "../MemoryX.h"
 #include "../FileFormats.h"
 #include "../Internat.h"
+#include "../xml/XMLTagHandler.h"
+#include "../xml/XMLWriter.h"
 
 #include "sndfile.h"
 

src/blockfile/ODDecodeBlockFile.cpp

@@ -27,6 +27,7 @@ The summary is eventually computed and written to a file in a background thread.
 #include <wx/thread.h>
 #include <sndfile.h>
 
+#include "../DirManager.h"
 #include "../FileException.h"
 #include "../FileFormats.h"
 #include "../Internat.h"

src/blockfile/ODDecodeBlockFile.h

@@ -30,7 +30,6 @@ Also, see ODPCMAliasBlockFile for a similar file.
 #include "SimpleBlockFile.h"
 #include "../BlockFile.h"
 #include "../ondemand/ODTaskThread.h"
-#include "../DirManager.h"
 #include "../ondemand/ODDecodeTask.h"
 #include <wx/atomic.h> // member variable
 

src/blockfile/ODPCMAliasBlockFile.cpp

@@ -30,6 +30,7 @@ The summary is eventually computed and written to a file in a background thread.
 
 #include "../AudacityApp.h"
 #include "PCMAliasBlockFile.h"
+#include "../DirManager.h"
 #include "../FileFormats.h"
 #include "../Internat.h"
 

src/blockfile/ODPCMAliasBlockFile.h

@@ -39,7 +39,6 @@ Some of these methods have been overridden only because they used the unsafe wxL
 #include "PCMAliasBlockFile.h"
 #include "../BlockFile.h"
 #include "../ondemand/ODTaskThread.h"
-#include "../DirManager.h"
 
 /// An AliasBlockFile that references uncompressed data in an existing file
 class ODPCMAliasBlockFile final : public PCMAliasBlockFile

src/blockfile/PCMAliasBlockFile.cpp

@@ -23,10 +23,7 @@
 #include "../Internat.h"
 #include "../MemoryX.h"
 
-#include "../ondemand/ODManager.h"
-#include "../AudioIO.h"
-
-extern AudioIO *gAudioIO;
+#include "../DirManager.h"
 
 PCMAliasBlockFile::PCMAliasBlockFile(
       wxFileNameWrapper &&fileName,

src/blockfile/PCMAliasBlockFile.h

@@ -12,7 +12,8 @@
 #define __AUDACITY_PCMALIASBLOCKFILE__
 
 #include "../BlockFile.h"
-#include "../DirManager.h"
+
+class DirManager;
 
 /// An AliasBlockFile that references uncompressed data in an existing file
 class PCMAliasBlockFile /* not final */ : public AliasBlockFile

src/blockfile/SilentBlockFile.cpp

@@ -12,6 +12,8 @@
 #include "SilentBlockFile.h"
 
 #include "../FileFormats.h"
+#include "../xml/XMLTagHandler.h"
+#include "../xml/XMLWriter.h"
 
 SilentBlockFile::SilentBlockFile(size_t sampleLen):
 BlockFile{ wxFileNameWrapper{}, sampleLen }

src/blockfile/SilentBlockFile.h

@@ -15,7 +15,8 @@
 #define __AUDACITY_SILENT_BLOCKFILE__
 
 #include "../BlockFile.h"
-#include "../DirManager.h"
+
+class DirManager;
 
 /// A BlockFile containing nothing but silence.  Saves disk space.
 class SilentBlockFile final : public BlockFile {

src/blockfile/SimpleBlockFile.cpp

@@ -66,6 +66,7 @@ to get its definition, rather than rolling our own.
 #include <wx/utils.h>
 #include <wx/log.h>
 
+#include "../DirManager.h"
 #include "../FileException.h"
 #include "../Prefs.h"
 

src/blockfile/SimpleBlockFile.h

@@ -12,8 +12,8 @@
 #define __AUDACITY_SIMPLE_BLOCKFILE__
 
 #include "../BlockFile.h"
-#include "../DirManager.h"
-#include "../xml/XMLWriter.h"
+
+class DirManager;
 
 struct SimpleBlockFileCache {
    bool active;

src/commands/AudacityCommand.cpp

@@ -22,6 +22,8 @@ ShuttleGui.
 #include "../Audacity.h"
 #include "AudacityCommand.h"
 
+#include "CommandContext.h"
+
 #include <algorithm>
 
 #include <wx/defs.h>
@@ -35,30 +37,16 @@ ShuttleGui.
 
 #include "audacity/ConfigInterface.h"
 
-#include "../AudacityException.h"
-#include "../AudioIO.h"
-#include "../LabelTrack.h"
-#include "../Mix.h"
-#include "../Prefs.h"
 #include "../Project.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
-#include "../WaveTrack.h"
-#include "../widgets/AButton.h"
 #include "../widgets/ProgressDialog.h"
-#include "../ondemand/ODManager.h"
 #include "../widgets/HelpSystem.h"
-#include "../widgets/LinkingHtmlWindow.h"
 #include "../widgets/ErrorDialog.h"
-#include "../FileNames.h"
-#include "../widgets/HelpSystem.h"
-
-#include "../commands/CommandTargets.h"
 
 #include "../commands/ScreenshotCommand.h"
 
 #include <unordered_map>
-#include "../commands/CommandContext.h"
 
 AudacityCommand::AudacityCommand()
 {

src/commands/AudacityCommand.h

@@ -18,25 +18,25 @@
 
 #include "../MemoryX.h"
 #include <wx/defs.h>
+#include <wx/event.h> // to inherit
 
-class wxWindow;
+#include "../widgets/wxPanelWrapper.h" // to inherit
 
-#include "../SampleFormat.h"
-#include "../SelectedRegion.h"
 #include "../Internat.h"
 #include "../include/audacity/ComponentInterface.h"
 #include "../include/audacity/EffectAutomationParameters.h" // for command automation
 
-#include "../Track.h"
-#include "../effects/Effect.h"
 #include "../Registrar.h"
 
 class ShuttleGui;
 
 #define BUILTIN_GENERIC_COMMAND_PREFIX wxT("Built-in AudacityCommand: ")
 
+class AudacityCommand;
 class AudacityProject;
 class CommandContext;
+class EffectUIHostInterface;
+class ProgressDialog;
 
 
 class AUDACITY_DLL_API AudacityCommand /* not final */ : public wxEvtHandler,

src/commands/OpenSaveCommands.cpp

@@ -17,7 +17,6 @@
 #include "../Audacity.h"
 #include "OpenSaveCommands.h"
 
-#include "../Menus.h"
 #include "../Project.h"
 #include "../export/Export.h"
 #include "../Shuttle.h"

src/commands/SelectCommand.cpp

@@ -40,6 +40,7 @@ explicitly code all three.
 #include "../TrackPanel.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
+#include "../effects/Effect.h"
 #include "CommandContext.h"
 
 

src/commands/SetClipCommand.cpp

@@ -26,7 +26,6 @@
 #include "../WaveTrack.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
-#include "CommandContext.h"
 
 SetClipCommand::SetClipCommand()
 {
@@ -73,9 +72,8 @@ void SetClipCommand::PopulateOrExchange(ShuttleGui & S)
    S.EndMultiColumn();
 }
 
-bool SetClipCommand::ApplyInner( const CommandContext & context, Track * t )
+bool SetClipCommand::ApplyInner( const CommandContext &, Track * t )
 {
-   static_cast<void>(context);
    // if no 'At' is specified, then any clip in any selected track will be set.
    t->TypeSwitch([&](WaveTrack *waveTrack) {
       WaveClipPointers ptrs( waveTrack->SortedClipArray());

src/commands/SetEnvelopeCommand.cpp

@@ -27,7 +27,6 @@
 #include "../Envelope.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
-#include "CommandContext.h"
 
 SetEnvelopeCommand::SetEnvelopeCommand()
 {
@@ -54,9 +53,8 @@ void SetEnvelopeCommand::PopulateOrExchange(ShuttleGui & S)
    S.EndMultiColumn();
 }
 
-bool SetEnvelopeCommand::ApplyInner( const CommandContext & context, Track * t )
+bool SetEnvelopeCommand::ApplyInner( const CommandContext &, Track * t )
 {
-   static_cast<void>(context);
    // if no time is specified, then
    //   - delete deletes any envelope in selected tracks.
    //   - value is not set for any clip

src/export/ExportMP3.cpp

@@ -88,7 +88,6 @@
 #include "../Project.h"
 #include "../ShuttleGui.h"
 #include "../Tags.h"
-#include "../Track.h"
 #include "../widgets/HelpSystem.h"
 #include "../widgets/LinkingHtmlWindow.h"
 #include "../widgets/ErrorDialog.h"

src/ondemand/ODComputeSummaryTask.h

@@ -22,6 +22,7 @@ updating the ODPCMAliasBlockFile and the GUI of the newly available data.
 #include <vector>
 #include "ODTask.h"
 #include "ODTaskThread.h"
+#include "../Internat.h"
 class ODPCMAliasBlockFile;
 class WaveTrack;
 

src/ondemand/ODDecodeFlacTask.h

@@ -29,6 +29,7 @@ robust enough to allow all the user changes such as copy/paste, DELETE, and so o
 #define __AUDACITY_ODDecodeFLACTask__
 
 #include <vector>
+#include <wx/ffile.h> // data member
 #include "ODDecodeTask.h"
 #include "ODTaskThread.h"
 

src/ondemand/ODDecodeTask.h

@@ -32,6 +32,7 @@ robust enough to allow all the user changes such as copy/paste, DELETE, and so o
 #include <vector>
 #include "ODTask.h"
 #include "ODTaskThread.h"
+#include "../Internat.h"
 class ODDecodeBlockFile;
 class WaveTrack;
 class ODFileDecoder;

src/ondemand/ODTask.h

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

src/prefs/BatchPrefs.cpp

@@ -23,10 +23,7 @@ setting used in debugging batch (aka macros) processing.
 
 #include "../Languages.h"
 #include "../Prefs.h"
-#include "../Project.h"
-#include "../BatchCommandDialog.h"
 #include "../ShuttleGui.h"
-#include "../toolbars/ToolManager.h"
 
 BEGIN_EVENT_TABLE(BatchPrefs, PrefsPanel)
 END_EVENT_TABLE()

src/prefs/EffectsPrefs.cpp

@@ -26,7 +26,6 @@
 #include <wx/defs.h>
 
 #include "../Languages.h"
-#include "../PluginManager.h"
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
 

src/prefs/ExtImportPrefs.cpp

@@ -23,6 +23,7 @@
 
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
+#include "../import/Import.h"
 #include "../widgets/ErrorDialog.h"
 #include "../widgets/Grid.h"
 

src/prefs/ExtImportPrefs.h

@@ -16,7 +16,6 @@
 
 #include "PrefsPanel.h"
 
-#include "../import/Import.h"
 #include "../import/ImportPlugin.h"
 
 class wxButton;
@@ -24,6 +23,7 @@ class wxGridEvent;
 class wxGridRangeSelectEvent;
 class wxListCtrl;
 class wxListEvent;
+class ExtImportItem;
 class ExtImportPrefs;
 class Grid;
 class ShuttleGui;

src/prefs/MidiIOPrefs.cpp

@@ -37,13 +37,13 @@ other settings.
 
 #include "../../lib-src/portmidi/pm_common/portmidi.h"
 
-#include "../AudioIO.h"
 #include "../Internat.h"
 #include "../Prefs.h"
-#include "../Project.h"
 #include "../ShuttleGui.h"
 #include "../widgets/ErrorDialog.h"
 
+#define DEFAULT_SYNTH_LATENCY 5
+
 enum {
    HostID = 10000,
    PlayID,

src/prefs/TracksPrefs.cpp

@@ -27,7 +27,6 @@
 
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
-#include "../WaveTrack.h"
 
 #include "../Internat.h"
 

src/toolbars/ScrubbingToolBar.cpp

@@ -41,7 +41,6 @@
 #include "../UndoManager.h"
 #include "../widgets/AButton.h"
 #include "../tracks/ui/Scrubbing.h"
-#include "../commands/CommandContext.h"
 
 IMPLEMENT_CLASS(ScrubbingToolBar, ToolBar);
 

src/widgets/ErrorDialog.cpp

@@ -34,7 +34,6 @@
 #include <wx/statusbr.h>
 
 #include "LinkingHtmlWindow.h"
-#include "../Theme.h"
 #include "../AllThemeResources.h"
 #include "../ShuttleGui.h"
 #include "../HelpText.h"

src/widgets/HelpSystem.cpp

@@ -22,6 +22,7 @@
 #include <wx/intl.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
+#include <wx/textctrl.h>
 #include <wx/utils.h>
 #include <wx/html/htmlwin.h>
 #include <wx/settings.h>
@@ -37,8 +38,6 @@
 #include "../Project.h"
 #include "../Prefs.h"
 
-#include "ErrorDialog.h"
-
 #ifdef USE_ALPHA_MANUAL
 const wxString HelpSystem::HelpHostname = wxT("alphamanual.audacityteam.org");
 const wxString HelpSystem::HelpServerHomeDir = wxT("/man/");

src/widgets/LinkingHtmlWindow.cpp

@@ -29,7 +29,6 @@
 #include "../HelpText.h"
 #include "../FileNames.h"
 #include "../Prefs.h"
-#include "ErrorDialog.h"
 #include "HelpSystem.h"
 
 BEGIN_EVENT_TABLE(BrowserDialog, wxDialogWrapper)

src/widgets/MultiDialog.cpp

@@ -35,7 +35,7 @@ for each problem encountered, since there can be many orphans.
 #include <wx/radiobox.h>
 
 #include "../Menus.h"
-#include "../commands/CommandContext.h"
+#include "wxPanelWrapper.h"
 
 class MultiDialog final : public wxDialogWrapper
 {