diff --git a/src/actionshandler.h b/src/actionshandler.h
index 3e13ab13e..e422ca961 100644
--- a/src/actionshandler.h
+++ b/src/actionshandler.h
@@ -5,8 +5,8 @@
 
 #include <QObject>
 
-#include "connection.h"
 #include "neochatroom.h"
+#include <connection.h>
 
 using namespace Quotient;
 
diff --git a/src/controller.cpp b/src/controller.cpp
index 32831e4fd..818c048fe 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -40,20 +40,21 @@
 #include "neochataccountregistry.h"
 #endif
 
-#include "csapi/account-data.h"
-#include "csapi/content-repo.h"
-#include "csapi/joining.h"
-#include "csapi/logout.h"
-#include "csapi/profile.h"
-#include "events/eventcontent.h"
+#include <csapi/account-data.h>
+#include <csapi/content-repo.h>
+#include <csapi/joining.h>
+#include <csapi/logout.h>
+#include <csapi/profile.h>
+#include <events/eventcontent.h>
+#include <qt_connection_util.h>
+#include <settings.h>
+
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
 #include "roommanager.h"
-#include "settings.h"
 #include "utils.h"
 #include "windowcontroller.h"
-#include <qt_connection_util.h>
 
 #include <KStandardShortcut>
 
diff --git a/src/controller.h b/src/controller.h
index 6eafe70bd..a54f1f27a 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -11,11 +11,11 @@
 
 class QKeySequences;
 
-#include "connection.h"
-#include "csapi/list_public_rooms.h"
-#include "room.h"
-#include "settings.h"
-#include "user.h"
+#include <connection.h>
+#include <csapi/list_public_rooms.h>
+#include <room.h>
+#include <settings.h>
+#include <user.h>
 
 class NeoChatRoom;
 class NeoChatUser;
diff --git a/src/login.cpp b/src/login.cpp
index 1871acee9..b0e26162c 100644
--- a/src/login.cpp
+++ b/src/login.cpp
@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "login.h"
-#include "connection.h"
+
+#include <connection.h>
+#include <qt_connection_util.h>
+
 #include "controller.h"
 
 #include <QUrl>
-#include <qt_connection_util.h>
 
 #include <KLocalizedString>
 
diff --git a/src/login.h b/src/login.h
index e589e2ec9..2fbab1a08 100644
--- a/src/login.h
+++ b/src/login.h
@@ -5,8 +5,8 @@
 
 #include <QObject>
 
-#include "connection.h"
-#include "csapi/wellknown.h"
+#include <connection.h>
+#include <csapi/wellknown.h>
 
 using namespace Quotient;
 
diff --git a/src/main.cpp b/src/main.cpp
index 907af648b..6e70aab46 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,8 +26,8 @@
 #include <KDBusService>
 #endif
 #ifdef HAVE_WINDOWSYSTEM
-#include <kwindowsystem_version.h>
 #include <KWindowSystem>
+#include <kwindowsystem_version.h>
 #endif
 #include <KLocalizedContext>
 #include <KLocalizedString>
@@ -36,11 +36,16 @@
 #include "neochat-version.h"
 
 #ifdef QUOTIENT_07
-#include "accountregistry.h"
+#include <accountregistry.h>
 #else
 #include "neochataccountregistry.h"
 #endif
 
+#include <csapi/joining.h>
+#include <csapi/leaving.h>
+#include <networkaccessmanager.h>
+#include <room.h>
+
 #include "actionshandler.h"
 #include "blurhashimageprovider.h"
 #include "chatboxhelper.h"
@@ -49,8 +54,6 @@
 #include "collapsestateproxymodel.h"
 #include "commandmodel.h"
 #include "controller.h"
-#include "csapi/joining.h"
-#include "csapi/leaving.h"
 #include "customemojimodel.h"
 #include "devicesmodel.h"
 #include "emojimodel.h"
@@ -63,7 +66,6 @@
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
-#include "networkaccessmanager.h"
 #include "notificationsmanager.h"
 #include "publicroomlistmodel.h"
 #include "roomlistmodel.h"
@@ -76,7 +78,6 @@
 #include "userlistmodel.h"
 #include "webshortcutmodel.h"
 #include "windowcontroller.h"
