Experimental.h in all .h or .cpp files that directly use EXPERIMENTALs...

... except Audacity.h; and in no others.

Do so even if Experimental.h gets multiply included, as in both the .h and
.cpp files.

This makes it easier to do a text scan to be sure there are no unintended quiet
changes of meaning because of omission of Experimental.h when the flag is
an enabled one.

Also move inclusions of Experimental.h earlier.

Also don't require Experimental.h to be preceded by Audacity.h to define
EXPERIMENTAL_MIDI_OUT correctly.

src/AColor.cpp

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

src/AboutDialog.cpp

@@ -27,6 +27,8 @@ hold information about one contributor to Audacity.
 
 #include "Audacity.h"
 
+#include "Experimental.h"
+
 #include <wx/dialog.h>
 #include <wx/html/htmlwin.h>
 #include <wx/button.h>

src/AdornedRulerPanel.cpp

@@ -21,12 +21,13 @@
 #include "Audacity.h"
 #include "AdornedRulerPanel.h"
 
+#include "Experimental.h"
+
 #include <wx/tooltip.h>
 
 #include "AColor.h"
 #include "AllThemeResources.h"
 #include "AudioIO.h"
-#include "Experimental.h"
 #include "Menus.h"
 #include "Prefs.h"
 #include "Project.h"

src/AdornedRulerPanel.h

@@ -21,7 +21,6 @@
 #include <wx/event.h>
 #include <wx/font.h>
 #include <wx/window.h>
-#include "Experimental.h"
 
 class ViewInfo;
 class AudacityProject;

src/AllThemeResources.h

@@ -45,6 +45,7 @@ from there.  Audacity will look for a file called "Pause.png".
 // we want to include it multiple times in Theme.cpp.
 
 #include "Experimental.h"
+
 #include "MacroMagic.h"
 #define XPMS_RETIRED
 

src/AudacityApp.cpp

@@ -17,6 +17,8 @@ It handles initialization and termination by subclassing wxApp.
 
 #include "Audacity.h" // This should always be included first
 
+#include "Experimental.h"
+
 #if 0
 // This may be used to debug memory leaks.
 // See: Visual Leak Dectector @ http://vld.codeplex.com/
@@ -104,8 +106,6 @@ It handles initialization and termination by subclassing wxApp.
 
 #include "import/Import.h"
 
-#include "Experimental.h"
-
 #if defined(EXPERIMENTAL_CRASH_REPORT)
 #include <wx/debugrpt.h>
 #include <wx/evtloop.h>

src/AudacityApp.h

@@ -17,6 +17,8 @@
 #include "Audacity.h"
 #include "audacity/Types.h"
 
+#include "Experimental.h"
+
 #include "MemoryX.h"
 #include <wx/app.h>
 #include <wx/cmdline.h>
@@ -31,7 +33,6 @@
 
 #include "widgets/FileHistory.h"
 #include "ondemand/ODTaskThread.h"
-#include "Experimental.h"
 
 #if defined(EXPERIMENTAL_CRASH_REPORT)
 #include <wx/debugrpt.h>

src/AudacityLogger.cpp

@@ -17,6 +17,8 @@ Provides thread-safe logging based on the wxWidgets log facility.
 #include "Audacity.h" // This should always be included first
 #include "AudacityLogger.h"
 
+#include "Experimental.h"
+
 #include "FileNames.h"
 #include "ShuttleGui.h"
 
@@ -27,7 +29,6 @@ Provides thread-safe logging based on the wxWidgets log facility.
 #include <wx/settings.h>
 
 #include "../images/AudacityLogoAlpha.xpm"
-#include "Experimental.h"
 #include "widgets/ErrorDialog.h"
 #include "Internat.h"
 

src/AudacityLogger.h

@@ -16,6 +16,8 @@
 
 #include "Audacity.h"
 
+#include "Experimental.h"
+
 #include "MemoryX.h"
 #include <wx/event.h>
 #include <wx/log.h>
@@ -23,8 +25,6 @@
 #include <wx/textctrl.h>
 #include <wx/string.h>
 
