diff --git a/src/core/notification/icon.cpp b/src/core/notification/icon.cpp
index 097513b..e66dfdd 100644
--- a/src/core/notification/icon.cpp
+++ b/src/core/notification/icon.cpp
@@ -22,6 +22,8 @@
 
 #include "notification/icon_p.h"
 
+#include <QBuffer>
+
 using namespace Snore;
 
 QByteArray Icon::dataFromImage(const QImage &image)
diff --git a/src/core/notification/icon_p.cpp b/src/core/notification/icon_p.cpp
index 0001894..df7a2ef 100644
--- a/src/core/notification/icon_p.cpp
+++ b/src/core/notification/icon_p.cpp
@@ -19,10 +19,10 @@
 #include "icon_p.h"
 #include "../snore_p.h"
 
-#include <QEventLoop>
+#include <QApplication>
+#include <QFile>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QApplication>
 
 using namespace Snore;
 
diff --git a/src/core/notification/icon_p.h b/src/core/notification/icon_p.h
index 38098a2..dbab576 100644
--- a/src/core/notification/icon_p.h
+++ b/src/core/notification/icon_p.h
@@ -24,12 +24,8 @@
 
 #include <QImage>
 #include <QSharedData>
-#include <QBuffer>
-#include <QFile>
-#include <QDebug>
 #include <QSet>
 
-#include <QMutex>
 
 class QNetworkAccessManager;
 
diff --git a/src/core/notification/notification.cpp b/src/core/notification/notification.cpp
index 7227502..9b9a0a6 100644
--- a/src/core/notification/notification.cpp
+++ b/src/core/notification/notification.cpp
@@ -21,7 +21,6 @@
 #include "notification/icon.h"
 #include "notification/notification_p.h"
 #include "plugins/plugincontainer.h"
-#include <QMetaEnum>
 #include <Qt>
 
 using namespace Snore;
diff --git a/src/core/notification/notification.h b/src/core/notification/notification.h
index 33c097c..194f0f1 100644
--- a/src/core/notification/notification.h
+++ b/src/core/notification/notification.h
@@ -24,7 +24,6 @@
 #include "../hint.h"
 #include "../application.h"
 
-#include <QVariant>
 #include <QDebug>
 
 namespace Snore
diff --git a/src/core/notification/notification_p.h b/src/core/notification/notification_p.h
index 8a65bb1..6a3ee9f 100644
--- a/src/core/notification/notification_p.h
+++ b/src/core/notification/notification_p.h
@@ -25,7 +25,6 @@
 
 #include <QSharedData>
 #include <QTimer>
