Each .cpp/.mm file includes corresponding header before any other...

... except Audacity.h

This forces us to make each header contain all forward declarations or nested
headers that it requires, rather than depend on context.

src/AColor.cpp

@@ -18,6 +18,7 @@ It is also a place to document colour usage policy in Audacity
 *//********************************************************************/
 
 #include "Audacity.h"
+#include "AColor.h"
 
 #include "Experimental.h"
 
@@ -28,7 +29,6 @@ It is also a place to document colour usage policy in Audacity
 #include <wx/settings.h>
 #include <wx/utils.h>
 
-#include "AColor.h"
 #include "Theme.h"
 #include "AllThemeResources.h"
 

src/AboutDialog.cpp

@@ -26,6 +26,7 @@ hold information about one contributor to Audacity.
 
 
 #include "Audacity.h"
+#include "AboutDialog.h"
 
 #include "Experimental.h"
 
@@ -37,7 +38,6 @@ hold information about one contributor to Audacity.
 #include <wx/statbmp.h>
 #include <wx/intl.h>
 
-#include "AboutDialog.h"
 #include "FileNames.h"
 #include "Internat.h"
 #include "ShuttleGui.h"

src/AudacityApp.cpp

@@ -16,6 +16,7 @@ It handles initialization and termination by subclassing wxApp.
 *//*******************************************************************/
 
 #include "Audacity.h" // This should always be included first
+#include "AudacityApp.h"
 
 #include "Experimental.h"
 
@@ -25,7 +26,6 @@ It handles initialization and termination by subclassing wxApp.
 #include <vld.h>
 #endif
 
-#include "AudacityApp.h"
 #include "TranslatableStringArray.h"
 
 #include <wx/defs.h>

src/AutoRecovery.cpp

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

src/BatchCommandDialog.cpp

@@ -19,7 +19,9 @@ selected command.
 *//*******************************************************************/
 
 #include "Audacity.h"
+#include "BatchCommandDialog.h"
 
+//
 #include <wx/defs.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
@@ -36,7 +38,6 @@ selected command.
 
 
 #include "Project.h"
-#include "BatchCommandDialog.h"
 #include "commands/CommandManager.h"
 #include "effects/EffectManager.h"
 #include "BatchCommands.h"

src/DeviceManager.cpp

@@ -7,6 +7,10 @@
 ******************************************************************/
 
 #include "Audacity.h"
+#include "DeviceManager.h"
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include <wx/wxprec.h>
 
 #include "Experimental.h"
 
@@ -19,9 +23,6 @@
 #include "portmixer.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
-
 #ifndef WX_PRECOMP
 #include <wx/choice.h>
 #include <wx/event.h>
@@ -37,7 +38,6 @@
 #include "AudioIO.h"
 
 #include "DeviceChange.h"
-#include "DeviceManager.h"
 #include "toolbars/DeviceToolBar.h"
 
 DeviceManager DeviceManager::dm;

src/Diags.cpp

@@ -29,6 +29,7 @@ count down so that we track how many times the event happens.
 
 
 #include "Audacity.h"
+#include "Diags.h"
 
 #include <wx/defs.h>
 #include <wx/hash.h>
@@ -36,7 +37,6 @@ count down so that we track how many times the event happens.
 #include <wx/log.h>
 
 #include <wx/stopwatch.h>
-#include "Diags.h"
 
 static wxStopWatch MasterWatch;
 static bool bStopWatchStarted = false;

src/Dither.cpp

@@ -35,6 +35,8 @@ and get deterministic behaviour.
 *//*******************************************************************/
 
 
+#include "Dither.h"
+
 // Erik de Castro Lopo's header file that
 // makes sure that we have lrint and lrintf
 // (Note: this file should be included first)
@@ -49,8 +51,6 @@ and get deterministic behaviour.
 
 #include <wx/defs.h>
 
-#include "Dither.h"
-
 //////////////////////////////////////////////////////////////////////////
 
 // Constants for the noise shaping buffer

src/FFT.cpp

@@ -40,10 +40,10 @@
 */
 
 #include "Audacity.h"
+#include "FFT.h"
 
 #include "Internat.h"
 
-#include "FFT.h"
 #include "MemoryX.h"
 #include "SampleFormat.h"
 

src/FileFormats.cpp

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

src/FileIO.cpp

@@ -9,14 +9,13 @@
 **********************************************************************/
 
 #include "Audacity.h"
+#include "FileIO.h"
 
 #include <wx/defs.h>
 #include <wx/crt.h>
 #include <wx/filename.h>
 #include <wx/wfstream.h>
 
-#include "FileIO.h"
-
 FileIO::FileIO(const wxString & name, FileIOMode mode)
 : mName(name),
   mMode(mode),

src/FileNames.cpp

@@ -21,6 +21,7 @@ used throughout Audacity into this one place.
 *//********************************************************************/
 
 #include "Audacity.h"
+#include "FileNames.h"
 
 #include "Experimental.h"
 
@@ -31,7 +32,6 @@ used throughout Audacity into this one place.
 #include <wx/intl.h>
 #include <wx/stdpaths.h>
 #include "Prefs.h"
