diff --git a/OWNCLOUD.cmake b/OWNCLOUD.cmake
index 67748a68de4..3b86996a2f0 100644
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -15,6 +15,8 @@ set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
 
 set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
 
+set( THEME_INCLUDE          "owncloudtheme.h" )
+
 # set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
 # set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
 
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 7290d74a3e8..80c21018ac4 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -31,10 +31,8 @@
 #include <QDebug>
 #include <QFile>
 #include <QFileInfo>
-#include <QJsonDocument>
 #include <QJsonObject>
 #include <QNetworkProxy>
-#include <QStringList>
 #include <QUrl>
 
 #include <iostream>
diff --git a/src/common/filesystembase.cpp b/src/common/filesystembase.cpp
index 5f102e0d49e..50bf9c51652 100644
--- a/src/common/filesystembase.cpp
+++ b/src/common/filesystembase.cpp
@@ -25,7 +25,6 @@
 #include <QDir>
 #include <QFile>
 #include <QSettings>
-#include <QUrl>
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/common/ownsql.cpp b/src/common/ownsql.cpp
index 26785ced4f2..bdce12a5f91 100644
--- a/src/common/ownsql.cpp
+++ b/src/common/ownsql.cpp
@@ -20,7 +20,6 @@
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#include <QLoggingCategory>
 #include <QString>
 
 #include "common/asserts.h"
@@ -31,7 +30,6 @@
 
 #include <sqlite3.h>
 
-#include <chrono>
 #include <thread>
 
 using namespace std::chrono_literals;
diff --git a/src/csync/csync.cpp b/src/csync/csync.cpp
index 3a95f059211..2cd346655a8 100644
--- a/src/csync/csync.cpp
+++ b/src/csync/csync.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "csync.h"
-#include "moc_csync.cpp"
 
 #include <QMetaEnum>
 
diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp
index d84dbbde6a0..81804815594 100644
--- a/src/csync/csync_exclude.cpp
+++ b/src/csync/csync_exclude.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "config_csync.h"
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
@@ -30,10 +29,9 @@
 #include "common/utility.h"
 #include "common/version.h"
 
-#include <QString>
-#include <QFileInfo>
 #include <QFile>