-#include <room.h>
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
@@ -159,7 +160,6 @@ int main(int argc, char *argv[])
     KAboutData::setApplicationData(about);
     QGuiApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("org.kde.neochat")));
 
-
 #ifdef NEOCHAT_FLATPAK
     // Copy over the included FontConfig configuration to the
     // app's config dir:
diff --git a/src/messageeventmodel.h b/src/messageeventmodel.h
index 4f2b33349..6690255a1 100644
--- a/src/messageeventmodel.h
+++ b/src/messageeventmodel.h
@@ -6,7 +6,7 @@
 #include <QAbstractListModel>
 
 #include "neochatroom.h"
-#include "room.h"
+#include <room.h>
 
 class MessageEventModel : public QAbstractListModel
 {
diff --git a/src/neochataccountregistry.cpp b/src/neochataccountregistry.cpp
index 573761f3e..ae250f021 100644
--- a/src/neochataccountregistry.cpp
+++ b/src/neochataccountregistry.cpp
@@ -4,7 +4,7 @@
 
 #include "neochataccountregistry.h"
 
-#include "connection.h"
+#include <connection.h>
 
 using namespace Quotient;
 
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index c86af0eac..e03fe03b9 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -19,29 +19,30 @@
 #include <qcoro/qcorosignal.h>
 #include <qcoro/task.h>
 
-#include "connection.h"
-#include "csapi/account-data.h"
-#include "csapi/content-repo.h"
-#include "csapi/leaving.h"
-#include "csapi/redaction.h"
-#include "csapi/room_state.h"
-#include "csapi/rooms.h"
-#include "csapi/typing.h"
-#include "events/accountdataevents.h"
-#include "events/reactionevent.h"
-#include "events/roomcanonicalaliasevent.h"
-#include "events/roomcreateevent.h"
-#include "events/roommessageevent.h"
-#include "events/roompowerlevelsevent.h"
-#include "events/typingevent.h"
-#include "jobs/downloadfilejob.h"
+#include <connection.h>
+#include <csapi/account-data.h>
+#include <csapi/content-repo.h>
+#include <csapi/leaving.h>
+#include <csapi/redaction.h>
+#include <csapi/room_state.h>
+#include <csapi/rooms.h>
+#include <csapi/typing.h>
+#include <events/accountdataevents.h>
+#include <events/eventcontent.h>
+#include <events/reactionevent.h>
+#include <events/roomcanonicalaliasevent.h>
+#include <events/roomcreateevent.h>
+#include <events/roommessageevent.h>
+#include <events/roompowerlevelsevent.h>
+#include <events/typingevent.h>
+#include <jobs/downloadfilejob.h>
+#include <qt_connection_util.h>
+#include <user.h>
+
 #include "neochatconfig.h"
 #include "notificationsmanager.h"
 #include "stickerevent.h"
-#include "user.h"
 #include "utils.h"
-#include <events/eventcontent.h>
-#include <qt_connection_util.h>
 
 #include <KLocalizedString>
 
diff --git a/src/neochatroom.h b/src/neochatroom.h
index 421e719fc..6c5db5e43 100644
--- a/src/neochatroom.h
+++ b/src/neochatroom.h
@@ -11,6 +11,7 @@
 #include <events/roommemberevent.h>
 #include <events/roommessageevent.h>
 #include <events/simplestateevents.h>
+#include <room.h>
 
 #include <QObject>
 #include <QPointer>
@@ -19,7 +20,6 @@
 #include <qcoro/task.h>
 
 #include "neochatuser.h"
-#include "room.h"
 
 using namespace Quotient;
 
diff --git a/src/neochatuser.h b/src/neochatuser.h
index bcc4304f2..bc3a2e697 100644
--- a/src/neochatuser.h
+++ b/src/neochatuser.h
@@ -5,7 +5,7 @@
 
 #include <QObject>
 
-#include "user.h"
+#include <user.h>
 
 using namespace Quotient;
 
diff --git a/src/publicroomlistmodel.h b/src/publicroomlistmodel.h
index e4bd6976e..58dff0458 100644
--- a/src/publicroomlistmodel.h
+++ b/src/publicroomlistmodel.h
@@ -6,9 +6,8 @@
 #include <QAbstractListModel>
 #include <QObject>
 
-#include "connection.h"
-#include "csapi/definitions/public_rooms_response.h"
-#include "csapi/list_public_rooms.h"
+#include <connection.h>
+#include <csapi/list_public_rooms.h>
 
 using namespace Quotient;
 
diff --git a/src/roomlistmodel.cpp b/src/roomlistmodel.cpp
index 0ddf705f7..d9676c57a 100644
--- a/src/roomlistmodel.cpp
+++ b/src/roomlistmodel.cpp
@@ -23,9 +23,9 @@
 #include <QGuiApplication>
 #include <utility>
 
-#include "csapi/notifications.h"
 #include "notificationsmanager.h"
 #include "roommanager.h"
+#include <csapi/notifications.h>
 
 Q_DECLARE_METATYPE(Quotient::JoinState)
 
diff --git a/src/roomlistmodel.h b/src/roomlistmodel.h
index 68e404fd7..f039821d1 100644
--- a/src/roomlistmodel.h
+++ b/src/roomlistmodel.h
@@ -3,10 +3,11 @@
 
 #pragma once
 
-#include "connection.h"
-#include "events/roomevent.h"
+#include <connection.h>
+#include <events/roomevent.h>
+#include <room.h>
+
 #include "neochatroom.h"
-#include "room.h"
 
 #include <QAbstractListModel>
 
diff --git a/src/runner.h b/src/runner.h
index 4589fc6c2..a0ac55546 100644
--- a/src/runner.h
+++ b/src/runner.h
@@ -166,4 +166,3 @@ private:
     SortFilterRoomListModel m_model;
     RoomListModel m_sourceModel;
 };
