diff --git a/src/actionshandler.cpp b/src/actionshandler.cpp
index a5ad8138e..3c296bfc1 100644
--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -17,9 +17,8 @@
 #include "controller.h"
 #include "customemojimodel.h"
 #include "neochatconfig.h"
-#include "neochatroom.h"
-#include "roommanager.h"
 #include "neochatuser.h"
+#include "roommanager.h"
 
 using namespace Quotient;
 
diff --git a/src/chatdocumenthandler.cpp b/src/chatdocumenthandler.cpp
index 6526a0476..134a4efa4 100644
--- a/src/chatdocumenthandler.cpp
+++ b/src/chatdocumenthandler.cpp
@@ -5,7 +5,6 @@
 
 #include <QQmlFile>
 #include <QQmlFileSelector>
-#include <QQuickTextDocument>
 #include <QStringBuilder>
 #include <QSyntaxHighlighter>
 #include <QTextBlock>
@@ -16,7 +15,6 @@
 #include <Sonnet/Settings>
 
 #include "actionsmodel.h"
-#include "completionmodel.h"
 #include "neochatroom.h"
 #include "roomlistmodel.h"
 
diff --git a/src/collapsestateproxymodel.cpp b/src/collapsestateproxymodel.cpp
index 92917cdb6..87a12212a 100644
--- a/src/collapsestateproxymodel.cpp
+++ b/src/collapsestateproxymodel.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "collapsestateproxymodel.h"
-#include "messageeventmodel.h"
 
 #include <KLocalizedString>
 
diff --git a/src/completionmodel.cpp b/src/completionmodel.cpp
index cf65c4f30..7572f573e 100644
--- a/src/completionmodel.cpp
+++ b/src/completionmodel.cpp
@@ -10,7 +10,6 @@
 #include "customemojimodel.h"
 #include "emojimodel.h"
 #include "neochatroom.h"
-#include "roomlistmodel.h"
 #include "userlistmodel.h"
 
 CompletionModel::CompletionModel(QObject *parent)
diff --git a/src/controller.cpp b/src/controller.cpp
index 0e5ca69c8..deca40e98 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -19,7 +19,6 @@
 #include <QGuiApplication>
 #include <QImageReader>
 #include <QNetworkProxy>
-#include <QQuickItem>
 #include <QQuickTextDocument>
 #include <QQuickWindow>
 #include <QStandardPaths>
diff --git a/src/login.cpp b/src/login.cpp
index fe60f4aa4..37dca19c8 100644
--- a/src/login.cpp
+++ b/src/login.cpp
@@ -14,8 +14,6 @@
 
 #include "controller.h"
 
-#include <QUrl>
-
 #include <KLocalizedString>
 
 using namespace Quotient;
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 312a3f0f2..361ddeb0f 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -14,7 +14,6 @@
 #include <QMediaPlayer>
 
 #include <qcoro/qcorosignal.h>
-#include <qcoro/task.h>
 
 #include <connection.h>
 #include <csapi/directory.h>
diff --git a/src/notificationsmanager.cpp b/src/notificationsmanager.cpp
index ee1a544ac..51f322a99 100644
--- a/src/notificationsmanager.cpp
+++ b/src/notificationsmanager.cpp
@@ -5,7 +5,6 @@
 
 #include <memory>
 
-#include <QImage>
 #include <QJsonArray>
 
 #include <KLocalizedString>
diff --git a/src/runner.cpp b/src/runner.cpp
index 17892e8f8..1adee90e8 100644
--- a/src/runner.cpp
+++ b/src/runner.cpp
@@ -7,7 +7,6 @@
 
 #include "controller.h"
 #include "neochatroom.h"
-#include "roomlistmodel.h"
 #include "roommanager.h"
 #include "windowcontroller.h"