Remove unnecessary #include-s from .cpp files...

... Unnecessary because transitively included.

But each .cpp file still includes its own .h file near the top to ensure
that it compiles indenendently, even if it is reincluded transitively later.

src/AColor.cpp

@@ -30,7 +30,6 @@ It is also a place to document colour usage policy in Audacity
 #include <wx/settings.h>
 #include <wx/utils.h>
 
-#include "Theme.h"
 #include "AllThemeResources.h"
 
 void DCUnchanger::operator () (wxDC *pDC) const

src/AboutDialog.cpp

@@ -39,11 +39,9 @@ hold information about one contributor to Audacity.
 #include <wx/intl.h>
 
 #include "FileNames.h"
-#include "Internat.h"
 #include "ShuttleGui.h"
 #include "widgets/LinkingHtmlWindow.h"
 
-#include "Theme.h"
 #include "AllThemeResources.h"
 
 // DA: Logo for About box.

src/AudacityApp.cpp

@@ -68,7 +68,6 @@ It handles initialization and termination by subclassing wxApp.
 #include <wx/msw/registry.h> // for wxRegKey
 #endif
 
-#include "AudacityException.h"
 #include "AudacityLogger.h"
 #include "AboutDialog.h"
 #include "AColor.h"
@@ -80,12 +79,10 @@ It handles initialization and termination by subclassing wxApp.
 #include "effects/Contrast.h"
 #include "widgets/ASlider.h"
 #include "FFmpeg.h"
-#include "Internat.h"
 #include "LangChoice.h"
 #include "Languages.h"
 #include "Menus.h"
 #include "PluginManager.h"
-#include "Prefs.h"
 #include "Project.h"
 #include "Screenshot.h"
 #include "Sequence.h"
@@ -99,7 +96,6 @@ It handles initialization and termination by subclassing wxApp.
 #include "FFT.h"
 #include "BlockFile.h"
 #include "ondemand/ODManager.h"
-#include "commands/Keyboard.h"
 #include "widgets/ErrorDialog.h"
 #include "prefs/DirectoriesPrefs.h"
 #include "tracks/ui/Scrubbing.h"

src/AudacityLogger.cpp

@@ -30,7 +30,6 @@ Provides thread-safe logging based on the wxWidgets log facility.
 
 #include "../images/AudacityLogoAlpha.xpm"
 #include "widgets/ErrorDialog.h"
-#include "Internat.h"
 
 //
 // AudacityLogger class

src/AudioIO.cpp

@@ -448,7 +448,6 @@ TimeTrack and AudioIOListener and whether the playback is looped.
 #include <wx/txtstrm.h>
 
 #include "AudacityApp.h"
-#include "AudacityException.h"
 #include "Mix.h"
 #include "Resample.h"
 #include "RingBuffer.h"

src/BatchCommandDialog.cpp

@@ -42,9 +42,7 @@ selected command.
 
 
 #include "Project.h"
-#include "commands/CommandManager.h"
 #include "effects/EffectManager.h"
-#include "BatchCommands.h"
 #include "ShuttleGui.h"
 #include "widgets/HelpSystem.h"
 

src/BatchCommands.cpp

@@ -28,7 +28,6 @@ processing.  See also MacrosWindow and ApplyMacroDialog.
 #include "commands/CommandManager.h"
 #include "effects/EffectManager.h"
 #include "FileNames.h"
-#include "Internat.h"
 #include "Menus.h"
 #include "PluginManager.h"
 #include "Prefs.h"
@@ -38,13 +37,10 @@ processing.  See also MacrosWindow and ApplyMacroDialog.
 #include "export/ExportOGG.h"
 #include "export/ExportPCM.h"
 
-#include "Theme.h"
 #include "AllThemeResources.h"
 
-#include "Track.h"
 #include "widgets/ErrorDialog.h"
 
-#include "commands/CommandFunctors.h"
 #include "commands/CommandContext.h"
 
 // KLUDGE: All commands should be on the same footing

src/BatchProcessDialog.cpp

@@ -38,21 +38,16 @@
 #include <wx/imaglist.h>
 #include <wx/settings.h>
 
-#include "AudacityException.h"
 #include "ShuttleGui.h"
 #include "Menus.h"
 #include "Prefs.h"
 #include "Project.h"
-#include "Internat.h"
 #include "commands/CommandManager.h"
 #include "effects/Effect.h"
 #include "../images/Arrow.xpm"
 #include "../images/Empty9x16.xpm"
-#include "BatchCommands.h"
-#include "Track.h"
 #include "UndoManager.h"
 
-#include "Theme.h"
 #include "AllThemeResources.h"
 
 #include "FileDialog.h"

src/BlockFile.cpp

@@ -50,8 +50,6 @@ out.
 #include <wx/ffile.h>
 #include <wx/log.h>
 
-#include "Internat.h"
-#include "MemoryX.h"
 #include "sndfile.h"
 #include "FileException.h"
 #include "FileFormats.h"

src/CellularPanel.cpp

@@ -33,7 +33,6 @@
 #include <wx/setup.h> // for wxUSE_* macros
 #include "Project.h"
 #include "UIHandle.h"
