diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 41d6d848..7fdb906c 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -9,6 +9,7 @@
 #include <aquamarine/output/Output.hpp>
 #include <random>
 #include <cstring>
+#include <filesystem>
 #include <unordered_set>
 #include "debug/HyprCtl.hpp"
 #include "debug/CrashReporter.hpp"
@@ -24,6 +25,7 @@
 #include "protocols/core/Compositor.hpp"
 #include "protocols/core/Subcompositor.hpp"
 #include "desktop/LayerSurface.hpp"
+#include "render/Renderer.hpp"
 #include "xwayland/XWayland.hpp"
 
 #include <hyprutils/string/String.hpp>
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index 1681dea1..a5f18693 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -24,6 +24,7 @@
 #include <ranges>
 #include <unordered_set>
 #include <hyprutils/string/String.hpp>
+#include <filesystem>
 using namespace Hyprutils::String;
 
 extern "C" char**             environ;
diff --git a/src/debug/CrashReporter.cpp b/src/debug/CrashReporter.cpp
index ce1a92ba..c25212fe 100644
--- a/src/debug/CrashReporter.cpp
+++ b/src/debug/CrashReporter.cpp
@@ -5,6 +5,7 @@
 #include <time.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <filesystem>
 
 #include "../plugins/PluginSystem.hpp"
 #include "../signal-safe.hpp"
diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp
index 76ef8218..61c3e4b0 100644
--- a/src/debug/HyprCtl.cpp
+++ b/src/debug/HyprCtl.cpp
@@ -12,6 +12,8 @@
 #include <sys/un.h>
 #include <unistd.h>
 #include <sys/poll.h>
+#include <filesystem>
+#include <ranges>
 
 #include <sstream>
 #include <string>
diff --git a/src/devices/IKeyboard.cpp b/src/devices/IKeyboard.cpp
index 3e69bfd8..284a8295 100644
--- a/src/devices/IKeyboard.cpp
+++ b/src/devices/IKeyboard.cpp
@@ -3,6 +3,7 @@
 #include "../helpers/varlist/VarList.hpp"
 #include "../managers/input/InputManager.hpp"
 #include "../managers/SeatManager.hpp"
+#include "../config/ConfigManager.hpp"
 #include <sys/mman.h>
 #include <aquamarine/input/Input.hpp>
 #include <cstring>
diff --git a/src/helpers/Format.cpp b/src/helpers/Format.cpp
index 8d080322..afc8b1c5 100644
--- a/src/helpers/Format.cpp
+++ b/src/helpers/Format.cpp
@@ -4,6 +4,7 @@
 #include "debug/Log.hpp"
 #include "../macros.hpp"
 #include <xf86drm.h>
