Include nothing before Audacity.h, as comments say we should...

... and remove some duplicated inclusions

src/AColor.cpp

@@ -18,6 +18,7 @@ It is also a place to document colour usage policy in Audacity
 *//********************************************************************/
 
 #include "Audacity.h"
+
 #include <wx/window.h>
 #include <wx/colour.h>
 #include <wx/dc.h>

src/AudacityApp.cpp

@@ -15,13 +15,14 @@ It handles initialization and termination by subclassing wxApp.
 
 *//*******************************************************************/
 
+#include "Audacity.h" // This should always be included first
+
 #if 0
 // This may be used to debug memory leaks.
 // See: Visual Leak Dectector @ http://vld.codeplex.com/
 #include <vld.h>
 #endif
 
-#include "Audacity.h" // This should always be included first
 #include "AudacityApp.h"
 #include "TranslatableStringArray.h"
 

src/AudacityLogger.cpp

@@ -16,6 +16,7 @@ Provides thread-safe logging based on the wxWidgets log facility.
 
 #include "Audacity.h" // This should always be included first
 #include "AudacityLogger.h"
+
 #include "FileNames.h"
 #include "ShuttleGui.h"
 

src/AudioIO.cpp

@@ -414,6 +414,7 @@ TimeTrack and AudioIOListener and whether the playback is looped.
 *//*******************************************************************/
 
 #include "Audacity.h"
+
 #include "Experimental.h"
 #include "AudioIO.h"
 #include "float_cast.h"

src/AudioIO.h

@@ -13,8 +13,9 @@
 #ifndef __AUDACITY_AUDIO_IO__
 #define __AUDACITY_AUDIO_IO__
 
-#include "portaudio.h"
 #include "Audacity.h"
+
+#include "portaudio.h"
 #include "Experimental.h"
 
 #include "MemoryX.h"

src/AutoRecovery.cpp

@@ -18,8 +18,9 @@ text or binary format to a file.
 
 *//********************************************************************/
 
-#include "AutoRecovery.h"
 #include "Audacity.h"
+#include "AutoRecovery.h"
+
 #include "FileNames.h"
 #include "blockfile/SimpleBlockFile.h"
 #include "Project.h"

src/CellularPanel.cpp

@@ -29,6 +29,7 @@
 
 #include "Audacity.h"
 #include "CellularPanel.h"
+
 #include "Project.h"
 #include "UIHandle.h"
 #include "TrackPanelCell.h"

src/DeviceChange.h

@@ -12,6 +12,7 @@
 #define __AUDACITY_DEVICECHANGE_H__
 
 #include "Audacity.h"
+
 #include "Experimental.h"
 
 #if defined(EXPERIMENTAL_DEVICE_CHANGE_HANDLER)

src/DeviceManager.cpp

@@ -6,6 +6,8 @@
 
 ******************************************************************/
 
+#include "Audacity.h"
+
 #include "portaudio.h"
 #ifdef __WXMSW__
 #include "pa_win_wasapi.h"
@@ -15,7 +17,6 @@
 #include "portmixer.h"
 #endif
 
-#include "Audacity.h"
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 

src/Diags.cpp

@@ -29,6 +29,7 @@ count down so that we track how many times the event happens.
 
 
 #include "Audacity.h"
+
 #include <wx/defs.h>
 #include <wx/hash.h>
 #include <wx/intl.h>

src/DirManager.cpp

@@ -63,6 +63,7 @@
 
 #include "Audacity.h"
 #include "DirManager.h"
+
 #include "MemoryX.h"
 
 #include <time.h> // to use time() for srand()

src/FFT.cpp

@@ -40,6 +40,7 @@
 */
 
 #include "Audacity.h"
+
 #include "Internat.h"
 
 #include "FFT.h"

src/FFmpeg.cpp

@@ -19,6 +19,7 @@ License: GPL v2.  See License.txt.
 
 #include "Audacity.h"   // for config*.h
 #include "FFmpeg.h"
+
 #include "FileNames.h"
 #include "Internat.h"
 #include "widgets/HelpSystem.h"

src/FFmpeg.h

@@ -16,6 +16,8 @@ Describes shared object that is used to access FFmpeg libraries.
 #if !defined(__AUDACITY_FFMPEG__)
 #define __AUDACITY_FFMPEG__
 
+#include "Audacity.h"
+
 #include "MemoryX.h"
 
 #include "Internat.h"