-#include "FileNames.h"
 #include "Internat.h"
 #include "PlatformCompatibility.h"
 #include "wxFileNameWrapper.h"

src/HelpText.cpp

@@ -13,14 +13,13 @@
 *//********************************************************************/
 
 #include "Audacity.h"
+#include "HelpText.h"
 
 #include "Experimental.h"
 
 #include <wx/string.h>
 #include <wx/intl.h>
 
-#include "HelpText.h"
-
 #include "FileNames.h"
 #include "AboutDialog.h"
 #include "AllThemeResources.h"

src/HelpText.h

@@ -11,6 +11,8 @@
 #ifndef __AUDACITY_HELP_TEXT__
 #define __AUDACITY_HELP_TEXT__
 
+class wxString;
+
 wxString HelpText( const wxString & Key );
 wxString TitleText( const wxString & Key );
 

src/HistoryWindow.cpp

@@ -17,6 +17,7 @@ undo memory so as to free up space.
 *//*******************************************************************/
 
 #include "Audacity.h"
+#include "HistoryWindow.h"
 
 #include <wx/app.h>
 #include <wx/defs.h>
@@ -34,7 +35,6 @@ undo memory so as to free up space.
 #include "AudacityApp.h"
 #include "../images/Arrow.xpm"
 #include "../images/Empty9x16.xpm"
-#include "HistoryWindow.h"
 #include "UndoManager.h"
 #include "Project.h"
 #include "ShuttleGui.h"

src/ImageManipulation.cpp

@@ -23,10 +23,10 @@ channel.  This collection of functions fills that gap.
 
 
 #include "Audacity.h"
+#include "ImageManipulation.h"
 
 #include <wx/image.h>
 
-#include "ImageManipulation.h"
 #include "AllThemeResources.h"
 #include "Theme.h"
 

src/Internat.cpp

@@ -20,6 +20,8 @@ and on Mac OS X for the filesystem.
 
 *//*******************************************************************/
 
+#include "Internat.h"
+
 #include "Experimental.h"
 
 #include <wx/log.h>
@@ -31,7 +33,6 @@ and on Mac OS X for the filesystem.
 
 #include "FileNames.h"
 #include "widgets/ErrorDialog.h"
-#include "Internat.h"
 #include "../include/audacity/ComponentInterface.h"
 
 // in order for the static member variables to exist, they must appear here

src/InterpolateAudio.cpp

@@ -8,12 +8,13 @@
 
 **********************************************************************/
 
+#include "InterpolateAudio.h"
+
 #include <math.h>
 #include <stdlib.h>
 
 #include <wx/defs.h>
 
-#include "InterpolateAudio.h"
 #include "Matrix.h"
 #include "SampleFormat.h"
 

src/InterpolateAudio.h

@@ -26,6 +26,7 @@
 #define __AUDACITY_INTERPOLATE_AUDIO__
 
 #include "Audacity.h"
+#include <cstddef>
 
 // See top of file for a description of the algorithm.  Interpolates
 // the samples from buffer[firstBad] through buffer[firstBad+numBad-1],

src/LangChoice.cpp

@@ -16,6 +16,7 @@ of languages for Audacity.
 
 
 #include "Audacity.h"
+#include "LangChoice.h"
 
 #include <wx/defs.h>
 #include <wx/button.h>
@@ -24,7 +25,6 @@ of languages for Audacity.
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 
-#include "LangChoice.h"
 #include "Languages.h"
 #include "ShuttleGui.h"
 #include "widgets/wxPanelWrapper.h"

src/Languages.cpp

@@ -31,13 +31,13 @@
 
 
 #include "Audacity.h"
+#include "Languages.h"
 
 #include <wx/defs.h>
 #include <wx/hashmap.h>
 #include <wx/intl.h>
 #include <wx/textfile.h>
 
-#include "Languages.h"
 #include "FileNames.h"
 
 #include "AudacityApp.h"

src/Legacy.cpp

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

src/Lyrics.cpp

@@ -9,6 +9,8 @@
 
 **********************************************************************/
 
+#include "Lyrics.h"
+
 #include <math.h>
 
 #include <wx/defs.h>
@@ -16,7 +18,6 @@
 #include <wx/mimetype.h>
 
 #include "AudioIO.h"
-#include "Lyrics.h"
 #include "Internat.h"
 #include "Project.h" // for GetActiveProject
 #include "LabelTrack.h"

src/Matrix.cpp

@@ -8,13 +8,13 @@
 
 **********************************************************************/
 
+#include "Matrix.h"
+
 #include <stdlib.h>
 #include <math.h>
 
 #include <wx/defs.h>
 
-#include "Matrix.h"
-
 Vector::Vector()
 {
 }

src/MixerBoard.cpp

@@ -10,11 +10,11 @@
 **********************************************************************/
 
 #include "Audacity.h"
+#include "MixerBoard.h"
 
 #include "Experimental.h"
 
 #include "Menus.h"
-#include "MixerBoard.h"
 
 #include <cfloat>
 #include <math.h>

src/ModuleManager.cpp

@@ -19,6 +19,7 @@ i.e. an alternative to the usual interface, for Audacity.
 *//*******************************************************************/
 
 #include "Audacity.h"
