diff --git a/lib/playlistmodel.cpp b/lib/playlistmodel.cpp
index 39d1acf..b95f033 100644
--- a/lib/playlistmodel.cpp
+++ b/lib/playlistmodel.cpp
@@ -628,3 +628,5 @@ PlaylistModel::removeRows (QModelIndexList index_list)
 		m_client->playlist ()->removeEntry (idlist.at(i));
 	}
 }
+
+#include "playlistmodel.moc"
diff --git a/lib/xclient.cpp b/lib/xclient.cpp
index f182467..602682c 100644
--- a/lib/xclient.cpp
+++ b/lib/xclient.cpp
@@ -267,4 +267,4 @@ XClient::convert_propdict (const Xmms::PropDict &dict)
 	return hash;
 }
 
-
+#include "xclient.moc"
diff --git a/lib/xclientcache.cpp b/lib/xclientcache.cpp
index 04089ad..2c04c1c 100644
--- a/lib/xclientcache.cpp
+++ b/lib/xclientcache.cpp
@@ -195,3 +195,5 @@ XClientCache::handle_playtime (const unsigned int &tme)
 	emit playtime(tme);
 	return true;
 }
+
+#include "xclientcache.moc"
diff --git a/lib/xcollection.cpp b/lib/xcollection.cpp
index 8e4f4b6..6b62d88 100644
--- a/lib/xcollection.cpp
+++ b/lib/xcollection.cpp
@@ -274,3 +274,6 @@ XCollection::addPlsFile (QUrl url)
 
 	return true;
 }
+
+#include "xcollection.moc"
+#include "xcollection_p.moc"
diff --git a/lib/xconfig.cpp b/lib/xconfig.cpp
index b13169e..281f413 100644
--- a/lib/xconfig.cpp
+++ b/lib/xconfig.cpp
@@ -144,3 +144,5 @@ XConfig::handle_config_value_changed (const Xmms::Dict &value)
 	// TODO
 	return true;
 }
+
+#include "xconfig.moc"
diff --git a/lib/xmmsqt4.cpp b/lib/xmmsqt4.cpp
index ef5d680..fa2a351 100644
--- a/lib/xmmsqt4.cpp
+++ b/lib/xmmsqt4.cpp
@@ -23,6 +23,7 @@
 #include <QObject>
 #include <QSocketNotifier>
 
+
 static void CheckWrite (int i, void *userdata);
 
 XmmsQT4::XmmsQT4 (xmmsc_connection_t *xmmsc) :
@@ -89,3 +90,5 @@ static void CheckWrite (int i, void *userdata)
 		obj->ToggleWrite (false);
 	}
 }
+
+#include "xmmsqt4.moc"
diff --git a/lib/xplayback.cpp b/lib/xplayback.cpp
index 01ff31c..ff2864e 100644
--- a/lib/xplayback.cpp
+++ b/lib/xplayback.cpp
@@ -291,3 +291,5 @@ XPlayback::setBalance (int new_balance)
 
 	m_balance = new_balance;
 }
+
+#include "xplayback.moc"
diff --git a/src/BrowseDialog.cpp b/src/BrowseDialog.cpp
index 66e4795..ee38a70 100644
--- a/src/BrowseDialog.cpp
+++ b/src/BrowseDialog.cpp
@@ -187,3 +187,4 @@ BrowseDialog::setPath (const QString &path)
 	m_model->setPath (path);
 }
 
+#include "BrowseDialog.moc"
diff --git a/src/BrowseModel.cpp b/src/BrowseModel.cpp
index be50365..3c54a9a 100644
--- a/src/BrowseModel.cpp
+++ b/src/BrowseModel.cpp
@@ -216,3 +216,5 @@ BrowseModel::fileIcon (const QModelIndex &index) const
 
 	return QIcon (m_style->standardPixmap (QStyle::SP_FileIcon));
 }
+
+#include "BrowseModel.moc"
diff --git a/src/FileDialog.cpp b/src/FileDialog.cpp
index c2852de..14e0ed2 100644
--- a/src/FileDialog.cpp
+++ b/src/FileDialog.cpp
@@ -56,3 +56,5 @@ FileDialog::getDirectory ()
 	return ret;
 
 }