-#include <QDir>
+#include <QFileInfo>
+#include <QString>
 
 namespace {
 
@@ -97,7 +95,7 @@ OCSYNC_EXPORT void csync_exclude_expand_escapes(QByteArray &input)
 
 /**
  * @brief Checks if filename is considered reserved by Windows
- * @param file_name filename
+ * @param filename filename
  * @return true if file is reserved, false otherwise
  */
 OCSYNC_EXPORT bool csync_is_windows_reserved_word(QStringView filename)
diff --git a/src/csync/std/c_time.cpp b/src/csync/std/c_time.cpp
index dbebaf287c5..f699c15350b 100644
--- a/src/csync/std/c_time.cpp
+++ b/src/csync/std/c_time.cpp
@@ -22,7 +22,6 @@
 #include "c_time.h"
 
 #include "common/filesystembase.h"
-#include "common/utility.h"
 
 #include <QFile>
 
diff --git a/src/gui/aboutdialog.cpp b/src/gui/aboutdialog.cpp
index 8fa22971c0a..e02d97d92dd 100644
--- a/src/gui/aboutdialog.cpp
+++ b/src/gui/aboutdialog.cpp
@@ -14,12 +14,11 @@
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
 
-#include "common/restartmanager.h"
 #include "gui/guiutility.h"
-#include "libsync/configfile.h"
 #include "libsync/theme.h"
 
 #ifdef WITH_AUTO_UPDATER
+#include "libsync/configfile.h"
 #include "updater/ocupdater.h"
 #ifdef Q_OS_MAC
 // FIXME We should unify those, but Sparkle does everything behind the scene transparently
@@ -71,7 +70,7 @@ void AboutDialog::openBrowserFromUrl(const QUrl &s)
 void AboutDialog::setupUpdaterWidget()
 {
 #ifdef WITH_AUTO_UPDATER
-    // non standard update channels are only supported by the vanilla theme and the testpilotcloud theme
+    // non-standard update channels are only supported by the vanilla theme and the testpilotcloud theme
     if (!Resources::isVanillaTheme() && !isTestPilotCloudTheme()) {
         if (Utility::isMac()) {
             // Because we don't have any statusString from the SparkleUpdater anyway we can hide the whole thing
diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index e2b17887017..047866b2cb6 100644
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -17,7 +17,6 @@
 #include "configfile.h"
 #include "creds/credentialmanager.h"
 #include "guiutility.h"
-#include <cookiejar.h>
 #include <creds/httpcredentialsgui.h>
 #include <theme.h>
 
@@ -25,9 +24,8 @@
 #include "common/utility_win.h"
 #endif
 
-#include <QSettings>
 #include <QDir>
-#include <QNetworkAccessManager>
+#include <QSettings>
 
 namespace {
 auto urlC()
diff --git a/src/gui/accountstate.cpp b/src/gui/accountstate.cpp
index 54a92b92246..46c0395353a 100644
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -30,7 +30,6 @@
 #include "gui/tlserrordialog.h"
 
 #include "logger.h"
-#include "settingsdialog.h"
 #include "socketapi/socketapi.h"
 #include "theme.h"
 
diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index 2c7a1f52023..409af96e135 100644
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -28,7 +28,6 @@
 #include "openfilemanager.h"
 #include "protocolwidget.h"
 #include "servernotificationhandler.h"
-#include "syncresult.h"
 #include "theme.h"
 
 #include "models/activitylistmodel.h"
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 748fd4b1c7d..fd4943ebf51 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -21,7 +21,6 @@
 #include "account.h"
 #include "accountmanager.h"
 #include "accountstate.h"
-#include "common/asserts.h"
 #include "common/version.h"
 #include "common/vfs.h"
 #include "configfile.h"
@@ -31,7 +30,6 @@
 #include "sharedialog.h"
 #include "socketapi/socketapi.h"
 #include "theme.h"
-#include "translations.h"
 
 #ifdef WITH_AUTO_UPDATER
 #include "updater/ocupdater.h"
@@ -43,10 +41,7 @@
 
 #include <QApplication>
 #include <QDesktopServices>
-#include <QDir>
 #include <QFileOpenEvent>
-#include <QMessageBox>
-#include <QPushButton>
 
 namespace OCC {
 
diff --git a/src/gui/connectionvalidator.cpp b/src/gui/connectionvalidator.cpp
index 291112346a9..1cf5f407615 100644
--- a/src/gui/connectionvalidator.cpp
+++ b/src/gui/connectionvalidator.cpp
@@ -17,20 +17,15 @@
 #include "gui/networkinformation.h"
 #include "gui/tlserrordialog.h"
 #include "libsync/account.h"
-#include "libsync/cookiejar.h"
 #include "libsync/creds/abstractcredentials.h"
 #include "libsync/networkjobs.h"
 #include "libsync/networkjobs/checkserverjobfactory.h"
-#include "libsync/networkjobs/jsonjob.h"
 #include "libsync/theme.h"
 
-#include <QJsonDocument>
 #include <QJsonObject>
 #include <QLoggingCategory>
-#include <QNetworkReply>
 #include <QNetworkProxyFactory>
-#include <QXmlStreamReader>
-
+#include <QNetworkReply>
 
 using namespace std::chrono_literals;
 
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index f15b365c0be..8ccaa3674b5 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -50,14 +50,13 @@
 #include <QDir>
 #include <QSettings>
 
-#include <QMessageBox>
-#include <QPushButton>
 #include <QApplication>
+#include <QMessageBox>
 
 using namespace std::chrono_literals;
 
 namespace {
-/* How oftern to retry a sync
+/* How often to retry a sync
  * Either due to _engine->isAnotherSyncNeeded or a sync error
  */
 constexpr int retrySyncLimitC = 3;
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index b8f2b17d148..13c10cc6d56 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -20,16 +20,12 @@
 #include "gui/quotainfo.h"
 #include "theme.h"
 
-#include "resources/resources.h"
-
 #include "libsync/graphapi/space.h"
 #include "libsync/graphapi/spacesmanager.h"
 
 #include <QApplication>
-#include <QDir>
 #include <QFileIconProvider>
 #include <QRandomGenerator>
-#include <QVarLengthArray>
 
 #include <set>
 
diff --git a/src/gui/folderwatcher.cpp b/src/gui/folderwatcher.cpp
index 50eebfbbaa5..476619c11c6 100644
--- a/src/gui/folderwatcher.cpp
+++ b/src/gui/folderwatcher.cpp
@@ -15,12 +15,9 @@
 // event masks
 #include "folderwatcher.h"
 
-#include <stdint.h>
+#include <cstdint>
 
-#include <QFileInfo>
 #include <QFlags>
-#include <QStringList>
-#include <QThread>
 #include <QTimer>
 
 #if defined(Q_OS_WIN)
diff --git a/src/gui/folderwizard/folderwizardremotepath.cpp b/src/gui/folderwizard/folderwizardremotepath.cpp
index 8549baf7b7a..0d80742b40e 100644
--- a/src/gui/folderwizard/folderwizardremotepath.cpp
+++ b/src/gui/folderwizard/folderwizardremotepath.cpp
@@ -19,7 +19,6 @@
 #include "folderwizardremotepath.h"
 #include "ui_folderwizardtargetpage.h"
 
-#include "folderwizard.h"
 #include "folderwizard_p.h"
 
 #include "gui/folderman.h"
diff --git a/src/gui/folderwizard/spacespage.cpp b/src/gui/folderwizard/spacespage.cpp
index 387a0543f37..9240e16354e 100644
--- a/src/gui/folderwizard/spacespage.cpp
+++ b/src/gui/folderwizard/spacespage.cpp
@@ -14,8 +14,6 @@
 #include "spacespage.h"
 #include "ui_spacespage.h"
 
-#include <QModelIndex>
-
 using namespace OCC;
 
 SpacesPage::SpacesPage(AccountPtr acc, QWidget *parent)
diff --git a/src/gui/ignorelisteditor.cpp b/src/gui/ignorelisteditor.cpp
index 583dd5122a1..10a7c543f0b 100644
--- a/src/gui/ignorelisteditor.cpp
+++ b/src/gui/ignorelisteditor.cpp
@@ -17,14 +17,12 @@
 
 #include "configfile.h"
 #include "gui/folderman.h"
-#include "gui/guiutility.h"
 
-#include <QFile>
 #include <QDir>
-#include <QListWidget>
+#include <QFile>
+#include <QInputDialog>
 #include <QListWidgetItem>
 #include <QMessageBox>
-#include <QInputDialog>
 
 namespace OCC {
 
diff --git a/src/gui/logbrowser.cpp b/src/gui/logbrowser.cpp
index 359d9e189b2..e90f8086035 100644
--- a/src/gui/logbrowser.cpp
+++ b/src/gui/logbrowser.cpp
@@ -17,16 +17,10 @@
 #include "stdio.h"
 #include <iostream>
 
-#include <QAction>
-#include <QCoreApplication>
 #include <QDesktopServices>
-#include <QDialogButtonBox>
 #include <QDir>
-#include <QLabel>
 #include <QLayout>
 #include <QMessageBox>
-#include <QPushButton>
-#include <QSettings>
 #include <QTextStream>
 #include <optional>
 
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 01aba06e386..40a4bbf2e45 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -16,7 +16,6 @@
 
 #include "accountmanager.h"
 #include "common/restartmanager.h"
-#include "common/utility.h"
 #include "gui/application.h"
 #include "gui/logbrowser.h"
 #include "gui/networkinformation.h"
diff --git a/src/gui/models/activitylistmodel.cpp b/src/gui/models/activitylistmodel.cpp
index dce36696468..b747b33cd18 100644
--- a/src/gui/models/activitylistmodel.cpp
+++ b/src/gui/models/activitylistmodel.cpp
@@ -12,24 +12,18 @@
  * for more details.
  */
 
-#include <QtCore>
 #include <QAbstractListModel>
-#include <QWidget>
-#include <QIcon>
-#include <QJsonObject>
 #include <QJsonDocument>
+#include <QJsonObject>
+#include <QtCore>
 
-#include "accessmanager.h"
 #include "account.h"
 #include "accountmanager.h"
 #include "accountstate.h"
 #include "folderman.h"
-#include "guiutility.h"
 #include "models.h"
 #include "networkjobs/jsonjob.h"
 
-#include "resources/resources.h"
-
 #include "activitydata.h"
 #include "activitylistmodel.h"
 
diff --git a/src/gui/models/expandingheaderview.cpp b/src/gui/models/expandingheaderview.cpp
index 6a2961c1fef..8bc1be5eb85 100644
--- a/src/gui/models/expandingheaderview.cpp
+++ b/src/gui/models/expandingheaderview.cpp
@@ -17,9 +17,7 @@
 #include "configfile.h"
 
 #include <QApplication>
-#include <QDebug>
 #include <QMenu>
-#include <QScopedValueRollback>
 
 using namespace OCC;
 
diff --git a/src/gui/newwizard/navigation.cpp b/src/gui/newwizard/navigation.cpp
index 882b9ae38dc..2be85d12d1f 100644
--- a/src/gui/newwizard/navigation.cpp
+++ b/src/gui/newwizard/navigation.cpp
@@ -1,6 +1,6 @@
 #include "navigation.h"
 
-#include <QDebug>
+#include <QHBoxLayout>
 #include <QRadioButton>
 
 namespace OCC::Wizard {
diff --git a/src/gui/newwizard/navigation.h b/src/gui/newwizard/navigation.h
index 35d7d858e98..1794d8d9f88 100644
--- a/src/gui/newwizard/navigation.h
+++ b/src/gui/newwizard/navigation.h
@@ -16,7 +16,6 @@
 
 #include "enums.h"
 
-#include <QHBoxLayout>
 #include <QMap>
 #include <QRadioButton>
 #include <QString>
diff --git a/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp b/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp
index 6eca05eb5f1..fce31c878f8 100644
--- a/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp
+++ b/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp
@@ -2,15 +2,12 @@
 #include "ui_accountconfiguredwizardpage.h"
 
 #include "gui/application.h"
-#include "gui/guiutility.h"
-#include "gui/settingsdialog.h"
 #include "libsync/theme.h"
 
 #include "resources/resources.h"
 
 #include <QDir>
 #include <QFileDialog>
-#include <QMessageBox>
 
 
 namespace OCC::Wizard {
diff --git a/src/gui/newwizard/pages/accountconfiguredwizardpage.h b/src/gui/newwizard/pages/accountconfiguredwizardpage.h
index 8c3c9df7142..7a2169fc808 100644
--- a/src/gui/newwizard/pages/accountconfiguredwizardpage.h
+++ b/src/gui/newwizard/pages/accountconfiguredwizardpage.h
@@ -17,8 +17,6 @@
 #include "abstractsetupwizardpage.h"
 #include "setupwizardcontroller.h"
 
-#include <QSharedPointer>
-
 namespace Ui {
 class AccountConfiguredWizardPage;
 }
diff --git a/src/gui/newwizard/postfixlineedit.cpp b/src/gui/newwizard/postfixlineedit.cpp
index a5d0b1c74e6..ef74908c6ec 100644
--- a/src/gui/newwizard/postfixlineedit.cpp
+++ b/src/gui/newwizard/postfixlineedit.cpp
@@ -12,7 +12,6 @@
  * for more details.
  */
 
-#include <QStyle>
 #include <QStyleOptionFrame>
 
 #include "postfixlineedit.h"
diff --git a/src/gui/newwizard/setupwizardcontroller.cpp b/src/gui/newwizard/setupwizardcontroller.cpp
index a964e718342..7a4e59baa73 100644
--- a/src/gui/newwizard/setupwizardcontroller.cpp
+++ b/src/gui/newwizard/setupwizardcontroller.cpp
@@ -1,11 +1,9 @@
 #include "setupwizardcontroller.h"
 
-#include "accessmanager.h"
 #include "determineauthtypejobfactory.h"
 #include "gui/application.h"
 #include "gui/folderman.h"
 #include "pages/accountconfiguredwizardpage.h"
-#include "pages/basiccredentialssetupwizardpage.h"
 #include "states/abstractsetupwizardstate.h"
 #include "states/accountconfiguredsetupwizardstate.h"
 #include "states/basiccredentialssetupwizardstate.h"
@@ -14,9 +12,6 @@
 #include "states/serverurlsetupwizardstate.h"
 #include "theme.h"
 
-#include <QClipboard>
-#include <QTimer>
-
 using namespace std::chrono_literals;
 
 namespace {
diff --git a/src/gui/newwizard/setupwizardcontroller.h b/src/gui/newwizard/setupwizardcontroller.h
index be039ba571d..bce683c5cf4 100644
--- a/src/gui/newwizard/setupwizardcontroller.h
+++ b/src/gui/newwizard/setupwizardcontroller.h
@@ -17,15 +17,11 @@
 #include "account.h"
 #include "enums.h"
 #include "gui/settingsdialog.h"
-#include "pages/abstractsetupwizardpage.h"
-#include "setupwizardaccountbuilder.h"
 #include "setupwizardcontext.h"
 #include "setupwizardcontroller_p.h"
 #include "setupwizardwidget.h"
 #include "states/abstractsetupwizardstate.h"
 
-#include <QDialog>
-#include <optional>
 
 namespace OCC::Wizard {
 /**
diff --git a/src/gui/newwizard/states/accountconfiguredsetupwizardstate.cpp b/src/gui/newwizard/states/accountconfiguredsetupwizardstate.cpp
index 80699a3f24f..6d1a82f2fca 100644
--- a/src/gui/newwizard/states/accountconfiguredsetupwizardstate.cpp
+++ b/src/gui/newwizard/states/accountconfiguredsetupwizardstate.cpp
@@ -12,8 +12,6 @@
  * for more details.
  */
 
-#include <QDir>
-
 #include "accountconfiguredsetupwizardstate.h"
 #include "gui/folderman.h"
 #include "libsync/filesystem.h"
diff --git a/src/gui/newwizard/states/basiccredentialssetupwizardstate.cpp b/src/gui/newwizard/states/basiccredentialssetupwizardstate.cpp
index f0b4bba6b0f..7a8fa780bc0 100644
--- a/src/gui/newwizard/states/basiccredentialssetupwizardstate.cpp
+++ b/src/gui/newwizard/states/basiccredentialssetupwizardstate.cpp
@@ -13,7 +13,6 @@
  */
 
 #include "basiccredentialssetupwizardstate.h"
-#include "networkjobs/fetchuserinfojobfactory.h"
 
 namespace OCC::Wizard {
 
diff --git a/src/gui/notificationconfirmjob.cpp b/src/gui/notificationconfirmjob.cpp
index 2412abcdc3d..b237df11bc6 100644
--- a/src/gui/notificationconfirmjob.cpp
+++ b/src/gui/notificationconfirmjob.cpp
@@ -17,8 +17,6 @@
 #include "networkjobs.h"
 #include "networkjobs/jsonjob.h"
 
-#include <QBuffer>
-
 namespace OCC {
 
 Q_DECLARE_LOGGING_CATEGORY(lcNotifications)
diff --git a/src/gui/ocssharejob.cpp b/src/gui/ocssharejob.cpp
index ec8ea07efdf..2db722cb139 100644
--- a/src/gui/ocssharejob.cpp
+++ b/src/gui/ocssharejob.cpp
@@ -17,9 +17,6 @@
 #include "common/utility.h"
 #include "networkjobs.h"
 
-#include <QBuffer>
-#include <QJsonDocument>
-
 namespace {
 OCC::JsonApiJob *createJob(OCC::AccountPtr account, const QString &path, const QByteArray &verb, const OCC::JsonApiJob::UrlQuery &arguments, QObject *parent)
 {
diff --git a/src/gui/openfilemanager.cpp b/src/gui/openfilemanager.cpp
index d7a391cdbad..86db142787e 100644
--- a/src/gui/openfilemanager.cpp
+++ b/src/gui/openfilemanager.cpp
@@ -17,12 +17,11 @@
 #include "application.h"
 #include "common/utility.h"
 
+#include <QDesktopServices>
+#include <QDir>
 #include <QProcess>
 #include <QSettings>
-#include <QDir>
 #include <QUrl>
-#include <QDesktopServices>
-#include <QApplication>
 
 namespace OCC {
 
diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 289e2c1b1f6..a4cd87fdcf6 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -21,7 +21,6 @@
 #include "common/restartmanager.h"
 #include "common/syncjournalfilerecord.h"
 #include "configfile.h"
-#include "creds/abstractcredentials.h"
 #include "folderman.h"
 #include "folderwizard/folderwizard.h"
 #include "gui/accountsettings.h"
@@ -45,10 +44,7 @@
 #include <QApplication>
 #include <QDesktopServices>
 #include <QDialog>
-#include <QDir>
 #include <QHBoxLayout>
-#include <QMessageBox>
-#include <QScreen>
 
 #ifdef Q_OS_WIN
 #include <qt_windows.h>
diff --git a/src/gui/protocolitem.cpp b/src/gui/protocolitem.cpp
index c21f004b84c..ccf771fc208 100644
--- a/src/gui/protocolitem.cpp
+++ b/src/gui/protocolitem.cpp
@@ -16,10 +16,7 @@
 #include "folderman.h"
 #include "progressdispatcher.h"
 
-#include <QApplication>
-#include <QFileInfo>
 #include <QMenu>
-#include <QPointer>
 
 
 using namespace OCC;
diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index 7a6a8072cb4..39fc3209cad 100644
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -12,7 +12,6 @@
  * for more details.
  */
 
-#include <QCursor>
 #include <QtGui>
 #include <QtWidgets>
 
diff --git a/src/gui/scheduling/syncscheduler.cpp b/src/gui/scheduling/syncscheduler.cpp
index 0b5b219cb7c..676b6baf3a8 100644
--- a/src/gui/scheduling/syncscheduler.cpp
+++ b/src/gui/scheduling/syncscheduler.cpp
@@ -20,8 +20,6 @@
 #include "libsync/configfile.h"
 #include "libsync/syncengine.h"
 
-#include "guiutility.h"
-
 using namespace std::chrono_literals;
 
 using namespace OCC;
diff --git a/src/gui/selectivesyncwidget.cpp b/src/gui/selectivesyncwidget.cpp
index 9f7c711f6d8..fbe6392a50a 100644
--- a/src/gui/selectivesyncwidget.cpp
+++ b/src/gui/selectivesyncwidget.cpp
@@ -20,11 +20,9 @@
 
 #include "resources/resources.h"
 
-#include <QDialogButtonBox>
 #include <QHeaderView>
 #include <QLabel>
 #include <QScopedValueRollback>
-#include <QSettings>
 #include <QTreeWidget>
 #include <QVBoxLayout>
 
diff --git a/src/gui/servernotificationhandler.cpp b/src/gui/servernotificationhandler.cpp
index 61ef1fa9e4a..e832a06df81 100644
--- a/src/gui/servernotificationhandler.cpp
+++ b/src/gui/servernotificationhandler.cpp
@@ -17,7 +17,6 @@
 #include "capabilities.h"
 #include "networkjobs/jsonjob.h"
 
-#include <QJsonDocument>
 #include <QJsonObject>
 
 namespace OCC {
diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp
index af6dbca4c84..eaa32b14216 100644
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@ -17,7 +17,6 @@
 
 #include "gui/accountstate.h"
 #include "gui/application.h"
-#include "gui/guiutility.h"
 #include "gui/settingsdialog.h"
 #include "gui/sharee.h"
 #include "gui/sharelinkwidget.h"
@@ -30,7 +29,6 @@
 
 #include <QFileIconProvider>
 #include <QFileInfo>
-#include <QFrame>
 #include <QPointer>
 #include <QPushButton>
 #include <QRegularExpression>
diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp
index 2acf2caa566..0ab6eb2a9f9 100644
--- a/src/gui/sharelinkwidget.cpp
+++ b/src/gui/sharelinkwidget.cpp
@@ -24,12 +24,10 @@
 #include "resources/resources.h"
 
 #include "QProgressIndicator.h"
-#include <QBuffer>
 #include <QClipboard>
 #include <QFileInfo>
-#include <QDesktopServices>
-#include <QMessageBox>
 #include <QMenu>
+#include <QMessageBox>
 #include <QToolButton>
 
 namespace OCC {
diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index d49f344fbb0..ab5fd02c5f1 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -28,17 +28,13 @@
 
 #include "QProgressIndicator.h"
 
-#include <QAbstractProxyModel>
 #include <QAction>
-#include <QBuffer>
 #include <QClipboard>
 #include <QColor>
 #include <QCompleter>
 #include <QCryptographicHash>
-#include <QDesktopServices>
 #include <QFileInfo>
 #include <QMenu>
-#include <QMessageBox>
 #include <QPainter>
 #include <QPropertyAnimation>
 
diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp
index dc296ba3271..b2911aa43a0 100644
--- a/src/gui/socketapi/socketapi.cpp
+++ b/src/gui/socketapi/socketapi.cpp
@@ -34,23 +34,19 @@
 #include "syncfileitem.h"
 #include "theme.h"
 
-#include <array>
-#include <QBitArray>
-#include <QUrl>
-#include <QMetaMethod>
-#include <QMetaObject>
-#include <QStringList>
-#include <QScopedPointer>
-#include <QFile>
-#include <QDir>
 #include <QApplication>
+#include <QDir>
+#include <QFile>
+#include <QFileDialog>
 #include <QLocalSocket>
-#include <QStringBuilder>
 #include <QMessageBox>
-#include <QFileDialog>
+#include <QMetaMethod>
+#include <QMetaObject>
+#include <QScopedPointer>
+#include <QUrl>
+#include <array>
 
 
-#include <QAction>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -59,9 +55,6 @@
 
 #include <QClipboard>
 
-#include <QProcess>
-#include <QStandardPaths>
-
 #ifdef Q_OS_MAC
 #include <CoreFoundation/CoreFoundation.h>
 #endif
diff --git a/src/gui/spaces/spacesmodel.cpp b/src/gui/spaces/spacesmodel.cpp
index 49d3ce8534a..26408167abe 100644
--- a/src/gui/spaces/spacesmodel.cpp
+++ b/src/gui/spaces/spacesmodel.cpp
@@ -16,8 +16,6 @@
 #include "gui/folderman.h"
 #include "libsync/graphapi/spacesmanager.h"
 
-#include <QIcon>
-#include <QPixmap>
 #include <QRandomGenerator>
 
 using namespace OCC::Spaces;
diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index 165f8cecc80..5c9d09d0bd2 100644
--- a/src/gui/systray.cpp
+++ b/src/gui/systray.cpp
@@ -16,10 +16,8 @@
 #include "theme.h"
 
 #ifdef USE_FDO_NOTIFICATIONS
-#include <QDBusConnection>
 #include <QDBusInterface>
 #include <QDBusMessage>
-#include <QDBusPendingCall>
 
 namespace {
 auto NOTIFICATIONS_SERVICE_C()
@@ -61,7 +59,7 @@ Systray::~Systray()
     if (delegate) {
         releaseOsXNotificationCenterDelegate(delegate);
     }
-#endif // Q_OS_OSX
+#endif // Q_OS_MACOS
 }
 
 void Systray::showMessage(const QString &title, const QString &message, const QIcon &icon, int millisecondsTimeoutHint)
diff --git a/src/gui/tlserrordialog.cpp b/src/gui/tlserrordialog.cpp
index 63ed5299845..deac06ad6b9 100644
--- a/src/gui/tlserrordialog.cpp
+++ b/src/gui/tlserrordialog.cpp
@@ -16,7 +16,6 @@
 #include "common/utility.h"
 #include "ui_tlserrordialog.h"
 
-#include <QAbstractButton>
 #include <QPushButton>
 
 namespace OCC {
diff --git a/src/gui/translations.cpp b/src/gui/translations.cpp
index d7db52ef25e..1ed15821b62 100644
--- a/src/gui/translations.cpp
+++ b/src/gui/translations.cpp
@@ -18,9 +18,8 @@
 #include "translations.h"
 
 #include <QApplication>
-#include <QLoggingCategory>
-#include <QDir>
 #include <QDirIterator>
+#include <QLoggingCategory>
 #include <QStandardPaths>
 
 namespace OCC {
diff --git a/src/gui/updateurldialog.cpp b/src/gui/updateurldialog.cpp
index d0bcb9c1b97..3b3444aaf6c 100644
--- a/src/gui/updateurldialog.cpp
+++ b/src/gui/updateurldialog.cpp
@@ -15,7 +15,6 @@
 #include "updateurldialog.h"
 
 #include <QMessageBox>
-#include <QPushButton>
 #include <QTimer>
 
 namespace OCC {
diff --git a/src/libsync/abstractnetworkjob.cpp b/src/libsync/abstractnetworkjob.cpp
index 3a32d85abef..fddf5bb4dd1 100644
--- a/src/libsync/abstractnetworkjob.cpp
+++ b/src/libsync/abstractnetworkjob.cpp
@@ -13,22 +13,8 @@
  * for more details.
  */
 
-#include <QLoggingCategory>
-#include <QNetworkRequest>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QSslConfiguration>
-#include <QBuffer>
-#include <QXmlStreamReader>
-#include <QStringList>
-#include <QStack>
-#include <QTimer>
-#include <QMutex>
-#include <QCoreApplication>
 #include <QAuthenticator>
-#include <QMetaEnum>
-#include <QRegularExpression>
+#include <QNetworkRequest>
 
 #include "common/asserts.h"
 #include "networkjobs.h"
diff --git a/src/libsync/accessmanager.cpp b/src/libsync/accessmanager.cpp
index 6e103054a43..8bd608aca17 100644
--- a/src/libsync/accessmanager.cpp
+++ b/src/libsync/accessmanager.cpp
@@ -13,13 +13,7 @@
  */
 
 #include <QAuthenticator>
-#include <QLoggingCategory>
 #include <QNetworkCookie>
-#include <QNetworkCookieJar>
-#include <QNetworkProxy>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QSslConfiguration>
 #include <QUuid>
 
 #include "accessmanager.h"
diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 02e7a935417..8d45ba1d2c0 100644
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -26,16 +26,11 @@
 
 #include <QAuthenticator>
 #include <QDir>
-#include <QFileInfo>
 #include <QLoggingCategory>
-#include <QMutex>
 #include <QNetworkAccessManager>
 #include <QNetworkCookieJar>
 #include <QNetworkDiskCache>
-#include <QNetworkReply>
-#include <QSettings>
 #include <QSslKey>
-#include <QSslSocket>
 #include <QStandardPaths>
 
 namespace OCC {
diff --git a/src/libsync/bandwidthmanager.cpp b/src/libsync/bandwidthmanager.cpp
index 60ca01c7ddd..b181a463b5b 100644
--- a/src/libsync/bandwidthmanager.cpp
+++ b/src/libsync/bandwidthmanager.cpp
@@ -15,8 +15,6 @@
 #include "owncloudpropagator.h"
 #include "propagatedownload.h"
 #include "propagateupload.h"
-#include "propagatorjobs.h"
-#include "common/utility.h"
 
 #include <QLoggingCategory>
 #include <QTimer>
diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index 5644a82abbc..56163f85c67 100644
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -26,7 +26,6 @@
 
 #include "csync_exclude.h"
 
-#include <QWidget>
 #include <QHeaderView>
 #include <QCoreApplication>
 #include <QDir>
diff --git a/src/libsync/cookiejar.cpp b/src/libsync/cookiejar.cpp
index 1ff1faec002..eb5f4c91a47 100644
--- a/src/libsync/cookiejar.cpp
+++ b/src/libsync/cookiejar.cpp
@@ -16,12 +16,9 @@
 
 #include "configfile.h"
 
-#include <QFile>
-#include <QDateTime>
+#include <QDir>
 #include <QLoggingCategory>
 #include <QNetworkCookie>
-#include <QDataStream>
-#include <QDir>
 
 namespace OCC {
 
diff --git a/src/libsync/creds/abstractcredentials.cpp b/src/libsync/creds/abstractcredentials.cpp
index cc82beb9698..5e991b166d9 100644
--- a/src/libsync/creds/abstractcredentials.cpp
+++ b/src/libsync/creds/abstractcredentials.cpp
@@ -13,8 +13,6 @@
  */
 
 #include <QLoggingCategory>
-#include <QString>
-#include <QCoreApplication>
 
 #include "account.h"
 #include "common/asserts.h"
diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp
index 37eb725d16e..4fd0e7100e7 100644
--- a/src/libsync/creds/httpcredentials.cpp
+++ b/src/libsync/creds/httpcredentials.cpp
@@ -22,11 +22,8 @@
 #include "syncengine.h"
 
 #include <QAuthenticator>
-#include <QBuffer>
-#include <QJsonDocument>
 #include <QJsonObject>
 #include <QLoggingCategory>
-#include <QMutex>
 #include <QNetworkInformation>
 #include <QNetworkReply>
 
diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index fb12fc5bafd..71bb0b19e76 100644
--- a/src/libsync/discoveryphase.cpp
+++ b/src/libsync/discoveryphase.cpp
@@ -23,7 +23,6 @@
 
 #include <QDateTime>
 #include <QFile>
-#include <QFileInfo>
 #include <QLoggingCategory>
 #include <QUrl>
 #include <cstring>
diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp
index d2cf16b35d3..1ca244edcf1 100644
--- a/src/libsync/filesystem.cpp
+++ b/src/libsync/filesystem.cpp
@@ -17,7 +17,6 @@
 #include "common/asserts.h"
 #include "common/utility.h"
 #include <QCoreApplication>
-#include <QDir>
 #include <QDirIterator>
 #include <QFile>
 #include <QFileInfo>
diff --git a/src/libsync/graphapi/jobs/drives.cpp b/src/libsync/graphapi/jobs/drives.cpp
index 5431f16beac..296a8d2ff2a 100644
--- a/src/libsync/graphapi/jobs/drives.cpp
+++ b/src/libsync/graphapi/jobs/drives.cpp
@@ -16,8 +16,6 @@
 
 #include "account.h"
 
-#include <QJsonArray>
-
 #include <OAICollection_of_drives.h>
 #include <OAIDrive.h>
 
diff --git a/src/libsync/logger.cpp b/src/libsync/logger.cpp
index b032e95ffdd..5863e963c12 100644
--- a/src/libsync/logger.cpp
+++ b/src/libsync/logger.cpp
@@ -17,8 +17,6 @@
 #include "theme.h"
 
 #include <QCoreApplication>
-#include <QDir>
-#include <QStringList>
 #include <QtConcurrent>
 #include <QtGlobal>
 
diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
index 63a18b8859d..a31759f1c45 100644
--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -15,18 +15,7 @@
 
 #include <QBuffer>
 #include <QCoreApplication>
-#include <QJsonDocument>
-#include <QLoggingCategory>
-#include <QMutex>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QNetworkRequest>
-#include <QSslCipher>
-#include <QSslConfiguration>
-#include <QStack>
-#include <QStringList>
-#include <QTimer>
-#include <QXmlStreamReader>
 #include <QPainter>
 #include <QPainterPath>
 
diff --git a/src/libsync/networkjobs/resources.cpp b/src/libsync/networkjobs/resources.cpp
index 3c80e2d6942..82420ee4813 100644
--- a/src/libsync/networkjobs/resources.cpp
+++ b/src/libsync/networkjobs/resources.cpp
@@ -1,6 +1,5 @@
 #include "resources.h"
 
-#include <QDir>
 #include <QFile>
 #include <QIcon>
 #include <QMimeDatabase>
diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index be277ac4144..0f2535ea5e5 100644
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -40,7 +40,6 @@
 #include <QObject>
 #include <QStack>
 #include <QTimer>
-#include <QTimerEvent>
 #include <qmath.h>
 
 using namespace std::chrono_literals;
diff --git a/src/libsync/owncloudtheme.cpp b/src/libsync/owncloudtheme.cpp
index 80f6dcf6a75..ad78b3aa2dc 100644
--- a/src/libsync/owncloudtheme.cpp
+++ b/src/libsync/owncloudtheme.cpp
@@ -14,11 +14,10 @@
 
 #include "owncloudtheme.h"
 
+#include <QCoreApplication>
+#include <QIcon>
 #include <QString>
 #include <QVariant>
-#include <QPixmap>
-#include <QIcon>
-#include <QCoreApplication>
 
 namespace OCC {
 
diff --git a/src/libsync/owncloudtheme.h b/src/libsync/owncloudtheme.h
index b8bc19eba6f..ebfe246eba8 100644
--- a/src/libsync/owncloudtheme.h
+++ b/src/libsync/owncloudtheme.h
@@ -36,4 +36,4 @@ class ownCloudTheme : public Theme
     QmlButtonColor secondaryButtonColor() const override;
 };
 }
-#endif // OWNCLOUD_MIRALL_THEME_H
+#endif // OWNCLOUD_THEME_H
diff --git a/src/libsync/platform.cpp b/src/libsync/platform.cpp
index b6fde1bf3d6..65f1fa5a350 100644
--- a/src/libsync/platform.cpp
+++ b/src/libsync/platform.cpp
@@ -15,7 +15,9 @@
 #include "platform.h"
 
 #include "platform_unix.h"
+#if defined(Q_OS_WIN)
 #include "platform_win.h"
+#endif
 
 #if defined(Q_OS_MAC)
 #include "platform_mac.h"
diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
index c375b5872b1..cf360635b6c 100644
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@ -31,7 +31,6 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QLoggingCategory>
-#include <QNetworkAccessManager>
 #include <QRandomGenerator>
 
 #include <cmath>
diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index 2787ff123c3..b73ded9e5a4 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -18,7 +18,6 @@
 #include "networkjobs.h"
 #include "owncloudpropagator_p.h"
 #include "propagateremotedelete.h"
-#include "propagatorjobs.h"
 #include "syncengine.h"
 
 #include "common/asserts.h"
@@ -31,9 +30,7 @@
 
 #include <QDir>
 #include <QFileInfo>
-#include <QJsonDocument>
 #include <QJsonObject>
-#include <QNetworkAccessManager>
 
 #include <chrono>
 #include <cmath>
diff --git a/src/libsync/propagateuploadng.cpp b/src/libsync/propagateuploadng.cpp
index 3a8ec0abae7..6e895a0aa41 100644
--- a/src/libsync/propagateuploadng.cpp
+++ b/src/libsync/propagateuploadng.cpp
@@ -15,7 +15,6 @@
 #include "account.h"
 #include "common/asserts.h"
 #include "common/syncjournaldb.h"
-#include "common/utility.h"
 #include "filesystem.h"
 #include "networkjobs.h"
 #include "owncloudpropagator_p.h"
@@ -25,10 +24,8 @@
 #include "propagatorjobs.h"
 #include "syncengine.h"
 
-#include <QCoreApplication>
 #include <QDir>
 #include <QFileInfo>
-#include <QNetworkAccessManager>
 #include <QRandomGenerator>
 
 #include <memory>
diff --git a/src/libsync/propagateuploadtus.cpp b/src/libsync/propagateuploadtus.cpp
index 7394f2f5805..edc22ba96ee 100644
--- a/src/libsync/propagateuploadtus.cpp
+++ b/src/libsync/propagateuploadtus.cpp
@@ -24,14 +24,11 @@
 #include "httplogger.h"
 #include "networkjobs.h"
 #include "owncloudpropagator_p.h"
-#include "propagateremotedelete.h"
 #include "propagateupload.h"
 #include "propagatorjobs.h"
 #include "syncengine.h"
 
-#include <QNetworkAccessManager>
 #include <QFileInfo>
-#include <QDir>
 
 #include <cmath>
 #include <memory>
diff --git a/src/libsync/propagateuploadv1.cpp b/src/libsync/propagateuploadv1.cpp
index f9d50d278a5..d11f003c6c1 100644
--- a/src/libsync/propagateuploadv1.cpp
+++ b/src/libsync/propagateuploadv1.cpp
@@ -12,23 +12,18 @@
  * for more details.
  */
 
-#include "propagateupload.h"
-#include "owncloudpropagator_p.h"
-#include "networkjobs.h"
 #include "account.h"
+#include "common/checksums.h"
 #include "common/syncjournaldb.h"
-#include "common/syncjournalfilerecord.h"
-#include "common/utility.h"
 #include "filesystem.h"
+#include "networkjobs.h"
+#include "owncloudpropagator_p.h"
+#include "propagateupload.h"
 #include "propagatorjobs.h"
-#include "common/checksums.h"
 #include "syncengine.h"
-#include "propagateremotedelete.h"
-#include "common/asserts.h"
 
 #include <QDir>
 #include <QFileInfo>
-#include <QNetworkAccessManager>
 #include <QRandomGenerator>
 
 #include <cmath>
diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp
index f9c732d3630..4f77705789d 100644
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -14,21 +14,19 @@
  */
 
 #include "propagatorjobs.h"
-#include "owncloudpropagator.h"
-#include "owncloudpropagator_p.h"
-#include "propagateremotemove.h"
-#include "common/utility.h"
 #include "common/syncjournaldb.h"
 #include "common/syncjournalfilerecord.h"
 #include "filesystem.h"
-#include <qfile.h>
+#include "owncloudpropagator.h"
+#include "owncloudpropagator_p.h"
+#include "propagateremotemove.h"
+#include <QCoreApplication>
+#include <QDateTime>
 #include <qdir.h>
-#include <qdiriterator.h>
-#include <qtemporaryfile.h>
+#include <qfile.h>
 #include <qsavefile.h>
-#include <QDateTime>
 #include <qstack.h>
-#include <QCoreApplication>
+#include <qtemporaryfile.h>
 
 #include <time.h>
 
diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 93972c7c240..848009c78a7 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -32,10 +32,8 @@
 
 #include <chrono>
 
-#include <QCoreApplication>
 #include <QDir>
 #include <QLoggingCategory>
-#include <QProcess>
 #include <QSslSocket>
 #include <QStringList>
 #include <QTextStream>
diff --git a/src/libsync/syncfileitem.cpp b/src/libsync/syncfileitem.cpp
index 89349eedd81..59842b71b8a 100644
--- a/src/libsync/syncfileitem.cpp
+++ b/src/libsync/syncfileitem.cpp
@@ -17,8 +17,6 @@
 #include "common/utility.h"
 #include "filesystem.h"
 
-#include "csync/vio/csync_vio_local.h"
-
 #include <QCoreApplication>
 
 #include <bitset>
diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index bafbcf287c3..2a07e75ad92 100644
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -23,13 +23,11 @@
 #include "resources/qmlresources.h"
 #include "resources/resources.h"
 
+#include <QSslSocket>
+#include <QStyle>
 #include <QtCore>
 #include <QtGui>
-#include <QStyle>
-#include <QApplication>
-#include <QSslSocket>
 
-#include "owncloudtheme.h"
 #include "themewatcher.h"
 
 #ifdef THEME_INCLUDE
diff --git a/src/plugins/vfs/suffix/vfs_suffix.cpp b/src/plugins/vfs/suffix/vfs_suffix.cpp
index 5bc9d314c58..70a46033a1c 100644
--- a/src/plugins/vfs/suffix/vfs_suffix.cpp
+++ b/src/plugins/vfs/suffix/vfs_suffix.cpp
@@ -14,8 +14,6 @@
 
 #include "vfs_suffix.h"
 
-#include <QFile>
-
 #include "common/syncjournaldb.h"
 #include "filesystem.h"
 #include "syncfileitem.h"