+#include <drm_fourcc.h>
 
 /*
     DRM formats are LE, while OGL is BE. The two primary formats
diff --git a/src/helpers/math/Math.cpp b/src/helpers/math/Math.cpp
index f8b61bce..fccfd636 100644
--- a/src/helpers/math/Math.cpp
+++ b/src/helpers/math/Math.cpp
@@ -70,113 +70,28 @@ void matrixRotate(float mat[9], float rad) {
     matrixMultiply(mat, mat, rotate);
 }
 
-std::unordered_map<eTransform, std::array<float, 9>> transforms = {
-    {HYPRUTILS_TRANSFORM_NORMAL,
-     {
-         1.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         1.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         1.0f,
-     }},
-    {HYPRUTILS_TRANSFORM_90,
-     {
-         0.0f,
-         1.0f,
-         0.0f,
-         -1.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         1.0f,
-     }},
-    {HYPRUTILS_TRANSFORM_180,
-     {
-         -1.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         -1.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         1.0f,
-     }},
-    {HYPRUTILS_TRANSFORM_270,
-     {
-         0.0f,
-         -1.0f,
-         0.0f,
-         1.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         1.0f,
-     }},
-    {HYPRUTILS_TRANSFORM_FLIPPED,
-     {
-         -1.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         1.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         1.0f,
-     }},
-    {HYPRUTILS_TRANSFORM_FLIPPED_90,
-     {
-         0.0f,
-         1.0f,
-         0.0f,
-         1.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         1.0f,
-     }},
-    {HYPRUTILS_TRANSFORM_FLIPPED_180,
-     {
-         1.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         -1.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         1.0f,
-     }},
-    {HYPRUTILS_TRANSFORM_FLIPPED_270,
-     {
-         0.0f,
-         -1.0f,
-         0.0f,
-         -1.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         0.0f,
-         1.0f,
-     }},
-};
+const std::unordered_map<eTransform, std::array<float, 9>>& getTransforms() {
+    static std::unordered_map<eTransform, std::array<float, 9>> transforms = {
+        {HYPRUTILS_TRANSFORM_NORMAL, {1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f}},
+        {HYPRUTILS_TRANSFORM_90, {0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}},
+        {HYPRUTILS_TRANSFORM_180, {-1.0f, 0.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 1.0f}},
+        {HYPRUTILS_TRANSFORM_270, {0.0f, -1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}},
+        {HYPRUTILS_TRANSFORM_FLIPPED, {-1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f}},
+        {HYPRUTILS_TRANSFORM_FLIPPED_90, {0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}},
+        {HYPRUTILS_TRANSFORM_FLIPPED_180, {1.0f, 0.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 1.0f}},
+        {HYPRUTILS_TRANSFORM_FLIPPED_270, {0.0f, -1.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}},
+    };
+    return transforms;
+}
 
 void matrixTransform(float mat[9], eTransform transform) {
-    matrixMultiply(mat, mat, transforms.at(transform).data());
+    matrixMultiply(mat, mat, getTransforms().at(transform).data());
 }
 
 void matrixProjection(float mat[9], int width, int height, eTransform transform) {
     memset(mat, 0, sizeof(*mat) * 9);
 
-    const float* t = transforms.at(transform).data();
+    const float* t = getTransforms().at(transform).data();
     float        x = 2.0f / width;
     float        y = 2.0f / height;
 
diff --git a/src/helpers/sync/SyncTimeline.hpp b/src/helpers/sync/SyncTimeline.hpp
index 4bb8019b..3d868a95 100644
--- a/src/helpers/sync/SyncTimeline.hpp
+++ b/src/helpers/sync/SyncTimeline.hpp
@@ -4,6 +4,7 @@
 #include <optional>
 #include <vector>
 #include <functional>
+#include "../memory/Memory.hpp"
 
 /*
     Hyprland synchronization timelines are based on the wlroots' ones, which
diff --git a/src/managers/CursorManager.hpp b/src/managers/CursorManager.hpp
index a2e8af21..4324dfb4 100644
--- a/src/managers/CursorManager.hpp
+++ b/src/managers/CursorManager.hpp
@@ -6,6 +6,8 @@
 #include "../includes.hpp"
 #include "../helpers/math/Math.hpp"
 #include "../helpers/memory/Memory.hpp"
+#include "../macros.hpp"
+#include <aquamarine/buffer/Buffer.hpp>
 
 class CWLSurface;
 
diff --git a/src/managers/PointerManager.hpp b/src/managers/PointerManager.hpp
index 6846c382..cf4f1a94 100644
--- a/src/managers/PointerManager.hpp
+++ b/src/managers/PointerManager.hpp
@@ -6,6 +6,7 @@
 #include "../helpers/math/Math.hpp"
 #include "../helpers/math/Math.hpp"
 #include "../desktop/WLSurface.hpp"
+#include "../helpers/sync/SyncTimeline.hpp"
 #include <tuple>
 
 class CMonitor;
diff --git a/src/managers/ProtocolManager.cpp b/src/managers/ProtocolManager.cpp
index 3006468f..387cac8f 100644
--- a/src/managers/ProtocolManager.cpp
+++ b/src/managers/ProtocolManager.cpp
@@ -49,6 +49,10 @@
 
 #include "../helpers/Monitor.hpp"
 #include "../render/Renderer.hpp"
+#include "../Compositor.hpp"
+
+#include <aquamarine/buffer/Buffer.hpp>
+#include <aquamarine/backend/Backend.hpp>
 
 void CProtocolManager::onMonitorModeChange(CMonitor* pMonitor) {
     const bool ISMIRROR = pMonitor->isMirror();
diff --git a/src/plugins/PluginAPI.cpp b/src/plugins/PluginAPI.cpp
index 6e09ba2c..098e3f12 100644
--- a/src/plugins/PluginAPI.cpp
+++ b/src/plugins/PluginAPI.cpp
@@ -2,6 +2,7 @@
 #include "../Compositor.hpp"
 #include "../debug/HyprCtl.hpp"
 #include <dlfcn.h>
+#include <filesystem>
 
 #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
 #include <sys/sysctl.h>
diff --git a/src/protocols/LinuxDMABUF.hpp b/src/protocols/LinuxDMABUF.hpp
index 7f252588..449b4ac9 100644
--- a/src/protocols/LinuxDMABUF.hpp
+++ b/src/protocols/LinuxDMABUF.hpp
@@ -7,6 +7,8 @@
 #include "wayland.hpp"
 #include "linux-dmabuf-v1.hpp"
 #include "../helpers/signal/Signal.hpp"
+#include "../helpers/Format.hpp"
+#include "../helpers/Monitor.hpp"
 #include <aquamarine/buffer/Buffer.hpp>
 
 class CDMABuffer;
diff --git a/src/protocols/Screencopy.hpp b/src/protocols/Screencopy.hpp
index 063068b5..4999773b 100644
--- a/src/protocols/Screencopy.hpp
+++ b/src/protocols/Screencopy.hpp
@@ -8,6 +8,7 @@
 #include "../managers/HookSystemManager.hpp"
 #include "../helpers/Timer.hpp"
 #include "../managers/eventLoop/EventLoopTimer.hpp"
+#include <aquamarine/buffer/Buffer.hpp>
 
 class CMonitor;
 class IHLBuffer;
diff --git a/src/protocols/core/Compositor.cpp b/src/protocols/core/Compositor.cpp
index 6fad79cc..a038bf08 100644
--- a/src/protocols/core/Compositor.cpp
+++ b/src/protocols/core/Compositor.cpp
@@ -8,6 +8,7 @@
 #include "../../helpers/Monitor.hpp"
 #include "../PresentationTime.hpp"
 #include "../DRMSyncobj.hpp"
+#include "../../render/Renderer.hpp"
 
 #define LOGM PROTO::compositor->protoLog
 
diff --git a/src/protocols/types/WLBuffer.cpp b/src/protocols/types/WLBuffer.cpp
index 7034dfc7..cc24546d 100644
--- a/src/protocols/types/WLBuffer.cpp
+++ b/src/protocols/types/WLBuffer.cpp
@@ -3,6 +3,7 @@
 #include "../core/Compositor.hpp"
 #include "../DRMSyncobj.hpp"
 #include "../../helpers/sync/SyncTimeline.hpp"
+#include "../../Compositor.hpp"
 #include <xf86drm.h>
 
 CWLBufferResource::CWLBufferResource(SP<CWlBuffer> resource_) : resource(resource_) {
diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp
index be449dfe..7870bf6d 100644
--- a/src/render/OpenGL.cpp
+++ b/src/render/OpenGL.cpp
@@ -11,6 +11,7 @@
 #include <xf86drm.h>
 #include <fcntl.h>
 #include <gbm.h>
+#include <filesystem>
 
 inline void loadGLProc(void* pProc, const char* name) {
     void* proc = (void*)eglGetProcAddress(name);
diff --git a/src/render/Renderbuffer.cpp b/src/render/Renderbuffer.cpp
index 57f4fbd2..58ed88d6 100644
--- a/src/render/Renderbuffer.cpp
+++ b/src/render/Renderbuffer.cpp
@@ -2,6 +2,8 @@
 #include "OpenGL.hpp"
 #include "../Compositor.hpp"
 #include "../protocols/types/Buffer.hpp"
+#include <hyprutils/signal/Listener.hpp>
+#include <hyprutils/signal/Signal.hpp>
 
 #include <dlfcn.h>
 
diff --git a/src/render/Renderbuffer.hpp b/src/render/Renderbuffer.hpp
index f8155087..e6bfa909 100644
--- a/src/render/Renderbuffer.hpp
+++ b/src/render/Renderbuffer.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "../helpers/signal/Signal.hpp"
+#include "../helpers/memory/Memory.hpp"
+#include "../helpers/WLListener.hpp"
 #include "Framebuffer.hpp"
 #include <aquamarine/buffer/Buffer.hpp>
 
diff --git a/src/xwayland/Server.cpp b/src/xwayland/Server.cpp
index 1d8b0cf5..3f4e7b43 100644
--- a/src/xwayland/Server.cpp
+++ b/src/xwayland/Server.cpp
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 #include <sys/un.h>
 #include <unistd.h>
+#include <filesystem>
 
 // TODO: cleanup
 static bool set_cloexec(int fd, bool cloexec) {