diff --git a/include/AudioAlsa.h b/include/AudioAlsa.h
index 04c37d35f..77938e164 100644
--- a/include/AudioAlsa.h
+++ b/include/AudioAlsa.h
@@ -38,9 +38,9 @@
 #include "AudioDevice.h"
 
 
-class AudioAlsa : public AudioDevice, public QThread
+class AudioAlsa : public QThread, public AudioDevice
 {
-	// Public classes and enums
+	Q_OBJECT
 public:
 	/**
 	 * @brief Contains the relevant information about available ALSA devices
diff --git a/include/AudioDummy.h b/include/AudioDummy.h
index c27a8ef1c..5094caddc 100644
--- a/include/AudioDummy.h
+++ b/include/AudioDummy.h
@@ -31,8 +31,9 @@
 #include "Mixer.h"
 
 
-class AudioDummy : public AudioDevice, public QThread
+class AudioDummy : public QThread, public AudioDevice
 {
+	Q_OBJECT
 public:
 	AudioDummy( bool & _success_ful, Mixer* mixer ) :
 		AudioDevice( DEFAULT_CHANNELS, mixer )
diff --git a/include/AudioOss.h b/include/AudioOss.h
index 649208f76..bacfd9597 100644
--- a/include/AudioOss.h
+++ b/include/AudioOss.h
@@ -39,8 +39,9 @@ class LcdSpinBox;
 class QLineEdit;
 
 
-class AudioOss : public AudioDevice, public QThread
+class AudioOss : public QThread, public AudioDevice
 {
+	Q_OBJECT
 public:
 	AudioOss( bool & _success_ful, Mixer* mixer );
 	virtual ~AudioOss();
diff --git a/include/AudioPulseAudio.h b/include/AudioPulseAudio.h
index 0fb821919..496746691 100644
--- a/include/AudioPulseAudio.h
+++ b/include/AudioPulseAudio.h
@@ -41,8 +41,9 @@ class LcdSpinBox;
 class QLineEdit;
 
 
-class AudioPulseAudio : public AudioDevice, public QThread
+class AudioPulseAudio : public QThread, public AudioDevice
 {
+	Q_OBJECT
 public:
 	AudioPulseAudio( bool & _success_ful, Mixer* mixer );
 	virtual ~AudioPulseAudio();
diff --git a/include/AudioSndio.h b/include/AudioSndio.h
index 22a15abc5..d2bc5c074 100644
--- a/include/AudioSndio.h
+++ b/include/AudioSndio.h
@@ -40,8 +40,9 @@ class LcdSpinBox;
 class QLineEdit;
 
 
-class AudioSndio : public AudioDevice, public QThread
+class AudioSndio : public QThread, public AudioDevice
 {
+	Q_OBJECT
 public:
 	AudioSndio( bool & _success_ful, Mixer * _mixer );
 	virtual ~AudioSndio();
diff --git a/include/MainWindow.h b/include/MainWindow.h
index 6f243bfab..83aefe27d 100644
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -29,7 +29,6 @@
 #include <QtCore/QTimer>
 #include <QtCore/QList>
 #include <QMainWindow>
-#include <QThread>
 
 #include "ConfigManager.h"
 #include "SubWindow.h"
diff --git a/include/MidiAlsaRaw.h b/include/MidiAlsaRaw.h
index 42ad2c4f1..81f288c22 100644
--- a/include/MidiAlsaRaw.h
+++ b/include/MidiAlsaRaw.h
@@ -37,11 +37,11 @@
 
 
 struct pollfd;
-class QLineEdit;
 
 
-class MidiAlsaRaw : public MidiClientRaw , public QThread
+class MidiAlsaRaw : public QThread, public MidiClientRaw
 {
+	Q_OBJECT
 public:
 	MidiAlsaRaw();
 	virtual ~MidiAlsaRaw();
diff --git a/include/MidiAlsaSeq.h b/include/MidiAlsaSeq.h
index 563b02c70..0406b42b9 100644
--- a/include/MidiAlsaSeq.h
+++ b/include/MidiAlsaSeq.h
@@ -39,7 +39,6 @@
 
 
 struct pollfd;
-class QLineEdit;
 
 
 class MidiAlsaSeq : public QThread, public MidiClient
diff --git a/include/MidiOss.h b/include/MidiOss.h
index d215391a0..27ebf0771 100644
--- a/include/MidiOss.h
+++ b/include/MidiOss.h
@@ -35,11 +35,10 @@
 #include "MidiClient.h"
 
 
-class QLineEdit;
 
-
-class MidiOss : public MidiClientRaw, public QThread
+class MidiOss : public QThread, public MidiClientRaw
 {
+	Q_OBJECT
 public:
 	MidiOss();
 	virtual ~MidiOss();
diff --git a/include/MidiSndio.h b/include/MidiSndio.h
index a41800d9f..d115993fe 100644
--- a/include/MidiSndio.h
+++ b/include/MidiSndio.h
@@ -37,11 +37,10 @@
 
 #include "MidiClient.h"
 
-class QLineEdit;
 
-
-class MidiSndio : public MidiClientRaw, public QThread
+class MidiSndio : public QThread, public MidiClientRaw
 {
+	Q_OBJECT
 public:
 	MidiSndio( void );
 	virtual ~MidiSndio();
diff --git a/include/MixerWorkerThread.h b/include/MixerWorkerThread.h
index ff9d7c213..9bf2be077 100644
--- a/include/MixerWorkerThread.h
+++ b/include/MixerWorkerThread.h
@@ -35,6 +35,7 @@ class ThreadableJob;
 
 class MixerWorkerThread : public QThread
 {
+	Q_OBJECT
 public:
 	// internal representation of the job queue - all functions are thread-safe
 	class JobQueue
diff --git a/include/Pattern.h b/include/Pattern.h
index 235f504c4..5924a0862 100644
--- a/include/Pattern.h
+++ b/include/Pattern.h
@@ -29,7 +29,6 @@
 #include <QtCore/QVector>
 #include <QWidget>
 #include <QDialog>
-#include <QtCore/QThread>
 #include <QPixmap>
 #include <QStaticText>
 
diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h
index 24526ee89..3395f272a 100644
--- a/include/RemotePlugin.h
+++ b/include/RemotePlugin.h
@@ -749,6 +749,7 @@ class RemotePlugin;
 
 class ProcessWatcher : public QThread
 {
+	Q_OBJECT
 public:
 	ProcessWatcher( RemotePlugin * );
 	virtual ~ProcessWatcher()
diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp
index 35ffa73cc..3298d3dd0 100644
--- a/src/core/Mixer.cpp
+++ b/src/core/Mixer.cpp
@@ -1090,6 +1090,7 @@ Mixer::fifoWriter::fifoWriter( Mixer* mixer, fifo * _fifo ) :
 	m_fifo( _fifo ),
 	m_writing( true )
 {
+	setObjectName("Mixer::fifoWriter");
 }