+
+#include "FileDialog.moc"
diff --git a/src/ServerBrowser.cpp b/src/ServerBrowser.cpp
index bbf15de..9b43807 100644
--- a/src/ServerBrowser.cpp
+++ b/src/ServerBrowser.cpp
@@ -203,3 +203,5 @@ ServerBrowserList::~ServerBrowserList ()
 	}
 	*/
 }
+
+#include "ServerBrowser.moc"
diff --git a/src/Skin.cpp b/src/Skin.cpp
index 7b805b8..7197aeb 100644
--- a/src/Skin.cpp
+++ b/src/Skin.cpp
@@ -771,3 +771,4 @@ Skin::setPositions ()
 //	m_positions.insert (SLIDER_EQUALIZER_BGS, QPoint ());
 }
 
+#include "Skin.moc"
diff --git a/src/SkinChooser.cpp b/src/SkinChooser.cpp
index 099280d..4bb9e78 100644
--- a/src/SkinChooser.cpp
+++ b/src/SkinChooser.cpp
@@ -109,3 +109,4 @@ SkinList::changeSkin (QListWidgetItem *item)
 	settings.setValue ("skin/path", it->getPath ());
 }
 
+#include "SkinChooser.moc"
diff --git a/src/application.cpp b/src/application.cpp
index b49ada8..e5356bd 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -125,3 +125,5 @@ main (int argc, char **argv)
 
 	return app.exec();
 }
+
+#include "application.moc"
diff --git a/src/basewindow.cpp b/src/basewindow.cpp
index 3f3cef9..fa1ce52 100644
--- a/src/basewindow.cpp
+++ b/src/basewindow.cpp
@@ -293,3 +293,5 @@ BaseWindow::snapWindow(QPoint pos, AttachedWindowMap attached)
 
 	return pos;
 }
+
+#include "basewindow.moc"
diff --git a/src/dialogs/entryinfo.cpp b/src/dialogs/entryinfo.cpp
index f2efc66..70289dd 100644
--- a/src/dialogs/entryinfo.cpp
+++ b/src/dialogs/entryinfo.cpp
@@ -83,3 +83,5 @@ EntryInfo::mlib_entry_removed (uint32_t id)
 		close ();
 	}
 }
+
+#include "entryinfo.moc"
diff --git a/src/dialogs/playlistchooser.cpp b/src/dialogs/playlistchooser.cpp
index a2625d9..a5d73f5 100644
--- a/src/dialogs/playlistchooser.cpp
+++ b/src/dialogs/playlistchooser.cpp
@@ -221,3 +221,5 @@ PlaylistChooser::on_textEdit_textChanged ()
 	createButton->setEnabled ((!playlistExists (textEdit->text ())
 	                           && (textEdit->text () != "")));
 }
+
+#include "playlistchooser.moc"
diff --git a/src/dialogs/urlopen.cpp b/src/dialogs/urlopen.cpp
index 33d0731..76ec122 100644
--- a/src/dialogs/urlopen.cpp
+++ b/src/dialogs/urlopen.cpp
@@ -39,3 +39,5 @@ UrlOpen::on_openButton_clicked ()
 		}
 	}
 }
+
+#include "urlopen.moc"
diff --git a/src/equalizer/equalizerwidget.cpp b/src/equalizer/equalizerwidget.cpp
index 510e69e..b545c28 100644
--- a/src/equalizer/equalizerwidget.cpp
+++ b/src/equalizer/equalizerwidget.cpp
@@ -284,3 +284,5 @@ EqualizerWidget::updateServerBands (int value, int id)
 	QString key = QString ("equalizer.legacy%1").arg (id);
 	m_xconfig->value_set (key, QString::number (value));
 }
+
+#include "equalizerwidget.moc"
diff --git a/src/equalizer/equalizerwindow.cpp b/src/equalizer/equalizerwindow.cpp
index c63522c..94503ee 100644
--- a/src/equalizer/equalizerwindow.cpp
+++ b/src/equalizer/equalizerwindow.cpp
@@ -42,3 +42,5 @@ EqualizerWindow::setEnabled (void)
 {
 	qDebug ("test");
 }
+
+#include "equalizerwindow.moc"
diff --git a/src/mainwindow/clutterbar.cpp b/src/mainwindow/clutterbar.cpp
index 26c68e1..6c19aaf 100644
--- a/src/mainwindow/clutterbar.cpp
+++ b/src/mainwindow/clutterbar.cpp
@@ -90,3 +90,5 @@ ClutterBar::paintEvent (QPaintEvent *event)
 	QPainter p (this);
 	p.drawPixmap (rect (), m_pixmap, m_pixmap.rect ());
 }
