diff --git a/include/AutomationTrack.h b/include/AutomationTrack.h
index 57a1b45db..bdee33286 100644
--- a/include/AutomationTrack.h
+++ b/include/AutomationTrack.h
@@ -32,7 +32,6 @@
 
 class AutomationTrack : public track
 {
-	Q_OBJECT
 public:
 	AutomationTrack( TrackContainer* tc, bool _hidden = false );
 	virtual ~AutomationTrack();
diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h
index a2be6ae8d..6da0bce60 100644
--- a/include/InstrumentMidiIOView.h
+++ b/include/InstrumentMidiIOView.h
@@ -38,7 +38,6 @@ class QToolButton;
 
 class InstrumentMidiIOView : public QWidget, public ModelView
 {
-	Q_OBJECT
 public:
 	InstrumentMidiIOView( QWidget* parent );
 	virtual ~InstrumentMidiIOView();
diff --git a/include/MeterDialog.h b/include/MeterDialog.h
index eba7bff63..2c9f78fe1 100644
--- a/include/MeterDialog.h
+++ b/include/MeterDialog.h
@@ -35,7 +35,6 @@ class LcdSpinBox;
 
 class MeterDialog : public QWidget, public ModelView
 {
-	Q_OBJECT
 public:
 	MeterDialog( QWidget * _parent, bool _simple = false );
 	virtual ~MeterDialog();
diff --git a/plugins/Amplifier/AmplifierControlDialog.h b/plugins/Amplifier/AmplifierControlDialog.h
index f9ee9e61b..4a3079e4a 100644
--- a/plugins/Amplifier/AmplifierControlDialog.h
+++ b/plugins/Amplifier/AmplifierControlDialog.h
@@ -34,7 +34,6 @@ class AmplifierControls;
 
 class AmplifierControlDialog : public EffectControlDialog
 {
-	Q_OBJECT
 public:
 	AmplifierControlDialog( AmplifierControls* controls );
 	virtual ~AmplifierControlDialog()
diff --git a/plugins/BassBooster/BassBoosterControlDialog.h b/plugins/BassBooster/BassBoosterControlDialog.h
index 218ec7cb7..b21f15a9f 100644
--- a/plugins/BassBooster/BassBoosterControlDialog.h
+++ b/plugins/BassBooster/BassBoosterControlDialog.h
@@ -33,7 +33,6 @@ class BassBoosterControls;
 
 class BassBoosterControlDialog : public EffectControlDialog
 {
-	Q_OBJECT
 public:
 	BassBoosterControlDialog( BassBoosterControls* controls );
 	virtual ~BassBoosterControlDialog()
diff --git a/plugins/DualFilter/DualFilterControlDialog.h b/plugins/DualFilter/DualFilterControlDialog.h
index aef0ad47f..224c3c481 100644
--- a/plugins/DualFilter/DualFilterControlDialog.h
+++ b/plugins/DualFilter/DualFilterControlDialog.h
@@ -34,7 +34,6 @@ class DualFilterControls;
 
 class DualFilterControlDialog : public EffectControlDialog
 {
-	Q_OBJECT
 public:
 	DualFilterControlDialog( DualFilterControls* controls );
 	virtual ~DualFilterControlDialog()
diff --git a/plugins/MidiImport/MidiImport.h b/plugins/MidiImport/MidiImport.h
index 1dfb57e2f..32aab2a33 100644
--- a/plugins/MidiImport/MidiImport.h
+++ b/plugins/MidiImport/MidiImport.h
@@ -35,7 +35,6 @@
 
 class MidiImport : public ImportFilter
 {
-	Q_OBJECT
 public:
 	MidiImport( const QString & _file );
 	virtual ~MidiImport();
diff --git a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.h b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.h
index fd940496a..a27ac46ca 100644
--- a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.h
+++ b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.h
@@ -33,7 +33,6 @@ class SpectrumAnalyzerControls;
 
 class SpectrumAnalyzerControlDialog : public EffectControlDialog
 {
-	Q_OBJECT
 public:
 	SpectrumAnalyzerControlDialog( SpectrumAnalyzerControls* controls );
 	virtual ~SpectrumAnalyzerControlDialog()
diff --git a/plugins/VstEffect/VstEffectControlDialog.h b/plugins/VstEffect/VstEffectControlDialog.h
index 40e22edf7..843c72ac3 100644
--- a/plugins/VstEffect/VstEffectControlDialog.h
+++ b/plugins/VstEffect/VstEffectControlDialog.h
@@ -42,7 +42,6 @@ class pixmapButton;
 
 class VstEffectControlDialog : public EffectControlDialog
 {
-	Q_OBJECT
 public:
 	VstEffectControlDialog( VstEffectControls * _controls );
 	virtual ~VstEffectControlDialog();
diff --git a/plugins/dynamics_processor/dynamics_processor_control_dialog.h b/plugins/dynamics_processor/dynamics_processor_control_dialog.h
index 9504766d2..cb9fa0a47 100644
--- a/plugins/dynamics_processor/dynamics_processor_control_dialog.h
+++ b/plugins/dynamics_processor/dynamics_processor_control_dialog.h
@@ -34,7 +34,6 @@ class dynProcControls;
 
 class dynProcControlDialog : public EffectControlDialog
 {
-	Q_OBJECT
 public:
 	dynProcControlDialog( dynProcControls * _controls );
 	virtual ~dynProcControlDialog()
diff --git a/plugins/kicker/kicker.h b/plugins/kicker/kicker.h
index edf0b7dd7..498031fc2 100644
--- a/plugins/kicker/kicker.h
+++ b/plugins/kicker/kicker.h
@@ -44,7 +44,6 @@ class NotePlayHandle;
 
 class kickerInstrument : public Instrument
 {
-	Q_OBJECT
 public:
 	kickerInstrument( InstrumentTrack * _instrument_track );
 	virtual ~kickerInstrument();
diff --git a/plugins/lb302/lb302.h b/plugins/lb302/lb302.h
index 635215128..dbef4e190 100644
--- a/plugins/lb302/lb302.h
+++ b/plugins/lb302/lb302.h
@@ -252,7 +252,6 @@ private:
 
 class lb302SynthView : public InstrumentView
 {
-	Q_OBJECT
 public:
 	lb302SynthView( Instrument * _instrument,
 	                QWidget * _parent );
diff --git a/plugins/lb303/lb303.h b/plugins/lb303/lb303.h
index be780cd29..3a7f347d0 100644
--- a/plugins/lb303/lb303.h
+++ b/plugins/lb303/lb303.h
@@ -241,7 +241,6 @@ private:
 
 class lb303SynthView : public InstrumentView
 {
-	Q_OBJECT
 public:
 	lb303SynthView( Instrument * _instrument,
 	                QWidget * _parent );
diff --git a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h
index e9b4ba6d4..b161a64c5 100644
--- a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h
+++ b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h
@@ -35,7 +35,6 @@ class ledCheckBox;
 
 class PeakControllerEffectControlDialog : public EffectControlDialog
 {
-	Q_OBJECT
 public:
 	PeakControllerEffectControlDialog(
 				PeakControllerEffectControls * _controls );
diff --git a/plugins/stereo_enhancer/stereoenhancer_control_dialog.h b/plugins/stereo_enhancer/stereoenhancer_control_dialog.h
index 3a98771a2..c7f3c6d8f 100644
--- a/plugins/stereo_enhancer/stereoenhancer_control_dialog.h
+++ b/plugins/stereo_enhancer/stereoenhancer_control_dialog.h
@@ -32,7 +32,6 @@ class stereoEnhancerControls;
 
 class stereoEnhancerControlDialog : public EffectControlDialog
 {
-	Q_OBJECT
 public:
 	stereoEnhancerControlDialog( stereoEnhancerControls * _controls );
 	virtual ~stereoEnhancerControlDialog()
diff --git a/plugins/stereo_matrix/stereomatrix_control_dialog.h b/plugins/stereo_matrix/stereomatrix_control_dialog.h
index 82d79c598..d123aa53e 100644
--- a/plugins/stereo_matrix/stereomatrix_control_dialog.h
+++ b/plugins/stereo_matrix/stereomatrix_control_dialog.h
@@ -32,7 +32,6 @@ class stereoMatrixControls;
 
 class stereoMatrixControlDialog : public EffectControlDialog
 {
-	Q_OBJECT
 public:
 	stereoMatrixControlDialog( stereoMatrixControls * _controls );
 	virtual ~stereoMatrixControlDialog()
diff --git a/plugins/stk/mallets/mallets.h b/plugins/stk/mallets/mallets.h
index ef7b0f0c9..2213d9666 100644
--- a/plugins/stk/mallets/mallets.h
+++ b/plugins/stk/mallets/mallets.h
@@ -133,7 +133,6 @@ protected:
 
 class malletsInstrument : public Instrument
 {
-	Q_OBJECT
 public:
 	malletsInstrument( InstrumentTrack * _instrument_track );
 	virtual ~malletsInstrument();
diff --git a/plugins/waveshaper/waveshaper_control_dialog.h b/plugins/waveshaper/waveshaper_control_dialog.h
index 37d08b3a7..faed7b1e8 100644
--- a/plugins/waveshaper/waveshaper_control_dialog.h
+++ b/plugins/waveshaper/waveshaper_control_dialog.h
@@ -34,7 +34,6 @@ class waveShaperControls;
 
 class waveShaperControlDialog : public EffectControlDialog
 {
-	Q_OBJECT
 public:
 	waveShaperControlDialog( waveShaperControls * _controls );
 	virtual ~waveShaperControlDialog()
diff --git a/src/gui/widgets/InstrumentMidiIOView.cpp b/src/gui/widgets/InstrumentMidiIOView.cpp
index 133486712..30069eb66 100644
--- a/src/gui/widgets/InstrumentMidiIOView.cpp
+++ b/src/gui/widgets/InstrumentMidiIOView.cpp
@@ -201,4 +201,4 @@ void InstrumentMidiIOView::modelChanged()
 	}
 }
 
-#include "moc_InstrumentMidiIOView.cxx"
+
diff --git a/src/gui/widgets/MeterDialog.cpp b/src/gui/widgets/MeterDialog.cpp
index 0fd1764e5..7517856e3 100644
--- a/src/gui/widgets/MeterDialog.cpp
+++ b/src/gui/widgets/MeterDialog.cpp
@@ -113,4 +113,4 @@ void MeterDialog::modelChanged()
 	m_denominator->setModel( &mm->denominatorModel() );
 }
 
-#include "moc_MeterDialog.cxx"
+
diff --git a/src/tracks/AutomationTrack.cpp b/src/tracks/AutomationTrack.cpp
index 4ca402dd7..5c4ff97b1 100644
--- a/src/tracks/AutomationTrack.cpp
+++ b/src/tracks/AutomationTrack.cpp
@@ -192,4 +192,4 @@ void AutomationTrackView::dropEvent( QDropEvent * _de )
 }
 
 
-#include "moc_AutomationTrack.cxx"
+