diff --git a/src/actionshandler.cpp b/src/actionshandler.cpp
index d35d88679..4f7990267 100644
--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -14,7 +14,6 @@
 #include "models/actionsmodel.h"
 #include "models/customemojimodel.h"
 #include "neochatconfig.h"
-#include "neochatroom.h"
 #include "texthandler.h"
 
 using namespace Quotient;
diff --git a/src/chatdocumenthandler.cpp b/src/chatdocumenthandler.cpp
index 02b255be0..19d443666 100644
--- a/src/chatdocumenthandler.cpp
+++ b/src/chatdocumenthandler.cpp
@@ -14,8 +14,6 @@
 #include <Sonnet/BackgroundChecker>
 #include <Sonnet/Settings>
 
-#include "neochatroom.h"
-
 class SyntaxHighlighter : public QSyntaxHighlighter
 {
 public:
diff --git a/src/controller.cpp b/src/controller.cpp
index 35349be08..632cfe423 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "controller.h"
-#include "models/pushrulemodel.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <qt5keychain/keychain.h>
diff --git a/src/models/collapsestateproxymodel.cpp b/src/models/collapsestateproxymodel.cpp
index f38d2f4eb..81a0f62f9 100644
--- a/src/models/collapsestateproxymodel.cpp
+++ b/src/models/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/models/messageeventmodel.cpp b/src/models/messageeventmodel.cpp
index e0606ee85..4685b96f4 100644
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -23,7 +23,6 @@
 #include <QGuiApplication>
 #include <QTimeZone>
 
-#include <KFormat>
 #include <KLocalizedString>
 
 #include "models/reactionmodel.h"
diff --git a/src/models/pushrulemodel.cpp b/src/models/pushrulemodel.cpp
index 5c858e057..da5df9f6f 100644
--- a/src/models/pushrulemodel.cpp
+++ b/src/models/pushrulemodel.cpp
@@ -14,7 +14,6 @@
 
 #include "controller.h"
 #include "neochatconfig.h"
-#include "notificationsmanager.h"
 
 // Alternate name text for default rules.
 static const QHash<QString, QString> defaultRuleNames = {
diff --git a/src/models/searchmodel.cpp b/src/models/searchmodel.cpp
index f443147c4..dea415300 100644
--- a/src/models/searchmodel.cpp
+++ b/src/models/searchmodel.cpp
@@ -10,7 +10,6 @@
 #include <connection.h>
 
 #ifdef QUOTIENT_07
-#include <csapi/search.h>
 #endif
 
 using namespace Quotient;
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 21c1685b5..735b51ff0 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -45,11 +45,9 @@
 #include "controller.h"
 #include "events/joinrulesevent.h"
 #include "neochatconfig.h"
-#include "neochatuser.h"
 #include "notificationsmanager.h"
 #ifdef QUOTIENT_07
 #include "events/pollevent.h"
-#include "pollhandler.h"
 #endif
 #include "events/stickerevent.h"
 #include "filetransferpseudojob.h"
diff --git a/src/notificationsmanager.cpp b/src/notificationsmanager.cpp
index 830403ef0..592a3bc81 100644
--- a/src/notificationsmanager.cpp
+++ b/src/notificationsmanager.cpp
@@ -18,9 +18,7 @@
 #endif
 
 #include <connection.h>
-#include <csapi/notifications.h>
 #include <csapi/pushrules.h>
-#include <jobs/basejob.h>
 #include <user.h>
 
 #include "controller.h"