diff --git a/plugins/Eq/EqControls.cpp b/plugins/Eq/EqControls.cpp
index 77f25ff9d..456136807 100644
--- a/plugins/Eq/EqControls.cpp
+++ b/plugins/Eq/EqControls.cpp
@@ -26,11 +26,11 @@
 
 #include <QtXml/QDomElement>
 
+#include "EqControlsDialog.h"
 #include "EqEffect.h"
 
 
 
-
 EqControls::EqControls( EqEffect *effect ) :
 	EffectControls( effect ),
 	m_effect( effect ),
@@ -149,6 +149,11 @@ void EqControls::loadSettings( const QDomElement &_this )
 	m_analyseOutModel.loadSettings( _this, "AnalyseOut" );
 }
 
+EffectControlDialog*EqControls::createView()
+{
+	return new EqControlsDialog( this );
+}
+
 
 
 
diff --git a/plugins/Eq/EqControls.h b/plugins/Eq/EqControls.h
index 813cc2233..b314454ea 100644
--- a/plugins/Eq/EqControls.h
+++ b/plugins/Eq/EqControls.h
@@ -26,7 +26,7 @@
 #define EQCONTROLS_H
 
 #include "EffectControls.h"
-#include "EqControlsDialog.h"
+#include "EqSpectrumView.h"
 
 
 class EqEffect;
@@ -54,10 +54,7 @@ public:
 		return 42;
 	}
 
-	virtual EffectControlDialog* createView()
-	{
-		return new EqControlsDialog( this );
-	}
+	virtual EffectControlDialog* createView();
 
 	float m_inPeakL;
 	float m_inPeakR;
diff --git a/plugins/Eq/EqControlsDialog.cpp b/plugins/Eq/EqControlsDialog.cpp
index a60c627f4..826b5e73f 100644
--- a/plugins/Eq/EqControlsDialog.cpp
+++ b/plugins/Eq/EqControlsDialog.cpp
@@ -32,10 +32,15 @@
 #include "AutomatableButton.h"
 #include "embed.h"
 #include "Engine.h"
-#include "EqControls.h"
-#include "EqFader.h"
+#include "Knob.h"
 #include "Fader.h"
 #include "LedCheckbox.h"
+#include "PixmapButton.h"
+
+#include "EqControls.h"
+#include "EqFader.h"
+#include "EqParameterWidget.h"
+#include "EqSpectrumView.h"
 
 
 EqControlsDialog::EqControlsDialog( EqControls *controls ) :
@@ -214,3 +219,22 @@ void EqControlsDialog::mouseDoubleClickEvent(QMouseEvent *event)
 	parentWidget()->setFixedHeight( parentWidget()->height() == m_originalHeight ? 283 : m_originalHeight  );
 	update();
 }
+
+EqBand* EqControlsDialog::setBand(int index, BoolModel* active, FloatModel* freq, FloatModel* res, FloatModel* gain, QColor color, QString name, float* peakL, float* peakR, BoolModel* hp12, BoolModel* hp24, BoolModel* hp48, BoolModel* lp12, BoolModel* lp24, BoolModel* lp48)
+{
+	EqBand *filterModels = m_parameterWidget->getBandModels( index );
+	filterModels->active = active;
+	filterModels->freq = freq;
+	filterModels->res = res;
+	filterModels->color = color;
+	filterModels->gain = gain;
+	filterModels->peakL = peakL;
+	filterModels->peakR = peakR;
+	filterModels->hp12 = hp12;
+	filterModels->hp24 = hp24;
+	filterModels->hp48 = hp48;
+	filterModels->lp12 = lp12;
+	filterModels->lp24 = lp24;
+	filterModels->lp48 = lp48;
+	return filterModels;
+}
diff --git a/plugins/Eq/EqControlsDialog.h b/plugins/Eq/EqControlsDialog.h
index b1a560a70..b28d38687 100644
--- a/plugins/Eq/EqControlsDialog.h
+++ b/plugins/Eq/EqControlsDialog.h
@@ -29,17 +29,13 @@
 #include <QPushButton>
 
 #include "EffectControlDialog.h"
-#include "EqParameterWidget.h"
-#include "EqSpectrumView.h"
-#include "Fader.h"
-#include "Knob.h"
-#include "LedCheckbox.h"
-#include "MainWindow.h"
-#include "PixmapButton.h"
-
 
+class BoolModel;
+class FloatModel;
 
 class EqControls;
+class EqBand;
+class EqParameterWidget;
 
 class EqControlsDialog : public EffectControlDialog
 {
@@ -58,24 +54,7 @@ private:
 
 	virtual void mouseDoubleClickEvent(QMouseEvent *event);
 
-	EqBand *setBand( int index, BoolModel *active, FloatModel *freq, FloatModel *res, FloatModel *gain, QColor color, QString name, float *peakL, float *peakR, BoolModel *hp12, BoolModel *hp24, BoolModel *hp48, BoolModel *lp12, BoolModel *lp24, BoolModel *lp48 )
-	{
-		EqBand *filterModels = m_parameterWidget->getBandModels( index );
-		filterModels->active = active;
-		filterModels->freq = freq;
-		filterModels->res = res;
-		filterModels->color = color;
-		filterModels->gain = gain;
-		filterModels->peakL = peakL;
-		filterModels->peakR = peakR;
-		filterModels->hp12 = hp12;
-		filterModels->hp24 = hp24;
-		filterModels->hp48 = hp48;
-		filterModels->lp12 = lp12;
-		filterModels->lp24 = lp24;
-		filterModels->lp48 = lp48;
-		return filterModels;
-	}
+	EqBand *setBand( int index, BoolModel *active, FloatModel *freq, FloatModel *res, FloatModel *gain, QColor color, QString name, float *peakL, float *peakR, BoolModel *hp12, BoolModel *hp24, BoolModel *hp48, BoolModel *lp12, BoolModel *lp24, BoolModel *lp48 );
 
 	int m_originalHeight;
 };
diff --git a/plugins/Eq/EqEffect.cpp b/plugins/Eq/EqEffect.cpp
index 32cc85715..25ab79e98 100644
--- a/plugins/Eq/EqEffect.cpp
+++ b/plugins/Eq/EqEffect.cpp
@@ -29,7 +29,6 @@
 #include "EqFader.h"
 #include "interpolation.h"
 #include "lmms_math.h"
-#include "MainWindow.h"
 
 
 extern "C"