@@ -144,7 +146,6 @@ extern "C" {
 }
 #endif
 
-#include "Audacity.h"
 #include "Experimental.h"
 
 /* rather earlier than normal, but pulls in config*.h and other program stuff

src/FileException.cpp

@@ -8,6 +8,7 @@
 
 #include "Audacity.h"
 #include "FileException.h"
+
 #include "Internat.h"
 #include "Prefs.h"
 

src/FileFormats.cpp

@@ -16,6 +16,7 @@ information.
 
 
 #include "Audacity.h"
+
 #include "MemoryX.h"
 #include <wx/arrstr.h>
 #include <wx/intl.h>

src/FileFormats.h

@@ -11,11 +11,12 @@
 #ifndef __AUDACITY_FILE_FORMATS__
 #define __AUDACITY_FILE_FORMATS__
 
+#include "Audacity.h"
+
 #include <wx/list.h>
 #include <wx/arrstr.h>
 #include <wx/string.h>
 
-#include "Audacity.h"
 #include "audacity/Types.h"
 
 #include "sndfile.h"

src/FileNames.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_FILE_NAMES__
 #define __AUDACITY_FILE_NAMES__
 
-#include <wx/string.h>
 #include "Audacity.h"
 
 #include "audacity/Types.h"

src/HelpText.cpp

@@ -12,11 +12,13 @@
 \brief Given a key, returns some html.
 *//********************************************************************/
 
+#include "Audacity.h"
+
 #include <wx/string.h>
 #include <wx/intl.h>
 
-#include "Audacity.h"
 #include "HelpText.h"
+
 #include "FileNames.h"
 #include "AboutDialog.h"
 #include "AllThemeResources.h"

src/ImageManipulation.cpp

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

src/InconsistencyException.cpp

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

src/Internat.h

@@ -12,13 +12,14 @@
 #ifndef __AUDACITY_INTERNAT__
 #define __AUDACITY_INTERNAT__
 
+#include "Audacity.h"
+
 #include <wx/string.h>
 #include <wx/longlong.h>
 
 #include <algorithm>
 
 #ifndef IN_RC
-#include "Audacity.h"
 #include "audacity/Types.h"
 
 class wxArrayString;

src/LabelTrack.cpp

@@ -30,6 +30,7 @@ for drawing different aspects of the label and its text box.
 
 #include "Audacity.h"
 #include "LabelTrack.h"
+
 #include "Experimental.h"
 #include "TrackPanel.h"
 

src/MixerBoard.cpp

@@ -10,6 +10,7 @@
 **********************************************************************/
 
 #include "Audacity.h"
+
 #include "Menus.h"
 #include "MixerBoard.h"
 

src/ModuleManager.cpp

@@ -18,13 +18,14 @@ i.e. an alternative to the usual interface, for Audacity.
 
 *//*******************************************************************/
 
+#include "Audacity.h"
+
 #include <wx/dynlib.h>
 #include <wx/list.h>
 #include <wx/log.h>
 #include <wx/string.h>
 #include <wx/filename.h>
 
-#include "Audacity.h"
 #include "AudacityApp.h"
 #include "FileNames.h"
 #include "Internat.h"

src/NoteTrack.cpp

@@ -16,6 +16,7 @@
 
 #include "Audacity.h"
 #include "NoteTrack.h"
+
 #include "Experimental.h"
 
 #include <wx/dc.h>

src/NoteTrack.h

@@ -11,9 +11,10 @@
 #ifndef __AUDACITY_NOTETRACK__
 #define __AUDACITY_NOTETRACK__
 
+#include "Audacity.h"
+
 #include <utility>
 #include <wx/string.h>
-#include "Audacity.h"
 #include "Experimental.h"
 #include "Track.h"
 #include "effects/TimeWarper.h"

src/PitchName.cpp

@@ -17,10 +17,11 @@
 *//*******************************************************************/
 
 
+#include "Audacity.h"
+
 #include <math.h>
 #include <stdio.h>
 
-#include "Audacity.h"
 #include "PitchName.h"
 #include "Internat.h"
 

src/PluginManager.cpp

@@ -18,10 +18,10 @@ effects, generators, analysis-effects, commands.  It also has functions
 for shared and private configs - which need to move out.
 *****************************************************************************/
 
-#include <algorithm>
-
 #include "Audacity.h"
 
