Remove redundant #include-s from .h files...

Redundant, because transitively implied.  But don't do this for inclusions of
Audacity.h or Experimental.h.

src/AColor.h

@@ -14,7 +14,7 @@
 #ifndef __AUDACITY_COLOR__
 #define __AUDACITY_COLOR__
 
-#include "MemoryX.h"
+#include <memory>
 #include <wx/brush.h> // member variable
 #include <wx/pen.h> // member variable
 

src/AboutDialog.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_ABOUT_DLG__
 #define __AUDACITY_ABOUT_DLG__
 
-#include "MemoryX.h"
 #include <vector>
 #include "widgets/wxPanelWrapper.h" // to inherit
 

src/AdornedRulerPanel.h

@@ -14,8 +14,6 @@
 #include "CellularPanel.h"
 #include "widgets/Ruler.h" // member variable
 
-#include "MemoryX.h"
-
 class ViewInfo;
 class AudacityProject;
 class SnapManager;

src/AudacityApp.h

@@ -19,7 +19,6 @@
 
 #include "Experimental.h"
 
-#include "MemoryX.h"
 #include <wx/app.h> // to inherit
 #include <wx/dir.h> // for wxDIR_FILES
 #include <wx/timer.h> // member variable

src/AudacityHeaders.h

@@ -53,23 +53,18 @@
 #include "FileFormats.h"
 #include "FreqWindow.h"
 #include "ImageManipulation.h"
-#include "Internat.h"
 #include "LabelTrack.h"
 #include "Mix.h"
 #include "NoteTrack.h"
 #include "Prefs.h"
 #include "Project.h"
-#include "SampleFormat.h"
 #include "Sequence.h"
 #include "TimeTrack.h"
-#include "Track.h"
 #include "UndoManager.h"
-#include "ViewInfo.h"
 #include "WaveTrack.h"
 #include "widgets/ASlider.h"
 #include "widgets/ProgressDialog.h"
 #include "widgets/Ruler.h"
-#include "xml/XMLTagHandler.h"
 
 // PRL:  These lines allow you to remove Project.h above.
 // They must be included before the definition of macro NEW below.

src/AudioIO.h

@@ -19,8 +19,8 @@
 
 #include "portaudio.h"
 
-#include "MemoryX.h"
 #include <atomic>
+#include <memory>
 #include <utility>
 #include <vector>
 #include <wx/atomic.h> // member variable

src/AutoRecovery.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_AUTORECOVERY__
 
 #include "xml/XMLTagHandler.h"
-#include "xml/XMLWriter.h"
 
 #include <wx/mstream.h> // member variables
 

src/BlockFile.h

@@ -12,8 +12,6 @@
 #ifndef __AUDACITY_BLOCKFILE__
 #define __AUDACITY_BLOCKFILE__
 
-#include "MemoryX.h"
-
 #include "SampleFormat.h"
 
 #include "wxFileNameWrapper.h" // member variable

src/CrossFade.h

@@ -15,7 +15,6 @@
 /// accepts a list of WaveClips and can do a mini-mixing
 /// to produce the desired crossfading
 
-#include "SampleFormat.h"
 #include "WaveClip.h"
 
 

src/DirManager.h

@@ -11,8 +11,6 @@
 #ifndef _DIRMANAGER_
 #define _DIRMANAGER_
 
-#include "MemoryX.h"
-
 #include "audacity/Types.h"
 #include "xml/XMLTagHandler.h"
 

src/Envelope.h

@@ -16,7 +16,6 @@
 #include <vector>
 
 #include "xml/XMLTagHandler.h"
-#include "Internat.h"
 
 class wxRect;
 class wxMouseEvent;

src/FFmpeg.h

@@ -18,10 +18,6 @@ Describes shared object that is used to access FFmpeg libraries.
 
 #include "Audacity.h" // for USE_* macros
 
-#include "MemoryX.h"
-
-#include "Internat.h"
-
 #include "widgets/wxPanelWrapper.h" // to inherit
 
 #if defined(__WXMSW__)

src/FileFormats.h

@@ -102,7 +102,6 @@ extern FileExtensions sf_get_all_extensions();
 wxString sf_normalize_name(const char *name);
 
 // This function wrapper uses a mutex to serialize calls to the SndFile library.
-#include "MemoryX.h"
 #include "ondemand/ODTaskThread.h"
 extern ODLock libSndFileMutex;
 template<typename R, typename F, typename... Args>

