diff --git a/autotests/server.cpp b/autotests/server.cpp
index a7a181045..4ac650c58 100644
--- a/autotests/server.cpp
+++ b/autotests/server.cpp
@@ -4,15 +4,12 @@
 #include "server.h"
 
 #include <QFile>
-#include <QHttpServer>
 #include <QHttpServerResponder>
 #include <QJsonArray>
 #include <QJsonDocument>
-#include <QJsonObject>
 #include <QNetworkReply>
 #include <QSslCertificate>
 #include <QSslKey>
-#include <QSslServer>
 #include <QUuid>
 
 #include <Quotient/networkaccessmanager.h>
diff --git a/src/app/controller.cpp b/src/app/controller.cpp
index d3e4b1a6a..b122b6bca 100644
--- a/src/app/controller.cpp
+++ b/src/app/controller.cpp
@@ -17,7 +17,6 @@
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>
 
-#include "accountmanager.h"
 #include "enums/roomsortparameter.h"
 #include "general_logging.h"
 #include "mediasizehelper.h"
@@ -26,9 +25,7 @@
 #include "models/roomlistmodel.h"
 #include "models/roomtreemodel.h"
 #include "neochatconfig.h"
-#include "neochatconnection.h"
 #include "neochatroom.h"
-#include "notificationsmanager.h"
 #include "proxycontroller.h"
 #include "roommanager.h"
 
diff --git a/src/app/roommanager.cpp b/src/app/roommanager.cpp
index 5ef75a6f9..6a6514805 100644
--- a/src/app/roommanager.cpp
+++ b/src/app/roommanager.cpp
@@ -9,8 +9,6 @@
 #include "controller.h"
 #include "eventhandler.h"
 #include "models/actionsmodel.h"
-#include "models/messagefiltermodel.h"
-#include "models/sortfilterroomtreemodel.h"
 #include "neochatconfig.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
diff --git a/src/app/runner.cpp b/src/app/runner.cpp
index 87f60d0d0..8eee96f1b 100644
--- a/src/app/runner.cpp
+++ b/src/app/runner.cpp
@@ -8,8 +8,6 @@
 #include <KWindowSystem>
 
 #include "controller.h"
-#include "models/roomlistmodel.h"
-#include "models/sortfilterroomlistmodel.h"
 #include "roommanager.h"
 #include "windowcontroller.h"
 
diff --git a/src/libneochat/eventhandler.cpp b/src/libneochat/eventhandler.cpp
index f6330a37f..6d7dba70f 100644
--- a/src/libneochat/eventhandler.cpp
+++ b/src/libneochat/eventhandler.cpp
@@ -10,7 +10,6 @@
 
 #include <Quotient/events/encryptionevent.h>
 #include <Quotient/events/event.h>
-#include <Quotient/events/eventcontent.h>
 #include <Quotient/events/reactionevent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roomavatarevent.h>
diff --git a/src/libneochat/events/pollevent.cpp b/src/libneochat/events/pollevent.cpp
index 0146a91c7..75a80bcce 100644
--- a/src/libneochat/events/pollevent.cpp
+++ b/src/libneochat/events/pollevent.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "pollevent.h"
-#include <Quotient/converters.h>
 
 using namespace Quotient;
 
diff --git a/src/libneochat/neochatconnection.cpp b/src/libneochat/neochatconnection.cpp
index 8ff5f591d..b02e4910d 100644
--- a/src/libneochat/neochatconnection.cpp
+++ b/src/libneochat/neochatconnection.cpp
@@ -9,7 +9,6 @@
 #include "neochatroom.h"
 #include "spacehierarchycache.h"
 
-#include <Quotient/connection.h>
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/quotient_common.h>
 #include <qt6keychain/keychain.h>
diff --git a/src/libneochat/neochatroom.cpp b/src/libneochat/neochatroom.cpp
index 9f36f81f2..6225c0694 100644
--- a/src/libneochat/neochatroom.cpp
+++ b/src/libneochat/neochatroom.cpp
@@ -45,7 +45,6 @@
 #include "chatbarcache.h"
 #include "clipboard.h"
 #include "eventhandler.h"
-#include "events/pollevent.h"
 #include "filetransferpseudojob.h"
 #include "neochatconnection.h"
 #include "roomlastmessageprovider.h"
diff --git a/src/messagecontent/models/messagecontentmodel.cpp b/src/messagecontent/models/messagecontentmodel.cpp
index b460c8f88..f81c60685 100644
--- a/src/messagecontent/models/messagecontentmodel.cpp
+++ b/src/messagecontent/models/messagecontentmodel.cpp
@@ -9,7 +9,6 @@
 
 #include "chatbarcache.h"
 #include "contentprovider.h"