+#include <algorithm>
+
 #include <wx/defs.h>
 #include <wx/dialog.h>
 #include <wx/dir.h>

src/Prefs.h

@@ -30,6 +30,7 @@
 #define __AUDACITY_PREFS__
 
 #include "Audacity.h"
+
 #include "../include/audacity/ComponentInterface.h"
 
 #include <wx/config.h>

src/Profiler.cpp

@@ -22,6 +22,7 @@ but it will probably work fine if you use it on a high level.
 
 #include "Audacity.h"
 #include "Profiler.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <wx/crt.h>

src/Project.h

@@ -19,6 +19,7 @@
 #define __AUDACITY_PROJECT__
 
 #include "Audacity.h"
+
 #include "Experimental.h"
 
 #include "Track.h"

src/RealFFTf.cpp

@@ -37,6 +37,7 @@
 */
 
 #include "Audacity.h"
+
 #include <vector>
 #include <stdlib.h>
 #include <stdio.h>

src/RealFFTf.h

@@ -2,6 +2,7 @@
 #define __realfftf_h
 
 #include "Audacity.h"
+
 #include "Experimental.h"
 #include "MemoryX.h"
 

src/RealFFTf48x.cpp

@@ -53,7 +53,9 @@
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+
 #include "Audacity.h"
+
 #include "Experimental.h"
 #ifdef EXPERIMENTAL_EQ_SSE_THREADED
 

src/Registrar.h

@@ -21,6 +21,7 @@ responsible for calling the appropriate callback functions.
 #define __AUDACITY_REGISTRAR__
 
 #include "Audacity.h"
+
 #include "MemoryX.h"
 
 class LoadableModule;

src/SampleFormat.h

@@ -12,6 +12,7 @@
 #define __AUDACITY_SAMPLE_FORMAT__
 
 #include "Audacity.h"
+
 #include "MemoryX.h"
 #include <wx/defs.h>
 

src/SelectedRegion.h

@@ -26,6 +26,7 @@
 #define __AUDACITY_SELECTEDREGION__
 
 #include "Audacity.h"
+
 #include "Experimental.h"
 
 #include <wx/defs.h>

src/SelectionState.cpp

@@ -8,6 +8,7 @@
 
 #include "Audacity.h"
 #include "SelectionState.h"
+
 #include "ViewInfo.h"
 #include "Track.h"
 

src/ShuttleGui.cpp

@@ -94,6 +94,7 @@ for registering for changes.
 
 
 #include "Audacity.h"
+
 #include "Experimental.h"
 #include "Prefs.h"
 #include "Shuttle.h"

src/Tags.h

@@ -30,6 +30,7 @@
 #define __AUDACITY_TAGS__
 
 #include "Audacity.h"
+
 #include "widgets/Grid.h"
 #include "xml/XMLTagHandler.h"
 

src/TimeTrack.cpp

@@ -15,6 +15,7 @@
 
 #include "Audacity.h"
 #include "TimeTrack.h"
+
 #include "Experimental.h"
 
 #include <cfloat>

src/TimerRecordDialog.cpp

@@ -20,6 +20,7 @@
 
 #include "Audacity.h"
 #include "TimerRecordDialog.h"
+
 #include "FileNames.h"
 
 #include <wx/defs.h>

src/TrackArtist.cpp

@@ -40,6 +40,7 @@ audio tracks.
 
 #include "Audacity.h"
 #include "TrackArtist.h"
+
 #include "float_cast.h"
 
 #include <math.h>

src/TrackPanel.cpp

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

src/TrackPanelResizeHandle.cpp

@@ -10,6 +10,7 @@ Paul Licameli split from TrackPanel.cpp
 
 #include "Audacity.h"
 #include "TrackPanelResizeHandle.h"
+
 #include "Experimental.h"
 
 #include "MemoryX.h"

src/UIHandle.cpp

@@ -10,6 +10,7 @@ Paul Licameli
 
 #include "Audacity.h"
 #include "UIHandle.h"
+
 #include "RefreshCode.h"
 
 UIHandle::~UIHandle()

src/VoiceKey.cpp

@@ -19,8 +19,8 @@ or "OFF" point
 
 
 #include "Audacity.h"
-
 #include "VoiceKey.h"
+
 #include <wx/string.h>
 #include <math.h>
 #include <stdio.h>

src/WaveClip.h