src/FreqWindow.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_FREQ_WINDOW__
 #define __AUDACITY_FREQ_WINDOW__
 
-#include "MemoryX.h"
 #include <vector>
 #include <wx/font.h> // member variable
 #include <wx/statusbr.h> // to inherit

src/LabelDialog.h

@@ -14,7 +14,6 @@
 #include <vector>
 #include <wx/defs.h>
 
-#include "Internat.h"
 #include "widgets/wxPanelWrapper.h" // to inherit
 #include "audacity/ComponentInterface.h" // member variable
 

src/Mix.h

@@ -20,7 +20,6 @@
 #ifndef __AUDACITY_MIX__
 #define __AUDACITY_MIX__
 
-#include "MemoryX.h"
 #include "SampleFormat.h"
 #include <vector>
 

src/Profiler.h

@@ -26,7 +26,6 @@ but it will probably work fine if you use it on a high level.
 
 #ifndef __AUDACITY_PROFILER__
 #define __AUDACITY_PROFILER__
-#include "MemoryX.h"
 #include <vector>
 #include <time.h>
 #include "ondemand/ODTaskThread.h"

src/Project.h

@@ -29,7 +29,6 @@
 
 #include "TrackPanelListener.h"
 #include "AudioIOListener.h"
-#include "xml/XMLTagHandler.h"
 #include "toolbars/SelectionBarListener.h"
 #include "toolbars/SpectralSelectionBarListener.h"
 

src/Resample.h

@@ -14,8 +14,6 @@
 
 #include "Audacity.h"
 
-#include "MemoryX.h"
-
 #include "SampleFormat.h"
 
 class EnumSetting;

src/Sequence.h

@@ -11,12 +11,10 @@
 #ifndef __AUDACITY_SEQUENCE__
 #define __AUDACITY_SEQUENCE__
 
-#include "MemoryX.h"
 #include <vector>
 
 #include "SampleFormat.h"
 #include "xml/XMLTagHandler.h"
-#include "xml/XMLWriter.h"
 #include "ondemand/ODTaskThread.h"
 
 #include "audacity/Types.h"

src/Snap.h

@@ -18,7 +18,6 @@
 #include <vector>
 #include <wx/defs.h>
 #include "widgets/NumericTextCtrl.h"
-#include "Internat.h"
 
 class AudacityProject;
 class Track;

src/SplashDialog.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_SPLASH_DLG__
 #define __AUDACITY_SPLASH_DLG__
 
-#include "MemoryX.h"
 #include "widgets/wxPanelWrapper.h" // to inherit
 
 class wxBitmap;

src/Tags.h

@@ -33,7 +33,6 @@
 
 #include "xml/XMLTagHandler.h"
 
-#include "MemoryX.h"
 #include <utility>
 
 #include "widgets/wxPanelWrapper.h" // to inherit

src/TimeDialog.h

@@ -15,7 +15,6 @@
 
 #include "widgets/NumericTextCtrl.h" // for NumericFormatSymbol
 #include "widgets/wxPanelWrapper.h" // to inherit
-#include "Internat.h"
 
 class NumericTextCtrl;
 class ShuttleGui;

src/Track.h

@@ -15,7 +15,6 @@
 
 #include "Experimental.h"
 
-#include "MemoryX.h"
 #include <vector>
 #include <list>
 #include <functional>

src/TrackPanel.h

@@ -14,7 +14,6 @@
 #include "Audacity.h" // for USE_* macros
 #include "Experimental.h"
 
-#include "MemoryX.h"
 #include <vector>
 
 #include <wx/setup.h> // for wxUSE_* macros

src/TrackPanelResizeHandle.h

@@ -11,7 +11,6 @@ Paul Licameli split from TrackPanel.cpp
 #ifndef __AUDACITY_TRACK_PANEL_RESIZE_HANDLE__
 #define __AUDACITY_TRACK_PANEL_RESIZE_HANDLE__
 
-#include "MemoryX.h"
 #include "UIHandle.h"
 
 class Track;

src/UndoManager.h

@@ -49,7 +49,6 @@
 #ifndef __AUDACITY_UNDOMANAGER__
 #define __AUDACITY_UNDOMANAGER__
 
-#include "MemoryX.h"
 #include <vector>
 #include <wx/event.h> // to declare custom event types
 #include "ondemand/ODTaskThread.h"