+
+#include "clutterbar.moc"
diff --git a/src/mainwindow/maindisplay.cpp b/src/mainwindow/maindisplay.cpp
index 4426a05..209e26f 100644
--- a/src/mainwindow/maindisplay.cpp
+++ b/src/mainwindow/maindisplay.cpp
@@ -372,3 +372,5 @@ MainDisplay::setRepeatAllEnabled (bool enabled) {
 		m_xconfig->value_set ("playlist.repeat_all", "0");
 	}
 }
+
+#include "maindisplay.moc"
diff --git a/src/mainwindow/mainwindow.cpp b/src/mainwindow/mainwindow.cpp
index 0a4496a..7ebd900 100644
--- a/src/mainwindow/mainwindow.cpp
+++ b/src/mainwindow/mainwindow.cpp
@@ -210,3 +210,5 @@ MainWindow::attachWidgets ()
 	}
 
 }
+
+#include "mainwindow.moc"
diff --git a/src/mainwindow/playstatus.cpp b/src/mainwindow/playstatus.cpp
index e6e3da5..2347b78 100644
--- a/src/mainwindow/playstatus.cpp
+++ b/src/mainwindow/playstatus.cpp
@@ -76,3 +76,4 @@ PlayStatus::paintEvent (QPaintEvent *event)
 	p.end ();
 }
 
+#include "playstatus.moc"
diff --git a/src/mainwindow/posbar.cpp b/src/mainwindow/posbar.cpp
index adba8a0..9196460 100644
--- a/src/mainwindow/posbar.cpp
+++ b/src/mainwindow/posbar.cpp
@@ -55,3 +55,4 @@ PosBar::setPixmaps (Skin *skin)
 	update ();
 }
 
+#include "posbar.moc"
diff --git a/src/mainwindow/shadeddisplay.cpp b/src/mainwindow/shadeddisplay.cpp
index 890a455..c88e0a1 100644
--- a/src/mainwindow/shadeddisplay.cpp
+++ b/src/mainwindow/shadeddisplay.cpp
@@ -136,4 +136,4 @@ ShadedDisplay::setPlaytime (uint32_t time)
 	m_time->setTime (showtime);
 }
 
-
+#include "shadeddisplay.moc"
diff --git a/src/mainwindow/skindisplay.cpp b/src/mainwindow/skindisplay.cpp
index e824f70..4aa692e 100644
--- a/src/mainwindow/skindisplay.cpp
+++ b/src/mainwindow/skindisplay.cpp
@@ -59,3 +59,4 @@ SkinDisplay::fileOpen (void)
 	}
 }
 
+#include "skindisplay.moc"
diff --git a/src/mainwindow/stereomono.cpp b/src/mainwindow/stereomono.cpp
index 9b93116..b2b6a74 100644
--- a/src/mainwindow/stereomono.cpp
+++ b/src/mainwindow/stereomono.cpp
@@ -59,3 +59,5 @@ StereoMono::setStereoMono (bool stereo, bool mono)
 
 	update ();
 }
+
+#include "stereomono.moc"
diff --git a/src/mainwindow/textscroller.cpp b/src/mainwindow/textscroller.cpp
index f6bdadf..da8a5db 100644
--- a/src/mainwindow/textscroller.cpp
+++ b/src/mainwindow/textscroller.cpp
@@ -302,3 +302,5 @@ TextScroller::mouseMoveEvent (QMouseEvent *event)
 
 	update ();
 }
+
+#include "textscroller.moc"
diff --git a/src/mainwindow/titlebar.cpp b/src/mainwindow/titlebar.cpp
index 90ab062..5b3efd1 100644
--- a/src/mainwindow/titlebar.cpp
+++ b/src/mainwindow/titlebar.cpp
@@ -195,3 +195,4 @@ TitleBar::mouseDoubleClickEvent (QMouseEvent *event)
 	mw->switchDisplay ();
 }
 