@@ -13,6 +13,7 @@
 #define __AUDACITY_WAVECLIP__
 
 #include "Audacity.h"
+
 #include "MemoryX.h"
 #include "SampleFormat.h"
 #include "widgets/ProgressDialog.h"

src/WrappedType.cpp

@@ -26,6 +26,7 @@
 *//**********************************************************************/
 
 #include "Audacity.h"
+
 #include <wx/wxprec.h>
 #include "Internat.h"
 #include "WrappedType.h"

src/blockfile/NotYetAvailableException.cpp

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

src/blockfile/SilentBlockFile.cpp

@@ -10,6 +10,7 @@
 
 #include "../Audacity.h"
 #include "SilentBlockFile.h"
+
 #include "../FileFormats.h"
 
 SilentBlockFile::SilentBlockFile(size_t sampleLen):

src/commands/AppCommandEvent.h

@@ -16,8 +16,9 @@
 #ifndef __APPCOMMANDEVENT__
 #define __APPCOMMANDEVENT__
 
-#include <wx/event.h>
 #include "../Audacity.h"
+
+#include <wx/event.h>
 #include "../MemoryX.h"
 
 DECLARE_EXPORTED_EVENT_TYPE(AUDACITY_DLL_API, wxEVT_APP_COMMAND_RECEIVED, -1);

src/commands/AudacityCommand.h

@@ -12,6 +12,7 @@
 #define __AUDACITY_COMMAND__
 
 #include "../Audacity.h"
+
 #include "../MemoryX.h"
 #include <set>
 

src/commands/BatchEvalCommand.cpp

@@ -15,6 +15,7 @@
 
 #include "../Audacity.h"
 #include "BatchEvalCommand.h"
+
 #include "CommandContext.h"
 
 ComponentInterfaceSymbol BatchEvalCommandType::BuildName()

src/commands/Command.cpp

@@ -77,6 +77,7 @@ classes derived from it.
 
 #include "../Audacity.h"
 #include "Command.h"
+
 #include <map>
 #include <wx/string.h>
 #include <wx/variant.h>

src/commands/CommandBuilder.cpp

@@ -23,6 +23,7 @@ system by constructing BatchCommandEval objects.
 
 #include "../Audacity.h"
 #include "CommandBuilder.h"
+
 #include "CommandDirectory.h"
 #include "../Shuttle.h"
 #include "BatchEvalCommand.h"

src/commands/CommandContext.cpp

@@ -21,6 +21,7 @@ messaging from a command back to its invoker.
 *//*******************************************************************/
 
 #include "../Audacity.h"
+
 #include "Command.h"
 #include <map>
 #include <wx/string.h>

src/commands/CommandDirectory.cpp

@@ -16,6 +16,7 @@ functions to look up a command by name.
 
 #include "../Audacity.h"
 #include "CommandDirectory.h"
+
 #include "CommandMisc.h"
 
 #include "HelpCommand.h"

src/commands/CommandHandler.cpp

@@ -18,6 +18,7 @@
 
 #include "../Audacity.h"
 #include "CommandHandler.h"
+
 #include <wx/event.h>
 #include "../Project.h"
 #include "Command.h"

src/commands/CommandManager.cpp

@@ -75,8 +75,9 @@ CommandManager.  It holds the callback for one command.
 
 *//******************************************************************/
 
-#include "../AudacityHeaders.h"
 #include "../Audacity.h"
+
+#include "../AudacityHeaders.h"
 #include "CommandManager.h"
 #include "CommandManagerWindowClasses.h"
 #include "CommandContext.h"

src/commands/CommandSignature.cpp

@@ -15,6 +15,7 @@
 
 #include "../Audacity.h"
 #include "CommandSignature.h"
+
 #include "CommandMisc.h"
 #include "Validators.h"
 

src/commands/CommandTargets.cpp

@@ -23,6 +23,7 @@ capture the more lengthy output from some commands.
 
 #include "../Audacity.h"
 #include "CommandTargets.h"
+
 #include <wx/string.h>
 #include "../ShuttleGui.h"
 #include "../Project.h"

src/commands/CommandType.cpp

@@ -19,6 +19,7 @@ Also acts as a factory.
 
 #include "../Audacity.h"
 #include "CommandType.h"
+
 #include "CommandMisc.h"
 #include "CommandSignature.h"
 #include <wx/string.h>

