diff --git a/src/Gui/ExportMenu.cpp b/src/Gui/ExportMenu.cpp
--- a/src/Gui/ExportMenu.cpp
+++ b/src/Gui/ExportMenu.cpp
@@ -19,26 +19,20 @@
 
 #include "ExportMenu.h"
 
-#include <QTimer>
-#include <QList>
-#include <QUrl>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QDebug>
+#include "Config.h"
 
 #include <KLocalizedString>
-#include <KStandardShortcut>
-#include <KService>
 #include <KMimeTypeTrader>
 #include <KRun>
-
-#include "Config.h"
+#include <KStandardShortcut>
 #ifdef KIPI_FOUND
 #include <KIPI/Plugin>
-#include <KIPI/PluginLoader>
-#include "KipiInterface/KSGKipiInterface.h"
 #endif
 
+#include <QDebug>
+#include <QJsonArray>
+#include <QTimer>
+
 ExportMenu::ExportMenu(QWidget *parent) :
     QMenu(parent),
 #ifdef PURPOSE_FOUND
diff --git a/src/Gui/KSMainWindow.cpp b/src/Gui/KSMainWindow.cpp
--- a/src/Gui/KSMainWindow.cpp
+++ b/src/Gui/KSMainWindow.cpp
@@ -18,35 +18,30 @@
  */
 
 #include "KSMainWindow.h"
+
 #include "Config.h"
+#include "SettingsDialog/SettingsDialog.h"
+
+#include <KAboutData>
+#include <KGuiItem>
+#include <KHelpMenu>
+#include <KIO/OpenFileManagerWindowJob>
+#include <KLocalizedString>
+#include <KNS3/KMoreToolsMenuFactory>
+#include <KStandardAction>
+#include <KStandardGuiItem>
+#include <KWindowSystem>
 
 #include <QDesktopServices>
 #include <QJsonArray>
 #include <QPrintDialog>
-#include <QShortcut>
-#include <QTimer>
 #include <QPushButton>
+#include <QTimer>
 #include <QVBoxLayout>
-
 #ifdef XCB_FOUND
 #include <QX11Info>
-#include <xcb/xcb.h>
 #endif
 
-#include <KLocalizedString>
-#include <KGuiItem>
-#include <KStandardAction>
-#include <KStandardGuiItem>
-#include <KHelpMenu>
-#include <KAboutData>
-#include <KWindowSystem>
-#include <KIO/OpenFileManagerWindowJob>
-#include <KNS3/KMoreToolsMenuFactory>
-
-#include "SettingsDialog/SettingsDialog.h"
-#include "ExportMenu.h"
-#include "ExportManager.h"
-#include "SpectacleConfig.h"
 
 static const int DEFAULT_WINDOW_HEIGHT = 420;
 static const int DEFAULT_WINDOW_WIDTH = 840;
diff --git a/src/Gui/KSWidget.cpp b/src/Gui/KSWidget.cpp
--- a/src/Gui/KSWidget.cpp
+++ b/src/Gui/KSWidget.cpp
@@ -19,23 +19,21 @@
 
 #include "KSWidget.h"
 
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QFormLayout>
-#include <QComboBox>
+#include "KSImageWidget.h"
+#include "SmartSpinBox.h"
+#include "SpectacleConfig.h"
+
+#include <KLocalizedString>
+
 #include <QCheckBox>
+#include <QComboBox>
+#include <QFormLayout>
+#include <QGridLayout>
 #include <QLabel>
 #include <QPushButton>
 #include <QShortcut>
 #include <QTimer>
 
-#include <KLocalizedString>
-
-#include "KSImageWidget.h"
-#include "SmartSpinBox.h"
-
-#include "SpectacleConfig.h"
 
 KSWidget::KSWidget(QWidget *parent) :
     QWidget(parent)