+#include "ModuleManager.h"
 
 #include "Experimental.h"
 
@@ -43,7 +44,6 @@ i.e. an alternative to the usual interface, for Audacity.
 #include "./prefs/ModulePrefs.h"
 #endif
 
-#include "ModuleManager.h"
 #include "widgets/MultiDialog.h"
 
 #include "widgets/ErrorDialog.h"

src/PitchName.cpp

@@ -18,11 +18,11 @@
 
 
 #include "Audacity.h"
+#include "PitchName.h"
 
 #include <math.h>
 #include <stdio.h>
 
-#include "PitchName.h"
 #include "Internat.h"
 
 

src/PlatformCompatibility.cpp

@@ -16,13 +16,13 @@
 *//*******************************************************************/
 
 
+#include "PlatformCompatibility.h"
+
 #include <wx/filefn.h>
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
 #include <wx/app.h>
 
-#include "PlatformCompatibility.h"
-
 FilePath PlatformCompatibility::GetLongFileName(const FilePath &shortFileName)
 {
    wxFileName fn(shortFileName);

src/PluginManager.cpp

@@ -19,6 +19,7 @@ for shared and private configs - which need to move out.
 *****************************************************************************/
 
 #include "Audacity.h"
+#include "PluginManager.h"
 
 #include "Experimental.h"
 
@@ -54,8 +55,6 @@ for shared and private configs - which need to move out.
 #include "widgets/WindowAccessible.h"
 #endif
 
-#include "PluginManager.h"
-
 #include <unordered_map>
 
 // ============================================================================

src/Prefs.cpp

@@ -51,6 +51,7 @@
 
 
 #include "Audacity.h"
+#include "Prefs.h"
 
 #include <wx/defs.h>
 #include <wx/app.h>
@@ -64,7 +65,6 @@
 #include "FileNames.h"
 #include "Languages.h"
 
-#include "Prefs.h"
 #include "widgets/ErrorDialog.h"
 #include "Internat.h"
 

src/RealFFTf.cpp

@@ -37,6 +37,7 @@
 */
 
 #include "Audacity.h"
+#include "RealFFTf.h"
 
 #include "Experimental.h"
 
@@ -47,7 +48,6 @@
 
 #include <wx/thread.h>
 
-#include "RealFFTf.h"
 #ifdef EXPERIMENTAL_EQ_SSE_THREADED
 #include "RealFFTf48x.h"
 #endif

src/RealFFTf48x.cpp

@@ -55,6 +55,7 @@
 */
 
 #include "Audacity.h"
+#include "RealFFTf48x.h"
 
 #include "Experimental.h"
 
@@ -72,7 +73,6 @@
 #include <stdio.h>
 #include <math.h>
 #include "RealFFTf.h"
-#include "RealFFTf48x.h"
 #ifdef __WXMSW__
 #pragma warning(disable:4305)
 #else

src/RealFFTf48x.h

@@ -15,6 +15,8 @@ enum {
    FFT_FastMathBR24
 };
 
+struct FFTParam;
+
 /* wrapper funcitons. If passed -1 function choice will be made locally */
 void RealFFTf1x(fft_type *, FFTParam*, int functionType=-1);
 void InverseRealFFTf1x(fft_type *, FFTParam*, int functionType=-1);

src/SampleFormat.cpp

@@ -34,13 +34,14 @@
 
 *//*******************************************************************/
 
+#include "SampleFormat.h"
+
 #include <wx/intl.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "SampleFormat.h"
 #include "Prefs.h"
 #include "Dither.h"
 #include "Internat.h"

src/SelectedRegion.cpp

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

src/Shuttle.cpp

@@ -51,6 +51,7 @@ preferences.
 *//*******************************************************************/
 
 #include "Audacity.h"
+#include "Shuttle.h"
 
 #include <wx/defs.h>
 #include <wx/checkbox.h>
@@ -67,7 +68,6 @@ preferences.
 #include "../include/audacity/EffectAutomationParameters.h" // for command automation
 
 //#include "Project.h"
-#include "Shuttle.h"
 #include "WrappedType.h"
 //#include "effects/Effect.h"
 

src/ShuttleGui.cpp

@@ -94,12 +94,12 @@ for registering for changes.
 
 
 #include "Audacity.h"
+#include "ShuttleGui.h"
 
 #include "Experimental.h"
 
 #include "Prefs.h"
 #include "Shuttle.h"
-#include "ShuttleGui.h"
 
 #include "MemoryX.h"
 #include <wx/wx.h>

src/ShuttlePrefs.cpp

@@ -25,12 +25,12 @@
 *//*******************************************************************/
 
 #include "Audacity.h"
+#include "ShuttlePrefs.h"
 
 #include <wx/defs.h>
 
 #include "Project.h"
 #include "Shuttle.h"
-#include "ShuttlePrefs.h"
 #include "WrappedType.h"
 #include "Prefs.h"
 

src/Spectrum.cpp

@@ -13,9 +13,10 @@
 
 *//*******************************************************************/
 
+#include "Spectrum.h"
+
 #include <math.h>
 
-#include "Spectrum.h"
 #include "FFT.h"
 
 #include "SampleFormat.h"

src/SplashDialog.cpp

@@ -21,6 +21,7 @@ most commonly asked questions about Audacity.
 
 
 #include "Audacity.h"
+#include "SplashDialog.h"
 
 #include "Experimental.h"
 
@@ -33,7 +34,6 @@ most commonly asked questions about Audacity.
 #include <wx/intl.h>
 #include <wx/image.h>
 
-#include "SplashDialog.h"
 #include "FileNames.h"
 #include "Internat.h"
 #include "ShuttleGui.h"

src/Theme.cpp

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

src/TimeDialog.cpp

@@ -14,6 +14,7 @@
 *//*******************************************************************/
 
 #include "Audacity.h"
+#include "TimeDialog.h"
 
 #include <wx/defs.h>
 #include <wx/intl.h>
@@ -22,7 +23,6 @@
 
 #include "widgets/NumericTextCtrl.h"
 #include "ShuttleGui.h"
-#include "TimeDialog.h"
 
 BEGIN_EVENT_TABLE(TimeDialog, wxDialogWrapper)
    EVT_COMMAND(wxID_ANY, EVT_TIMETEXTCTRL_UPDATED, TimeDialog::OnUpdate)

src/TimeDialog.h

@@ -15,6 +15,7 @@
 #include <wx/event.h>
 #include <wx/string.h>
 
+#include "widgets/NumericTextCtrl.h" // for NumericFormatSymbol
 #include "widgets/wxPanelWrapper.h"
 #include "Internat.h"
 

src/Track.cpp

@@ -21,11 +21,12 @@ and TimeTrack.
 
 *//*******************************************************************/
 
+#include "Track.h"
+
 #include "Experimental.h"
 
 #include <algorithm>
 #include <numeric>
-#include "Track.h"
 
 #include <float.h>
 #include <wx/file.h>

src/TrackPanel.cpp

@@ -61,11 +61,11 @@ is time to refresh some aspect of the screen.
 *//*****************************************************************/
 
 #include "Audacity.h"
+#include "TrackPanel.h"
 
 #include "Experimental.h"
 
 #include "AdornedRulerPanel.h"
-#include "TrackPanel.h"
 #include "Project.h"
 #include "TrackPanelMouseEvent.h"
 #include "TrackPanelResizeHandle.h"

src/UndoManager.cpp

@@ -21,6 +21,7 @@ UndoManager
 
 
 #include "Audacity.h"
+#include "UndoManager.h"
 
 #include <wx/hashset.h>
 
@@ -34,7 +35,6 @@ UndoManager
 #include "Diags.h"
 #include "Tags.h"
 
-#include "UndoManager.h"
 
 #include <unordered_set>
 

src/WrappedType.cpp

@@ -26,10 +26,10 @@
 *//**********************************************************************/
 
 #include "Audacity.h"
+#include "WrappedType.h"
 
 #include <wx/wxprec.h>
 #include "Internat.h"
-#include "WrappedType.h"
 
 /// @return true iff the wrapped type is a string.
 bool WrappedType::IsString()

src/commands/CommandContext.cpp

@@ -21,6 +21,7 @@ messaging from a command back to its invoker.
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "CommandContext.h"
 
 #include "Command.h"
 #include <map>
@@ -36,8 +37,6 @@ messaging from a command back to its invoker.
 #include "CommandTargets.h"
 #include "CommandDirectory.h"
 
-//#include "CommandContext.h"
-#include "CommandContext.h"
 #include "../Project.h"
 
 CommandContext::CommandContext(

src/commands/CommandManager.cpp

@@ -81,6 +81,7 @@ CommandManager.  It holds the callback for one command.
 
 #include "../AudacityHeaders.h"
 #include "CommandManager.h"
+
 #include "CommandManagerWindowClasses.h"
 #include "CommandContext.h"
 

src/commands/Keyboard.cpp

@@ -10,7 +10,6 @@
 **********************************************************************/
 
 #include "../Audacity.h"
-
 #include "Keyboard.h"
 
 NormalizedKeyString::NormalizedKeyString(const wxString & key)

src/commands/LoadCommands.cpp

@@ -14,10 +14,9 @@ modelled on BuiltinEffectsModule
 *****************************************************************************/
 
 #include "../Audacity.h"
+#include "LoadCommands.h"
 
 #include "../Prefs.h"
-
-#include "LoadCommands.h"
 #include "../MemoryX.h"
 
 #include "../effects/EffectManager.h"

src/commands/ResponseQueue.cpp

@@ -14,6 +14,7 @@
 *//*******************************************************************/
 
 #include "ResponseQueue.h"
+
 #include <queue>
 #include <string>
 #include <wx/thread.h>

src/commands/ScriptCommandRelay.cpp

@@ -20,6 +20,7 @@ code out of ModuleManager.
 *//*******************************************************************/
 
 #include "ScriptCommandRelay.h"
+
 #include "CommandTargets.h"
 #include "CommandBuilder.h"
 #include "AppCommandEvent.h"

src/commands/SelectCommand.cpp

@@ -30,11 +30,11 @@ explicitly code all three.
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "SelectCommand.h"
 
 #include <wx/string.h>
 #include <float.h>
 
-#include "SelectCommand.h"
 #include "../Project.h"
 #include "../Track.h"
 #include "../TrackPanel.h"

src/effects/ChangeTempo.cpp

@@ -18,6 +18,7 @@
 #include "../Audacity.h" // for USE_SOUNDTOUCH
 
 #if USE_SOUNDTOUCH
+#include "ChangeTempo.h"
 
 #if USE_SBSMS
 #include "../../../lib-src/header-substitutes/sbsms.h"
@@ -33,8 +34,6 @@
 #include "../widgets/valnum.h"
 #include "TimeWarper.h"
 
-#include "ChangeTempo.h"
-
 // Soundtouch defines these as well, which are also in generated configmac.h
 // and configunix.h, so get rid of them before including,
 // to avoid compiler warnings, and be sure to do this

src/effects/EffectManager.cpp

@@ -19,6 +19,7 @@ effects.
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "EffectManager.h"
 
 #include "../Experimental.h"
 
@@ -32,7 +33,6 @@ effects.
 #include "EffectRack.h"
 #endif
 
-#include "EffectManager.h"
 #include "../Shuttle.h"
 #include "../commands/Command.h"
 #include "../commands/CommandContext.h"

src/effects/EffectRack.cpp

@@ -12,6 +12,7 @@
 **********************************************************************/
 
 #include "../Audacity.h"
+#include "EffectRack.h"
 
 #include "../Experimental.h"
 
@@ -36,7 +37,6 @@
 #include <wx/tglbtn.h>
 
 #include "EffectManager.h"
-#include "EffectRack.h"
 #include "../commands/CommandContext.h"
 #include "../Menus.h"
 #include "../Prefs.h"

src/effects/Equalization48x.cpp

@@ -14,6 +14,7 @@
 *//****************************************************************/
 
 #include "../Audacity.h"
+#include "Equalization48x.h"
 
 #include "../Experimental.h"
 
@@ -36,7 +37,6 @@
 
 #include <math.h>
 
-#include "Equalization48x.h"
 #include "../RealFFTf.h"
 #include "../RealFFTf48x.h"
 

src/effects/Fade.cpp

@@ -14,11 +14,10 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "Fade.h"
 
 #include <wx/intl.h>
 
-#include "Fade.h"
-
 EffectFade::EffectFade(bool fadeIn)
 {
    mFadeIn = fadeIn;

src/effects/Invert.cpp

@@ -15,11 +15,10 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "Invert.h"
 
 #include <wx/intl.h>
 
-#include "Invert.h"
-
 EffectInvert::EffectInvert()
 {
 }

src/effects/LoadEffects.cpp

@@ -12,12 +12,12 @@
 *****************************************************************************/
 
 #include "../Audacity.h"
+#include "LoadEffects.h"
 
 #include "../Experimental.h"
 
 #include "../Prefs.h"
 
-#include "LoadEffects.h"
 #include "../MemoryX.h"
 
 #include "EffectManager.h"

src/effects/NoiseReduction.cpp

@@ -37,10 +37,10 @@
 */
 
 #include "../Audacity.h"
+#include "NoiseReduction.h"
 
 #include "../Experimental.h"
 
-#include "NoiseReduction.h"
 #include "EffectManager.h"
 
 #include "../ShuttleGui.h"

src/effects/NoiseRemoval.cpp

@@ -39,13 +39,12 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "NoiseRemoval.h"
 
 #include "../Experimental.h"
 
 #if !defined(EXPERIMENTAL_NOISE_REDUCTION)
 
-#include "NoiseRemoval.h"
-
 #include "../WaveTrack.h"
 #include "../Prefs.h"
 #include "../Project.h"

src/effects/Repair.cpp

@@ -22,6 +22,7 @@ the audio, rather than actually finding the clicks.
 
 
 #include "../Audacity.h"
+#include "Repair.h"
 
 #include <math.h>
 
@@ -31,8 +32,6 @@ the audio, rather than actually finding the clicks.
 #include "../WaveTrack.h"
 #include "../widgets/ErrorDialog.h"
 
-#include "Repair.h"
-
 EffectRepair::EffectRepair()
 {
 }

src/effects/Repeat.cpp

@@ -21,6 +21,7 @@
 
 
 #include "../Audacity.h"
+#include "Repeat.h"
 
 
 #include <math.h>
@@ -34,8 +35,6 @@
 #include "../widgets/NumericTextCtrl.h"
 #include "../widgets/valnum.h"
 
-#include "Repeat.h"
-
 // Define keys, defaults, minimums, and maximums for the effect parameters
 //
 //     Name    Type  Key             Def  Min   Max      Scale

src/effects/SBSMSEffect.cpp

@@ -14,10 +14,10 @@ effect that uses SBSMS to do its processing (TimeScale)
 #include "../Audacity.h"
 
 #if USE_SBSMS
+#include "SBSMSEffect.h"
 
 #include <math.h>
 
-#include "SBSMSEffect.h"
 #include "../LabelTrack.h"
 #include "../WaveTrack.h"
 #include "../Project.h"

src/effects/ScoreAlignDialog.cpp

@@ -17,6 +17,7 @@ It \TODO: description
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "ScoreAlignDialog.h"
 
 #include "../Experimental.h"
 
@@ -51,7 +52,6 @@ It \TODO: description
 #include "audioreader.h"
 #include "scorealign.h"
 #include "scorealign-glue.h"
-#include "ScoreAlignDialog.h"
 
 static std::unique_ptr<ScoreAlignDialog> gScoreAlignDialog{};
 

src/effects/ScoreAlignDialog.h

@@ -9,6 +9,10 @@
 #ifndef __AUDACITY_SCORE_ALIGN_DIALOG__
 #define __AUDACITY_SCORE_ALIGN_DIALOG__
 
+#include "../Experimental.h"
+
+#ifdef EXPERIMENTAL_SCOREALIGN
+
 #include <wx/dialog.h>
 #include <wx/slider.h>
 #include <wx/checkbox.h>
@@ -127,3 +131,5 @@ private:
 };
 
 #endif
+
+#endif

src/effects/SimpleMono.cpp

@@ -20,8 +20,8 @@
 
 
 #include "../Audacity.h"
-
 #include "SimpleMono.h"
+
 #include "../WaveTrack.h"
 
 #include <math.h>

src/effects/SoundTouchEffect.cpp

@@ -15,13 +15,13 @@ effect that uses SoundTouch to do its processing (ChangeTempo
 #include "../Audacity.h"
 
 #if USE_SOUNDTOUCH
+#include "SoundTouchEffect.h"
 
 #include <math.h>
 
 #include "../LabelTrack.h"
 #include "../WaveTrack.h"
 #include "../Project.h"
-#include "SoundTouchEffect.h"
 #include "TimeWarper.h"
 #include "../NoteTrack.h"
 

src/effects/TimeScale.cpp

@@ -16,7 +16,6 @@
 #include "../Audacity.h" // for USE_SBSMS
 
 #if USE_SBSMS
-
 #include "TimeScale.h"
 
 #include <math.h>

src/effects/VST/VSTControl.h

@@ -54,12 +54,4 @@ protected:
    VSTEffectLink *mLink;
 };
 
-#if defined(__WXOSX__)
-#include "VSTControlOSX.h"
-#elif defined(__WXMSW__)
-#include "VSTControlMSW.h"
-#elif defined(__WXGTK__)
-#include "VSTControlGTK.h"
-#endif
-
 #endif

src/effects/VST/VSTControlGTK.cpp

@@ -8,11 +8,11 @@
 
 **********************************************************************/
 
+#include "VSTControlGTK.h"
+
 #include <wx/dynlib.h>
 #include <wx/sizer.h>
 
-#include "VSTControl.h"
-
 #if 0
 static int trappedErrorCode = 0;
 static int X11TrapHandler(Display *, XErrorEvent *err)

src/effects/VST/VSTControlGTK.h

@@ -17,9 +17,7 @@
 #include <gdk/gdkx.h>
 #undef Region
 
-#include <wx/control.h>
-
-#include "aeffectx.h"
+#include "VSTControl.h"
 
 class VSTControl final : public VSTControlBase
 {

src/effects/VST/VSTControlMSW.cpp

@@ -8,11 +8,11 @@
 
 **********************************************************************/
 
+#include "VSTControlMSW.h"
+
 #include <wx/dynlib.h>
 #include <wx/sizer.h>
 
-#include "VSTControl.h"
-
 VSTControl::VSTControl()
 :  VSTControlBase()
 {

src/effects/VST/VSTControlMSW.h

@@ -13,9 +13,7 @@
 
 #include <Windows.h>
 
-#include <wx/control.h>
-
-#include "aeffectx.h"
+#include "VSTControl.h"
 
 class VSTControl final : public VSTControlBase
 {

src/effects/VST/VSTControlOSX.h

@@ -17,9 +17,7 @@
 
 #include <wx/osx/private.h>
 
-#include <wx/control.h>
-
-#include "aeffectx.h"
+#include "VSTControl.h"
 
 class VSTControlImpl final : public wxWidgetCocoaImpl
 {

src/effects/VST/VSTControlOSX.mm

@@ -22,8 +22,8 @@
 **********************************************************************/
 
 #include "../../Audacity.h"
+#include "VSTControlOSX.h"
 
-#include "VSTControl.h"
 #include "../../MemoryX.h"
 
 @interface VSTView : NSView

src/effects/VST/VSTEffect.cpp

@@ -25,15 +25,14 @@
 // *******************************************************************
 
 #include "../../Audacity.h"
+#include "VSTEffect.h"
 
 #if 0
 #if defined(BUILDING_AUDACITY)
 #include "../../PlatformCompatibility.h"
 
 // Make the main function private
-#define MODULEMAIN_SCOPE static
 #else
-#define MODULEMAIN_SCOPE
 #define USE_VST 1
 #endif
 #endif
@@ -99,10 +98,19 @@
 
 #include "audacity/ConfigInterface.h"
 
-#include "VSTEffect.h"
 #include "../../MemoryX.h"
 #include <cstring>
 
+// Put this inclusion last.  On Linux it makes some unfortunate pollution of
+// preprocessor macro name space that interferes with other headers.
+#if defined(__WXOSX__)
+#include "VSTControlOSX.h"
+#elif defined(__WXMSW__)
+#include "VSTControlMSW.h"
+#elif defined(__WXGTK__)
+#include "VSTControlGTK.h"
+#endif
+
 static float reinterpretAsFloat(uint32_t x)
 {
     static_assert(sizeof(float) == sizeof(uint32_t), "Cannot reinterpret uint32_t to float since sizes are different.");

src/effects/VST/VSTEffect.h

@@ -18,7 +18,9 @@
 
 #include "../../SampleFormat.h"
 #include "../../widgets/NumericTextCtrl.h"
+#include "../../xml/XMLTagHandler.h"
 
+class VSTControl;
 #include "VSTControl.h"
 
 #define VSTCMDKEY wxT("-checkvst")
@@ -56,6 +58,13 @@ class wxDynamicLibrary;
 
 #if defined(__WXMAC__)
 struct __CFBundle;
+typedef struct __CFBundle *CFBundleRef;
+#if __LP64__
+typedef int CFBundleRefNum;
+#else
+typedef signed short                    SInt16;
+typedef SInt16 CFBundleRefNum;
+#endif
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////

src/effects/audiounits/AUControl.h

@@ -26,6 +26,7 @@
 #include <wx/control.h>
 
 #include <AudioUnit/AudioComponent.h>
+#include <AudioUnit/AudioUnit.h>
 
 class AUControlImpl final : public wxWidgetCocoaImpl
 {

src/effects/audiounits/AUControl.mm

@@ -22,9 +22,8 @@
 **********************************************************************/
 
 #include "../../Audacity.h"
+#include "AUControl.h"
 
-#include <AudioUnit/AudioUnit.h>
-#include <AudioUnit/AudioComponent.h>
 #include <AudioUnit/AudioUnitProperties.h>
 #include <AudioUnit/AUCocoaUIView.h>
 #include <CoreAudioKit/CoreAudioKit.h>
@@ -33,7 +32,6 @@
 #include <AudioUnit/AudioUnitCarbonView.h>
 #endif
 
-#include "AUControl.h"
 #include "../../MemoryX.h"
 
 @interface AUView : NSView

src/effects/audiounits/AudioUnitEffect.cpp

@@ -17,6 +17,7 @@
 #include "../../Audacity.h"
 
 #if USE_AUDIO_UNITS
+#include "AudioUnitEffect.h"
 
 #include <wx/defs.h>
 #include <wx/button.h>
@@ -41,7 +42,6 @@
 #include "../../widgets/valnum.h"
 #include "../../widgets/wxPanelWrapper.h"
 
-#include "AudioUnitEffect.h"
 #include "../../Internat.h"
 
 struct CFReleaser

src/effects/ladspa/LadspaEffect.cpp

@@ -23,6 +23,7 @@ effects from this one class.
 
 
 #include "../../Audacity.h"
+#include "LadspaEffect.h"       // This class's header file
 
 #include "ladspa.h"
 
@@ -33,7 +34,6 @@ effects from this one class.
 #include <wx/checkbox.h>
 #include <wx/dcbuffer.h>
 #include <wx/dcclient.h>
-#include <wx/dynlib.h>
 #include <wx/filename.h>
 #include <wx/log.h>
 #include <wx/menu.h>
@@ -47,7 +47,6 @@ effects from this one class.
 #include <wx/scrolwin.h>
 #include <wx/version.h>
 
-#include "LadspaEffect.h"       // This class's header file
 #include "../../FileNames.h"
 #include "../../Internat.h"
 #include "../../ShuttleGui.h"

src/effects/ladspa/LadspaEffect.h

@@ -15,6 +15,7 @@ class wxCheckBox;
 
 #include "../../MemoryX.h"
 #include <wx/dialog.h>
+#include <wx/dynlib.h>
 
 #include "audacity/EffectInterface.h"
 #include "audacity/ModuleInterface.h"

src/effects/lv2/LV2Effect.cpp

@@ -12,6 +12,7 @@
 #include "../../Audacity.h"
 
 #if defined(USE_LV2)
+#include "LV2Effect.h"
 
 #include <cmath>
 
@@ -31,7 +32,6 @@
 #include <wx/scrolwin.h>
 
 #include "LoadLV2.h"
-#include "LV2Effect.h"
 #include "../../Internat.h"
 #include "../../ShuttleGui.h"
 #include "../../widgets/valnum.h"

src/effects/lv2/LoadLV2.cpp

@@ -17,6 +17,7 @@ Functions that find and load all LV2 plugins on the system.
 #include "../../Audacity.h"
 
 #if defined(USE_LV2)
+#include "LoadLV2.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -41,8 +42,6 @@ Functions that find and load all LV2 plugins on the system.
 #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
 #include "lv2/lv2plug.in/ns/ext/presets/presets.h"
 
-#include "LoadLV2.h"
-
 #include <unordered_map>
 
 // ============================================================================

src/effects/nyquist/LoadNyquist.cpp

@@ -9,12 +9,12 @@
 **********************************************************************/
 
 #include "../../AudacityApp.h"
+#include "LoadNyquist.h"
 
 #include <wx/log.h>
 
 #include "Nyquist.h"
 
-#include "LoadNyquist.h"
 #include "../../FileNames.h"
 
 // ============================================================================

src/effects/nyquist/Nyquist.cpp

@@ -25,6 +25,7 @@ effects from this one class.
 *//*******************************************************************/
 
 #include "../../Audacity.h"
+#include "Nyquist.h"
 
 #include "../../Experimental.h"
 
@@ -69,8 +70,6 @@ effects from this one class.
 
 #include "../lib-src/FileDialog/FileDialog.h"
 
-#include "Nyquist.h"
-
 #ifndef nyx_returns_start_and_end_time
 #error You need to update lib-src/libnyquist
 #endif

src/effects/vamp/LoadVamp.cpp

@@ -11,12 +11,12 @@
 #include "../../Audacity.h"
 
 #if defined(USE_VAMP)
+#include "LoadVamp.h"
 
 #include <wx/filename.h>
 
 #include "../EffectManager.h"
 #include "VampEffect.h"
-#include "LoadVamp.h"
 
 #include <iostream>
 #include <map>

src/effects/vamp/LoadVamp.h

@@ -12,10 +12,14 @@
 
 #if defined(USE_VAMP)
 
+#include <memory>
+
 #include "audacity/ModuleInterface.h"
 #include "audacity/EffectInterface.h"
 #include "audacity/PluginInterface.h"
 
+#include <vamp-hostsdk/PluginLoader.h>
+
 ///////////////////////////////////////////////////////////////////////////////
 //
 // VampEffectsModule

src/effects/vamp/VampEffect.cpp

@@ -14,7 +14,6 @@
 #include "../../Audacity.h"
 
 #if defined(USE_VAMP)
-
 #include "VampEffect.h"
 
 #include <vamp-hostsdk/Plugin.h>

src/export/ExportFFmpeg.cpp

@@ -20,6 +20,7 @@ function.
 
 
 #include "../Audacity.h"   // keep ffmpeg before wx because they interact
+#include "ExportFFmpeg.h"
 
 #include "../FFmpeg.h"     // and Audacity.h before FFmpeg for config*.h
 
@@ -44,7 +45,6 @@ function.
 #include "../widgets/ErrorDialog.h"
 
 #include "Export.h"
-#include "ExportFFmpeg.h"
 
 #include "ExportFFmpegDialogs.h"
 

src/export/ExportFFmpegDialogs.cpp

@@ -37,11 +37,10 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"   // keep ffmpeg before wx because they interact
+#include "ExportFFmpegDialogs.h"
 
 #include "../FFmpeg.h"     // and Audacity.h before FFmpeg for config*.h
 
-#include "ExportFFmpegDialogs.h"
-
 #include <wx/choice.h>
 #include <wx/intl.h>
 #include <wx/timer.h>

src/export/ExportFLAC.cpp

@@ -21,8 +21,8 @@ and libvorbis examples, Monty <monty@xiph.org>
 #include "../Audacity.h"
 
 #ifdef USE_LIBFLAC
-
 #include "ExportFLAC.h"
+
 #include "Export.h"
 
 #include <wx/progdlg.h>

src/export/ExportOGG.cpp

@@ -18,8 +18,8 @@
 #include "../Audacity.h"
 
 #ifdef USE_LIBVORBIS
-
 #include "ExportOGG.h"
+
 #include "Export.h"
 
 #include <wx/log.h>

src/import/ImportGStreamer.cpp

@@ -25,11 +25,12 @@ Licensed under the GNU General Public License v2 or later
 
 #include "../Audacity.h"	// needed before GStreamer.h
 
+#if defined(USE_GSTREAMER)
+#include "ImportGStreamer.h"
+
 #include <wx/window.h>
 #include <wx/log.h>
 
-#if defined(USE_GSTREAMER)
-
 #include "../MemoryX.h"
 
 #define DESC _("GStreamer-compatible files")
@@ -54,7 +55,6 @@ Licensed under the GNU General Public License v2 or later
 #include "../WaveTrack.h"
 #include "Import.h"
 #include "ImportPlugin.h"
-#include "ImportGStreamer.h"
 
 extern "C"
 {

src/ondemand/ODDecodeFFmpegTask.cpp

@@ -10,6 +10,7 @@
 ******************************************************************/
 
 #include "../Audacity.h"   // needed before FFmpeg.h
+#include "ODDecodeFFmpegTask.h"
 
 #include "../Experimental.h"
 
@@ -31,7 +32,6 @@
 
 
 extern FFmpegLibs *FFmpegLibsInst();
-#include "ODDecodeFFmpegTask.h"
 
 
 #define ODFFMPEG_SEEKING_TEST_UNKNOWN 0

src/ondemand/ODTask.cpp

@@ -19,6 +19,7 @@ in a background thread.
 
 
 #include "ODTask.h"
+
 #include "ODManager.h"
 #include "../WaveTrack.h"
 #include "../Project.h"

src/ondemand/ODTaskThread.cpp

@@ -17,6 +17,7 @@
 
 
 #include "ODTaskThread.h"
+
 #include "ODTask.h"
 #include "ODManager.h"