src/commands/CompareAudioCommand.cpp

@@ -20,6 +20,7 @@ threshold of difference in two selected tracks
 
 #include "../Audacity.h"
 #include "CompareAudioCommand.h"
+
 #include "../MemoryX.h"
 #include "../Project.h"
 #include "../WaveTrack.h"

src/commands/DragCommand.cpp

@@ -18,6 +18,7 @@
 
 #include "../Audacity.h"
 #include "DragCommand.h"
+
 #include "../Project.h"
 #include "../Track.h"
 #include "../TrackPanel.h"

src/commands/GetInfoCommand.cpp

@@ -22,6 +22,7 @@ This class now lists
 
 #include "../Audacity.h"
 #include "GetInfoCommand.h"
+
 #include "../Project.h"
 #include "CommandManager.h"
 #include "../effects/EffectManager.h"

src/commands/GetTrackInfoCommand.cpp

@@ -18,6 +18,7 @@
 
 #include "../Audacity.h"
 #include "GetTrackInfoCommand.h"
+
 #include "../Project.h"
 #include "../Track.h"
 #include "../TrackPanel.h"

src/commands/HelpCommand.cpp

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

src/commands/ImportExportCommands.cpp

@@ -16,6 +16,7 @@
 
 #include "../Audacity.h"
 #include "ImportExportCommands.h"
+
 #include "../Project.h"
 #include "../Track.h"
 #include "../export/Export.h"

src/commands/LoadCommands.cpp

@@ -14,6 +14,7 @@ modelled on BuiltinEffectsModule
 *****************************************************************************/
 
 #include "../Audacity.h"
+
 #include "../Prefs.h"
 
 #include "LoadCommands.h"

src/commands/MessageCommand.cpp

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

src/commands/OpenSaveCommands.cpp

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

src/commands/PreferenceCommands.cpp

@@ -17,6 +17,7 @@ SetPreferenceCommand classes
 
 #include "../Audacity.h"
 #include "PreferenceCommands.h"
+
 #include "../Menus.h"
 #include "../Prefs.h"
 #include "../Shuttle.h"

src/commands/ScreenshotCommand.cpp

@@ -19,6 +19,7 @@ small calculations of rectangles.
 
 #include "../Audacity.h"
 #include "ScreenshotCommand.h"
+
 #include "CommandTargets.h"
 #include "../Project.h"
 #include <wx/toplevel.h>

src/commands/ScriptCommandRelay.h

@@ -17,6 +17,7 @@
 #define __SCRIPT_COMMAND_RELAY__
 
 #include "../Audacity.h"
+
 #include "../MemoryX.h"
 
 class CommandHandler;

src/commands/SelectCommand.cpp

@@ -30,6 +30,7 @@ explicitly code all three.
 *//*******************************************************************/
 
 #include "../Audacity.h"
+
 #include <wx/string.h>
 #include <float.h>
 

src/commands/SetClipCommand.cpp

@@ -18,6 +18,7 @@
 
 #include "../Audacity.h"
 #include "SetClipCommand.h"
+
 #include "../Project.h"
 #include "../Track.h"
 #include "../TrackPanel.h"

src/commands/SetEnvelopeCommand.cpp

@@ -18,6 +18,7 @@
 
 #include "../Audacity.h"
 #include "SetEnvelopeCommand.h"
+
 #include "../Project.h"
 #include "../Track.h"
 #include "../TrackPanel.h"

src/commands/SetLabelCommand.cpp

@@ -18,6 +18,7 @@
 
 #include "../Audacity.h"
 #include "SetLabelCommand.h"
+
 #include "../Project.h"
 #include "../Track.h"
 #include "../TrackPanel.h"

src/commands/SetProjectCommand.cpp

@@ -19,6 +19,7 @@
 
 #include "../Audacity.h"
 #include "SetProjectCommand.h"
+
 #include "../Project.h"
 #include "../Track.h"
 #include "../TrackPanel.h"

src/commands/SetTrackInfoCommand.cpp

@@ -35,6 +35,7 @@ SetTrackAudioCommand and SetTrackVisualsCommand.
 
 #include "../Audacity.h"
 #include "SetTrackInfoCommand.h"
+
 #include "../Project.h"
 #include "../Track.h"
 #include "../TrackPanel.h"

src/effects/DtmfGen.cpp