-#include "enums/messagecomponenttype.h"
 #include "neochatconnection.h"
 #include "texthandler.h"
 
diff --git a/src/messagecontent/models/threadmodel.cpp b/src/messagecontent/models/threadmodel.cpp
index 0690a33da..9d1262231 100644
--- a/src/messagecontent/models/threadmodel.cpp
+++ b/src/messagecontent/models/threadmodel.cpp
@@ -12,7 +12,6 @@
 #include "contentprovider.h"
 #include "enums/messagecomponenttype.h"
 #include "eventhandler.h"
-#include "messagecontentmodel.h"
 #include "neochatroom.h"
 
 ThreadModel::ThreadModel(const QString &threadRootId, NeoChatRoom *room)
diff --git a/src/messagecontent/pollhandler.cpp b/src/messagecontent/pollhandler.cpp
index 50c64c4b3..766ec6df0 100644
--- a/src/messagecontent/pollhandler.cpp
+++ b/src/messagecontent/pollhandler.cpp
@@ -5,7 +5,6 @@
 
 #include <KLocalization>
 
-#include "events/pollevent.h"
 #include "neochatroom.h"
 
 #include <Quotient/csapi/relations.h>
diff --git a/src/rooms/models/sortfilterroomlistmodel.cpp b/src/rooms/models/sortfilterroomlistmodel.cpp
index 8ad723de2..c785e1fb6 100644
--- a/src/rooms/models/sortfilterroomlistmodel.cpp
+++ b/src/rooms/models/sortfilterroomlistmodel.cpp
@@ -3,8 +3,6 @@
 
 #include "sortfilterroomlistmodel.h"
 
-#include "models/roomlistmodel.h"
-
 #include "neochatconnection.h"
 
 using namespace Qt::StringLiterals;
diff --git a/src/rooms/models/sortfilterroomtreemodel.cpp b/src/rooms/models/sortfilterroomtreemodel.cpp
index 79422bc9d..24a2bc12b 100644
--- a/src/rooms/models/sortfilterroomtreemodel.cpp
+++ b/src/rooms/models/sortfilterroomtreemodel.cpp
@@ -8,7 +8,6 @@
 #include "enums/roomsortparameter.h"
 #include "models/roomtreemodel.h"
 #include "neochatconnection.h"
-#include "neochatroom.h"
 #include "spacehierarchycache.h"
 
 #include <Quotient/eventstats.h>
diff --git a/src/rooms/models/sortfilterspacelistmodel.cpp b/src/rooms/models/sortfilterspacelistmodel.cpp
index 465ceee3d..e4efc3255 100644
--- a/src/rooms/models/sortfilterspacelistmodel.cpp
+++ b/src/rooms/models/sortfilterspacelistmodel.cpp
@@ -3,8 +3,6 @@
 
 #include "sortfilterspacelistmodel.h"
 
-#include "models/roomlistmodel.h"
-
 using namespace Qt::StringLiterals;
 
 SortFilterSpaceListModel::SortFilterSpaceListModel(RoomListModel *sourceModel, QObject *parent)
diff --git a/src/settings/models/pushrulemodel.cpp b/src/settings/models/pushrulemodel.cpp
index 69786a8a6..6422cb50d 100644
--- a/src/settings/models/pushrulemodel.cpp
+++ b/src/settings/models/pushrulemodel.cpp
@@ -10,8 +10,6 @@
 #include <Quotient/csapi/pushrules.h>
 #include <Quotient/jobs/basejob.h>
 
-#include "enums/pushrule.h"
-
 #include <KLazyLocalizedString>
 
 // Alternate name text for default rules.
diff --git a/src/settings/models/roomsortparametermodel.cpp b/src/settings/models/roomsortparametermodel.cpp
index 3e0ba5b27..4f69171df 100644
--- a/src/settings/models/roomsortparametermodel.cpp
+++ b/src/settings/models/roomsortparametermodel.cpp
@@ -3,8 +3,6 @@
 
 #include "roomsortparametermodel.h"
 
-#include "enums/roomsortparameter.h"
-
 using namespace Qt::StringLiterals;
 
 RoomSortParameterModel::RoomSortParameterModel(QObject *parent)
diff --git a/src/timeline/messagedelegate.cpp b/src/timeline/messagedelegate.cpp
index 4ef6a1127..81b874f59 100644
--- a/src/timeline/messagedelegate.cpp
+++ b/src/timeline/messagedelegate.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
 #include "messagedelegate.h"
-#include "timelinedelegate.h"
 
 #include <algorithm>
 #include <cmath>