diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index fb8d8ab4..f031c80f 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -54,6 +54,7 @@
 #include "ui/NhekoEventObserver.h"
 #include "ui/NhekoGlobalObject.h"
 #include "ui/UIA.h"
+#include "voip/CallManager.h"
 #include "voip/WebRTCSession.h"
 
 #ifdef NHEKO_DBUS_SYS
diff --git a/src/encryption/SelfVerificationStatus.cpp b/src/encryption/SelfVerificationStatus.cpp
index 00e6be49..ab50b6f3 100644
--- a/src/encryption/SelfVerificationStatus.cpp
+++ b/src/encryption/SelfVerificationStatus.cpp
@@ -7,12 +7,14 @@
 
 #include <QApplication>
 
+#include "Cache.h"
 #include "Cache_p.h"
 #include "ChatPage.h"
 #include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
 #include "Olm.h"
+#include "encryption/VerificationManager.h"
 #include "timeline/TimelineViewManager.h"
 #include "ui/UIA.h"
 
diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp
index 972f061d..0a49f596 100644
--- a/src/timeline/RoomlistModel.cpp
+++ b/src/timeline/RoomlistModel.cpp
@@ -5,6 +5,7 @@
 
 #include "RoomlistModel.h"
 
+#include "Cache.h"
 #include "Cache_p.h"
 #include "ChatPage.h"
 #include "Logging.h"
@@ -14,6 +15,8 @@
 #include "TimelineModel.h"
 #include "TimelineViewManager.h"
 #include "UserSettingsPage.h"
+#include "Utils.h"
+#include "voip/CallManager.h"
 
 #ifdef NHEKO_DBUS_SYS
 #include <QDBusConnection>
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 53559644..2151a4ae 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -20,6 +20,7 @@
 #include <QVariant>
 #include <utility>
 
+#include "Cache.h"
 #include "Cache_p.h"
 #include "ChatPage.h"
 #include "Config.h"
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 384cb3ff..a0f42d17 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -22,8 +22,11 @@
 #include "RoomsModel.h"
 #include "UserSettingsPage.h"
 #include "UsersModel.h"
+#include "Utils.h"
 #include "emoji/EmojiModel.h"
-#include "emoji/Provider.h"
+#include "encryption/VerificationManager.h"
+#include "voip/CallManager.h"
+#include "voip/WebRTCSession.h"
 
 namespace msgs = mtx::events::msg;
 
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index 6b9d9e94..994042b6 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -12,21 +12,10 @@
 
 #include <mtx/common.hpp>
 #include <mtx/responses/messages.hpp>
-#include <mtx/responses/sync.hpp>
 
-#include "Cache.h"
-#include "JdenticonProvider.h"
-#include "Logging.h"
-#include "TimelineModel.h"
-#include "Utils.h"
-#include "emoji/EmojiModel.h"
-#include "emoji/Provider.h"
-#include "encryption/VerificationManager.h"
 #include "timeline/CommunitiesModel.h"
 #include "timeline/PresenceEmitter.h"
 #include "timeline/RoomlistModel.h"
-#include "voip/CallManager.h"
-#include "voip/WebRTCSession.h"
 
 class MxcImageProvider;
 class BlurhashProvider;
@@ -34,6 +23,13 @@ class ColorImageProvider;
 class UserSettings;
 class ChatPage;
 class ImagePackListModel;
+class TimelineModel;
+class CallManager;
+class VerificationManager;
+
+namespace mtx::responses {
+struct Sync;
+}
 
 class TimelineViewManager : public QObject
 {
diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp
index e9d1bc18..d1559112 100644
--- a/src/ui/UserProfile.cpp
+++ b/src/ui/UserProfile.cpp
@@ -8,12 +8,14 @@
 #include <QMimeDatabase>
 #include <QStandardPaths>
 
+#include "Cache.h"
 #include "Cache_p.h"
 #include "ChatPage.h"
 #include "Logging.h"
 #include "UserProfile.h"
 #include "Utils.h"
 #include "encryption/DeviceVerificationFlow.h"
+#include "encryption/VerificationManager.h"
 #include "mtx/responses/crypto.hpp"
 #include "timeline/TimelineModel.h"
 #include "timeline/TimelineViewManager.h"