@@ -14,6 +14,7 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+
 #include "../Experimental.h"
 #include "DtmfGen.h"
 

src/effects/Effect.h

@@ -13,6 +13,7 @@
 #define __AUDACITY_EFFECT__
 
 #include "../Audacity.h"
+
 #include "../MemoryX.h"
 #include <set>
 

src/effects/EffectRack.cpp

@@ -12,6 +12,7 @@
 **********************************************************************/
 
 #include "../Audacity.h"
+
 #include "../Experimental.h"
 
 #if defined(EXPERIMENTAL_EFFECTS_RACK)

src/effects/Equalization48x.cpp

@@ -14,6 +14,7 @@
 *//****************************************************************/
 
 #include "../Audacity.h"
+
 #include "../Experimental.h"
 #ifdef EXPERIMENTAL_EQ_SSE_THREADED
 #include "../MemoryX.h"

src/effects/LoadEffects.cpp

@@ -12,6 +12,7 @@
 *****************************************************************************/
 
 #include "../Audacity.h"
+
 #include "../Prefs.h"
 
 #include "LoadEffects.h"

src/effects/NoiseReduction.cpp

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

src/effects/NoiseRemoval.cpp

@@ -39,6 +39,7 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+
 #include "../Experimental.h"
 
 #if !defined(EXPERIMENTAL_NOISE_REDUCTION)

src/effects/Reverb.cpp

@@ -20,7 +20,6 @@
 #include <wx/arrstr.h>
 #include <wx/intl.h>
 
-#include "../Audacity.h"
 #include "../Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"

src/effects/ScoreAlignDialog.cpp

@@ -17,6 +17,7 @@ It \TODO: description
 *//*******************************************************************/
 
 #include "../Audacity.h"
+
 #include "../Experimental.h"
 
 #ifdef EXPERIMENTAL_SCOREALIGN

src/effects/TwoPassSimpleMono.cpp

@@ -19,7 +19,6 @@ doing the second pass over all selected tracks.
 
 
 #include "../Audacity.h"
-
 #include "TwoPassSimpleMono.h"
 
 #include "../WaveTrack.h"

src/effects/VST/VSTControlOSX.mm

@@ -22,6 +22,7 @@
 **********************************************************************/
 
 #include "../../Audacity.h"
+
 #include "VSTControl.h"
 #include "../../MemoryX.h"
 

src/effects/VST/VSTEffect.cpp

@@ -28,7 +28,6 @@
 
 #if 0
 #if defined(BUILDING_AUDACITY)
-#include "../../Audacity.h"
 #include "../../PlatformCompatibility.h"
 
 // Make the main function private

src/effects/audiounits/AUControl.mm

@@ -22,6 +22,7 @@
 **********************************************************************/
 
 #include "../../Audacity.h"
+
 #include <AudioUnit/AudioUnit.h>
 #include <AudioUnit/AudioComponent.h>
 #include <AudioUnit/AudioUnitProperties.h>

src/export/ExportCL.cpp

@@ -13,6 +13,7 @@
 
 #include "../Audacity.h"
 #include "ExportCL.h"
+
 #include "../Project.h"
 
 #include <wx/app.h>

src/export/ExportFFmpeg.cpp

@@ -20,6 +20,7 @@ function.
 
 
 #include "../Audacity.h"   // keep ffmpeg before wx because they interact
+
 #include "../FFmpeg.h"     // and Audacity.h before FFmpeg for config*.h
 
 #include <wx/choice.h>

src/export/ExportFFmpegDialogs.cpp

@@ -37,6 +37,7 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"   // keep ffmpeg before wx because they interact
+
 #include "../FFmpeg.h"     // and Audacity.h before FFmpeg for config*.h
 
 #include "ExportFFmpegDialogs.h"

src/export/ExportFFmpegDialogs.h

@@ -14,6 +14,7 @@ LRN
 #if defined(USE_FFMPEG)
 
 #include "../Audacity.h"   // keep ffmpeg before wx because they interact
+
 #include "../FFmpeg.h"     // and Audacity.h before FFmpeg for config*.h
 
 #include <wx/hashmap.h>

src/import/ImportGStreamer.cpp

@@ -24,6 +24,7 @@ Licensed under the GNU General Public License v2 or later
 *//*******************************************************************/
 
 #include "../Audacity.h"	// needed before GStreamer.h
+
 #include <wx/window.h>
 #include <wx/log.h>