src/WaveClip.h

@@ -14,7 +14,6 @@
 
 #include "Audacity.h"
 
-#include "MemoryX.h"
 #include "SampleFormat.h"
 #include "ondemand/ODTaskThread.h"
 #include "xml/XMLTagHandler.h"

src/WaveTrack.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_WAVETRACK__
 
 #include "Track.h"
-#include "SampleFormat.h"
 
 #include <vector>
 #include <wx/longlong.h>

src/blockfile/LegacyAliasBlockFile.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_LEGACYALIASBLOCKFILE__
 #define __AUDACITY_LEGACYALIASBLOCKFILE__
 
-#include "../BlockFile.h"
 #include "PCMAliasBlockFile.h"
 
 /// An AliasBlockFile that references uncompressed data in an existing file

src/blockfile/ODDecodeBlockFile.h

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

src/blockfile/ODPCMAliasBlockFile.h

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

src/commands/AudacityCommand.h

@@ -13,16 +13,13 @@
 
 #include "../Audacity.h"
 
-#include "../MemoryX.h"
 #include <set>
 
-#include "../MemoryX.h"
 #include <wx/defs.h>
 #include <wx/event.h> // to inherit
 
 #include "../widgets/wxPanelWrapper.h" // to inherit
 
-#include "../Internat.h"
 #include "../include/audacity/ComponentInterface.h"
 #include "../include/audacity/EffectAutomationParameters.h" // for command automation
 

src/commands/Command.h

@@ -17,9 +17,6 @@
 #ifndef __COMMAND__
 #define __COMMAND__
 
-#include "../MemoryX.h"
-
-#include "CommandMisc.h"
 #include "CommandSignature.h"
 #include "../commands/AudacityCommand.h"
 

src/commands/CommandContext.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_COMMAND_CONTEXT__
 
 #include "audacity/Types.h"
-#include "../MemoryX.h"
 #include "Command.h"
 
 class AudacityProject;

src/commands/CommandDirectory.h

@@ -23,8 +23,6 @@ they are kept separate to make things simpler.
 #ifndef __COMMANDDIRECTORY__
 #define __COMMANDDIRECTORY__
 
-#include "../MemoryX.h"
-#include "CommandMisc.h"
 #include "CommandType.h"
 
 class CommandOutputTargets;

src/commands/CommandFunctors.h

@@ -9,7 +9,6 @@
 #ifndef __AUDACITY_COMMAND_FUNCTORS__
 #define __AUDACITY_COMMAND_FUNCTORS__
 
-#include "../MemoryX.h"
 #include "Command.h"
 
 class AudacityProject;

src/commands/CommandManager.h

@@ -19,7 +19,6 @@
 #include "CommandFunctors.h"
 #include "CommandFlag.h"
 
-#include "../MemoryX.h"
 #include "Keyboard.h"
 #include <vector>
 

src/commands/CommandTargets.h

@@ -156,7 +156,7 @@ public:
 
 #if 0
 
-#include "../widgets/ProgressDialog.h" // Member variable
+//#include "../widgets/ProgressDialog.h" // Member variable
 
 /// Sends command progress information to a ProgressDialog
 class GUIProgressTarget final : public CommandProgressTarget

src/commands/CommandType.h

@@ -16,9 +16,7 @@
 #ifndef __COMMANDTYPE__
 #define __COMMANDTYPE__
 
-#include "CommandMisc.h"
 #include "CommandSignature.h"
-#include "../MemoryX.h"
 #include "../commands/AudacityCommand.h"
 
 class OldStyleCommand;

src/commands/ScreenshotCommand.h

@@ -14,7 +14,6 @@
 #define __SCREENSHOT_COMMAND__
 
 #include "Command.h"
-#include "../commands/AudacityCommand.h"
 
 #include <wx/colour.h> // member variable
 

src/commands/SetClipCommand.h

@@ -16,8 +16,6 @@
 #ifndef __SET_CLIP_COMMAND__
 #define __SET_CLIP_COMMAND__
 
-#include "Command.h"
-#include "CommandType.h"
 #include "SetTrackInfoCommand.h"
 
 #define SET_CLIP_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Set Clip") }

src/commands/SetEnvelopeCommand.h

@@ -16,8 +16,6 @@
 #ifndef __SET_ENVELOPE_COMMAND__
 #define __SET_ENVELOPE_COMMAND__
 
