diff --git a/include/controller_dialog.h b/include/controller_dialog.h
index 2cbf94edd..1b0b1555f 100644
--- a/include/controller_dialog.h
+++ b/include/controller_dialog.h
@@ -28,10 +28,11 @@
 
 #include <QtGui/QWidget>
 
-#include "automatable_model.h"
-#include "controller.h"
 #include "mv_base.h"
 
+class controller;
+
+
 class controllerDialog : public QWidget, public modelView
 {
     Q_OBJECT
@@ -41,13 +42,13 @@ public:
 	virtual ~controllerDialog();
 
 signals:
-    void closed();
+	void closed();
 
 
 protected:
-	virtual void contextMenuEvent( QContextMenuEvent * _me ) {};
+/*	virtual void contextMenuEvent( QContextMenuEvent * _me ) {};
 	virtual void paintEvent( QPaintEvent * _pe ) {};
-	virtual void modelChanged( void ) {};
+	virtual void modelChanged( void ) {};*/
 	virtual void closeEvent( QCloseEvent * _ce );
 
 } ;
diff --git a/src/core/lfo_controller.cpp b/src/core/lfo_controller.cpp
index 2fa086a87..3241b5b07 100644
--- a/src/core/lfo_controller.cpp
+++ b/src/core/lfo_controller.cpp
@@ -46,10 +46,10 @@ lfoController::lfoController( model * _parent ) :
 	m_lfoAmountModel( 1.0, -1.0, 1.0, 0.005, this ),
 	m_lfoPhaseModel( 0.0, 0.0, 360.0, 4.0, this ),
 	m_lfoWaveModel( oscillator::SineWave, 0, oscillator::NumWaveShapes, 1, this ),
-	m_sampleFunction( &oscillator::sinSample ),
 	m_duration( 1000 ),
 	m_phaseCorrection( 0 ),
-	m_phaseOffset( 0 )
+	m_phaseOffset( 0 ),
+	m_sampleFunction( &oscillator::sinSample )
 {
 
 	connect( &m_lfoWaveModel, SIGNAL( dataChanged() ),
diff --git a/src/gui/controller_dialog.cpp b/src/gui/controller_dialog.cpp
index 289bb81db..0cbe22b52 100644
--- a/src/gui/controller_dialog.cpp
+++ b/src/gui/controller_dialog.cpp
@@ -25,32 +25,33 @@
  *
  */
 
-#include <QtGui/QWidget>
 #include <QtGui/QCloseEvent>
 
 #include "controller_dialog.h"
 #include "controller.h"
 
 
-controllerDialog::controllerDialog( controller * _controller, QWidget * _parent ) :
-    modelView( _controller ),
-    QWidget( _parent )
+controllerDialog::controllerDialog( controller * _controller,
+							QWidget * _parent ) :
+	QWidget( _parent ),
+	modelView( _controller )
 {
-};
+}
 
 
 
 controllerDialog::~controllerDialog()
 {
-};
+}
 
 
 
 void controllerDialog::closeEvent( QCloseEvent * _ce )
 {
-    _ce->ignore();
-    emit( closed() );
-};
+	_ce->ignore();
+	emit closed();
+}
+
 
 #include "controller_dialog.moc"
 
diff --git a/src/gui/widgets/controller_view.cpp b/src/gui/widgets/controller_view.cpp
index 229def1f9..a759f9848 100644
--- a/src/gui/widgets/controller_view.cpp
+++ b/src/gui/widgets/controller_view.cpp
@@ -45,12 +45,12 @@
 
 
 controllerView::controllerView( controller * _model, QWidget * _parent ) :
-	modelView( _model ),
 	QWidget( _parent ),
+	modelView( _model ),
 	m_bg( embed::getIconPixmap( "controller_bg" ) ),
-	m_show( TRUE ),
 	m_subWindow( NULL ),
-	m_controllerDlg( NULL )
+	m_controllerDlg( NULL ),
+	m_show( TRUE )
 {
 	setFixedSize( 210, 20 );