-#include "TrackPanelCell.h"
 #include "TrackPanelMouseEvent.h"
 #include "HitTestResult.h"
 #include "RefreshCode.h"

src/CrossFade.cpp

@@ -16,9 +16,6 @@ been abandoned.
 
 #include "CrossFade.h"
 
-#include "SampleFormat.h"
-#include "WaveClip.h"
-
 #include <iostream>
 #include <vector>
 

src/Dependencies.cpp

@@ -51,7 +51,6 @@ AliasedFile s.
 
 #include "BlockFile.h"
 #include "DirManager.h"
-#include "Internat.h"
 #include "Prefs.h"
 #include "Project.h"
 #include "Sequence.h"

src/DirManager.cpp

@@ -64,8 +64,6 @@
 #include "Audacity.h" // for __UNIX__
 #include "DirManager.h"
 
-#include "MemoryX.h"
-
 #include <time.h> // to use time() for srand()
 
 #include <wx/wxcrtvararg.h>
@@ -89,19 +87,13 @@
 #endif
 
 #include "AudacityApp.h"
-#include "AudacityException.h"
-#include "BlockFile.h"
-#include "FileException.h"
 #include "FileNames.h"
 #include "blockfile/LegacyBlockFile.h"
 #include "blockfile/LegacyAliasBlockFile.h"
-#include "blockfile/SimpleBlockFile.h"
 #include "blockfile/SilentBlockFile.h"
-#include "blockfile/PCMAliasBlockFile.h"
 #include "blockfile/ODPCMAliasBlockFile.h"
 #include "blockfile/ODDecodeBlockFile.h"
 #include "InconsistencyException.h"
-#include "Internat.h"
 #include "Project.h"
 #include "Prefs.h"
 #include "Sequence.h"
@@ -112,8 +104,6 @@
 
 #include "ondemand/ODManager.h"
 
-#include "Track.h"
-
 #if defined(__WXMAC__)
 #include <mach/mach.h>
 #include <mach/vm_statistics.h>

src/FFT.cpp

@@ -44,7 +44,6 @@
 
 #include "Internat.h"
 
-#include "MemoryX.h"
 #include "SampleFormat.h"
 
 #include <wx/wxcrtvararg.h>

src/FFmpeg.cpp

@@ -21,7 +21,6 @@ License: GPL v2.  See License.txt.
 #include "FFmpeg.h"
 
 #include "FileNames.h"
-#include "Internat.h"
 #include "widgets/HelpSystem.h"
 #include "widgets/ErrorDialog.h"
 

src/FileException.cpp

@@ -9,7 +9,6 @@
 #include "Audacity.h"
 #include "FileException.h"
 
-#include "Internat.h"
 #include "Prefs.h"
 
 FileException::~FileException()

src/FileFormats.cpp

@@ -18,7 +18,6 @@ information.
 #include "Audacity.h"
 #include "FileFormats.h"
 
-#include "MemoryX.h"
 #include <wx/arrstr.h>
 #include <wx/intl.h>
 #include "sndfile.h"
@@ -28,8 +27,6 @@ information.
 #error Requires libsndfile 1.0 or higher
 #endif
 
-#include "Internat.h"
-
 //
 // enumerating headers
 //

src/FreqWindow.cpp

@@ -72,13 +72,11 @@ and in the spectrogram spectral selection.
 #include "ShuttleGui.h"
 #include "AColor.h"
 #include "FFT.h"
-#include "Internat.h"
 #include "PitchName.h"
 #include "prefs/GUISettings.h"
 #include "Prefs.h"
 #include "Project.h"
 #include "WaveClip.h"
-#include "Theme.h"
 #include "AllThemeResources.h"
 
 #include "FileNames.h"

src/HelpText.cpp

@@ -23,7 +23,6 @@
 #include "FileNames.h"
 #include "AboutDialog.h"
 #include "AllThemeResources.h"