-#include "Command.h"
-#include "CommandType.h"
 #include "SetTrackInfoCommand.h"
 
 #define SET_ENVELOPE_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Set Envelope") }

src/effects/Compressor.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_EFFECT_COMPRESSOR__
 
 #include "TwoPassSimpleMono.h"
-#include "../SampleFormat.h"
 
 class wxCheckBox;
 class wxSlider;

src/effects/Echo.h

@@ -13,7 +13,6 @@
 #define __AUDACITY_EFFECT_ECHO__
 
 #include "Effect.h"
-#include "../SampleFormat.h"
 
 class ShuttleGui;
 

src/effects/Effect.h

@@ -16,10 +16,8 @@
 
 #include "../Experimental.h"
 
-#include "../MemoryX.h"
 #include <set>
 
-#include "../MemoryX.h"
 #include <wx/defs.h>
 
 class wxButton;
@@ -31,9 +29,7 @@ class wxWindow;
 #include "audacity/ConfigInterface.h"
 #include "audacity/EffectInterface.h"
 
-#include "../SampleFormat.h"
 #include "../SelectedRegion.h"
-#include "../Internat.h"
 
 #include "../Track.h"
 

src/effects/Equalization.h

@@ -20,9 +20,7 @@
 #include <wx/setup.h> // for wxUSE_* macros
 
 #include "Effect.h"
-#include "../xml/XMLTagHandler.h"
 #include "../RealFFTf.h"
-#include "../SampleFormat.h"
 
 #define EQUALIZATION_PLUGIN_SYMBOL \
 ComponentInterfaceSymbol{ XO("Equalization") }

src/effects/NoiseReduction.h

@@ -15,8 +15,6 @@
 
 #include "Effect.h"
 