+#include "titlebar.moc"
diff --git a/src/playlist/playlistcontrols.cpp b/src/playlist/playlistcontrols.cpp
index 918bdab..581d9c2 100644
--- a/src/playlist/playlistcontrols.cpp
+++ b/src/playlist/playlistcontrols.cpp
@@ -134,3 +134,5 @@ PlaylistControls::setPlaylistPlaytime (uint32_t playtime, bool isExact)
 	is_playlist_playtime_exact = isExact;
 	update ();
 }
+
+#include "playlistcontrols.moc"
diff --git a/src/playlist/playlistmenu.cpp b/src/playlist/playlistmenu.cpp
index 2d18924..d0afced 100644
--- a/src/playlist/playlistmenu.cpp
+++ b/src/playlist/playlistmenu.cpp
@@ -198,3 +198,5 @@ PlaylistMenu::setPixmaps (Skin *skin)
 
 	update ();
 }
+
+#include "playlistmenu.moc"
diff --git a/src/playlist/playlistshade.cpp b/src/playlist/playlistshade.cpp
index f446262..3f7ef41 100644
--- a/src/playlist/playlistshade.cpp
+++ b/src/playlist/playlistshade.cpp
@@ -164,3 +164,4 @@ PlaylistShade::paintEvent (QPaintEvent *event)
 
 }
 
+#include "playlistshade.moc"
diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index bc4148e..07749be 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -330,3 +330,5 @@ PlaylistView::showEntryInfo (void)
 		m_entry_info->show ();
 	}
 }
+
+#include "playlistview.moc"
diff --git a/src/playlist/playlistwidget.cpp b/src/playlist/playlistwidget.cpp
index a6bc78a..1cb206c 100644
--- a/src/playlist/playlistwidget.cpp
+++ b/src/playlist/playlistwidget.cpp
@@ -603,4 +603,4 @@ PlaylistWidget::openPlaylistChooser ()
 	tmp->show ();
 }
 
-
+#include "playlistwidget.moc"
diff --git a/src/playlist/playlistwindow.cpp b/src/playlist/playlistwindow.cpp
index acf3750..594cff0 100644
--- a/src/playlist/playlistwindow.cpp
+++ b/src/playlist/playlistwindow.cpp
@@ -114,3 +114,4 @@ PlaylistWindow::leaveEvent (QEvent *event)
 	m_shaded->setActive (false);
 }
 
+#include "playlistwindow.moc"
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 9a0d3ce..390b115 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -517,3 +517,5 @@ SettingsTabMain::saveSettings (void)
 	//TODO: Check if we really changed something
 	return true;
 }
+
+#include "settingsdialog.moc"
diff --git a/src/timedisplay.cpp b/src/timedisplay.cpp
index 1e6a55d..1242d46 100644
--- a/src/timedisplay.cpp
+++ b/src/timedisplay.cpp
@@ -113,3 +113,5 @@ AbstractTimeDisplay::paintEvent (QPaintEvent *event)
 	}
 	paint.end ();
 }
+
+#include "timedisplay.moc"
diff --git a/src/widgets/pixmapbutton.cpp b/src/widgets/pixmapbutton.cpp
index 84bac04..02ab964 100644
--- a/src/widgets/pixmapbutton.cpp
+++ b/src/widgets/pixmapbutton.cpp
@@ -34,3 +34,5 @@ PixmapButton::paintEvent( QPaintEvent * event )
 	p.end();
 
 }
+
+#include "pixmapbutton.moc"
diff --git a/src/widgets/pixmapnumberdisplay.cpp b/src/widgets/pixmapnumberdisplay.cpp
index dc56c38..72f164d 100644
--- a/src/widgets/pixmapnumberdisplay.cpp
+++ b/src/widgets/pixmapnumberdisplay.cpp
@@ -80,3 +80,4 @@ PixmapNumberDisplay::paintEvent (QPaintEvent *event)
 	paint.end ();
 }
 
+#include "pixmapnumberdisplay.moc"
diff --git a/src/widgets/pixmapslider.cpp b/src/widgets/pixmapslider.cpp
index 037b1a5..9be2363 100644
--- a/src/widgets/pixmapslider.cpp
+++ b/src/widgets/pixmapslider.cpp
@@ -189,3 +189,5 @@ PixmapSlider::backgroundIndex ()
 	                                        sliderPosition (),
 	                                        m_backgrounds.size () - 1, false);
 }
+
+#include "pixmapslider.moc"