-#include "Internat.h"
 
 
 wxString HtmlColourOfIndex( int i ){

src/HistoryWindow.cpp

@@ -39,7 +39,6 @@ undo memory so as to free up space.
 #include "UndoManager.h"
 #include "Project.h"
 #include "ShuttleGui.h"
-#include "Track.h"
 
 enum {
    ID_AVAIL = 1000,

src/ImageManipulation.cpp

@@ -28,7 +28,6 @@ channel.  This collection of functions fills that gap.
 #include <wx/image.h>
 
 #include "AllThemeResources.h"
-#include "Theme.h"
 
 /// This looks at the first pixel in the image, and shifts
 /// the entire image by the vector difference between that

src/InconsistencyException.cpp

@@ -9,8 +9,6 @@
 #include "Audacity.h"
 #include "InconsistencyException.h"
 
-#include "Internat.h"
-
 InconsistencyException::~InconsistencyException()
 {
 }

src/InterpolateAudio.cpp

@@ -16,7 +16,6 @@
 #include <wx/defs.h>
 
 #include "Matrix.h"
-#include "SampleFormat.h"
 
 static inline int imin(int x, int y)
 {

src/LabelDialog.cpp

@@ -31,12 +31,9 @@
 #include <wx/textdlg.h>
 
 #include "ShuttleGui.h"
-#include "Internat.h"
 #include "LabelTrack.h"
 #include "Prefs.h"
 #include "Project.h"
-#include "ViewInfo.h"
-#include "widgets/NumericTextCtrl.h"
 #include "widgets/ErrorDialog.h"
 #include "widgets/Grid.h"
 #include "widgets/HelpSystem.h"

src/LabelTrack.cpp

@@ -58,10 +58,8 @@ for drawing different aspects of the label and its text box.
 
 #include "AudioIO.h"
 #include "DirManager.h"
-#include "Internat.h"
 #include "Prefs.h"
 #include "RefreshCode.h"
-#include "Theme.h"
 #include "AllThemeResources.h"
 #include "AColor.h"
 #include "Project.h"

src/LangChoice.cpp

@@ -27,9 +27,7 @@ of languages for Audacity.
 
 #include "Languages.h"
 #include "ShuttleGui.h"
-#include "widgets/wxPanelWrapper.h"
 #include "widgets/ErrorDialog.h"
-#include "Internat.h"
 
 class LangChoiceDialog final : public wxDialogWrapper {
 public:

src/Legacy.cpp

@@ -40,7 +40,6 @@ On failure the old version is put back in place.
 #include <wx/string.h>
 #include <wx/textfile.h>
 
-#include "Internat.h"
 #include "widgets/ErrorDialog.h"
 #include "xml/XMLWriter.h"
 

src/Lyrics.cpp

@@ -19,7 +19,6 @@
 #include <wx/mimetype.h>
 
 #include "AudioIO.h"
-#include "Internat.h"
 #include "Project.h" // for GetActiveProject
 #include "LabelTrack.h"
 #include "commands/CommandManager.h"

src/Menus.cpp

@@ -42,7 +42,6 @@
 #include "Project.h"
 #include "TrackPanel.h"
 #include "UndoManager.h"
-#include "WaveTrack.h"
 #include "commands/CommandManager.h"
 #include "effects/EffectManager.h"
 #include "prefs/TracksPrefs.h"

src/Mix.cpp

@@ -32,7 +32,6 @@
 #include <wx/intl.h>
 
 #include "WaveTrack.h"
-#include "Internat.h"
 #include "Prefs.h"
 #include "Resample.h"
 #include "TimeTrack.h"

src/MixerBoard.cpp

@@ -25,7 +25,6 @@
 #include <wx/icon.h>
 #include <wx/settings.h> // for wxSystemSettings::GetColour and wxSystemSettings::GetMetric
 
-#include "Theme.h"
 #include "AColor.h"
 #include "AllThemeResources.h"
 #include "AudioIO.h"

src/ModuleManager.cpp

@@ -30,7 +30,6 @@ i.e. an alternative to the usual interface, for Audacity.
 
 #include "AudacityApp.h"
 #include "FileNames.h"
-#include "Internat.h"
 #include "PluginManager.h"
 
 #include "commands/ScriptCommandRelay.h"

src/NoteTrack.cpp

@@ -32,9 +32,7 @@
 
 #include "AColor.h"
 #include "DirManager.h"
-#include "Internat.h"
 #include "Prefs.h"
-#include "effects/TimeWarper.h"
 
 #include "InconsistencyException.h"
 

src/Prefs.cpp

@@ -65,7 +65,6 @@
 #include "Languages.h"
 
 #include "widgets/ErrorDialog.h"
-#include "Internat.h"
 
 std::unique_ptr<AudacityPrefs> ugPrefs {};
 

src/Printing.cpp

@@ -31,7 +31,6 @@
 #include "widgets/ErrorDialog.h"
 
 #include "TrackPanelDrawingContext.h"
-#include "Internat.h"
 
 // Globals, so that we remember settings from session to session
 wxPrintData &gPrintData()

src/Project.cpp

@@ -94,7 +94,6 @@ scroll information.  It also has some status flags.
 #endif
 
 #include "AdornedRulerPanel.h"
-#include "AudacityException.h"
 #include "FreqWindow.h"
 #include "effects/Contrast.h"
 #include "AutoRecovery.h"
@@ -107,7 +106,6 @@ scroll information.  It also has some status flags.
 #include "HistoryWindow.h"
 #include "InconsistencyException.h"
 #include "MixerBoard.h"
-#include "Internat.h"
 #include "import/Import.h"
 #include "LabelTrack.h"
 #include "Legacy.h"
@@ -122,30 +120,22 @@ scroll information.  It also has some status flags.
 #include "TimeTrack.h"
 #include "TrackPanel.h"
 #include "WaveClip.h"
-#include "WaveTrack.h"
 #include "DirManager.h"
-#include "commands/CommandManager.h"
-#include "effects/Effect.h"
 #include "prefs/PrefsDialog.h"
 #include "widgets/LinkingHtmlWindow.h"
-#include "widgets/ASlider.h"
 #include "widgets/ErrorDialog.h"
 #include "widgets/Warning.h"
 #include "xml/XMLFileReader.h"
 #include "PlatformCompatibility.h"
 #include "effects/EffectManager.h"
-#include "export/Export.h"
 #include "FileNames.h"
-#include "BlockFile.h"
 #include "ondemand/ODManager.h"
-#include "ondemand/ODTask.h"
 #include "ondemand/ODComputeSummaryTask.h"
 #ifdef EXPERIMENTAL_OD_FLAC
 #include "ondemand/ODDecodeFlacTask.h"
 #endif
 #include "ModuleManager.h"
 
-#include "Theme.h"
 #include "AllThemeResources.h"
 
 #include "FileDialog.h"
@@ -169,9 +159,7 @@ scroll information.  It also has some status flags.
 
 #include "commands/ScriptCommandRelay.h"
 #include "commands/CommandTargets.h"
-#include "commands/Command.h"
 #include "commands/CommandType.h"
-#include "commands/CommandContext.h"
 
 #include "prefs/QualityPrefs.h"
 #include "prefs/TracksPrefs.h"
@@ -207,7 +195,6 @@ const int sbarSpaceWidth = 15;
 const int sbarControlWidth = 15;
 const int sbarExtraLen = 0;
 const int sbarHjump = 30;       //STM: This is how far the thumb jumps when the l/r buttons are pressed, or auto-scrolling occurs -- in pixels
-#include "Theme.h"
 #include "AllThemeResources.h"
 #endif
 

src/SampleFormat.cpp

@@ -44,7 +44,6 @@
 
 #include "Prefs.h"
 #include "Dither.h"
-#include "Internat.h"
 #include "prefs/QualityPrefs.h"
 
 static DitherType gLowQualityDither = DitherType::none;

src/Screenshot.cpp

@@ -17,7 +17,6 @@ It forwards the actual work of doing the commands to the ScreenshotCommand.
 ***********************************************************************/
 
 #include "Screenshot.h"
-#include "MemoryX.h"
 #include "commands/ScreenshotCommand.h"
 #include "commands/CommandTargets.h"
 #include "commands/CommandContext.h"

src/SelectedRegion.cpp

@@ -12,8 +12,6 @@ Paul Licameli
 
 #include "Experimental.h"
 
-#include "Internat.h"
-
 #include "xml/XMLWriter.h"
 
 const wxChar *SelectedRegion::sDefaultT0Name = wxT("selStart");

src/Sequence.cpp

@@ -40,13 +40,9 @@
 #include <wx/ffile.h>
 #include <wx/log.h>
 
-#include "AudacityException.h"
-
-#include "BlockFile.h"
 #include "blockfile/ODDecodeBlockFile.h"
 #include "DirManager.h"
 
-#include "blockfile/SimpleBlockFile.h"
 #include "blockfile/SilentBlockFile.h"
 
 #include "InconsistencyException.h"

src/ShuttleGui.cpp

@@ -99,9 +99,8 @@ for registering for changes.
 #include "Experimental.h"
 
 #include "Prefs.h"
-#include "Shuttle.h"
+#include "ShuttlePrefs.h"
 
-#include "MemoryX.h"
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/wx.h>
 #include <wx/wxprec.h>
@@ -113,8 +112,6 @@ for registering for changes.
 #include <wx/stattext.h>
 #include <wx/bmpbuttn.h>
 #include "../include/audacity/ComponentInterface.h"
-#include "Internat.h"
-#include "WrappedType.h"
 #include "widgets/wxPanelWrapper.h"
 #include "AllThemeResources.h"
 
@@ -2127,9 +2124,7 @@ void SetIfCreated( wxStaticText *&Var, wxStaticText * Val )
 // two files at some later date.
 #include "../extnpanel-src/GuiWaveTrack.h"
 #endif
-#include "./widgets/Ruler.h"
 #include "./widgets/AttachableScrollBar.h"
-#include "ShuttlePrefs.h"
 
 ShuttleGui::ShuttleGui(wxWindow * pParent, teShuttleMode ShuttleMode) :
    ShuttleGuiBase( pParent, ShuttleMode )

src/ShuttlePrefs.cpp

@@ -30,7 +30,6 @@
 #include <wx/defs.h>
 
 #include "Project.h"
-#include "Shuttle.h"
 #include "WrappedType.h"
 #include "Prefs.h"
 

src/SoundActivatedRecord.cpp

@@ -24,7 +24,6 @@
 #include "ShuttleGui.h"
 #include "Prefs.h"
 #include "prefs/GUISettings.h"
-#include "Internat.h"
 
 BEGIN_EVENT_TABLE(SoundActivatedRecord, wxDialogWrapper)
    EVT_BUTTON(wxID_OK, SoundActivatedRecord::OnOK)

src/Spectrum.cpp

@@ -17,8 +17,6 @@
 
 #include <math.h>
 
-#include "FFT.h"
-
 #include "SampleFormat.h"
 
 bool ComputeSpectrum(const float * data, size_t width,

src/SplashDialog.cpp

@@ -35,12 +35,10 @@ most commonly asked questions about Audacity.
 #include <wx/image.h>
 
 #include "FileNames.h"
-#include "Internat.h"
 #include "ShuttleGui.h"
 #include "widgets/ErrorDialog.h"
 #include "widgets/LinkingHtmlWindow.h"
 
-#include "Theme.h"
 #include "AllThemeResources.h"
 #include "Prefs.h"
 #include "HelpText.h"

src/Tags.cpp

@@ -44,7 +44,6 @@
 #endif
 
 #include "FileNames.h"
-#include "Internat.h"
 #include "Prefs.h"
 #include "ShuttleGui.h"
 #include "TranslatableStringArray.h"

src/Theme.cpp

@@ -73,7 +73,6 @@ can't be.
 #include <wx/settings.h>
 
 #include "Project.h"
-#include "toolbars/ToolBar.h"
 #include "toolbars/ToolManager.h"
 #include "AllThemeResources.h"  // can remove this later, only needed for 'XPMS_RETIRED'.
 #include "FileNames.h"

src/TimeDialog.cpp

@@ -21,7 +21,6 @@
 #include <wx/sizer.h>
 #include <wx/string.h>
 
-#include "widgets/NumericTextCtrl.h"
 #include "ShuttleGui.h"
 
 BEGIN_EVENT_TABLE(TimeDialog, wxDialogWrapper)

src/TimeTrack.cpp

@@ -28,8 +28,6 @@
 #include "Prefs.h"
 #include "Project.h"
 #include "TrackArtist.h"
-#include "Internat.h"
-#include "ViewInfo.h"
 #include "AllThemeResources.h"
 
 //TODO-MB: are these sensible values?

src/TimerRecordDialog.cpp

@@ -46,7 +46,6 @@
 #include "ShuttleGui.h"
 #include "Menus.h"
 #include "Project.h"
-#include "Internat.h"
 #include "Prefs.h"
 #include "widgets/NumericTextCtrl.h"
 #include "widgets/HelpSystem.h"

src/TrackArtist.cpp

@@ -74,7 +74,6 @@ audio tracks.
 #include "Envelope.h"
 #include "NumberScale.h"
 #include "WaveClip.h"
-#include "WaveTrack.h"
 #include "LabelTrack.h"
 #include "TimeTrack.h"
 #include "Prefs.h"
@@ -86,7 +85,6 @@ audio tracks.
 #include "TrackPanel.h"
 #include "ViewInfo.h"
 #include "widgets/Ruler.h"
-#include "Theme.h"
 #include "AllThemeResources.h"
 #include "TrackPanelDrawingContext.h"
 

src/TrackPanelAx.cpp

@@ -32,7 +32,6 @@
 
 #include "Track.h"
 #include "TrackPanel.h"
-#include "Internat.h"
 
 TrackPanelAx::TrackPanelAx( wxWindow *window )
 #if wxUSE_ACCESSIBILITY

src/TrackPanelResizeHandle.cpp

@@ -11,15 +11,12 @@ Paul Licameli split from TrackPanel.cpp
 #include "Audacity.h"
 #include "TrackPanelResizeHandle.h"
 
-#include "MemoryX.h"
-
 #include <wx/cursor.h>
 #include <wx/translation.h>
 
 #include "HitTestResult.h"
 #include "Project.h"
 #include "RefreshCode.h"
-#include "Track.h"
 #include "TrackPanelMouseEvent.h"
 #include "tracks/ui/TrackControls.h"
 

src/UndoManager.cpp

@@ -27,7 +27,6 @@ UndoManager
 
 #include "BlockFile.h"
 #include "Diags.h"
-#include "Internat.h"
 #include "Project.h"
 #include "Sequence.h"
 #include "WaveClip.h"

src/ViewInfo.cpp

@@ -15,11 +15,9 @@ Paul Licameli
 #include <algorithm>
 
 #include "AudioIO.h"
-#include "Internat.h"
 #include "Project.h"
 #include "prefs/GUISettings.h"
 #include "Prefs.h"
-#include "xml/XMLWriter.h"
 #include "prefs/TracksBehaviorsPrefs.h"
 
 namespace {

src/VoiceKey.cpp

@@ -32,7 +32,6 @@ or "OFF" point
 
 #include "WaveTrack.h"
 #include "widgets/ErrorDialog.h"
-#include "Internat.h"
 
 using std::cout;
 using std::endl;

src/WaveClip.cpp

@@ -24,7 +24,6 @@
 #include "Experimental.h"
 
 #include <math.h>
-#include "MemoryX.h"
 #include <functional>
 #include <vector>
 #include <wx/log.h>
@@ -35,7 +34,6 @@
 #include "Envelope.h"
 #include "Resample.h"
 #include "WaveTrack.h"
-#include "FFT.h"
 #include "Profiler.h"
 #include "InconsistencyException.h"
 #include "UserException.h"

src/WaveTrack.cpp

@@ -40,7 +40,6 @@ Track classes.
 #include <float.h>
 #include <math.h>
 #include <algorithm>
-#include "MemoryX.h"
 
 #include "float_cast.h"
 
@@ -49,7 +48,6 @@ Track classes.
 #include "Spectrum.h"
 
 #include "Project.h"
-#include "Internat.h"
 
 #include "AudioIO.h"
 #include "Prefs.h"

src/blockfile/LegacyAliasBlockFile.cpp

@@ -18,9 +18,7 @@
 
 #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

@@ -30,11 +30,8 @@
 #include <wx/utils.h>
 #include <wx/log.h>
 
-#include "../MemoryX.h"
 #include "../FileFormats.h"
-#include "../Internat.h"
 #include "../xml/XMLTagHandler.h"
-#include "../xml/XMLWriter.h"
 
 #include "sndfile.h"
 

src/blockfile/NotYetAvailableException.cpp

@@ -9,8 +9,6 @@
 #include "../Audacity.h"
 #include "NotYetAvailableException.h"
 
-#include "../Internat.h"
-
 NotYetAvailableException::~NotYetAvailableException()
 {
 }

src/blockfile/ODDecodeBlockFile.cpp

@@ -28,9 +28,7 @@ The summary is eventually computed and written to a file in a background thread.
 #include <sndfile.h>
 
 #include "../DirManager.h"
-#include "../FileException.h"
 #include "../FileFormats.h"
-#include "../Internat.h"
 #include "NotYetAvailableException.h"
 
 const int bheaderTagLen = 20;

src/blockfile/ODPCMAliasBlockFile.cpp

@@ -28,10 +28,8 @@ The summary is eventually computed and written to a file in a background thread.
 #include <wx/thread.h>
 #include <sndfile.h>
 
-#include "PCMAliasBlockFile.h"
 #include "../DirManager.h"
 #include "../FileFormats.h"
-#include "../Internat.h"
 
 #include "../ondemand/ODManager.h"
 #include "../AudioIO.h"

src/blockfile/PCMAliasBlockFile.cpp

@@ -19,8 +19,6 @@
 #include <sndfile.h>
 
 #include "../FileFormats.h"
-#include "../Internat.h"
-#include "../MemoryX.h"
 
 #include "../DirManager.h"
 

src/blockfile/SilentBlockFile.cpp

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

src/blockfile/SimpleBlockFile.cpp

@@ -67,14 +67,11 @@ to get its definition, rather than rolling our own.
 #include <wx/log.h>
 
 #include "../DirManager.h"
-#include "../FileException.h"
 #include "../Prefs.h"
 
 #include "../FileFormats.h"
 
 #include "sndfile.h"
-#include "../Internat.h"
-#include "../MemoryX.h"
 
 
 static wxUint32 SwapUintEndianess(wxUint32 in)

src/commands/Command.cpp

@@ -83,10 +83,6 @@ classes derived from it.
 #include <wx/variant.h>
 #include <wx/arrstr.h>
 
-#include "../AudacityException.h"
-#include "Validators.h"
-#include "CommandType.h"
-#include "CommandMisc.h"
 #include "CommandBuilder.h"
 #include "CommandTargets.h"
 #include "CommandDirectory.h"

src/commands/CommandBuilder.cpp

@@ -27,8 +27,6 @@ system by constructing BatchCommandEval objects.
 #include "CommandDirectory.h"
 #include "../Shuttle.h"
 #include "BatchEvalCommand.h"
-#include "Command.h"
-#include "CommandTargets.h"
 #include "ScriptCommandRelay.h"
 #include "CommandContext.h"
 

src/commands/CommandContext.cpp

@@ -23,16 +23,11 @@ messaging from a command back to its invoker.
 #include "../Audacity.h"
 #include "CommandContext.h"
 
-#include "Command.h"
 #include <map>
 #include <wx/string.h>
 #include <wx/variant.h>
 #include <wx/arrstr.h>
 
-#include "../AudacityException.h"
-#include "Validators.h"
-#include "CommandType.h"
-#include "CommandMisc.h"
 #include "CommandBuilder.h"
 #include "CommandTargets.h"
 #include "CommandDirectory.h"

src/commands/CommandDirectory.cpp

@@ -17,8 +17,6 @@ functions to look up a command by name.
 #include "../Audacity.h"
 #include "CommandDirectory.h"
 
-#include "CommandMisc.h"
-
 #include "HelpCommand.h"
 #include "MessageCommand.h"
 #include "BatchEvalCommand.h"

src/commands/CommandHandler.cpp

@@ -21,7 +21,6 @@
 
 #include <wx/event.h>
 #include "../Project.h"
-#include "Command.h"
 #include "AppCommandEvent.h"
 #include "ScriptCommandRelay.h"
 #include "../commands/CommandContext.h"

src/commands/CommandManager.cpp

@@ -82,7 +82,6 @@ CommandManager.  It holds the callback for one command.
 #include "../AudacityHeaders.h"
 #include "CommandManager.h"
 
-#include "CommandManagerWindowClasses.h"
 #include "CommandContext.h"
 
 #include <wx/defs.h>
@@ -94,12 +93,8 @@ CommandManager.  It holds the callback for one command.
 #include <wx/menu.h>
 #include <wx/tokenzr.h>
 
-#include "../AudacityException.h"
 #include "../Menus.h"
-#include "../Prefs.h"
-#include "../Project.h"
 
-#include "Keyboard.h"
 #include "../PluginManager.h"
 #include "../effects/EffectManager.h"
 #include "../widgets/LinkingHtmlWindow.h"

src/commands/CommandSignature.cpp

@@ -16,9 +16,6 @@
 #include "../Audacity.h"
 #include "CommandSignature.h"
 
-#include "CommandMisc.h"
-#include "Validators.h"
-
 CommandSignature::~CommandSignature()
 {
 }

src/commands/CommandType.cpp

@@ -20,8 +20,6 @@ Also acts as a factory.
 #include "../Audacity.h"
 #include "CommandType.h"
 
-#include "CommandMisc.h"
-#include "CommandSignature.h"
 #include <wx/string.h>
 
 OldStyleCommandType::OldStyleCommandType()

src/commands/CompareAudioCommand.cpp

@@ -21,10 +21,8 @@ threshold of difference in two selected tracks
 #include "../Audacity.h"
 #include "CompareAudioCommand.h"
 
-#include "../MemoryX.h"
 #include "../Project.h"
 #include "../WaveTrack.h"
-#include "Command.h"
 
 
 #include <float.h>
@@ -34,7 +32,6 @@ threshold of difference in two selected tracks
 #include "../ShuttleGui.h"
 #include "../widgets/ErrorDialog.h"
 #include "../widgets/valnum.h"
-#include "../SampleFormat.h"
 #include "CommandContext.h"
 
 extern void RegisterCompareAudio( Registrar & R){

src/commands/Demo.cpp

@@ -30,8 +30,6 @@ parameters.  It is for development purposes.
 #include "../ShuttleGui.h"
 #include "../widgets/ErrorDialog.h"
 #include "../widgets/valnum.h"
-#include "../SampleFormat.h"
-#include "../commands/Command.h"
 #include "../commands/CommandContext.h"
 
 bool DemoCommand::DefineParams( ShuttleParams & S ){

src/commands/DragCommand.cpp

@@ -20,7 +20,6 @@
 #include "DragCommand.h"
 
 #include "../Project.h"
-#include "../Track.h"
 #include "../TrackPanel.h"
 #include "../WaveTrack.h"
 #include "../Shuttle.h"

src/commands/GetInfoCommand.cpp

@@ -27,9 +27,7 @@ This class now lists
 #include "CommandManager.h"
 #include "../effects/EffectManager.h"
 #include "../widgets/Overlay.h"
-#include "../widgets/OverlayPanel.h"
 #include "../TrackPanel.h"
-#include "../Track.h"
 #include "../WaveClip.h"
 #include "../WaveTrack.h"
 #include "../LabelTrack.h"

src/commands/GetTrackInfoCommand.cpp

@@ -20,7 +20,6 @@
 #include "GetTrackInfoCommand.h"
 
 #include "../Project.h"
-#include "../Track.h"
 #include "../TrackPanel.h"
 #include "../NoteTrack.h"
 #include "../WaveTrack.h"

src/commands/ImportExportCommands.cpp

@@ -18,7 +18,6 @@
 #include "ImportExportCommands.h"
 
 #include "../Project.h"
-#include "../Track.h"
 #include "../export/Export.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"

src/commands/LoadCommands.cpp

@@ -18,14 +18,11 @@ modelled on BuiltinEffectsModule
 
 #include "../Prefs.h"
 
-#include "../MemoryX.h"
-
 #include "../effects/EffectManager.h"
 #include "Demo.h"
 #include "../commands/MessageCommand.h"
 #include "../commands/ScreenshotCommand.h"
 #include "../commands/CompareAudioCommand.h"
-#include "../commands/SetTrackInfoCommand.h"
 #include "../commands/GetTrackInfoCommand.h"
 #include "../commands/SelectCommand.h"
 #include "../commands/PreferenceCommands.h"

src/commands/MessageCommand.cpp

@@ -16,7 +16,6 @@
 #include "../Audacity.h"
 #include "MessageCommand.h"
 
-#include "CommandType.h"
 #include "CommandContext.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"

src/commands/ScreenshotCommand.cpp

@@ -20,7 +20,6 @@ small calculations of rectangles.
 #include "../Audacity.h"
 #include "ScreenshotCommand.h"
 
-#include "CommandTargets.h"
 #include "../Project.h"
 #include <wx/toplevel.h>
 #include <wx/dcscreen.h>
@@ -31,10 +30,8 @@ small calculations of rectangles.
 #include <wx/valgen.h>
 
 #include "../AdornedRulerPanel.h"
-#include "../Track.h"
 #include "../TrackPanel.h"
 #include "../toolbars/ToolManager.h"
-#include "../toolbars/ToolBar.h"
 #include "../Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"

src/commands/ScriptCommandRelay.cpp

@@ -24,7 +24,6 @@ code out of ModuleManager.
 #include "CommandTargets.h"
 #include "CommandBuilder.h"
 #include "AppCommandEvent.h"
-#include "ResponseQueue.h"
 #include "../Project.h"
 #include "../AudacityApp.h"
 #include <wx/string.h>

src/commands/SelectCommand.cpp

@@ -36,7 +36,6 @@ explicitly code all three.
 #include <float.h>
 
 #include "../Project.h"
-#include "../Track.h"
 #include "../TrackPanel.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"

src/commands/SetClipCommand.cpp

@@ -20,7 +20,6 @@
 #include "SetClipCommand.h"
 
 #include "../Project.h"
-#include "../Track.h"
 #include "../TrackPanel.h"
 #include "../WaveClip.h"
 #include "../WaveTrack.h"

src/commands/SetEnvelopeCommand.cpp

@@ -20,7 +20,6 @@
 #include "SetEnvelopeCommand.h"
 
 #include "../Project.h"
-#include "../Track.h"
 #include "../TrackPanel.h"
 #include "../WaveClip.h"
 #include "../WaveTrack.h"

src/commands/SetLabelCommand.cpp

@@ -20,7 +20,6 @@
 #include "SetLabelCommand.h"
 
 #include "../Project.h"
-#include "../Track.h"
 #include "../TrackPanel.h"
 #include "../WaveTrack.h"
 #include "../LabelTrack.h"

src/commands/SetProjectCommand.cpp

@@ -21,7 +21,6 @@
 #include "SetProjectCommand.h"
 
 #include "../Project.h"
-#include "../Track.h"
 #include "../TrackPanel.h"
 #include "../WaveTrack.h"
 #include "../Shuttle.h"

src/commands/SetTrackInfoCommand.cpp

@@ -37,7 +37,6 @@ SetTrackAudioCommand and SetTrackVisualsCommand.
 #include "SetTrackInfoCommand.h"
 
 #include "../Project.h"
-#include "../Track.h"
 #include "../TrackPanel.h"
 #include "../WaveTrack.h"
 #include "../prefs/WaveformSettings.h"

src/effects/AutoDuck.cpp

@@ -28,11 +28,9 @@
 
 #include "../AColor.h"
 #include "../AllThemeResources.h"
-#include "../Internat.h"
 #include "../Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
-#include "../Theme.h"
 #include "../widgets/valnum.h"
 
 #include "../WaveTrack.h"

src/effects/Compressor.cpp

@@ -45,7 +45,6 @@
 #include "../widgets/Ruler.h"
 
 #include "../WaveTrack.h"
-#include "../Theme.h"
 #include "../AllThemeResources.h"
 
 enum

src/effects/Echo.cpp

@@ -30,7 +30,6 @@
 #include "../Shuttle.h"
 #include "../widgets/ErrorDialog.h"
 #include "../widgets/valnum.h"
-#include "../SampleFormat.h"
 
 // Define keys, defaults, minimums, and maximums for the effect parameters
 //

src/effects/Effect.cpp

@@ -48,7 +48,6 @@ greater use in future.
 #include "audacity/ConfigInterface.h"
 
 #include "EffectManager.h"
-#include "../AudacityException.h"
 #include "../AudioIO.h"
 #include "../LabelTrack.h"
 #include "../Menus.h"
@@ -71,7 +70,6 @@ greater use in future.
 #include "../widgets/NumericTextCtrl.h"
 #include "../widgets/ErrorDialog.h"
 #include "../FileNames.h"
-#include "../commands/AudacityCommand.h"
 #include "../commands/CommandContext.h"
 
 #if defined(__WXMAC__)

src/effects/EffectManager.cpp

@@ -34,7 +34,6 @@ effects.
 #endif
 
 #include "../Shuttle.h"
-#include "../commands/Command.h"
 #include "../commands/CommandContext.h"
 #include "../PluginManager.h"
 

src/effects/EffectRack.cpp

@@ -18,7 +18,6 @@
 
 #if defined(EXPERIMENTAL_EFFECTS_RACK)
 
-#include "../MemoryX.h"
 #include "../UndoManager.h"
 
 #include <wx/defs.h>
@@ -35,7 +34,6 @@
 #include <wx/timer.h>
 #include <wx/tglbtn.h>
 
-#include "EffectManager.h"
 #include "../commands/CommandContext.h"
 #include "../Menus.h"
 #include "../Prefs.h"

src/effects/Equalization.cpp

@@ -103,7 +103,6 @@
 #include "../WaveTrack.h"
 #include "../widgets/Ruler.h"
 #include "../xml/XMLFileReader.h"
-#include "../Theme.h"
 #include "../AllThemeResources.h"
 #include "../float_cast.h"
 

src/effects/Equalization48x.cpp

@@ -19,7 +19,6 @@
 #include "../Experimental.h"
 
 #ifdef EXPERIMENTAL_EQ_SSE_THREADED
-#include "../MemoryX.h"
 #include "../Project.h"
 #include "Equalization.h"
 #include "../WaveTrack.h"
@@ -39,7 +38,6 @@
 
 #include <math.h>
 
-#include "../RealFFTf.h"
 #include "../RealFFTf48x.h"
 
 #ifndef USE_SSE2

src/effects/FindClipping.cpp

@@ -33,7 +33,6 @@
 
 #include "../LabelTrack.h"
 #include "../WaveTrack.h"
-#include "../MemoryX.h"
 
 // Define keys, defaults, minimums, and maximums for the effect parameters
 //

src/effects/Generator.cpp

@@ -22,7 +22,6 @@
 
 #include "TimeWarper.h"
 
-#include "../MemoryX.h"
 #include "../widgets/ErrorDialog.h"
 
 bool Generator::Process()