-#include "Experimental.h"
-
 class AudacityLogger final : public wxEvtHandler, public wxLog {
  public:
    AudacityLogger();

src/AudioIO.cpp

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

src/AudioIO.h

@@ -15,9 +15,10 @@
 
 #include "Audacity.h"
 
-#include "portaudio.h"
 #include "Experimental.h"
 
+#include "portaudio.h"
+
 #include "MemoryX.h"
 #include <atomic>
 #include <utility>

src/DeviceManager.cpp

@@ -8,6 +8,8 @@
 
 #include "Audacity.h"
 
+#include "Experimental.h"
+
 #include "portaudio.h"
 #ifdef __WXMSW__
 #include "pa_win_wasapi.h"
@@ -38,8 +40,6 @@
 #include "DeviceManager.h"
 #include "toolbars/DeviceToolBar.h"
 
-#include "Experimental.h"
-
 DeviceManager DeviceManager::dm;
 
 /// Gets the singleton instance

src/Envelope.cpp

@@ -27,7 +27,9 @@ a draggable point type.
 *//*******************************************************************/
 
 #include "Envelope.h"
+
 #include "Experimental.h"
+
 #include "ViewInfo.h"
 
 #include <math.h>

src/Experimental.h

@@ -138,7 +138,6 @@
 // Paul Licameli (PRL) 29 Nov 2014
 // #define EXPERIMENTAL_IMPROVED_SEEKING
 
-#ifdef USE_MIDI
 // RBD, 1 Sep 2008
 // Enables MIDI Output of NoteTrack (MIDI) data during playback
 // USE_MIDI must be defined in order for EXPERIMENTAL_MIDI_OUT to work
@@ -149,12 +148,9 @@
 // b) Crashes with Sync-Lock (Bug 1719)
 // c) Needs UI design review.
 //#define EXPERIMENTAL_MIDI_STRETCHING
-#endif
 
 // USE_MIDI must be defined in order for EXPERIMENTAL_SCOREALIGN to work
-#ifdef USE_MIDI
 //#define EXPERIMENTAL_SCOREALIGN
-#endif
 
 //If you want any of these files, ask JKC.  They are not
 //yet checked in to Audacity SVN as of 12-Feb-2010

src/FFT.cpp

@@ -53,7 +53,6 @@
 #include <math.h>
 
 #include "RealFFTf.h"
-#include "Experimental.h"
 
 static ArraysOf<int> gFFTBitTable;
 static const size_t MaxFastBits = 16;

src/FFmpeg.cpp

@@ -28,8 +28,6 @@ License: GPL v2.  See License.txt.
 #include <wx/file.h>
 #include <wx/filedlg.h>
 
-#include "Experimental.h"
-
 #if !defined(USE_FFMPEG)
 /// FFmpeg support may or may not be compiled in,
 /// but Preferences dialog requires this function nevertheless

src/FFmpeg.h

@@ -146,8 +146,6 @@ extern "C" {
 }
 #endif
 
-#include "Experimental.h"
-
 /* rather earlier than normal, but pulls in config*.h and other program stuff
  * we need for the next bit */
 #include <wx/string.h>

src/FreqWindow.cpp

@@ -79,8 +79,6 @@ and in the spectrogram spectral selection.
 
 #include "WaveTrack.h"
 
-#include "Experimental.h"
-
 #include "./widgets/LinkingHtmlWindow.h"
 #include "./widgets/HelpSystem.h"
 #include "widgets/ErrorDialog.h"

src/HelpText.cpp

@@ -14,6 +14,8 @@
 
 #include "Audacity.h"
 
+#include "Experimental.h"
+
 #include <wx/string.h>
 #include <wx/intl.h>
 

src/Internat.cpp

@@ -20,6 +20,8 @@ and on Mac OS X for the filesystem.
 
 *//*******************************************************************/
 
+#include "Experimental.h"
+
 #include <wx/log.h>
 #include <wx/intl.h>
 #include <wx/filename.h>
@@ -27,7 +29,6 @@ and on Mac OS X for the filesystem.
 #include <locale.h>
 #include <math.h> // for pow()
 
-#include "Experimental.h"
 #include "FileNames.h"
 #include "widgets/ErrorDialog.h"
 #include "Internat.h"

src/LabelTrack.cpp

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

src/LyricsWindow.h

@@ -9,8 +9,6 @@
 
 **********************************************************************/
 
-#include "Experimental.h"
-
 #ifndef __AUDACITY_LYRICS_WINDOW__
 #define __AUDACITY_LYRICS_WINDOW__
 

src/Menus.cpp

@@ -28,6 +28,8 @@
 #include "Audacity.h"
 #include "Menus.h"
 
+#include "Experimental.h"
+
 #include "AdornedRulerPanel.h"
 #include "AudacityApp.h"
 #include "AudioIO.h"

src/Menus.h

@@ -10,7 +10,6 @@
 #ifndef __AUDACITY_MENUS__
 #define __AUDACITY_MENUS__
 
-#include "Experimental.h"
 #include "audacity/Types.h"
 
 #include <wx/arrstr.h>

src/MixerBoard.cpp

@@ -11,6 +11,8 @@
 
 #include "Audacity.h"
 
+#include "Experimental.h"
+
 #include "Menus.h"
 #include "MixerBoard.h"
 
@@ -22,7 +24,6 @@
 #include <wx/settings.h> // for wxSystemSettings::GetColour and wxSystemSettings::GetMetric
 
 #include "Theme.h"
-#include "Experimental.h"
 #include "AColor.h"
 #include "AllThemeResources.h"
 #include "AudioIO.h"

src/ModuleManager.cpp

@@ -20,6 +20,8 @@ i.e. an alternative to the usual interface, for Audacity.
 
 #include "Audacity.h"
 
+#include "Experimental.h"
+
 #include <wx/dynlib.h>
 #include <wx/list.h>
 #include <wx/log.h>
@@ -44,7 +46,6 @@ i.e. an alternative to the usual interface, for Audacity.
 #include "ModuleManager.h"
 #include "widgets/MultiDialog.h"
 
-#include "Experimental.h"
 #include "widgets/ErrorDialog.h"
 
 #define initFnName      "ExtensionModuleInit"

src/NoteTrack.h

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

src/PluginManager.cpp

@@ -20,6 +20,8 @@ for shared and private configs - which need to move out.
 
 #include "Audacity.h"
 
+#include "Experimental.h"
+
 #include <algorithm>
 
 #include <wx/defs.h>
@@ -54,8 +56,6 @@ for shared and private configs - which need to move out.
 
 #include "PluginManager.h"
 
-#include "Experimental.h"
-
 #include <unordered_map>
 
 // ============================================================================

src/Printing.cpp

@@ -30,8 +30,6 @@
 #include "widgets/Ruler.h"
 #include "widgets/ErrorDialog.h"
 
-#include "Experimental.h"
-
 #include "TrackPanelDrawingContext.h"
 #include "Internat.h"
 

src/Project.cpp

@@ -51,6 +51,8 @@ scroll information.  It also has some status flags.
 #include "Audacity.h"
 #include "Project.h"
 
+#include "Experimental.h"
+
 #include <stdio.h>
 #include <iostream>
 #include <wx/wxprec.h>
@@ -126,7 +128,6 @@ scroll information.  It also has some status flags.
 #include "widgets/Warning.h"
 #include "xml/XMLFileReader.h"
 #include "PlatformCompatibility.h"
-#include "Experimental.h"
 #include "effects/EffectManager.h"
 #include "export/Export.h"
 #include "FileNames.h"

src/RealFFTf.cpp

@@ -38,11 +38,12 @@
 
 #include "Audacity.h"
 
+#include "Experimental.h"
+
 #include <vector>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
-#include "Experimental.h"
 
 #include <wx/thread.h>
 

src/RealFFTf.h

@@ -4,6 +4,7 @@
 #include "Audacity.h"
 
 #include "Experimental.h"
+
 #include "MemoryX.h"
 
 using fft_type = float;

src/RealFFTf48x.cpp

@@ -57,6 +57,7 @@
 #include "Audacity.h"
 
 #include "Experimental.h"
+
 #ifdef EXPERIMENTAL_EQ_SSE_THREADED
 
 // at the moment these two are mutually exclusive

src/SelectedRegion.cpp

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

src/ShuttleGui.cpp

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

src/Spectrum.cpp

@@ -18,7 +18,6 @@
 #include "Spectrum.h"
 #include "FFT.h"
 
-#include "Experimental.h"
 #include "SampleFormat.h"
 
 bool ComputeSpectrum(const float * data, size_t width,

src/SplashDialog.cpp

@@ -22,6 +22,8 @@ most commonly asked questions about Audacity.
 
 #include "Audacity.h"
 
+#include "Experimental.h"
+
 #include <wx/dialog.h>
 #include <wx/html/htmlwin.h>
 #include <wx/button.h>

src/Theme.cpp

@@ -61,6 +61,8 @@ can't be.
 
 #include "Audacity.h"
 
+#include "Experimental.h"
+
 #include <wx/wxprec.h>
 #include <wx/image.h>
 #include <wx/file.h>
@@ -73,7 +75,6 @@ can't be.
 #include "toolbars/ToolManager.h"
 #include "ImageManipulation.h"
 #include "Theme.h"
-#include "Experimental.h"
 #include "AllThemeResources.h"  // can remove this later, only needed for 'XPMS_RETIRED'.
 #include "FileNames.h"
 #include "Prefs.h"

src/Track.cpp

@@ -21,6 +21,8 @@ and TimeTrack.
 
 *//*******************************************************************/
 
+#include "Experimental.h"
+
 #include <algorithm>
 #include <numeric>
 #include "Track.h"
@@ -37,7 +39,6 @@ and TimeTrack.
 #include "Project.h"
 #include "DirManager.h"
 
-#include "Experimental.h"
 #include "InconsistencyException.h"
 
 #include "TrackPanel.h" // for TrackInfo

src/Track.h

@@ -13,6 +13,8 @@
 
 #include "Audacity.h"
 
+#include "Experimental.h"
+
 #include "MemoryX.h"
 #include <vector>
 #include <list>
@@ -22,7 +24,6 @@
 #include <wx/longlong.h>
 #include <wx/string.h>
 
-#include "Experimental.h"
 #include "SampleFormat.h"
 #include "tracks/ui/CommonTrackPanelCell.h"
 #include "xml/XMLTagHandler.h"

src/TrackArtist.cpp

@@ -41,6 +41,8 @@ audio tracks.
 #include "Audacity.h"
 #include "TrackArtist.h"
 
+#include "Experimental.h"
+
 #include "float_cast.h"
 
 #include <math.h>
@@ -84,7 +86,6 @@ audio tracks.
 #include "widgets/Ruler.h"
 #include "Theme.h"
 #include "AllThemeResources.h"
-#include "Experimental.h"
 #include "TrackPanelDrawingContext.h"
 
 

src/TrackArtist.h

@@ -18,10 +18,11 @@
 #ifndef __AUDACITY_TRACKARTIST__
 #define __AUDACITY_TRACKARTIST__
 
+#include "Experimental.h"
+
 #include "MemoryX.h"
 #include <wx/brush.h>
 #include <wx/pen.h>
-#include "Experimental.h"
 #include "audacity/Types.h"
 
 class wxRect;

src/TrackPanel.cpp

@@ -62,8 +62,9 @@ is time to refresh some aspect of the screen.
 
 #include "Audacity.h"
 
-#include "AdornedRulerPanel.h"
 #include "Experimental.h"
+
+#include "AdornedRulerPanel.h"
 #include "TrackPanel.h"
 #include "Project.h"
 #include "TrackPanelMouseEvent.h"

src/TrackPanel.h

@@ -11,13 +11,13 @@
 #ifndef __AUDACITY_TRACK_PANEL__
 #define __AUDACITY_TRACK_PANEL__
 
+#include "Experimental.h"
+
 #include "MemoryX.h"
 #include <vector>
 
 #include <wx/timer.h>
 
-#include "Experimental.h"
-
 #include "HitTestResult.h"
 
 #include "SelectedRegion.h"

src/TrackPanelResizeHandle.cpp

@@ -11,8 +11,6 @@ Paul Licameli split from TrackPanel.cpp
 #include "Audacity.h"
 #include "TrackPanelResizeHandle.h"
 
-#include "Experimental.h"
-
 #include "MemoryX.h"
 
 #include <wx/cursor.h>

src/ViewInfo.cpp

@@ -9,6 +9,7 @@ Paul Licameli
 **********************************************************************/
 
 #include "ViewInfo.h"
+
 #include "Experimental.h"
 
 #include <algorithm>

src/WaveClip.cpp

@@ -21,6 +21,8 @@
 
 #include "WaveClip.h"
 
+#include "Experimental.h"
+
 #include <math.h>
 #include "MemoryX.h"
 #include <functional>
@@ -43,8 +45,6 @@
 
 #include <wx/listimpl.cpp>
 
-#include "Experimental.h"
-
 #ifdef _OPENMP
 #include <omp.h>
 #endif

src/WaveClip.h

@@ -20,7 +20,6 @@
 #include "ondemand/ODTaskThread.h"
 #include "xml/XMLTagHandler.h"
 
-#include "Experimental.h"
 #include "RealFFTf.h"
 
 #include <wx/gdicmn.h>

src/WaveTrack.cpp

@@ -28,6 +28,9 @@ Track classes.
 
 
 #include "WaveTrack.h"
+
+#include "Experimental.h"
+
 #include <wx/defs.h>
 #include <wx/intl.h>
 #include <wx/debug.h>
@@ -58,8 +61,6 @@ Track classes.
 
 #include "InconsistencyException.h"
 
-#include "Experimental.h"
-
 #include "TrackPanel.h" // for TrackInfo
 // Assumptions in objects separation were wrong.  We need to activate
 // VZooming (that lives in WaveTrackVRulerHandle) from an action on the

src/WaveTrack.h

@@ -14,7 +14,6 @@
 #include "Track.h"
 #include "SampleFormat.h"
 #include "WaveClip.h"
-#include "Experimental.h"
 #include "widgets/ProgressDialog.h"
 
 #include <vector>

src/commands/AudacityCommand.cpp

@@ -57,7 +57,6 @@ ShuttleGui.
 
 #include "../commands/CommandTargets.h"
 
-#include "../Experimental.h"
 #include "../commands/ScreenshotCommand.h"
 
 #include <unordered_map>

src/commands/AudacityCommand.h

@@ -30,7 +30,6 @@ class wxChoice;
 class wxListBox;
 class wxWindow;
 
-#include "../Experimental.h"
 #include "../SampleFormat.h"
 #include "../SelectedRegion.h"
 #include "../Internat.h"

src/commands/CommandManager.cpp

@@ -77,6 +77,8 @@ CommandManager.  It holds the callback for one command.
 
 #include "../Audacity.h"
 
+#include "../Experimental.h"
+
 #include "../AudacityHeaders.h"
 #include "CommandManager.h"
 #include "CommandManagerWindowClasses.h"
@@ -123,8 +125,6 @@ CommandManager.  It holds the callback for one command.
 #include <gtk/gtk.h>
 #endif
 
-#include "../Experimental.h"
-
 NonKeystrokeInterceptingWindow::~NonKeystrokeInterceptingWindow()
 {
 }

src/commands/LoadCommands.cpp

@@ -22,7 +22,6 @@ modelled on BuiltinEffectsModule
 
 #include "../effects/EffectManager.h"
 #include "Demo.h"
-#include "../Experimental.h"
 #include "../commands/MessageCommand.h"
 #include "../commands/ScreenshotCommand.h"
 #include "../commands/CompareAudioCommand.h"

src/effects/BassTreble.cpp

@@ -17,6 +17,8 @@
 #include "../Audacity.h"
 #include "BassTreble.h"
 
+#include "../Experimental.h"
+
 #include <math.h>
 #include <algorithm>
 

src/effects/Distortion.cpp

@@ -19,6 +19,8 @@
 #include "../Audacity.h"
 #include "Distortion.h"
 
+#include "../Experimental.h"
+
 #include <cmath>
 #include <algorithm>
 #define _USE_MATH_DEFINES

src/effects/DtmfGen.cpp

@@ -14,9 +14,9 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "DtmfGen.h"
 
 #include "../Experimental.h"
-#include "DtmfGen.h"
 
 #include <wx/intl.h>
 #include <wx/valgen.h>

src/effects/Effect.cpp

@@ -24,6 +24,8 @@ greater use in future.
 #include "../Audacity.h"
 #include "Effect.h"
 
+#include "../Experimental.h"
+
 #include <algorithm>
 
 #include <wx/defs.h>
@@ -69,7 +71,6 @@ greater use in future.
 #include <Cocoa/Cocoa.h>
 #endif
 
-#include "../Experimental.h"
 #include "../commands/ScreenshotCommand.h"
 
 #include <unordered_map>

src/effects/Effect.h

@@ -14,6 +14,8 @@
 
 #include "../Audacity.h"
 
+#include "../Experimental.h"
+
 #include "../MemoryX.h"
 #include <set>
 
@@ -33,7 +35,6 @@ class wxWindow;
 #include "audacity/ConfigInterface.h"
 #include "audacity/EffectInterface.h"
 
-#include "../Experimental.h"
 #include "../SampleFormat.h"
 #include "../SelectedRegion.h"
 #include "../Internat.h"

src/effects/EffectManager.cpp

@@ -20,11 +20,12 @@ effects.
 
 #include "../Audacity.h"
 
+#include "../Experimental.h"
+
 #include <algorithm>
 #include <wx/stopwatch.h>
 #include <wx/tokenzr.h>
 
-#include "../Experimental.h"
 #include "../widgets/ErrorDialog.h"
 
 #if defined(EXPERIMENTAL_EFFECTS_RACK)

src/effects/Equalization.cpp

@@ -55,6 +55,8 @@
 #include "../Audacity.h"
 #include "Equalization.h"
 
+#include "../Experimental.h"
+
 #include <math.h>
 #include <vector>
 
@@ -79,7 +81,6 @@
 #include <wx/tooltip.h>
 #include <wx/utils.h>
 
-#include "../Experimental.h"
 #include "../AColor.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"

src/effects/Equalization.h

@@ -9,14 +9,14 @@
 
 ***********************************************************************/
 
+#include "../Experimental.h"
+
 #ifndef __AUDACITY_EFFECT_EQUALIZATION__
 #define __AUDACITY_EFFECT_EQUALIZATION__
 #define NUMBER_OF_BANDS 31
 #define NUM_PTS 180
 #define PANELBORDER 1   // only increase from '1' for testing purposes - MJS
 
-#include "../Experimental.h"
-
 #include <wx/button.h>
 #include <wx/panel.h>
 #include <wx/dialog.h>

src/effects/Equalization48x.cpp

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

src/effects/Equalization48x.h

@@ -12,6 +12,7 @@ Intrinsics (SSE/AVX) and Threaded Equalization
 #define __AUDACITY_EFFECT_EQUALIZATION48X__
 
 #include "../Experimental.h"
+
 #ifdef EXPERIMENTAL_EQ_SSE_THREADED
 
 #include "../MemoryX.h"

src/effects/LoadEffects.cpp

@@ -13,6 +13,8 @@
 
 #include "../Audacity.h"
 
+#include "../Experimental.h"
+
 #include "../Prefs.h"
 
 #include "LoadEffects.h"
@@ -61,8 +63,6 @@
 #include "ChangeTempo.h"
 #endif
 
-#include "../Experimental.h"
-
 //
 // Include the SoundTouch effects, if requested
 //

src/effects/NoiseReduction.cpp

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

src/effects/Normalize.cpp

@@ -19,6 +19,8 @@
 #include "../Audacity.h" // for rint from configwin.h
 #include "Normalize.h"
 
+#include "../Experimental.h"
+
 #include <math.h>
 
 #include <wx/intl.h>

src/effects/Normalize.h

@@ -13,6 +13,8 @@
 #ifndef __AUDACITY_EFFECT_NORMALIZE__
 #define __AUDACITY_EFFECT_NORMALIZE__
 
+#include "Experimental.h"
+
 #include <wx/checkbox.h>
 #include <wx/event.h>
 #include <wx/stattext.h>

src/effects/Phaser.cpp

@@ -22,6 +22,8 @@
 #include "../Audacity.h"
 #include "Phaser.h"
 
+#include "../Experimental.h"
+
 #include <math.h>
 
 #include <wx/intl.h>
@@ -30,8 +32,6 @@
 #include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
-#include "../Experimental.h"
-
 enum
 {
    ID_Stages = 10000,

src/effects/Wahwah.cpp

@@ -21,6 +21,8 @@
 #include "../Audacity.h"
 #include "Wahwah.h"
 
+#include "../Experimental.h"
+
 #include <math.h>
 
 #include <wx/intl.h>
@@ -29,8 +31,6 @@
 #include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
-#include "../Experimental.h"
-
 enum
 {
    ID_Freq = 10000,

src/effects/nyquist/Nyquist.cpp

@@ -26,6 +26,8 @@ effects from this one class.
 
 #include "../../Audacity.h"
 
+#include "../../Experimental.h"
+
 #include <algorithm>
 #include <cmath>
 
@@ -79,8 +81,6 @@ effects from this one class.
 #include <sstream>
 #include <float.h>
 
-#include "../../Experimental.h"
-
 int NyquistEffect::mReentryCount = 0;
 
 enum

src/import/ImportFFmpeg.cpp

@@ -23,6 +23,8 @@ Licensed under the GNU General Public License v2 or later
 #include "../Audacity.h"    // needed before FFmpeg.h
 #include "ImportFFmpeg.h"
 
+#include "../Experimental.h"
+
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
@@ -33,7 +35,6 @@ Licensed under the GNU General Public License v2 or later
 #include <wx/window.h>
 #endif
 
-#include "../Experimental.h"
 #include "../MemoryX.h"
 
 

src/import/ImportFLAC.cpp

@@ -25,6 +25,8 @@
 #include "../Audacity.h"
 #include "ImportFLAC.h"
 
+#include "../Experimental.h"
+
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
@@ -44,8 +46,6 @@
 #include "../Tags.h"
 #include "../prefs/QualityPrefs.h"
 
-#include "../Experimental.h"
-
 #define FLAC_HEADER "fLaC"
 
 #define DESC _("FLAC files")

src/menus/FileMenus.cpp

@@ -1,6 +1,7 @@
+#include "../Experimental.h"
+
 #include "../AudacityApp.h"
 #include "../BatchCommands.h"
-#include "../Experimental.h"
 #include "../FileNames.h"
 #include "../LabelTrack.h"
 #include "../NoteTrack.h"

src/menus/HelpMenus.cpp

@@ -1,9 +1,10 @@
+#include "../Experimental.h"
+
 #include "../AboutDialog.h"
 #include "../AudacityApp.h"
 #include "../AudacityLogger.h"
 #include "../AudioIO.h"
 #include "../Dependencies.h"
-#include "../Experimental.h"
 #include "../FileNames.h"
 #include "../Project.h"
 #include "../ShuttleGui.h"

src/menus/PluginMenus.cpp

@@ -1,8 +1,9 @@
+#include "../Experimental.h"
+
 #include "../AudacityApp.h"
 #include "../AudioIO.h"
 #include "../BatchProcessDialog.h"
 #include "../Benchmark.h"
-#include "../Experimental.h"
 #include "../FreqWindow.h"
 #include "../Menus.h"
 #include "../PluginManager.h"

src/menus/SelectMenus.cpp

@@ -1,6 +1,7 @@
+#include "../Experimental.h"
+
 #include "../AdornedRulerPanel.h"
 #include "../AudioIO.h"
-#include "../Experimental.h"
 #include "../FreqWindow.h"
 #include "../Menus.h" // for PrefsListener
 #include "../Prefs.h"

src/menus/ToolbarMenus.cpp

@@ -1,4 +1,5 @@
 #include "../Experimental.h"
+
 #include "../Menus.h"
 #include "../Project.h"
 #include "../TrackPanel.h"

src/menus/TrackMenus.cpp

@@ -1,5 +1,6 @@
-#include "../AudacityApp.h"
 #include "../Experimental.h"
+
+#include "../AudacityApp.h"
 #include "../LabelTrack.h"
 #include "../Menus.h"
 #include "../Mix.h"

src/menus/TransportMenus.cpp

@@ -1,7 +1,8 @@
+#include "../Experimental.h"
+
 #include "../AdornedRulerPanel.h"
 #include "../AudioIO.h"
 #include "../DeviceManager.h"
-#include "../Experimental.h"
 #include "../LabelTrack.h"
 #include "../Menus.h"
 #include "../Prefs.h"

src/menus/ViewMenus.cpp

@@ -1,4 +1,5 @@
 #include "../Experimental.h"
+
 #include "../HistoryWindow.h"
 #include "../LyricsWindow.h"
 #include "../Menus.h"

src/ondemand/ODDecodeFFmpegTask.cpp

@@ -11,6 +11,8 @@
 
 #include "../Audacity.h"   // needed before FFmpeg.h
 
+#include "../Experimental.h"
+
 #include <wx/wxprec.h>
 // For compilers that support precompilation, includes "wx/wx.h".
 #ifndef WX_PRECOMP
@@ -18,8 +20,6 @@
 #include <wx/window.h>
 #endif
 
-#include "../Experimental.h"
-
 #ifdef USE_FFMPEG
 #ifdef EXPERIMENTAL_OD_FFMPEG
 

src/ondemand/ODDecodeFFmpegTask.h

@@ -13,6 +13,7 @@
 #define __ODDECODEFFMPEGTASK__
 
 #include "../Experimental.h"
+
 #include "../MemoryX.h"
 
 #ifdef EXPERIMENTAL_OD_FFMPEG

src/prefs/EffectsPrefs.cpp

@@ -19,6 +19,8 @@
 
 #include "../Audacity.h"
 
+#include "../Experimental.h"
+
 #include <wx/choice.h>
 #include <wx/defs.h>
 
@@ -29,7 +31,6 @@
 
 #include "EffectsPrefs.h"
 
-#include "../Experimental.h"
 #include "../Internat.h"
 
 EffectsPrefs::EffectsPrefs(wxWindow * parent, wxWindowID winid)

src/prefs/GUIPrefs.cpp

@@ -20,6 +20,8 @@
 #include "../Audacity.h"
 #include "GUIPrefs.h"
 
+#include "../Experimental.h"
+
 #include <wx/defs.h>
 
 #include "../AudacityApp.h"
@@ -30,8 +32,6 @@
 
 #include "GUISettings.h"
 
-#include "../Experimental.h"
-
 #include "ThemePrefs.h"
 #include "../AColor.h"
 #include "../Internat.h"

src/prefs/KeyConfigPrefs.cpp

@@ -21,7 +21,6 @@ KeyConfigPrefs and MousePrefs use.
 
 #include "../Audacity.h"
 
-#include "../Experimental.h"
 #include "KeyConfigPrefs.h"
 
 #include <wx/defs.h>

src/prefs/KeyConfigPrefs.h

@@ -12,8 +12,6 @@
 #ifndef __AUDACITY_KEY_CONFIG_PREFS__
 #define __AUDACITY_KEY_CONFIG_PREFS__
 
-#include "../Experimental.h"
-
 class CommandManager;
 class ShuttleGui;
 

src/prefs/LibraryPrefs.cpp

@@ -18,6 +18,8 @@ MP3 and FFmpeg encoding libraries.
 
 #include "../Audacity.h"
 
+#include "../Experimental.h"
+
 #include <wx/defs.h>
 #include <wx/button.h>
 
@@ -30,8 +32,6 @@ MP3 and FFmpeg encoding libraries.
 
 #include "LibraryPrefs.h"
 
-#include "../Experimental.h"
-
 ////////////////////////////////////////////////////////////////////////////////
 
 #define ID_MP3_FIND_BUTTON          7001

src/prefs/MidiIOPrefs.cpp

@@ -26,6 +26,7 @@ other settings.
 #include "../Audacity.h"
 
 #include "../Experimental.h"
+
 #ifdef EXPERIMENTAL_MIDI_OUT
 
 #include <wx/defs.h>

src/prefs/MousePrefs.cpp

@@ -33,9 +33,9 @@
 *//********************************************************************/
 
 #include "../Audacity.h"
+#include "MousePrefs.h"
 
 #include "../Experimental.h"
-#include "MousePrefs.h"
 
 #include <wx/defs.h>
 #include <wx/intl.h>

src/prefs/PrefsDialog.cpp

@@ -17,6 +17,8 @@
 #include "../Audacity.h"
 #include "PrefsDialog.h"
 
+#include "../Experimental.h"
+
 #include <wx/defs.h>
 #include <wx/button.h>
 #include <wx/dialog.h>
@@ -32,7 +34,6 @@
 #include <wx/treebook.h>
 
 #include "../AudioIO.h"
-#include "../Experimental.h"
 #include "../Project.h"
 #include "../Prefs.h"
 #include "../ShuttleGui.h"

src/prefs/RecordingPrefs.cpp

@@ -19,9 +19,9 @@
 *//********************************************************************/
 
 #include "../Audacity.h"
+#include "RecordingPrefs.h"
 
 #include "../Experimental.h"
-#include "RecordingPrefs.h"
 
 #include <wx/defs.h>
 #include <wx/textctrl.h>
@@ -32,7 +32,6 @@
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
 
-#include "../Experimental.h"
 #include "../Internat.h"
 
 #include "../widgets/Warning.h"

src/prefs/SpectrogramSettings.cpp

@@ -16,6 +16,8 @@ Paul Licameli
 #include "../Audacity.h"
 #include "SpectrogramSettings.h"
 
+#include "../Experimental.h"
+
 #include "../NumberScale.h"
 #include "../TranslatableStringArray.h"
 
@@ -27,7 +29,6 @@ Paul Licameli
 
 #include <cmath>
 
-#include "../Experimental.h"
 #include "../widgets/ErrorDialog.h"
 #include "../Internat.h"
 

src/prefs/SpectrogramSettings.h

@@ -12,6 +12,7 @@ Paul Licameli
 #define __AUDACITY_SPECTROGRAM_SETTINGS__
 
 #include "../Experimental.h"
+
 #include "../SampleFormat.h"
 #include "../RealFFTf.h"
 

src/prefs/SpectrumPrefs.cpp

@@ -17,6 +17,8 @@
 #include "../Audacity.h"
 #include "SpectrumPrefs.h"
 
+#include "../Experimental.h"
+
 #include <wx/choice.h>
 #include <wx/defs.h>
 #include <wx/intl.h>
@@ -31,7 +33,6 @@
 
 #include <algorithm>
 
-#include "../Experimental.h"
 #include "../widgets/ErrorDialog.h"
 
 SpectrumPrefs::SpectrumPrefs(wxWindow * parent, wxWindowID winid, WaveTrack *wt)

src/prefs/SpectrumPrefs.h

@@ -21,11 +21,12 @@
 #ifndef __AUDACITY_SPECTRUM_PREFS__
 #define __AUDACITY_SPECTRUM_PREFS__
 
+#include "../Experimental.h"
+
 #include <wx/defs.h>
 #include <wx/string.h>
 #include <wx/window.h>
 
-#include "../Experimental.h"
 #include "../WaveTrack.h"
 
 #include "PrefsPanel.h"

src/prefs/TracksBehaviorsPrefs.cpp

@@ -17,9 +17,10 @@
 #include "../Audacity.h"
 #include "TracksBehaviorsPrefs.h"
 
+#include "../Experimental.h"
+
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
-#include "../Experimental.h"
 #include "../Internat.h"
 
 TracksBehaviorsPrefs::TracksBehaviorsPrefs(wxWindow * parent, wxWindowID winid)

src/prefs/TracksPrefs.cpp

@@ -20,6 +20,8 @@
 #include "../Audacity.h"
 #include "TracksPrefs.h"
 
+#include "../Experimental.h"
+
 //#include <algorithm>
 //#include <wx/defs.h>
 
@@ -27,7 +29,6 @@
 #include "../ShuttleGui.h"
 #include "../WaveTrack.h"
 
-#include "../Experimental.h"
 #include "../Internat.h"
 
 int TracksPrefs::iPreferencePinned = -1;

src/toolbars/ControlToolBar.cpp

@@ -34,10 +34,11 @@
 
 #include "../Audacity.h"
 
+#include "../Experimental.h"
+
 #include <algorithm>
 #include <cfloat>
 
-#include "../Experimental.h"
 #include "ControlToolBar.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".

src/toolbars/EditToolBar.cpp

@@ -34,6 +34,8 @@
 #include "../Audacity.h"
 #include "EditToolBar.h"
 
+#include "../Experimental.h"
+
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
@@ -57,7 +59,6 @@
 #include "../UndoManager.h"
 #include "../widgets/AButton.h"
 
-#include "../Experimental.h"
 #include "../commands/CommandContext.h"
 #include "../commands/CommandManager.h"