diff --git a/src/Gui/SettingsDialog/GeneralOptionsPage.cpp b/src/Gui/SettingsDialog/GeneralOptionsPage.cpp
--- a/src/Gui/SettingsDialog/GeneralOptionsPage.cpp
+++ b/src/Gui/SettingsDialog/GeneralOptionsPage.cpp
@@ -19,14 +19,13 @@
 
 #include "GeneralOptionsPage.h"
 
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QCheckBox>
+#include "SpectacleConfig.h"
 
 #include <KLocalizedString>
 
-#include "SpectacleConfig.h"
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QVBoxLayout>
 
 GeneralOptionsPage::GeneralOptionsPage(QWidget *parent) :
     SettingsPage(parent)
diff --git a/src/Gui/SettingsDialog/SaveOptionsPage.cpp b/src/Gui/SettingsDialog/SaveOptionsPage.cpp
--- a/src/Gui/SettingsDialog/SaveOptionsPage.cpp
+++ b/src/Gui/SettingsDialog/SaveOptionsPage.cpp
@@ -19,20 +19,18 @@
 
 #include "SaveOptionsPage.h"
 
+#include "SpectacleConfig.h"
+
+#include <KIOWidgets/KUrlRequester>
+#include <KLocalizedString>
+
 #include <QLineEdit>
 #include <QLabel>
 #include <QGroupBox>
 #include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QStandardPaths>
 #include <QComboBox>
 #include <QImageWriter>
 