-#include <QPointer>
 
 namespace Snore
 {
diff --git a/src/core/plugins/plugincontainer.cpp b/src/core/plugins/plugincontainer.cpp
index 008bb7f..a97603d 100644
--- a/src/core/plugins/plugincontainer.cpp
+++ b/src/core/plugins/plugincontainer.cpp
@@ -25,7 +25,6 @@
 #include "../version.h"
 
 #include <QDir>
-#include <QDebug>
 #include <QMetaEnum>
 #include <QApplication>
 #include <QTime>
diff --git a/src/core/plugins/plugincontainer.h b/src/core/plugins/plugincontainer.h
index 975a8e8..e1a039c 100644
--- a/src/core/plugins/plugincontainer.h
+++ b/src/core/plugins/plugincontainer.h
@@ -21,10 +21,8 @@
 #include "snore_exports.h"
 #include "../snore_p.h"
 
-#include <QPointer>
-#include <QSettings>
-#include <QFlag>
 #include <QPluginLoader>
+#include <QDir>
 
 namespace Snore
 {
diff --git a/src/core/plugins/plugins.cpp b/src/core/plugins/plugins.cpp
index ccc6cb4..7fbae81 100644
--- a/src/core/plugins/plugins.cpp
+++ b/src/core/plugins/plugins.cpp
@@ -23,13 +23,9 @@
 #include "../notification/notification_p.h"
 #include "plugincontainer.h"
 
-#include <QTimer>
-#include <QPluginLoader>
-#include <QDir>
 #include <QDebug>
 #include <QMetaEnum>
 #include <QApplication>
-#include <QWidget>
 
 using namespace Snore;
 
diff --git a/src/core/plugins/plugins.h b/src/core/plugins/plugins.h
index 325f612..6899ce3 100644
--- a/src/core/plugins/plugins.h
+++ b/src/core/plugins/plugins.h
@@ -22,11 +22,7 @@
 #include "pluginsettingswidget.h"
 #include "../notification/notification.h"
 
-#include <QPointer>
 #include <QHash>
-#include <QTimer>
-#include <QtPlugin>
-#include <QSettings>
 
 namespace Snore
 {
diff --git a/src/core/plugins/snorebackend.cpp b/src/core/plugins/snorebackend.cpp
index 7525a9a..198d534 100644
--- a/src/core/plugins/snorebackend.cpp
+++ b/src/core/plugins/snorebackend.cpp
@@ -24,8 +24,6 @@
 #include "../notification/notification_p.h"
 
 #include <QTimer>
-#include <QDir>
-#include <QDebug>
 #include <QThread>
 #include <QMetaMethod>
 
diff --git a/src/core/plugins/snorebackend.h b/src/core/plugins/snorebackend.h
index d79b64a..190019f 100644
--- a/src/core/plugins/snorebackend.h
+++ b/src/core/plugins/snorebackend.h
@@ -23,8 +23,6 @@
 #include "../notification/notification.h"
 #include "../snore.h"
 
-#include <QPointer>
-#include <QFlag>
 
 namespace Snore
 {
diff --git a/src/core/plugins/snorefrontend.cpp b/src/core/plugins/snorefrontend.cpp
index 29d0376..d896743 100644
--- a/src/core/plugins/snorefrontend.cpp
+++ b/src/core/plugins/snorefrontend.cpp
@@ -19,9 +19,6 @@
 #include "snorefrontend.h"
 #include "../snore.h"
 
-#include <QTimer>
-#include <QDir>
-#include <QDebug>
 
 namespace Snore
 {
diff --git a/src/core/plugins/snorefrontend.h b/src/core/plugins/snorefrontend.h
index 2eba49c..5c5622d 100644
--- a/src/core/plugins/snorefrontend.h
+++ b/src/core/plugins/snorefrontend.h
@@ -22,8 +22,6 @@
 #include "../notification/notification.h"
 #include "plugins.h"
 
-#include <QPointer>
-#include <QFlag>
 
 namespace Snore
 {
diff --git a/src/core/snore.cpp b/src/core/snore.cpp
index 76711aa..a0a15e8 100644
--- a/src/core/snore.cpp
+++ b/src/core/snore.cpp
@@ -28,10 +28,6 @@
 
 #include <iostream>
 
-#include <QDebug>
-#include <QDir>
-#include <QSystemTrayIcon>
-#include <QApplication>
 #include <QSettings>
 
 using namespace Snore;
diff --git a/src/core/snore.h b/src/core/snore.h
index 1486c48..c7dd84c 100644
--- a/src/core/snore.h
+++ b/src/core/snore.h
@@ -26,6 +26,7 @@
 #include "plugins/plugins.h"
 #include "hint.h"
 
+#include <QSettings>
 #include <QStringList>
 #include <QTextDocument>
 #include <QTextDocumentFragment>
diff --git a/src/core/snore_p.h b/src/core/snore_p.h
index c624d3a..b0a3d8a 100644
--- a/src/core/snore_p.h
+++ b/src/core/snore_p.h
@@ -22,7 +22,6 @@
 #include "snore.h"
 #include "plugins/snorebackend.h"
 
-#include <QDir>
 #include <QPointer>
 #include <QCryptographicHash>
 
diff --git a/src/daemon/snorenotify.cpp b/src/daemon/snorenotify.cpp
index 0ad0200..1cd7426 100644
--- a/src/daemon/snorenotify.cpp
+++ b/src/daemon/snorenotify.cpp
@@ -20,17 +20,11 @@
 #include "trayicon.h"
 #include "core/snore.h"
 
-#include <QDir>
-#include <QFile>
-#include <QList>
-#include <QDebug>
-#include <QPluginLoader>
-#include <QSystemTrayIcon>
-#include <QSettings>
 
 #include <iostream>
 #include <stdlib.h>
 
+#include <QApplication>
 
 using namespace Snore;
 
diff --git a/src/daemon/snorenotify.h b/src/daemon/snorenotify.h
index a5a2d22..e38db4a 100644
--- a/src/daemon/snorenotify.h
+++ b/src/daemon/snorenotify.h
@@ -19,7 +19,7 @@
 #ifndef SNORENOTIFY_H
 #define SNORENOTIFY_H
 
-#include <QtCore>
+#include <QSettings>
 
 namespace Snore
 {
@@ -38,7 +38,7 @@ public:
 private:
     class TrayIcon *m_trayIcon;
     Snore::SnoreCore *m_snore;
-    class QSettings m_settings;
+    QSettings m_settings;
 
 private slots:
     void exit();
diff --git a/src/daemon/trayicon.cpp b/src/daemon/trayicon.cpp
index a5341f9..deb2084 100644
--- a/src/daemon/trayicon.cpp
+++ b/src/daemon/trayicon.cpp
@@ -21,9 +21,11 @@
 #include "core/snore.h"
 #include "core/snore_p.h"
 
-#include <QSystemTrayIcon>
-#include <QMenu>
 #include <QAction>
+#include <QApplication>
+#include <QMenu>
+#include <QSystemTrayIcon>
+#include <QTimer>
 
 #include "core/version.h"
 
diff --git a/src/daemon/trayicon.h b/src/daemon/trayicon.h
index db4b84f..efe8fb7 100644
--- a/src/daemon/trayicon.h
+++ b/src/daemon/trayicon.h
@@ -19,7 +19,6 @@
 #ifndef TRAYICON_H
 #define TRAYICON_H
 
-#include <QtCore>
 #include <QAction>
 #include "core/snore.h"
 
diff --git a/src/plugins/backends/freedesktop/fredesktopnotification.cpp b/src/plugins/backends/freedesktop/fredesktopnotification.cpp
index 57ac8a4..b2711e1 100644
--- a/src/plugins/backends/freedesktop/fredesktopnotification.cpp
+++ b/src/plugins/backends/freedesktop/fredesktopnotification.cpp
@@ -19,7 +19,6 @@
 #include "fredesktopnotification.h"
 
 #include <QImage>
-#include <QtGlobal>
 
 int FreedesktopImageHint::imageHintID = qDBusRegisterMetaType<FreedesktopImageHint>();
 
diff --git a/src/plugins/backends/freedesktop/fredesktopnotification.h b/src/plugins/backends/freedesktop/fredesktopnotification.h
index 1641b85..6e33624 100644
--- a/src/plugins/backends/freedesktop/fredesktopnotification.h
+++ b/src/plugins/backends/freedesktop/fredesktopnotification.h
@@ -21,7 +21,6 @@
 
 #include "core/notification/notification.h"
 
-#include <QtDBus>
 #include <QMetaType>
 
 class FreedesktopImageHint
diff --git a/src/plugins/backends/freedesktop/freedesktopnotification_backend.cpp b/src/plugins/backends/freedesktop/freedesktopnotification_backend.cpp
index 8086ead..42d1283 100644
--- a/src/plugins/backends/freedesktop/freedesktopnotification_backend.cpp
+++ b/src/plugins/backends/freedesktop/freedesktopnotification_backend.cpp
@@ -1,12 +1,8 @@
 #include "freedesktopnotification_backend.h"
 
-#include <QtGlobal>
-#include <QDebug>
 #include "core/notification/notification.h"
 #include "core/notification/notification_p.h"
 #include "core/snore_p.h"
-#include <QtCore>
-#include <QImage>
 #include "fredesktopnotification.h"
 #include "core/snore.h"
 
diff --git a/src/plugins/backends/growl/growlbackend.cpp b/src/plugins/backends/growl/growlbackend.cpp
index 0d4b3bd..0a80198 100644
--- a/src/plugins/backends/growl/growlbackend.cpp
+++ b/src/plugins/backends/growl/growlbackend.cpp
@@ -21,8 +21,6 @@
 #include "core/snore.h"
 #include "core/snore_p.h"
 
-#include <QtCore>
-#include <QTcpSocket>
 
 using namespace Snore;
 
diff --git a/src/plugins/backends/snarl/snarl.cpp b/src/plugins/backends/snarl/snarl.cpp
index 478cca3..5cb9185 100644
--- a/src/plugins/backends/snarl/snarl.cpp
+++ b/src/plugins/backends/snarl/snarl.cpp
@@ -24,7 +24,6 @@
 #include "core/plugins/snorebackend.h"
 #include "core/notification/notification_p.h"
 
-#include <QtDebug>
 #include <QWidget>
 
 #include <iostream>
diff --git a/src/plugins/backends/snore/notifywidget.cpp b/src/plugins/backends/snore/notifywidget.cpp
index 13bb738..4c49002 100644
--- a/src/plugins/backends/snore/notifywidget.cpp
+++ b/src/plugins/backends/snore/notifywidget.cpp
@@ -20,11 +20,6 @@
 #include "snorenotifier.h"
 #include "core/log.h"
 
-#include <QDesktopWidget>
-#include <QDesktopServices>
-#include <QPicture>
-#include <QLayout>
-#include <QSize>
 
 using namespace Snore;
 
diff --git a/src/plugins/backends/snore/notifywidget.h b/src/plugins/backends/snore/notifywidget.h
index af39cce..c9ea727 100644
--- a/src/plugins/backends/snore/notifywidget.h
+++ b/src/plugins/backends/snore/notifywidget.h
@@ -19,13 +19,10 @@
 #ifndef NOTIFYWIDGET_H
 #define NOTIFYWIDGET_H
 
-#include <QWidget>
-#include <QTimer>
 #include <QSharedMemory>
 #include "core/notification/notification.h"
 
 #include <QtQuick/QtQuick>
-#include <QPropertyAnimation>
 
 class SnoreNotifier;
 
diff --git a/src/plugins/backends/snore/snorenotifier.cpp b/src/plugins/backends/snore/snorenotifier.cpp
index c4f61b2..d1a22c4 100644
--- a/src/plugins/backends/snore/snorenotifier.cpp
+++ b/src/plugins/backends/snore/snorenotifier.cpp
@@ -23,7 +23,6 @@
 #include "core/snore_p.h"
 
 
-#include <QApplication>
 #include <QThread>
 
 using namespace Snore;
diff --git a/src/plugins/backends/snoretoast/snoretoast.cpp b/src/plugins/backends/snoretoast/snoretoast.cpp
index 9055c39..f39bac5 100644
--- a/src/plugins/backends/snoretoast/snoretoast.cpp
+++ b/src/plugins/backends/snoretoast/snoretoast.cpp
@@ -4,7 +4,6 @@
 #include "core/plugins/plugins.h"
 #include "core/plugins/snorebackend.h"
 
-#include <QDebug>
 #include <QDir>
 #include <QApplication>
 #include <QSysInfo>
diff --git a/src/plugins/backends/trayicon/trayiconnotifer.cpp b/src/plugins/backends/trayicon/trayiconnotifer.cpp
index 526a217..42cdec3 100644
--- a/src/plugins/backends/trayicon/trayiconnotifer.cpp
+++ b/src/plugins/backends/trayicon/trayiconnotifer.cpp
@@ -2,11 +2,7 @@
 #include "core/snore.h"
 #include "core/snore_p.h"
 
-#include <QtCore>
 #include <QSystemTrayIcon>
-#include <QTimer>
-#include <QTime>
-#include <QDebug>
 using namespace Snore;
 
 TrayIconNotifer::TrayIconNotifer() :
diff --git a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp
index 166e3e2..6c161b3 100644
--- a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp
+++ b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp
@@ -24,8 +24,6 @@
 #include "core/version.h"
 #include "core/notification/notification_p.h"
 
-#include <QtCore>
-#include <QtDBus>
 #include <QImage>
 #include <QIcon>
 
diff --git a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h
index 76e74f6..9ac4639 100644
--- a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h
+++ b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h
@@ -20,7 +20,6 @@
 #define FREEDESKTOPNOTIFICATION_FRONTEND_H
 #include "core/plugins/snorefrontend.h"
 #include "core/application.h"
-#include <QtDBus>
 
 class NotificationsAdaptor;
 
diff --git a/src/plugins/frontends/snarlnetwork/parser.cpp b/src/plugins/frontends/snarlnetwork/parser.cpp
index 13da77e..74500c6 100644
--- a/src/plugins/frontends/snarlnetwork/parser.cpp
+++ b/src/plugins/frontends/snarlnetwork/parser.cpp
@@ -23,10 +23,6 @@
 #include "core/notification/notification.h"
 #include "core/notification/notification_p.h"
 
-#include <QDir>
-#include <QNetworkAccessManager>
-#include <QEventLoop>
-#include <QNetworkReply>
 #include <QObject>
 #include <QTcpSocket>
 
diff --git a/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp b/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
index 9a50c03..687c852 100644
--- a/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
+++ b/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
@@ -19,7 +19,6 @@
 #include "snarlnetwork.h"
 #include "core/snore.h"
 
-#include <QtCore>
 #include <QTcpServer>
 #include <QTcpSocket>
 
diff --git a/src/plugins/frontends/snarlnetwork/snarlnetwork.h b/src/plugins/frontends/snarlnetwork/snarlnetwork.h
index 0044b7f..c5a72a5 100644
--- a/src/plugins/frontends/snarlnetwork/snarlnetwork.h
+++ b/src/plugins/frontends/snarlnetwork/snarlnetwork.h
@@ -22,7 +22,6 @@
 #include "core/log.h"
 #include "parser.h"
 
-#include <QPointer>
 #include <QTcpSocket>
 #include <QTcpServer>
 
diff --git a/src/plugins/secondary_backends/toasty/toasty.cpp b/src/plugins/secondary_backends/toasty/toasty.cpp
index edb2094..b9076c3 100644
--- a/src/plugins/secondary_backends/toasty/toasty.cpp
+++ b/src/plugins/secondary_backends/toasty/toasty.cpp
@@ -18,8 +18,11 @@
 #include "toasty.h"
 #include "toastysettings.h"
 
-#include <QtNetwork>
-#include <QImage>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QHttpMultiPart>
+#include <QFile>
 
 using namespace Snore;