diff --git a/src/singletons/Fonts.cpp b/src/singletons/Fonts.cpp
index 2760723e0..70aaa93b6 100644
--- a/src/singletons/Fonts.cpp
+++ b/src/singletons/Fonts.cpp
@@ -1,12 +1,12 @@
 #include "singletons/Fonts.hpp"
 
+#include "Application.hpp"
+#include "debug/AssertInGuiThread.hpp"
+#include "singletons/WindowManager.hpp"
+
 #include <QDebug>
 #include <QtGlobal>
 
-#include "Application.hpp"
-#include "WindowManager.hpp"
-#include "debug/AssertInGuiThread.hpp"
-
 #ifdef Q_OS_WIN32
 #define DEFAULT_FONT_FAMILY "Segoe UI"
 #define DEFAULT_FONT_SIZE 10
diff --git a/src/singletons/NativeMessaging.cpp b/src/singletons/NativeMessaging.cpp
index 60226433b..805f0f384 100644
--- a/src/singletons/NativeMessaging.cpp
+++ b/src/singletons/NativeMessaging.cpp
@@ -1,4 +1,4 @@
-#include "NativeMessaging.hpp"
+#include "singletons/NativeMessaging.hpp"
 
 #include "Application.hpp"
 #include "providers/twitch/TwitchServer.hpp"
diff --git a/src/singletons/Resources.cpp b/src/singletons/Resources.cpp
index fdbbf9bbf..4b05b718b 100644
--- a/src/singletons/Resources.cpp
+++ b/src/singletons/Resources.cpp
@@ -1,8 +1,12 @@
-#include "Resources.hpp"
-#include "common/UrlFetch.hpp"
+#include "singletons/Resources.hpp"
 
+#include "common/NetworkRequest.hpp"
+
+#include <QDebug>
 #include <QIcon>
+#include <QJsonArray>
 #include <QPixmap>
+#include <QThread>
 
 namespace chatterino {
 
diff --git a/src/singletons/Theme.cpp b/src/singletons/Theme.cpp
index 38c864c36..b20a79875 100644
--- a/src/singletons/Theme.cpp
+++ b/src/singletons/Theme.cpp
@@ -1,6 +1,6 @@
 #define LOOKUP_COLOR_COUNT 360
 
-#include "Theme.hpp"
+#include "singletons/Theme.hpp"
 
 #include <QColor>
 
diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp
index 7dc3b7421..2e43f7d15 100644
--- a/src/singletons/WindowManager.cpp
+++ b/src/singletons/WindowManager.cpp
@@ -1,4 +1,4 @@
-#include "WindowManager.hpp"
+#include "singletons/WindowManager.hpp"
 
 #include "Application.hpp"
 #include "debug/AssertInGuiThread.hpp"
@@ -11,12 +11,11 @@
 #include "widgets/AccountSwitchPopupWidget.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"
 
+#include <QDebug>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 
-#include <QDebug>
-
 #define SETTINGS_FILENAME "/window-layout.json"
 
 namespace chatterino {
diff --git a/src/singletons/WindowManager.hpp b/src/singletons/WindowManager.hpp
index 217bf737d..93a586079 100644
--- a/src/singletons/WindowManager.hpp
+++ b/src/singletons/WindowManager.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <common/Singleton.hpp>
-
+#include "common/Singleton.hpp"
 #include "widgets/Window.hpp"
 #include "widgets/splits/SplitContainer.hpp"