-
diff --git a/src/spacehierarchycache.cpp b/src/spacehierarchycache.cpp
index 81bbe8f8c..d90dc1b72 100644
--- a/src/spacehierarchycache.cpp
+++ b/src/spacehierarchycache.cpp
@@ -5,7 +5,7 @@
 
 #include "controller.h"
 #ifdef QUOTIENT_07
-#include "csapi/space_hierarchy.h"
+#include <csapi/space_hierarchy.h>
 #endif
 #include "neochatroom.h"
 
diff --git a/src/stickerevent.h b/src/stickerevent.h
index 636aecedb..ed0c44fe0 100644
--- a/src/stickerevent.h
+++ b/src/stickerevent.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "events/eventcontent.h"
-#include "events/roomevent.h"
+#include <events/eventcontent.h>
+#include <events/roomevent.h>
 
 namespace Quotient
 {
diff --git a/src/userdirectorylistmodel.h b/src/userdirectorylistmodel.h
index 2a77efa4d..5b5685cd6 100644
--- a/src/userdirectorylistmodel.h
+++ b/src/userdirectorylistmodel.h
@@ -6,8 +6,8 @@
 #include <QAbstractListModel>
 #include <QObject>
 
-#include "connection.h"
-#include "csapi/users.h"
+#include <connection.h>
+#include <csapi/users.h>
 
 using namespace Quotient;
 
diff --git a/src/userlistmodel.cpp b/src/userlistmodel.cpp
index b5ec604d0..2421f0cb0 100644
--- a/src/userlistmodel.cpp
+++ b/src/userlistmodel.cpp
@@ -4,11 +4,10 @@
 #include "userlistmodel.h"
 
 #include <connection.h>
+#include <events/roompowerlevelsevent.h>
 #include <room.h>
 #include <user.h>
 
-#include "events/roompowerlevelsevent.h"
-
 #include <QDebug>
 #include <QElapsedTimer>
 #include <QPixmap>
diff --git a/src/userlistmodel.h b/src/userlistmodel.h
index 1c116ba0f..b619517cd 100644
--- a/src/userlistmodel.h
+++ b/src/userlistmodel.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "room.h"
+#include <room.h>
 
 #include <QAbstractListModel>
 #include <QObject>
diff --git a/src/utils.h b/src/utils.h
index 555957c56..eeb803db2 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "room.h"
-#include "user.h"
+#include <room.h>
+#include <user.h>
 
 #include <QObject>
 #include <QRegularExpression>