Remove Envelope.h from other headers

src/AudioIO.cpp

@@ -295,6 +295,7 @@ writing audio.
 #include <wx/txtstrm.h>
 
 #include "AudacityApp.h"
+#include "Envelope.h"
 #include "Mix.h"
 #include "MixerBoard.h"
 #include "Resample.h"
@@ -308,8 +309,6 @@ writing audio.
 #include "toolbars/ControlToolBar.h"
 #include "widgets/Meter.h"
 
-#include "Experimental.h"
-
 #ifdef EXPERIMENTAL_MIDI_OUT
    #define MIDI_SLEEP 10 /* milliseconds */
    #define ROUND(x) (int) ((x)+0.5)

src/FreqWindow.cpp

@@ -71,6 +71,7 @@ and in the spectrogram spectral selection.
 
 #include <math.h>
 
+#include "Envelope.h"
 #include "ShuttleGui.h"
 #include "AColor.h"
 #include "FFT.h"

src/Mix.cpp

@@ -35,7 +35,6 @@
 
 #include "WaveTrack.h"
 #include "DirManager.h"
-#include "Envelope.h"
 #include "Internat.h"
 #include "Prefs.h"
 #include "Project.h"

src/TimeTrack.cpp

@@ -19,6 +19,7 @@
 #include <wx/intl.h>
 #include "AColor.h"
 #include "widgets/Ruler.h"
+#include "Envelope.h"
 #include "Prefs.h"
 #include "Internat.h"
 #include "Resample.h"

src/effects/ChangeSpeed.cpp

@@ -20,7 +20,6 @@
 
 #include <wx/intl.h>
 
-#include "../Envelope.h"
 #include "../LabelTrack.h"
 #include "../Prefs.h"
 #include "../Project.h"

src/effects/ClickRemoval.h

@@ -21,10 +21,9 @@
 #include <wx/string.h>
 #include <wx/textctrl.h>
 
-#include "../Envelope.h"
-
 #include "Effect.h"
 
+class Envelope;
 class ShuttleGui;
 
 #define CLICKREMOVAL_PLUGIN_SYMBOL XO("Click Removal")

src/effects/Contrast.cpp

@@ -14,7 +14,6 @@
 
 #include "../AudacityApp.h"
 
-#include "../Envelope.h"
 #include "../FFT.h"
 #include "../WaveTrack.h"
 #include "../Prefs.h"

src/effects/Equalization.h

@@ -35,7 +35,6 @@
 #endif
 
 #include "Effect.h"
-#include "../Envelope.h"
 #include "../xml/XMLTagHandler.h"
 #include "../widgets/Grid.h"
 #include "../widgets/Ruler.h"
@@ -44,6 +43,7 @@
 #define EQUALIZATION_PLUGIN_SYMBOL XO("Equalization")
 
 
+class Envelope;
 class EqualizationPanel;
 
 //

src/prefs/BatchPrefs.cpp

@@ -21,7 +21,6 @@
 #include <wx/textdlg.h>
 
 #include "BatchPrefs.h"
-#include "../Envelope.h"
 #include "../Languages.h"
 #include "../Prefs.h"
 #include "../Project.h"

src/widgets/Meter.cpp

@@ -60,6 +60,7 @@
 
 #include "../AudioIO.h"
 #include "../AColor.h"
+#include "../Envelope.h"
 #include "../ImageManipulation.h"
 #include "../Project.h"
 #include "../toolbars/MeterToolBar.h"

src/widgets/Ruler.h

@@ -16,7 +16,6 @@
 #include <wx/font.h>
 #include <wx/panel.h>
 #include <wx/window.h>
-#include "../Envelope.h"
 #include "../Experimental.h"
 
 class ViewInfo;