Removed ShuttleGui.h from other headers

src/AboutDialog.h

@@ -16,7 +16,7 @@
 #include <wx/statbmp.h>
 #include <wx/bitmap.h>
 
-#include "ShuttleGui.h"
+class ShuttleGui;
 
 struct AboutDialogCreditItem {
    wxString description;

src/AutoRecovery.cpp

@@ -19,6 +19,7 @@ recover previous Audacity projects that were closed incorrectly.
 #include "AudacityApp.h"
 #include "FileNames.h"
 #include "blockfile/SimpleBlockFile.h"
+#include "ShuttleGui.h"
 
 #include <wx/wxprec.h>
 #include <wx/filefn.h>

src/BatchProcessDialog.cpp

@@ -15,6 +15,7 @@
 *//*******************************************************************/
 
 #include "Audacity.h"
+#include "BatchProcessDialog.h"
 
 #include <wx/defs.h>
 #include <wx/checkbox.h>
@@ -32,9 +33,9 @@
 #include <wx/msgdlg.h>
 #include <wx/settings.h>
 
+#include "ShuttleGui.h"
 #include "Prefs.h"
 #include "Project.h"
-#include "BatchProcessDialog.h"
 #include "Internat.h"
 #include "commands/CommandManager.h"
 #include "effects/Effect.h"

src/BatchProcessDialog.h

@@ -25,7 +25,6 @@
 #include  <wx/menuitem.h>
 #include  <wx/checklst.h>
 
-#include "ShuttleGui.h"
 #include "BatchCommands.h"
 
 class wxWindow;
@@ -37,6 +36,7 @@ class wxRadioButton;
 class wxListCtrl;
 class wxListEvent;
 class wxButton;
+class ShuttleGui;
 
 class BatchProcessDialog:public wxDialog {
  public:

src/Benchmark.cpp

@@ -16,6 +16,7 @@ of the BlockFile system.
 
 
 #include "Audacity.h"
+#include "Benchmark.h"
 
 #include <wx/log.h>
 #include <wx/textctrl.h>
@@ -33,7 +34,7 @@ of the BlockFile system.
 #include <wx/valtext.h>
 #include <wx/intl.h>
 
-#include "Benchmark.h"
+#include "ShuttleGui.h"
 #include "Project.h"
 #include "WaveTrack.h"
 #include "Sequence.h"

src/FreqWindow.cpp

@@ -41,6 +41,7 @@ and in the spectrogram spectral selection.
 
 
 #include "Audacity.h"
+#include "FreqWindow.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
@@ -70,8 +71,7 @@ and in the spectrogram spectral selection.
 
 #include <math.h>
 
-#include "FreqWindow.h"
+#include "ShuttleGui.h"
-
 #include "AColor.h"
 #include "FFT.h"
 #include "Internat.h"

src/LabelDialog.cpp

@@ -14,6 +14,7 @@
 *//*******************************************************************/
 
 #include "Audacity.h"
+#include "LabelDialog.h"
 
 #include <wx/button.h>
 #include <wx/defs.h>
@@ -29,8 +30,8 @@
 #include <wx/stattext.h>
 #include <wx/textdlg.h>
 
+#include "ShuttleGui.h"
 #include "Internat.h"
-#include "LabelDialog.h"
 #include "LabelTrack.h"
 #include "Prefs.h"
 #include "Project.h"

src/TimerRecordDialog.cpp

@@ -19,6 +19,7 @@
 *//*******************************************************************/
 
 #include "Audacity.h"
+#include "TimerRecordDialog.h"
 
 #include <wx/defs.h>
 #include <wx/datetime.h>
@@ -29,7 +30,7 @@
 #include <wx/timer.h>
 #include <wx/dynlib.h> //<! For windows.h
 
-#include "TimerRecordDialog.h"
+#include "ShuttleGui.h"
 #include "Project.h"
 #include "Internat.h"
 #include "Prefs.h"

src/TimerRecordDialog.h

@@ -19,10 +19,12 @@
 #include <wx/dialog.h>
 #include <wx/datectrl.h>
 #include <wx/calctrl.h>
+#include <wx/timer.h>
 
-#include "ShuttleGui.h"
+class wxTimerEvent;
 
 class NumericTextCtrl;
+class ShuttleGui;
 
 class TimerRecordDialog : public wxDialog
 {

src/TrackPanel.cpp

@@ -204,6 +204,7 @@ is time to refresh some aspect of the screen.
 #include "Prefs.h"
 #include "Project.h"
 #include "Snap.h"
+#include "ShuttleGui.h"
 #include "Theme.h"
 #include "TimeTrack.h"
 #include "Track.h"

src/effects/Amplify.cpp

@@ -19,6 +19,7 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "Amplify.h"
 
 #include <math.h>
 #include <float.h>
@@ -32,11 +33,10 @@
 #include <wx/valtext.h>
 #include <wx/log.h>
 
+#include "../ShuttleGui.h"
 #include "../WaveTrack.h"
 #include "../widgets/valnum.h"
 
-#include "Amplify.h"
-
 
 enum
 {

src/effects/Amplify.h

@@ -21,12 +21,12 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
-
 #include "Effect.h"
 
 #define AMPLIFY_PLUGIN_SYMBOL XO("Amplify")
 
+class ShuttleGui;
+
 class EffectAmplify : public Effect
 {
 public:

src/effects/AutoDuck.cpp

@@ -14,6 +14,7 @@
 *******************************************************************/
 
 #include "../Audacity.h"
+#include "AutoDuck.h"
 
 #include <math.h>
 #include <float.h>
@@ -28,11 +29,10 @@
 #include "../AllThemeResources.h"
 #include "../Internat.h"
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 #include "../Theme.h"
 #include "../widgets/valnum.h"
 
-#include "AutoDuck.h"
-
 // Define keys, defaults, minimums, and maximums for the effect parameters
 //
 //     Name                Type     Key                     Def      Min      Max      Scale

src/effects/AutoDuck.h

@@ -19,12 +19,12 @@
 #include <wx/textctrl.h>
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
 #include "../WaveTrack.h"
 
 #include "Effect.h"
 
 class EffectAutoDuckPanel;
+class ShuttleGui;
 
 #define AUTO_DUCK_PANEL_NUM_CONTROL_POINTS 5
 

src/effects/BassTreble.cpp

@@ -19,6 +19,7 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "BassTreble.h"
 
 #include <math.h>
 
@@ -28,11 +29,10 @@
 #include <wx/sizer.h>
 
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 #include "../WaveTrack.h"
 #include "../widgets/valnum.h"
 
-#include "BassTreble.h"
-
 enum 
 {
    ID_Bass = 10000,

src/effects/BassTreble.h

@@ -19,10 +19,10 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
-
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define BASSTREBLE_PLUGIN_SYMBOL XO("Bass and Treble")
 
 class EffectBassTreble : public Effect

src/effects/ChangePitch.cpp

@@ -19,6 +19,8 @@ the pitch without changing the tempo.
 
 #if USE_SOUNDTOUCH
 
+#include "ChangePitch.h"
+
 #include <float.h>
 #include <math.h>
 
@@ -26,13 +28,12 @@ the pitch without changing the tempo.
 #include <wx/valtext.h>
 
 #include "../PitchName.h"
+#include "../ShuttleGui.h"
 #include "../Spectrum.h"
 #include "../WaveTrack.h"
 #include "../widgets/valnum.h"
 #include "TimeWarper.h"
 
-#include "ChangePitch.h"
-
 enum {
    ID_PercentChange = 10000,
    ID_FromPitch,

src/effects/ChangePitch.h

@@ -27,10 +27,10 @@ the pitch without changing the tempo.
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
-
 #include "SoundTouchEffect.h"
 
+class ShuttleGui;
+
 #define CHANGEPITCH_PLUGIN_SYMBOL XO("Change Pitch")
 
 class EffectChangePitch : public EffectSoundTouch

src/effects/ChangeSpeed.h

@@ -19,13 +19,14 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
 #include "../Track.h"
 #include "../WaveTrack.h"
 #include "../widgets/NumericTextCtrl.h"
 
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define CHANGESPEED_PLUGIN_SYMBOL XO("Change Speed")
 
 class EffectChangeSpeed : public Effect

src/effects/ChangeTempo.h

@@ -21,10 +21,10 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
-
 #include "SoundTouchEffect.h"
 
+class ShuttleGui;
+
 #define CHANGETEMPO_PLUGIN_SYMBOL XO("Change Tempo")
 
 class EffectChangeTempo : public EffectSoundTouch

src/effects/ClickRemoval.cpp

@@ -25,6 +25,7 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "ClickRemoval.h"
 
 #include <math.h>
 
@@ -33,10 +34,9 @@
 #include <wx/valgen.h>
 
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
-#include "ClickRemoval.h"
-
 enum
 {
    ID_Thresh = 10000,

src/effects/ClickRemoval.h

@@ -22,11 +22,12 @@
 #include <wx/textctrl.h>
 
 #include "../Envelope.h"
-#include "../ShuttleGui.h"
 #include "../WaveTrack.h"
 
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define CLICKREMOVAL_PLUGIN_SYMBOL XO("Click Removal")
 
 class EffectClickRemoval : public Effect

src/effects/Compressor.cpp

@@ -25,6 +25,7 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "Compressor.h"
 
 #include <math.h>
 
@@ -36,11 +37,10 @@
 
 #include "../AColor.h"
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 #include "../float_cast.h"
 #include "../widgets/Ruler.h"
 
-#include "Compressor.h"
-
 enum
 {
    ID_Threshold = 10000,

src/effects/Compressor.h

@@ -21,11 +21,10 @@
 #include <wx/stattext.h>
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "TwoPassSimpleMono.h"
 
 class EffectCompressorPanel;
+class ShuttleGui;
 
 #define COMPRESSOR_PLUGIN_SYMBOL XO("Compressor")
 

src/effects/Contrast.cpp

@@ -10,15 +10,16 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
-#include "../AudacityApp.h"
-
 #include "Contrast.h"
 
+#include "../AudacityApp.h"
+
 #include "../Envelope.h"
 #include "../FFT.h"
 #include "../WaveTrack.h"
 #include "../Prefs.h"
 #include "../Project.h"
+#include "../ShuttleGui.h"
 #include "../FileNames.h"
 #include "../widgets/LinkingHtmlWindow.h"
 #include "../widgets/HelpSystem.h"

src/effects/Contrast.h

@@ -15,6 +15,7 @@
 class wxButton;
 class wxSizer;
 class wxString;
+class wxTextCtrl;
 
 class Envelope;
 class NumericTextCtrl;

src/effects/DtmfGen.cpp

@@ -14,15 +14,16 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "DtmfGen.h"
 
 #include <wx/intl.h>
 #include <wx/valgen.h>
 #include <wx/valtext.h>
 
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
-#include "DtmfGen.h"
 
 enum
 {

src/effects/DtmfGen.h

@@ -19,11 +19,12 @@
 #include <wx/stattext.h>
 #include <wx/string.h>
 
-#include "../ShuttleGui.h"
 #include "../widgets/NumericTextCtrl.h"
 
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define DTMFTONES_PLUGIN_SYMBOL XO("DTMF Tones")
 
 class EffectDtmf : public Effect

src/effects/Echo.cpp

@@ -20,15 +20,15 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "Echo.h"
 
 #include <float.h>
 
 #include <wx/intl.h>
 
+#include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
-#include "Echo.h"
-
 // Define keys, defaults, minimums, and maximums for the effect parameters
 //
 //     Name    Type     Key            Def   Min      Max      Scale

src/effects/Echo.h

@@ -16,10 +16,10 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
-
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define ECHO_PLUGIN_SYMBOL XO("Echo")
 
 class EffectEcho : public Effect

src/effects/Effect.cpp

@@ -22,6 +22,7 @@ greater use in future.
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "Effect.h"
 
 #include <wx/defs.h>
 #include <wx/hashmap.h>
@@ -36,11 +37,11 @@ greater use in future.
 
 #include "audacity/ConfigInterface.h"
 
-#include "Effect.h"
 #include "../AudioIO.h"
 #include "../Mix.h"
 #include "../Prefs.h"
 #include "../Project.h"
+#include "../ShuttleGui.h"
 #include "../WaveTrack.h"
 #include "../toolbars/ControlToolBar.h"
 #include "../widgets/AButton.h"

src/effects/Effect.h

@@ -20,7 +20,10 @@
 #include <wx/string.h>
 #include <wx/tglbtn.h>
 
+class wxCheckBox;
+class wxChoice;
 class wxDialog;
+class wxListBox;
 class wxWindow;
 
 #include "audacity/ConfigInterface.h"
@@ -30,10 +33,11 @@ class wxWindow;
 #include "../WaveTrack.h"
 #include "../SelectedRegion.h"
 #include "../Shuttle.h"
-#include "../ShuttleGui.h"
 #include "../Internat.h"
 #include "../widgets/ProgressDialog.h"
 
+class ShuttleGui;
+
 #define BUILTIN_EFFECT_PREFIX wxT("Built-in Effect: ")
 
 class SelectedRegion;

src/effects/FindClipping.cpp

@@ -20,16 +20,16 @@
 
 
 #include "../Audacity.h"
+#include "FindClipping.h"
 
 #include <math.h>
 
 #include <wx/intl.h>
 
 #include "../AudacityApp.h"
+#include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
-#include "FindClipping.h"
-
 // Define keys, defaults, minimums, and maximums for the effect parameters
 //
 //     Name    Type  Key               Def   Min   Max      Scale

src/effects/Leveller.cpp

@@ -14,6 +14,7 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "Leveller.h"
 
 #include <math.h>
 
@@ -22,8 +23,7 @@
 #include <wx/valgen.h>
 
 #include "../Prefs.h"
-
+#include "../ShuttleGui.h"
-#include "Leveller.h"
 
 enum kPasses
 {

src/effects/Leveller.h

@@ -14,10 +14,10 @@
 #include <wx/arrstr.h>
 #include <wx/string.h>
 
-#include "../ShuttleGui.h"
-
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define LEVELLER_PLUGIN_SYMBOL XO("Leveller")
 
 class EffectLeveller : public Effect

src/effects/Noise.cpp

@@ -14,6 +14,7 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "Noise.h"
 
 #include <math.h>
 
@@ -23,10 +24,9 @@
 #include <wx/valgen.h>
 
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
-#include "Noise.h"
-
 enum kTypes
 {
    kWhite,

src/effects/Noise.h

@@ -15,11 +15,12 @@
 
 #include <wx/string.h>
 
-#include "../ShuttleGui.h"
 #include "../widgets/NumericTextCtrl.h"
 
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define NOISE_PLUGIN_SYMBOL XO("Noise")
 
 class EffectNoise : public Effect

src/effects/NoiseReduction.cpp

@@ -40,6 +40,7 @@
 #include "../Experimental.h"
 #include "NoiseReduction.h"
 
+#include "../ShuttleGui.h"
 #include "../Prefs.h"
 
 #include <algorithm>

src/effects/Normalize.h

@@ -18,11 +18,12 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
 #include "../WaveTrack.h"
 
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define NORMALIZE_PLUGIN_SYMBOL XO("Normalize")
 
 class EffectNormalize : public Effect

src/effects/Paulstretch.cpp

@@ -15,6 +15,7 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "Paulstretch.h"
 
 #include <math.h>
 #include <float.h>
@@ -22,11 +23,10 @@
 #include <wx/intl.h>
 #include <wx/valgen.h>
 
+#include "../ShuttleGui.h"
 #include "../FFT.h"
 #include "../widgets/valnum.h"
 
-#include "Paulstretch.h"
-
 // Define keys, defaults, minimums, and maximums for the effect parameters
 //
 //     Name    Type     Key                     Def      Min      Max      Scale

src/effects/Paulstretch.h

@@ -12,11 +12,12 @@
 
 #include <wx/string.h>
 
-#include "../ShuttleGui.h"
 #include "../WaveTrack.h"
 
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define PAULSTRETCH_PLUGIN_SYMBOL XO("Paulstretch")
 
 class EffectPaulstretch : public Effect

src/effects/Phaser.cpp

@@ -20,14 +20,15 @@
 
 
 #include "../Audacity.h"
+#include "Phaser.h"
 
 #include <math.h>
 
 #include <wx/intl.h>
 
+#include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
-#include "Phaser.h"
 
 enum
 {

src/effects/Phaser.h

@@ -21,10 +21,10 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
-
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define NUM_STAGES 24
 
 #define PHASER_PLUGIN_SYMBOL XO("Phaser")

src/effects/Repeat.h

@@ -16,10 +16,10 @@
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
-
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define REPEAT_PLUGIN_SYMBOL XO("Repeat")
 
 class EffectRepeat : public Effect

src/effects/Reverb.cpp

@@ -15,16 +15,17 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "Reverb.h"
 
 #include <wx/arrstr.h>
 #include <wx/intl.h>
 
 #include "../Audacity.h"
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
 #include "Reverb_libSoX.h"
-#include "Reverb.h"
 
 enum 
 {

src/effects/Reverb.h

@@ -18,10 +18,10 @@
 #include <wx/spinctrl.h>
 #include <wx/string.h>
 
-#include "../ShuttleGui.h"
-
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define REVERB_PLUGIN_SYMBOL XO("Reverb")
 
 struct Reverb_priv_t;

src/effects/ScienFilter.cpp

@@ -33,6 +33,7 @@ a graph for EffectScienFilter.
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "ScienFilter.h"
 
 #include <math.h>
 #include <float.h>
@@ -50,12 +51,12 @@ a graph for EffectScienFilter.
 #include "../PlatformCompatibility.h"
 #include "../Prefs.h"
 #include "../Project.h"
+#include "../ShuttleGui.h"
 #include "../Theme.h"
 #include "../WaveTrack.h"
 #include "../widgets/valnum.h"
 
 #include "Equalization.h" // For SliderAx
-#include "ScienFilter.h"
 
 #if !defined(M_PI)
 #define PI = 3.1415926535897932384626433832795

src/effects/ScienFilter.h

@@ -23,12 +23,14 @@ Vaughan Johnson (Preview)
 #include <wx/string.h>
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
 #include "../widgets/Ruler.h"
 #include "Biquad.h"
 
 #include "Effect.h"
 
+class wxTextCtrl;
+class ShuttleGui;
+
 #define CLASSICFILTERS_PLUGIN_SYMBOL XO("Classic Filters")
 
 class EffectScienFilterPanel;

src/effects/Silence.cpp

@@ -14,10 +14,11 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "Silence.h"
 
 #include <wx/intl.h>
 
-#include "Silence.h"
+#include "../ShuttleGui.h"
 
 EffectSilence::EffectSilence()
 {

src/effects/TimeScale.cpp

@@ -17,13 +17,15 @@
 
 #if USE_SBSMS
 
+#include "TimeScale.h"
+
 #include <math.h>
 
 #include <wx/intl.h>
 
+#include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
-#include "TimeScale.h"
 #include "sbsms.h"
 
 enum

src/effects/TimeScale.h

@@ -20,10 +20,10 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
-
 #include "SBSMSEffect.h"
 
+class ShuttleGui;
+
 #define TIMESCALE_PLUGIN_SYMBOL XO("Time Scale")
 
 class EffectTimeScale : public EffectSBSMS

src/effects/ToneGen.cpp

@@ -19,6 +19,7 @@ frequency changes smoothly during the tone.
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "ToneGen.h"
 
 #include <math.h>
 #include <float.h>
@@ -27,11 +28,10 @@ frequency changes smoothly during the tone.
 #include <wx/valgen.h>
 
 #include "../Project.h"
+#include "../ShuttleGui.h"
 #include "../widgets/NumericTextCtrl.h"
 #include "../widgets/valnum.h"
 
-#include "ToneGen.h"
-
 enum kInterpolations
 {
    kLinear,

src/effects/ToneGen.h

@@ -16,11 +16,12 @@
 #include <wx/arrstr.h>
 #include <wx/string.h>
 
-#include "../ShuttleGui.h"
 #include "../widgets/NumericTextCtrl.h"
 
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define CHIRP_PLUGIN_SYMBOL XO("Chirp")
 #define TONE_PLUGIN_SYMBOL XO("Tone")
 

src/effects/TruncSilence.cpp

@@ -16,6 +16,7 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "TruncSilence.h"
 
 #include <limits>
 #include <math.h>
@@ -23,11 +24,10 @@
 #include <wx/valgen.h>
 
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 #include "../WaveTrack.h"
 #include "../widgets/valnum.h"
 
-#include "TruncSilence.h"
-
 enum kActions
 {
    kTruncate,

src/effects/TruncSilence.h

@@ -24,10 +24,10 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
-
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define TRUNCATESILENCE_PLUGIN_SYMBOL XO("Truncate Silence")
 
 // Declaration of RegionList

src/effects/Wahwah.cpp

@@ -19,15 +19,15 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "Wahwah.h"
 
 #include <math.h>
 
 #include <wx/intl.h>
 
+#include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 
-#include "Wahwah.h"
-
 enum
 {
    ID_Freq = 10000,

src/effects/Wahwah.h

@@ -21,10 +21,10 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
-
 #include "Effect.h"
 
+class ShuttleGui;
+
 #define WAHWAH_PLUGIN_SYMBOL XO("Wahwah")
 
 class EffectWahwah : public Effect

src/effects/vamp/VampEffect.cpp

@@ -37,6 +37,7 @@
 #include <wx/version.h>
 
 
+#include "../../ShuttleGui.h"
 #include "../../widgets/valnum.h"
 
 enum

src/export/Export.cpp

@@ -28,6 +28,9 @@
 
 *//********************************************************************/
 
+#include "../Audacity.h"
+#include "Export.h"
+
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
@@ -48,7 +51,6 @@
 #include <wx/timer.h>
 #include <wx/dcmemory.h>
 
-#include "Export.h"
 #include "ExportPCM.h"
 #include "ExportMP3.h"
 #include "ExportOGG.h"
@@ -61,7 +63,6 @@
 
 #include "FileDialog.h"
 
-#include "../Audacity.h"
 #include "../DirManager.h"
 #include "../FileFormats.h"
 #include "../Internat.h"
@@ -69,6 +70,7 @@
 #include "../Mix.h"
 #include "../Prefs.h"
 #include "../Project.h"
+#include "../ShuttleGui.h"
 #include "../Track.h"
 #include "../WaveTrack.h"
 #include "../widgets/Warning.h"

src/export/ExportCL.cpp

@@ -12,6 +12,7 @@
 **********************************************************************/
 
 #include "../Audacity.h"
+#include "ExportCL.h"
 #include "../Project.h"
 
 #include <wx/button.h>
@@ -22,10 +23,10 @@
 #include <wx/textctrl.h>
 #include <FileDialog.h>
 #include "Export.h"
-#include "ExportCL.h"
 
 #include "../Mix.h"
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 #include "../Internat.h"
 #include "../float_cast.h"
 #include "../widgets/FileHistory.h"

src/export/ExportFLAC.cpp

@@ -22,8 +22,8 @@ and libvorbis examples, Monty <monty@xiph.org>
 
 #ifdef USE_LIBFLAC
 
-#include "Export.h"
 #include "ExportFLAC.h"
+#include "Export.h"
 
 #include <wx/progdlg.h>
 #include <wx/ffile.h>
@@ -36,6 +36,7 @@ and libvorbis examples, Monty <monty@xiph.org>
 #include "../Project.h"
 #include "../Mix.h"
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 
 #include "../Internat.h"
 #include "../Tags.h"

src/export/ExportMP2.cpp

@@ -33,6 +33,7 @@
 */
 
 #include "../Audacity.h"
+#include "ExportMP2.h"
 
 #ifdef USE_LIBTWOLAME
 
@@ -47,12 +48,12 @@
 #include <wx/intl.h>
 
 #include "Export.h"
-#include "ExportMP2.h"
 #include "../FileIO.h"
 #include "../Internat.h"
 #include "../Mix.h"
 #include "../Prefs.h"
 #include "../Project.h"
+#include "../ShuttleGui.h"
 #include "../Tags.h"
 #include "../WaveTrack.h"
 

src/export/ExportMP3.cpp

@@ -59,6 +59,9 @@
 
 *//********************************************************************/
 
+#include "../Audacity.h"
+#include "ExportMP3.h"
+
 #include <wx/defs.h>
 
 #include <wx/choice.h>
@@ -75,13 +78,13 @@
 #include <wx/utils.h>
 #include <wx/window.h>
 
-#include "../Audacity.h"
 #include "../FileNames.h"
 #include "../float_cast.h"
 #include "../Internat.h"
 #include "../Mix.h"
 #include "../Prefs.h"
 #include "../Project.h"
+#include "../ShuttleGui.h"
 #include "../Tags.h"
 #include "../WaveTrack.h"
 #include "../widgets/LinkingHtmlWindow.h"
@@ -89,7 +92,6 @@
 #include "FileDialog.h"
 
 #include "Export.h"
-#include "ExportMP3.h"
 
 #include <lame/lame.h>
 

src/export/ExportMultiple.cpp

@@ -16,6 +16,7 @@
 *//********************************************************************/
 
 #include "../Audacity.h"
+#include "ExportMultiple.h"
 
 #include <wx/defs.h>
 #include <wx/button.h>
@@ -38,7 +39,6 @@
 #include <wx/textdlg.h>
 
 #include "Export.h"
-#include "ExportMultiple.h"
 
 #include "../Internat.h"
 #include "../FileFormats.h"
@@ -46,6 +46,7 @@
 #include "../LabelTrack.h"
 #include "../Project.h"
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 #include "../Tags.h"
 #include "../widgets/HelpSystem.h"
 

src/export/ExportOGG.cpp

@@ -19,8 +19,8 @@
 
 #ifdef USE_LIBVORBIS
 
-#include "Export.h"
 #include "ExportOGG.h"
+#include "Export.h"
 
 #include <wx/log.h>
 #include <wx/msgdlg.h>
@@ -31,6 +31,7 @@
 #include "../Project.h"
 #include "../Mix.h"
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 
 #include "../Internat.h"
 #include "../Tags.h"

src/export/ExportPCM.cpp

@@ -8,6 +8,9 @@
 
 **********************************************************************/
 
+#include "../Audacity.h"
+#include "ExportPCM.h"
+
 #include <wx/defs.h>
 
 #include <wx/choice.h>
@@ -23,20 +26,19 @@
 
 #include "sndfile.h"
 
-#include "../Audacity.h"
 #include "../FileFormats.h"
 #include "../Internat.h"
 #include "../LabelTrack.h"
 #include "../Mix.h"
 #include "../Prefs.h"
 #include "../Project.h"
+#include "../ShuttleGui.h"
 #include "../Tags.h"
 #include "../Track.h"
 #include "../WaveTrack.h"
 #include "../ondemand/ODManager.h"
 
 #include "Export.h"
-#include "ExportPCM.h"
 
 #ifdef USE_LIBID3TAG
    #include <id3tag.h>

src/prefs/BatchPrefs.h

@@ -16,10 +16,10 @@
 
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
+class ShuttleGui;
+
 class BatchPrefs : public PrefsPanel
 {
 public:

src/prefs/DevicePrefs.h

@@ -19,11 +19,11 @@
 #include <wx/window.h>
 #include <wx/dynarray.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class DevicePrefs:public PrefsPanel
+class ShuttleGui;
+
+class DevicePrefs :public PrefsPanel
 {
  public:
    DevicePrefs(wxWindow * parent);

src/prefs/DirectoriesPrefs.h

@@ -14,11 +14,11 @@
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class DirectoriesPrefs:public PrefsPanel
+class ShuttleGui;
+
+class DirectoriesPrefs :public PrefsPanel
 {
  public:
    DirectoriesPrefs(wxWindow * parent);

src/prefs/EffectsPrefs.h

@@ -18,11 +18,11 @@
 #include <wx/arrstr.h>
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class EffectsPrefs:public PrefsPanel
+class ShuttleGui;
+
+class EffectsPrefs :public PrefsPanel
 {
  public:
    EffectsPrefs(wxWindow * parent);

src/prefs/ExtImportPrefs.h

@@ -16,15 +16,15 @@
 #include <wx/window.h>
 #include "../widgets/Grid.h"
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
 #include "../import/Import.h"
 #include "../import/ImportPlugin.h"
 
+class wxButton;
 class wxListEvent;
 class ExtImportPrefs;
+class ShuttleGui;
 
 class ExtImportPrefsDropTarget: public wxDropTarget
 {

src/prefs/GUIPrefs.h

@@ -18,11 +18,11 @@
 #include <wx/arrstr.h>
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class GUIPrefs:public PrefsPanel
+class ShuttleGui;
+
+class GUIPrefs :public PrefsPanel
 {
  public:
    GUIPrefs(wxWindow * parent);

src/prefs/ImportExportPrefs.h

@@ -17,11 +17,11 @@
 
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class ImportExportPrefs:public PrefsPanel
+class ShuttleGui;
+
+class ImportExportPrefs :public PrefsPanel
 {
  public:
    ImportExportPrefs(wxWindow * parent);

src/prefs/KeyConfigPrefs.h

@@ -12,6 +12,8 @@
 #ifndef __AUDACITY_KEY_CONFIG_PREFS__
 #define __AUDACITY_KEY_CONFIG_PREFS__
 
+class ShuttleGui;
+
 #if defined(EXPERIMENTAL_KEY_VIEW)
 
 #include <wx/defs.h>
@@ -23,13 +25,12 @@
 #include <wx/textctrl.h>
 #include <wx/timer.h>
 
-#include "../ShuttleGui.h"
 #include "../commands/CommandManager.h"
 #include "../widgets/KeyView.h"
 
 #include "PrefsPanel.h"
 
-class KeyConfigPrefs:public PrefsPanel
+class KeyConfigPrefs :public PrefsPanel
 {
 public:
    KeyConfigPrefs(wxWindow * parent);
@@ -93,7 +94,6 @@ private:
 #include <wx/textctrl.h>
 #include <wx/string.h>
 
-#include "../ShuttleGui.h"
 #include "../commands/CommandManager.h"
 
 #include "PrefsPanel.h"

src/prefs/LibraryPrefs.h

@@ -18,11 +18,11 @@
 #include <wx/stattext.h>
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class LibraryPrefs:public PrefsPanel
+class ShuttleGui;
+
+class LibraryPrefs :public PrefsPanel
 {
  public:
    LibraryPrefs(wxWindow * parent);

src/prefs/MidiIOPrefs.h

@@ -10,6 +10,9 @@
 **********************************************************************/
 
 #include "../Experimental.h"
+
+class ShuttleGui;
+
 #ifdef EXPERIMENTAL_MIDI_OUT
 
 #ifndef __AUDACITY_MIDI_IO_PREFS__
@@ -21,8 +24,6 @@
 #include <wx/string.h>
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
 class MidiIOPrefs:public PrefsPanel

src/prefs/ModulePrefs.h

@@ -17,11 +17,11 @@
 
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
 
+class ShuttleGui;
+
 enum {
    kModuleDisabled = 0,
    kModuleEnabled = 1,

src/prefs/MousePrefs.h

@@ -15,11 +15,11 @@
 #include <wx/string.h>
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class MousePrefs:public PrefsPanel
+class ShuttleGui;
+
+class MousePrefs :public PrefsPanel
 {
  public:
    MousePrefs(wxWindow * parent);

src/prefs/PlaybackPrefs.h

@@ -16,11 +16,11 @@
 
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class PlaybackPrefs:public PrefsPanel
+class ShuttleGui;
+
+class PlaybackPrefs :public PrefsPanel
 {
  public:
    PlaybackPrefs(wxWindow * parent);

src/prefs/PrefsDialog.cpp

@@ -39,6 +39,7 @@
 #include "../Experimental.h"
 #include "../Project.h"
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 
 #include "PrefsDialog.h"
 #include "PrefsPanel.h"

src/prefs/ProjectsPrefs.h

@@ -17,11 +17,11 @@
 
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class ProjectsPrefs:public PrefsPanel
+class ShuttleGui;
+
+class ProjectsPrefs :public PrefsPanel
 {
  public:
    ProjectsPrefs(wxWindow * parent);

src/prefs/QualityPrefs.h

@@ -19,11 +19,11 @@
 #include <wx/dynarray.h>
 #include <wx/textctrl.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class QualityPrefs:public PrefsPanel
+class ShuttleGui;
+
+class QualityPrefs :public PrefsPanel
 {
  public:
    QualityPrefs(wxWindow * parent);

src/prefs/RecordingPrefs.h

@@ -16,11 +16,11 @@
 
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class RecordingPrefs:public PrefsPanel
+class ShuttleGui;
+
+class RecordingPrefs :public PrefsPanel
 {
  public:
    RecordingPrefs(wxWindow * parent);

src/prefs/SpectrumPrefs.h

@@ -26,11 +26,12 @@
 #include <wx/window.h>
 
 #include "../Experimental.h"
-#include "../ShuttleGui.h"
 
 #include "PrefsPanel.h"
 
+class wxTextCtrl;
 struct FFTParam;
+class ShuttleGui;
 
 class SpectrumPrefs:public PrefsPanel
 {

src/prefs/ThemePrefs.h

@@ -17,11 +17,11 @@
 #include <wx/defs.h>
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class ThemePrefs:public PrefsPanel
+class ShuttleGui;
+
+class ThemePrefs :public PrefsPanel
 {
  public:
    ThemePrefs(wxWindow * parent);

src/prefs/TracksPrefs.h

@@ -18,11 +18,11 @@
 #include <wx/arrstr.h>
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class TracksPrefs:public PrefsPanel
+class ShuttleGui;
+
+class TracksPrefs :public PrefsPanel
 {
  public:
    TracksPrefs(wxWindow * parent);

src/prefs/WarningsPrefs.h

@@ -17,11 +17,11 @@
 
 #include <wx/window.h>
 
-#include "../ShuttleGui.h"
-
 #include "PrefsPanel.h"
 
-class WarningsPrefs:public PrefsPanel
+class ShuttleGui;
+
+class WarningsPrefs :public PrefsPanel
 {
  public:
    WarningsPrefs(wxWindow * parent);

src/toolbars/DeviceToolBar.cpp

@@ -15,6 +15,7 @@
 
 
 #include "../Audacity.h"
+#include "DeviceToolBar.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
@@ -31,7 +32,6 @@
 
 #include "../AudacityApp.h"
 
-#include "DeviceToolBar.h"
 #include "ToolDock.h"
 #include "../TrackPanel.h"
 
@@ -41,6 +41,7 @@
 #include "../ImageManipulation.h"
 #include "../Prefs.h"
 #include "../Project.h"
+#include "../ShuttleGui.h"
 #include "../Theme.h"
 #include "../widgets/Grabber.h"
 #include "../DeviceManager.h"

src/widgets/Meter.cpp

@@ -39,6 +39,7 @@
 *//******************************************************************/
 
 #include "../Audacity.h"
+#include "Meter.h"
 #include "../AudacityApp.h"
 
 #include <wx/defs.h>
@@ -57,8 +58,6 @@
 
 #include <math.h>
 
-#include "Meter.h"
-
 #include "../AudioIO.h"
 #include "../AColor.h"
 #include "../ImageManipulation.h"
@@ -66,6 +65,7 @@
 #include "../toolbars/MeterToolBar.h"
 #include "../toolbars/ControlToolBar.h"
 #include "../Prefs.h"
+#include "../ShuttleGui.h"
 
 #include "../Theme.h"
 #include "../AllThemeResources.h"