-#include <KLocalizedString>
-#include <KIOWidgets/KUrlRequester>
-
-#include "SpectacleConfig.h"
-
 SaveOptionsPage::SaveOptionsPage(QWidget *parent) :
     SettingsPage(parent)
 {
diff --git a/src/Gui/SettingsDialog/SettingsDialog.cpp b/src/Gui/SettingsDialog/SettingsDialog.cpp
--- a/src/Gui/SettingsDialog/SettingsDialog.cpp
+++ b/src/Gui/SettingsDialog/SettingsDialog.cpp
@@ -19,15 +19,13 @@
 
 #include "SettingsDialog.h"
 
-#include <QMetaObject>
-#include <QIcon>
-#include <QMessageBox>
+#include "GeneralOptionsPage.h"
+#include "SaveOptionsPage.h"
 
 #include <KLocalizedString>
-#include <KPageWidgetModel>
 
-#include "SaveOptionsPage.h"
-#include "GeneralOptionsPage.h"
+#include <QIcon>
+#include <QMessageBox>
 
 SettingsDialog::SettingsDialog(QWidget *parent) :
     KPageDialog(parent)
diff --git a/src/Main.cpp b/src/Main.cpp
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -17,22 +17,16 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <QApplication>
-#include <QIcon>
-#include <QObject>
-#include <QString>
-#include <QCommandLineParser>
-#include <QDBusConnection>
-#include <QDebug>
+#include "Config.h"
+#include "SpectacleCore.h"
+#include "SpectacleDBusAdapter.h"
 
 #include <KAboutData>
-#include <KLocalizedString>
 #include <KDBusService>
+#include <KLocalizedString>
 
-#include "SpectacleCore.h"
-#include "SpectacleDBusAdapter.h"
-#include "ExportManager.h"
-#include "Config.h"
+#include <QCommandLineParser>
+#include <QDBusConnection>
 
 int main(int argc, char **argv)
 {
diff --git a/src/PlatformBackends/KWinWaylandImageGrabber.cpp b/src/PlatformBackends/KWinWaylandImageGrabber.cpp
--- a/src/PlatformBackends/KWinWaylandImageGrabber.cpp
+++ b/src/PlatformBackends/KWinWaylandImageGrabber.cpp
@@ -22,12 +22,11 @@
 #include <QDBusPendingCall>
 #include <QDBusPendingReply>
 #include <QDBusUnixFileDescriptor>
-
-#include <QtConcurrentRun>
 #include <QFutureWatcher>
+#include <QtConcurrentRun>
 #include <qplatformdefs.h>
 
-#include <errno.h>
+#include <cerrno>
 
 static int readData(int fd, QByteArray &data)
 {
diff --git a/src/PlatformBackends/X11ImageGrabber.cpp b/src/PlatformBackends/X11ImageGrabber.cpp
--- a/src/PlatformBackends/X11ImageGrabber.cpp
+++ b/src/PlatformBackends/X11ImageGrabber.cpp
@@ -25,17 +25,18 @@
 
 #include "X11ImageGrabber.h"
 
-#include <QX11Info>
-#include <QStack>
+#include <KWindowSystem>
+
 #include <QDBusConnection>
-#include <QDBusInterface>
 #include <QDBusConnectionInterface>
-#include <QDBusReply>
-#include <QPainter>
-#include <QGraphicsScene>
-#include <QGraphicsPixmapItem>
+#include <QDBusInterface>
 #include <QGraphicsDropShadowEffect>
+#include <QGraphicsPixmapItem>
+#include <QGraphicsScene>
+#include <QPainter>
 #include <QSet>
+#include <QStack>
+#include <QX11Info>
 #include <QtMath>
 
 #include <KWindowSystem>
diff --git a/src/QuickEditor/QuickEditor.cpp b/src/QuickEditor/QuickEditor.cpp
--- a/src/QuickEditor/QuickEditor.cpp
+++ b/src/QuickEditor/QuickEditor.cpp
@@ -19,21 +19,16 @@
 
 #include "QuickEditor.h"
 
-#include <QSize>
-#include <QPixmap>
-#include <QSharedPointer>
-#include <QMetaObject>
+#include "SpectacleConfig.h"
 
+#include <KDeclarative/KDeclarative>
+
+#include <QPixmap>
 #include <QQuickImageProvider>
 #include <QQuickItem>
 #include <QQuickItemGrabResult>
 #include <QQuickView>
-#include <QQmlEngine>
-
-#include <KLocalizedString>
-#include <KDeclarative/KDeclarative>
-
-#include "SpectacleConfig.h"
+#include <QSize>
 
 struct QuickEditor::ImageStore : public QQuickImageProvider
 {
diff --git a/src/SpectacleConfig.cpp b/src/SpectacleConfig.cpp
--- a/src/SpectacleConfig.cpp
+++ b/src/SpectacleConfig.cpp
@@ -19,8 +19,6 @@
 
 #include "SpectacleConfig.h"
 
-#include <QStandardPaths>
-
 SpectacleConfig::SpectacleConfig(QObject *parent) :
     QObject(parent)
 {
diff --git a/src/SpectacleCore.cpp b/src/SpectacleCore.cpp
--- a/src/SpectacleCore.cpp
+++ b/src/SpectacleCore.cpp
@@ -18,30 +18,27 @@
  */
 
 #include "SpectacleCore.h"
-#include "SpectacleConfig.h"
-
-#include <QClipboard>
-#include <QDir>
-#include <QTimer>
-#include <QDebug>
-#include <QMimeData>
-#include <QDrag>
-
-#include <KMessageBox>
-#include <KNotification>
-#include <KWindowSystem>
-#include <KLocalizedString>
-#include <KRun>
-#include <KConfigGroup>
-#include <KSharedConfig>
 
 #include "Config.h"
 #include "PlatformBackends/DummyImageGrabber.h"
 #ifdef XCB_FOUND
 #include "PlatformBackends/X11ImageGrabber.h"
 #endif
 #include "PlatformBackends/KWinWaylandImageGrabber.h"
 
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KNotification>
+#include <KRun>
+#include <KWindowSystem>
+
+#include <QClipboard>
+#include <QDebug>
+#include <QDir>
+#include <QDrag>
+#include <QMimeData>
+#include <QTimer>
+
 SpectacleCore::SpectacleCore(StartMode startMode, ImageGrabber::GrabMode grabMode, QString &saveFileName,
                qint64 delayMsec, bool notifyOnGrab, QObject *parent) :
     QObject(parent),