-#include "../MemoryX.h"
-
 #define NOISEREDUCTION_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Noise Reduction") }
 
 class EffectNoiseReduction final : public Effect {

src/effects/NoiseRemoval.h

@@ -20,9 +20,6 @@
 
 #include "Effect.h"
 
-#include "../MemoryX.h"
-#include "../SampleFormat.h"
-
 class wxButton;
 class wxSizer;
 class wxSlider;

src/effects/ladspa/LadspaEffect.h

@@ -13,7 +13,6 @@ class wxStaticText;
 class wxTextCtrl;
 class wxCheckBox;
 
-#include "../../MemoryX.h"
 #include <wx/dynlib.h> // member variable
 
 #include "audacity/EffectInterface.h"

src/effects/lv2/LV2Effect.h

@@ -15,7 +15,6 @@
 
 class wxArrayString;
 
-#include "../../MemoryX.h"
 #include <vector>
 
 #include "lv2/lv2plug.in/ns/ext/atom/forge.h"

src/effects/vamp/VampEffect.h

@@ -17,7 +17,6 @@
 
 #include <vamp-hostsdk/PluginLoader.h>
 
-#include "../../SampleFormat.h"
 #include "../Effect.h"
 
 class wxStaticText;

src/export/Export.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_EXPORT__
 #define __AUDACITY_EXPORT__
 
-#include "../MemoryX.h"
 #include <vector>
 #include <wx/filename.h> // member variable
 #include "../SampleFormat.h"

src/import/FormatClassifier.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_FORMATCLASSIFIER_H_
 
 #include <vector>
-#include "../SampleFormat.h"
 #include "MultiFormatReader.h"
 #include "SpecPowerMeter.h"
 

src/import/ImportPlugin.h

@@ -59,7 +59,6 @@ but little else.
 
 #include "audacity/Types.h"
 #include "../Internat.h"
-#include "../MemoryX.h"
 
 #include "ImportRaw.h" // defines TrackHolders
 

src/ondemand/ODComputeSummaryTask.h

@@ -21,7 +21,6 @@ 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/ODDecodeFFmpegTask.h

@@ -14,14 +14,11 @@
 
 #include "../Experimental.h"
 
-#include "../MemoryX.h"
-
 #ifdef EXPERIMENTAL_OD_FFMPEG
 
 #include "../import/ImportRaw.h" // for TrackHolders
 #include <vector>
 #include "ODDecodeTask.h"
-#include "ODTaskThread.h"
 
 struct streamContext;
 using Scs = ArrayOf<std::unique_ptr<streamContext>>;

src/ondemand/ODDecodeFlacTask.h

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

src/ondemand/ODDecodeTask.h

@@ -28,10 +28,8 @@ robust enough to allow all the user changes such as copy/paste, DELETE, and so o
 #ifndef __AUDACITY_ODDecodeTask__
 #define __AUDACITY_ODDecodeTask__
 
-#include "../MemoryX.h"
 #include <vector>
 #include "ODTask.h"
-#include "ODTaskThread.h"
 #include "../Internat.h"
 class ODDecodeBlockFile;
 class WaveTrack;

src/ondemand/ODTask.h

@@ -23,10 +23,8 @@ in a background thread.
 #ifndef __AUDACITY_ODTASK__
 #define __AUDACITY_ODTASK__
 
-#include "ODTaskThread.h"
 #include "../BlockFile.h"
 
-#include "../MemoryX.h"
 #include <vector>
 #include <wx/event.h> // to declare custom event type
 class AudacityProject;

src/ondemand/ODWaveTrackTaskQueue.h

@@ -22,7 +22,6 @@ tasks associated with a WaveTrack.
 #ifndef __AUDACITY_ODWAVETRACKTASKQUEUE__
 #define __AUDACITY_ODWAVETRACKTASKQUEUE__
 
-#include "../MemoryX.h"
 #include <vector>
 #include "ODTaskThread.h"
 class Track;

src/prefs/PrefsDialog.h

@@ -15,7 +15,6 @@
 #include <functional>
 #include <vector>
 #include "../widgets/wxPanelWrapper.h" // to inherit
-#include "../Internat.h"
 
 class wxTreebook;
 class wxTreeEvent;

src/toolbars/ControlToolBar.h

@@ -14,9 +14,7 @@
 #ifndef __AUDACITY_CONTROL_TOOLBAR__
 #define __AUDACITY_CONTROL_TOOLBAR__
 
-#include "../MemoryX.h"
 #include "ToolBar.h"
-#include "../Theme.h"
 
 class wxBoxSizer;
 class wxCommandEvent;

src/toolbars/DeviceToolBar.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_DEVICE_TOOLBAR__
 #define __AUDACITY_DEVICE_TOOLBAR__
 
-#include "../MemoryX.h"
 #include <vector>
 #include "ToolBar.h"
 

src/toolbars/EditToolBar.h

@@ -19,7 +19,6 @@
 #include <wx/defs.h>
 
 #include "ToolBar.h"
-#include "../Theme.h"
 
 class wxCommandEvent;
 class wxDC;

src/toolbars/MixerToolBar.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_MIXER_TOOLBAR__
 #define __AUDACITY_MIXER_TOOLBAR__
 
-#include "../MemoryX.h"
 #include "ToolBar.h"
 
 class wxSize;

src/toolbars/ScrubbingToolBar.h

@@ -17,7 +17,6 @@
 #include <wx/defs.h>
 
 #include "ToolBar.h"
-#include "../Theme.h"
 
 class wxCommandEvent;
 class wxDC;

src/toolbars/ToolDock.h

@@ -14,7 +14,6 @@
 #define __AUDACITY_TOOLDOCK__
 
 #include <vector>
-#include "../MemoryX.h" // for std::move
 #include <wx/defs.h>
 
 #include "ToolBar.h"

src/toolbars/ToolManager.h

@@ -13,14 +13,12 @@
 #ifndef __AUDACITY_TOOLMANAGER__
 #define __AUDACITY_TOOLMANAGER__
 
-#include "../MemoryX.h"
 #include <wx/defs.h>
 #include <wx/eventfilter.h> // to inherit
 #include <wx/frame.h> // to inherit
 #include <wx/timer.h> // member variable
 
 #include "ToolDock.h"
-#include "ToolBar.h"
 
 class wxCommandEvent;
 class wxFrame;

src/toolbars/ToolsToolBar.h

@@ -18,8 +18,6 @@
 
 #include "ToolBar.h"
 
-#include "../Theme.h"
-
 class wxCommandEvent;
 class wxDC;
 class wxGridSizer;

src/toolbars/TranscriptionToolBar.h

@@ -17,11 +17,9 @@
 
 #include "ToolBar.h"
 
-#include "../MemoryX.h"
 #include <wx/brush.h> // member variable
 
 #include "audacity/Types.h"
-#include "../Theme.h"
 
 class wxChoice;
 class wxCommandEvent;

src/tracks/labeltrack/ui/LabelDefaultClickHandle.h

@@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp
 #define __AUDACITY_LABEL_DEFAULT_CLICK_HANDLE__
 
 #include "../../../UIHandle.h"
-#include "../../../MemoryX.h"
 
 class wxMouseEvent;
 class LabelTrack;

src/tracks/labeltrack/ui/LabelGlyphHandle.h

@@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp
 #define __AUDACITY_LABEL_GLYPH_HANDLE__
 
 #include "LabelDefaultClickHandle.h"
-#include "../../../MemoryX.h"
 
 class wxMouseState;
 class LabelTrack;

src/tracks/labeltrack/ui/LabelTextHandle.h

@@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp
 #define __AUDACITY_LABEL_TEXT_HANDLE__
 
 #include "LabelDefaultClickHandle.h"
-#include "../../../MemoryX.h"
 #include "../../../SelectedRegion.h"
 
 class wxMouseState;

src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h

@@ -14,7 +14,6 @@ Paul Licameli split from TrackPanel.cpp
 class wxMouseState;
 class NoteTrack;
 
-#include "../../../../MemoryX.h"
 #include "../../../../UIHandle.h"
 
 ///////////////////////////////////////////////////////////////////////////////

src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h

@@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp
 #define __AUDACITY_NOTE_TRACK_CONTROLS__
 
 #include "../../../ui/TrackControls.h"
-#include "../../../../MemoryX.h"
 class MuteButtonHandle;
 class SoloButtonHandle;
 class NoteTrackButtonHandle;

src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h

@@ -14,7 +14,6 @@ Paul Licameli split from TrackPanel.cpp
 class wxMouseState;
 class NoteTrack;
 
-#include "../../../../MemoryX.h"
 #include "../../../../UIHandle.h"
 
 class NoteTrackVZoomHandle : public UIHandle

src/tracks/playabletrack/notetrack/ui/StretchHandle.h

@@ -13,8 +13,6 @@ Paul Licameli split from TrackPanel.cpp
 
 #include "../../../../UIHandle.h"
 
-#include "../../../../MemoryX.h"
-
 class Alg_seq;
 class NoteTrack;
 class Track;

src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h

@@ -11,9 +11,7 @@ Paul Licameli
 #ifndef __AUDACITY_CUTLINE_HANDLE__
 #define __AUDACITY_CUTLINE_HANDLE__
 
-#include "../../../../MemoryX.h"
 #include "../../../../UIHandle.h"
-#include "../../../../MemoryX.h"
 #include "../../../../WaveTrackLocation.h"
 
 class wxMouseEvent;

src/tracks/playabletrack/wavetrack/ui/SampleHandle.h

@@ -13,7 +13,6 @@ Paul Licameli
 
 #include "../../../../UIHandle.h"
 #include "audacity/Types.h"
-#include "../../../../MemoryX.h"
 
 class wxMouseEvent;
 class wxMouseState;

src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h

@@ -13,7 +13,6 @@ Paul Licameli split from TrackPanel.cpp
 
 class wxMouseState;
 class WaveTrack;
-#include "../../../../MemoryX.h"
 #include "../../../../UIHandle.h"
 
 

src/tracks/ui/BackgroundCell.h

@@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp
 #define __AUDACITY_BACKGROUND_CELL__
 
 #include "CommonTrackPanelCell.h"
-#include "../../MemoryX.h"
 
 class AudacityProject;
 

src/tracks/ui/ButtonHandle.h

@@ -12,7 +12,6 @@ Paul Licameli
 #define __AUDACITY_BUTTON_HANDLE__
 
 #include "../../UIHandle.h"
-#include "../../MemoryX.h"
 
 class wxMouseEvent;
 class wxMouseState;

src/tracks/ui/CommonTrackPanelCell.h

@@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp
 #define __AUDACITY_COMMON_TRACK_PANEL_CELL__
 
 #include "../../TrackPanelCell.h"
-#include "../../MemoryX.h"
 #include <stdlib.h>
 
 class Track;

src/tracks/ui/EnvelopeHandle.h

@@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp
 #define __AUDACITY_ENVELOPE_HANDLE__
 
 #include "../../UIHandle.h"
-#include "../../MemoryX.h"
 
 #include <vector>
 

src/tracks/ui/Scrubbing.h

@@ -13,12 +13,10 @@ Paul Licameli split from TrackPanel.cpp
 
 #include "../../Experimental.h"
 
-#include "../../MemoryX.h"
 #include <vector>
 #include <wx/longlong.h>
 
 #include "../../widgets/Overlay.h" // to inherit
-#include "../../commands/CommandFunctors.h"
 #include "../../commands/CommandContext.h"
 #include "../../commands/CommandManager.h" // for MenuTable
 #include "../../../include/audacity/Types.h"

src/tracks/ui/SelectHandle.h

@@ -15,7 +15,6 @@ Paul Licameli split from TrackPanel.cpp
 #include "../../SelectedRegion.h"
 #include "../../Snap.h"
 
-#include "../../MemoryX.h"
 #include <vector>
 
 class SelectionStateChanger;

src/tracks/ui/SliderHandle.h

@@ -11,7 +11,6 @@ Paul Licameli
 #ifndef __AUDACITY_SLIDER_HANDLE__
 #define __AUDACITY_SLIDER_HANDLE__
 
-#include "../../MemoryX.h"
 #include "../../UIHandle.h"
 
 class wxMouseEvent;

src/tracks/ui/TimeShiftHandle.h

@@ -13,8 +13,6 @@ Paul Licameli
 
 #include "../../UIHandle.h"
 
-#include "../../MemoryX.h"
-
 #include "../../Snap.h"
 #include "../../Track.h"
 

src/tracks/ui/TrackControls.h

@@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp
 #define __AUDACITY_TRACK_CONTROLS__
 
 #include "CommonTrackPanelCell.h"
-#include "../../MemoryX.h"
 
 class PopupMenuTable;
 class Track;

src/tracks/ui/TrackSelectHandle.h

@@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp
 #define __AUDACITY_TRACK_SELECT_HANDLE__
 
 #include "../../UIHandle.h"
-#include "../../MemoryX.h"
 
 class wxMouseEvent;
 class Track;

src/tracks/ui/TrackVRulerControls.h

@@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp
 #define __AUDACITY_TRACK_VRULER_CONTROLS__
 
 #include "CommonTrackPanelCell.h"
-#include "../../MemoryX.h"
 
 class Track;
 class wxDC;

src/widgets/AButton.h

@@ -12,7 +12,6 @@
 #ifndef __AUDACITY_BUTTON__
 #define __AUDACITY_BUTTON__
 
-#include "../MemoryX.h"
 #include <vector>
 
 #include <wx/setup.h> // for wxUSE_* macros

src/widgets/ASlider.h

@@ -13,7 +13,6 @@
 #ifndef __AUDACITY_SLIDER__
 #define __AUDACITY_SLIDER__
 
-#include "../MemoryX.h"
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/timer.h> // member variable

src/widgets/BackedPanel.h

@@ -9,7 +9,6 @@
 #ifndef __AUDACITY_BACKED_PANEL__
 #define __AUDACITY_BACKED_PANEL__
 
-#include "../MemoryX.h"
 #include <wx/dcmemory.h> // member variable
 #include "wxPanelWrapper.h" // to inherit
 

src/widgets/ExpandingToolBar.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_EXPANDING_TOOL_BAR__
 #define __AUDACITY_EXPANDING_TOOL_BAR__
 
-#include "../MemoryX.h"
 #include <vector>
 #include <wx/defs.h>
 #include <wx/dragimag.h> // use macros and typedefs in this header
@@ -19,7 +18,6 @@
 #include <wx/minifram.h> // to inherit
 
 #include "ImageRoll.h"
-#include "wxPanelWrapper.h" // to inherit
 
 #include <unordered_map>
 

src/widgets/Grid.h

@@ -11,13 +11,11 @@
 #ifndef __AUDACITY_WIDGETS_GRID__
 #define __AUDACITY_WIDGETS_GRID__
 
-#include "../MemoryX.h"
 #include <vector>
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/grid.h> // to inherit wxGridCellEditor
 #include "NumericTextCtrl.h"
-#include "../Internat.h"
 
 #if wxUSE_ACCESSIBILITY
 class GridAx;

src/widgets/ProgressDialog.h

@@ -20,7 +20,6 @@
 
 #include "../Audacity.h"
 
-#include "../MemoryX.h"
 #include <vector>
 #include <wx/defs.h>
 #include <wx/evtloop.h> // member variable