core: cleanup header includes (#9088)

Cleanup some unneeded includes to speed up compilation

src/Compositor.cpp

@@ -42,6 +42,25 @@
 #include "helpers/ByteOperations.hpp"
 #include "render/decorations/CHyprGroupBarDecoration.hpp"
 
+#include "managers/KeybindManager.hpp"
+#include "managers/SessionLockManager.hpp"
+#include "managers/ThreadManager.hpp"
+#include "managers/XWaylandManager.hpp"
+
+#include "config/ConfigManager.hpp"
+#include "render/OpenGL.hpp"
+#include "managers/input/InputManager.hpp"
+#include "managers/AnimationManager.hpp"
+#include "managers/EventManager.hpp"
+#include "managers/HookSystemManager.hpp"
+#include "managers/ProtocolManager.hpp"
+#include "managers/LayoutManager.hpp"
+#include "plugins/PluginSystem.hpp"
+#include "helpers/Watchdog.hpp"
+#include "hyprerror/HyprError.hpp"
+#include "debug/HyprNotificationOverlay.hpp"
+#include "debug/HyprDebugOverlay.hpp"
+
 #include <hyprutils/string/String.hpp>
 #include <aquamarine/input/Input.hpp>
 

src/Compositor.hpp

@@ -5,30 +5,12 @@
 #include <sys/resource.h>
 
 #include "defines.hpp"
-#include "debug/Log.hpp"
-#include "events/Events.hpp"
-#include "config/ConfigManager.hpp"
 #include "managers/ThreadManager.hpp"
 #include "managers/XWaylandManager.hpp"
-#include "managers/input/InputManager.hpp"
-#include "managers/LayoutManager.hpp"
 #include "managers/KeybindManager.hpp"
-#include "managers/AnimationManager.hpp"
-#include "managers/EventManager.hpp"
-#include "managers/ProtocolManager.hpp"
 #include "managers/SessionLockManager.hpp"
-#include "managers/HookSystemManager.hpp"
-#include "debug/HyprDebugOverlay.hpp"
-#include "debug/HyprNotificationOverlay.hpp"
-#include "helpers/Monitor.hpp"
-#include "desktop/Workspace.hpp"
 #include "desktop/Window.hpp"
 #include "protocols/types/ColorManagement.hpp"
-#include "render/Renderer.hpp"
-#include "render/OpenGL.hpp"
-#include "hyprerror/HyprError.hpp"
-#include "plugins/PluginSystem.hpp"
-#include "helpers/Watchdog.hpp"
 
 #include <aquamarine/backend/Backend.hpp>
 #include <aquamarine/output/Output.hpp>

src/SharedDefs.hpp

@@ -4,6 +4,7 @@
 #include <functional>
 #include <any>
 #include <string>
+#include <algorithm>
 #include <hyprutils/math/Box.hpp>
 
 enum eIcons : uint8_t {

src/config/ConfigManager.cpp

@@ -11,8 +11,19 @@
 #include "../protocols/LayerShell.hpp"
 #include "../xwayland/XWayland.hpp"
 #include "../protocols/OutputManagement.hpp"
-#include "managers/AnimationManager.hpp"
+#include "../managers/AnimationManager.hpp"
+#include "../desktop/LayerSurface.hpp"
+#include "defaultConfig.hpp"
 
+#include "../render/Renderer.hpp"
+#include "../hyprerror/HyprError.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/LayoutManager.hpp"
+#include "../managers/EventManager.hpp"
+#include "../debug/HyprNotificationOverlay.hpp"
+#include "../plugins/PluginSystem.hpp"
+
+#include "managers/HookSystemManager.hpp"
 #include <cstddef>
 #include <cstdint>
 #include <hyprutils/path/Path.hpp>

src/config/ConfigManager.hpp

@@ -4,23 +4,24 @@
 #define CONFIG_MANAGER_H
 
 #include <map>
-#include "../debug/Log.hpp"
 #include <unordered_map>
 #include "../defines.hpp"
 #include <variant>
 #include <vector>
-#include <algorithm>
 #include <optional>
 #include <functional>
 #include <xf86drmMode.h>
-#include "../helpers/WLClasses.hpp"
 #include "../helpers/Monitor.hpp"
-#include "../helpers/varlist/VarList.hpp"
 #include "../desktop/Window.hpp"
-#include "../desktop/LayerSurface.hpp"
+#include "../desktop/LayerRule.hpp"
 
-#include "defaultConfig.hpp"
 #include "ConfigDataValues.hpp"
+#include "SharedDefs.hpp"
+#include "helpers/Color.hpp"
+#include "desktop/DesktopTypes.hpp"
+#include "helpers/memory/Memory.hpp"
+#include "desktop/WindowRule.hpp"
+#include "managers/XWaylandManager.hpp"
 
 #include <hyprlang.hpp>
 

src/config/ConfigValue.hpp

@@ -3,7 +3,6 @@
 #include <string>
 #include <typeindex>
 #include <hyprlang.hpp>
-#include "../debug/Log.hpp"
 #include "../macros.hpp"
 #include "ConfigManager.hpp"
 
@@ -71,4 +70,4 @@ template <>
 inline Hyprlang::CUSTOMTYPE CConfigValue<Hyprlang::CUSTOMTYPE>::operator*() const {
     RASSERT(false, "Impossible to implement operator* of CConfigValue<Hyprlang::CUSTOMTYPE>, use ptr()");
     return *ptr();
-}
+}

src/debug/CrashReporter.cpp

@@ -6,6 +6,7 @@
 #include <cerrno>
 #include <sys/stat.h>
 #include <filesystem>
+#include "../helpers/MiscFunctions.hpp"
 
 #include "../plugins/PluginSystem.hpp"
 #include "../signal-safe.hpp"

src/debug/HyprCtl.cpp

@@ -39,8 +39,18 @@ using namespace Hyprutils::String;
 #include "debug/RollingLogFollow.hpp"
 #include "config/ConfigManager.hpp"
 #include "helpers/MiscFunctions.hpp"
+#include "../desktop/LayerSurface.hpp"
 #include "../version.h"
 
+#include "../Compositor.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/XWaylandManager.hpp"
+#include "../managers/LayoutManager.hpp"
+#include "../plugins/PluginSystem.hpp"
+#include "../managers/AnimationManager.hpp"
+#include "../debug/HyprNotificationOverlay.hpp"
+#include "../render/Renderer.hpp"
+
 static void trimTrailingComma(std::string& str) {
     if (!str.empty() && str.back() == ',')
         str.pop_back();

src/debug/HyprCtl.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../Compositor.hpp"
 #include <fstream>
 #include "../helpers/MiscFunctions.hpp"
+#include "../desktop/Window.hpp"
 #include <functional>
 
 // exposed for main.cpp

src/debug/HyprDebugOverlay.cpp

@@ -4,6 +4,7 @@
 #include "../Compositor.hpp"
 #include "../render/pass/TexPassElement.hpp"
 #include "../render/Renderer.hpp"
+#include "../managers/AnimationManager.hpp"
 
 CHyprDebugOverlay::CHyprDebugOverlay() {
     m_pTexture = makeShared<CTexture>();

src/debug/HyprDebugOverlay.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "../defines.hpp"
-#include "../helpers/Monitor.hpp"
 #include "../render/Texture.hpp"
 #include <cairo/cairo.h>
 #include <map>
@@ -49,4 +48,4 @@ class CHyprDebugOverlay {
     friend class CHyprRenderer;
 };
 
-inline std::unique_ptr<CHyprDebugOverlay> g_pDebugOverlay;
+inline std::unique_ptr<CHyprDebugOverlay> g_pDebugOverlay;

src/debug/HyprNotificationOverlay.cpp

@@ -5,6 +5,10 @@
 #include "../config/ConfigValue.hpp"
 #include "../render/pass/TexPassElement.hpp"
 
+#include "../managers/AnimationManager.hpp"
+#include "../managers/HookSystemManager.hpp"
+#include "../render/Renderer.hpp"
+
 static inline auto iconBackendFromLayout(PangoLayout* layout) {
     // preference: Nerd > FontAwesome > text
     auto eIconBackendChecks = std::array<eIconBackend, 2>{ICONS_BACKEND_NF, ICONS_BACKEND_FA};

src/debug/HyprNotificationOverlay.hpp

@@ -2,7 +2,6 @@
 
 #include "../defines.hpp"
 #include "../helpers/Timer.hpp"
-#include "../helpers/Monitor.hpp"
 #include "../render/Texture.hpp"
 #include "../SharedDefs.hpp"
 

src/debug/Log.cpp

@@ -1,6 +1,5 @@
 #include "Log.hpp"
 #include "../defines.hpp"
-#include "../Compositor.hpp"
 #include "RollingLogFollow.hpp"
 
 #include <fstream>

src/debug/Log.hpp

@@ -5,8 +5,6 @@
 #include <fstream>
 #include <chrono>
 #include <mutex>
-#include "../includes.hpp"
-#include "../helpers/MiscFunctions.hpp"
 
 #define LOGMESSAGESIZE   1024
 #define ROLLING_LOG_SIZE 4096

src/defines.hpp

@@ -1,3 +1,5 @@
+#pragma once
+
 #include "includes.hpp"
 #include "debug/Log.hpp"
 #include "helpers/Color.hpp"

src/desktop/DesktopTypes.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "../macros.hpp"
+#include "helpers/memory/Memory.hpp"
 class CWorkspace;
 class CWindow;
 class CLayerSurface;

src/desktop/LayerSurface.cpp

@@ -5,6 +5,12 @@
 #include "../protocols/core/Compositor.hpp"
 #include "../managers/SeatManager.hpp"
 #include "../managers/AnimationManager.hpp"
+#include "../render/Renderer.hpp"
+#include "../config/ConfigManager.hpp"
+#include "../helpers/Monitor.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/HookSystemManager.hpp"
+#include "../managers/EventManager.hpp"
 
 PHLLS CLayerSurface::create(SP<CLayerShellResource> resource) {
     PHLLS pLS = SP<CLayerSurface>(new CLayerSurface(resource));

src/desktop/LayerSurface.hpp

@@ -4,7 +4,6 @@
 #include "../defines.hpp"
 #include "WLSurface.hpp"
 #include "../helpers/AnimatedVariable.hpp"
-#include "LayerRule.hpp"
 
 class CLayerShellResource;
 

src/desktop/Popup.cpp

@@ -6,6 +6,10 @@
 #include "../protocols/core/Compositor.hpp"
 #include "../managers/SeatManager.hpp"
 #include "../managers/eventLoop/EventLoopManager.hpp"
+#include "../desktop/LayerSurface.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../render/Renderer.hpp"
+#include "../render/OpenGL.hpp"
 #include <ranges>
 
 CPopup::CPopup(PHLWINDOW pOwner) : m_pWindowOwner(pOwner) {

src/desktop/Subsurface.cpp

@@ -4,6 +4,8 @@
 #include "../config/ConfigValue.hpp"
 #include "../protocols/core/Compositor.hpp"
 #include "../protocols/core/Subcompositor.hpp"
+#include "../render/Renderer.hpp"
+#include "../managers/input/InputManager.hpp"
 
 CSubsurface::CSubsurface(PHLWINDOW pOwner) : m_pWindowParent(pOwner) {
     initSignals();

src/desktop/WLSurface.cpp

@@ -1,7 +1,9 @@
 #include "WLSurface.hpp"
-#include "../Compositor.hpp"
+#include "LayerSurface.hpp"
+#include "../desktop/Window.hpp"
 #include "../protocols/core/Compositor.hpp"
 #include "../protocols/LayerShell.hpp"
+#include "../render/Renderer.hpp"
 
 void CWLSurface::assign(SP<CWLSurfaceResource> pSurface) {
     m_pResource = pSurface;

src/desktop/Window.cpp

@@ -17,6 +17,13 @@
 #include "../protocols/core/Compositor.hpp"
 #include "../xwayland/XWayland.hpp"
 #include "../helpers/Color.hpp"
+#include "../events/Events.hpp"
+#include "../managers/XWaylandManager.hpp"
+#include "../render/Renderer.hpp"
+#include "../managers/LayoutManager.hpp"
+#include "../managers/HookSystemManager.hpp"
+#include "../managers/EventManager.hpp"
+#include "../managers/input/InputManager.hpp"
 
 #include <hyprutils/string/String.hpp>
 

src/desktop/Window.hpp

@@ -4,7 +4,6 @@
 #include <string>
 
 #include "../config/ConfigDataValues.hpp"
-#include "../defines.hpp"
 #include "../helpers/AnimatedVariable.hpp"
 #include "../helpers/math/Math.hpp"
 #include "../helpers/signal/Signal.hpp"
@@ -12,6 +11,7 @@
 #include "../macros.hpp"
 #include "../managers/XWaylandManager.hpp"
 #include "../render/decorations/IHyprWindowDecoration.hpp"
+#include "../render/Transformer.hpp"
 #include "DesktopTypes.hpp"
 #include "Popup.hpp"
 #include "Subsurface.hpp"

src/desktop/Workspace.cpp

@@ -3,6 +3,8 @@
 #include "../config/ConfigValue.hpp"
 #include "config/ConfigManager.hpp"
 #include "managers/AnimationManager.hpp"
+#include "../managers/EventManager.hpp"
+#include "../managers/HookSystemManager.hpp"
 
 #include <hyprutils/animation/AnimatedVariable.hpp>
 #include <hyprutils/string/String.hpp>

src/devices/Keyboard.cpp

@@ -1,6 +1,5 @@
 #include "Keyboard.hpp"
 #include "../defines.hpp"
-#include "../Compositor.hpp"
 
 #include <aquamarine/input/Input.hpp>
 

src/events/Windows.cpp

@@ -14,6 +14,11 @@
 #include "../xwayland/XSurface.hpp"
 #include "managers/AnimationManager.hpp"
 #include "managers/PointerManager.hpp"
+#include "../desktop/LayerSurface.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/LayoutManager.hpp"
+#include "../managers/EventManager.hpp"
+#include "../managers/AnimationManager.hpp"
 
 #include <hyprutils/string/String.hpp>
 using namespace Hyprutils::String;

src/helpers/Color.hpp

@@ -2,7 +2,6 @@
 
 #include <cstdint>
 #include <hyprgraphics/color/Color.hpp>
-#include "../debug/Log.hpp"
 #include "../macros.hpp"
 
 class CHyprColor {

src/helpers/MiscFunctions.cpp

@@ -3,6 +3,8 @@
 #include <algorithm>
 #include "../Compositor.hpp"
 #include "../managers/TokenManager.hpp"
+#include "Monitor.hpp"
+#include "../config/ConfigManager.hpp"
 #include <optional>
 #include <cstring>
 #include <cmath>

src/helpers/MiscFunctions.hpp

@@ -1,9 +1,7 @@
 #pragma once
 
 #include <optional>
-#include <string>
 #include <wayland-server.h>
-#include "math/Math.hpp"
 #include <vector>
 #include <format>
 #include <expected>

src/helpers/Monitor.cpp

@@ -17,9 +17,15 @@
 #include "../managers/PointerManager.hpp"
 #include "../managers/eventLoop/EventLoopManager.hpp"
 #include "../protocols/core/Compositor.hpp"
+#include "../render/Renderer.hpp"
+#include "../managers/EventManager.hpp"
+#include "../managers/LayoutManager.hpp"
+#include "../managers/input/InputManager.hpp"
 #include "sync/SyncTimeline.hpp"
+#include "../desktop/LayerSurface.hpp"
 #include <aquamarine/output/Output.hpp>
 #include "debug/Log.hpp"
+#include "debug/HyprNotificationOverlay.hpp"
 #include <hyprutils/string/String.hpp>
 #include <hyprutils/utils/ScopeGuard.hpp>
 #include <cstring>

src/helpers/Monitor.hpp

@@ -4,6 +4,7 @@
 #include <stack>
 #include <vector>
 #include "../SharedDefs.hpp"
+#include "MiscFunctions.hpp"
 #include "WLClasses.hpp"
 #include <vector>
 #include <array>

src/helpers/WLClasses.hpp

@@ -1,13 +1,13 @@
 #pragma once
 
-#include "../events/Events.hpp"
 #include "../defines.hpp"
-#include "../desktop/Window.hpp"
 #include "../desktop/Subsurface.hpp"
 #include "../desktop/Popup.hpp"
 #include "../desktop/WLSurface.hpp"
+#include "macros.hpp"
+#include "desktop/DesktopTypes.hpp"
+#include "helpers/memory/Memory.hpp"
 #include "signal/Signal.hpp"
-#include "math/Math.hpp"
 
 class CMonitor;
 class IPointer;

src/hyprerror/HyprError.cpp

@@ -4,6 +4,8 @@
 #include "../config/ConfigValue.hpp"
 #include "../render/pass/TexPassElement.hpp"
 #include "../managers/AnimationManager.hpp"
+#include "../render/Renderer.hpp"
+#include "../managers/HookSystemManager.hpp"
 
 #include <hyprutils/utils/ScopeGuard.hpp>
 using namespace Hyprutils::Animation;

src/layout/DwindleLayout.cpp

@@ -2,6 +2,10 @@
 #include "../Compositor.hpp"
 #include "../config/ConfigValue.hpp"
 #include "../render/decorations/CHyprGroupBarDecoration.hpp"
+#include "../render/Renderer.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/LayoutManager.hpp"
+#include "../managers/EventManager.hpp"
 
 void SDwindleNodeData::recalcSizePosRecursive(bool force, bool horizontalOverride, bool verticalOverride) {
     if (children[0]) {

src/layout/IHyprLayout.cpp

@@ -7,6 +7,11 @@
 #include "../protocols/XDGShell.hpp"
 #include "../protocols/core/Compositor.hpp"
 #include "../xwayland/XSurface.hpp"
+#include "../render/Renderer.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/LayoutManager.hpp"
+#include "../managers/EventManager.hpp"
+#include "../managers/HookSystemManager.hpp"
 
 void IHyprLayout::onWindowCreated(PHLWINDOW pWindow, eDirection direction) {
     CBox desiredGeometry = {};

src/layout/MasterLayout.cpp

@@ -4,6 +4,10 @@
 #include "config/ConfigDataValues.hpp"
 #include <ranges>
 #include "../config/ConfigValue.hpp"
+#include "../render/Renderer.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/LayoutManager.hpp"
+#include "../managers/EventManager.hpp"
 
 SMasterNodeData* CHyprMasterLayout::getNodeFromWindow(PHLWINDOW pWindow) {
     for (auto& nd : m_lMasterNodesData) {

src/layout/MasterLayout.hpp

@@ -2,7 +2,7 @@
 
 #include "IHyprLayout.hpp"
 #include "../desktop/DesktopTypes.hpp"
-#include "../config/ConfigManager.hpp"
+#include "../helpers/varlist/VarList.hpp"
 #include <vector>
 #include <list>
 #include <vector>

src/macros.hpp

@@ -6,6 +6,7 @@
 #include <utility>
 
 #include "helpers/memory/Memory.hpp"
+#include "debug/Log.hpp"
 
 #ifndef NDEBUG
 #ifdef HYPRLAND_DEBUG

src/managers/AnimationManager.cpp

@@ -10,6 +10,7 @@
 #include "../desktop/LayerSurface.hpp"
 #include "eventLoop/EventLoopManager.hpp"
 #include "../helpers/varlist/VarList.hpp"
+#include "../render/Renderer.hpp"
 
 #include <hyprgraphics/color/Color.hpp>
 #include <hyprutils/animation/AnimatedVariable.hpp>

src/managers/CursorManager.cpp

@@ -3,6 +3,7 @@
 #include "../config/ConfigValue.hpp"
 #include "PointerManager.hpp"
 #include "../xwayland/XWayland.hpp"
+#include "../managers/HookSystemManager.hpp"
 
 static int cursorAnimTimer(SP<CEventLoopTimer> self, void* data) {
     const auto cursorMgr = reinterpret_cast<CCursorManager*>(data);

src/managers/HookSystemManager.hpp

@@ -57,4 +57,4 @@ class CHookSystemManager {
     std::unordered_map<std::string, std::vector<SCallbackFNPtr>> m_mRegisteredHooks;
 };
 
-inline std::unique_ptr<CHookSystemManager> g_pHookSystem;
+inline std::unique_ptr<CHookSystemManager> g_pHookSystem;

src/managers/KeybindManager.cpp

@@ -13,6 +13,12 @@
 #include "debug/Log.hpp"
 #include "helpers/varlist/VarList.hpp"
 #include "../helpers/signal/Signal.hpp"
+#include "../managers/HookSystemManager.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/LayoutManager.hpp"
+#include "../managers/EventManager.hpp"
+#include "../render/Renderer.hpp"
+#include "../hyprerror/HyprError.hpp"
 
 #include <optional>
 #include <iterator>

src/managers/PointerManager.cpp

@@ -9,6 +9,10 @@
 #include "../protocols/core/Seat.hpp"
 #include "eventLoop/EventLoopManager.hpp"
 #include "../render/pass/TexPassElement.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/HookSystemManager.hpp"
+#include "../render/Renderer.hpp"
+#include "../render/OpenGL.hpp"
 #include "SeatManager.hpp"
 #include <cstring>
 #include <gbm.h>

src/managers/ProtocolManager.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "../defines.hpp"
-#include "../helpers/Monitor.hpp"
 #include "../helpers/memory/Memory.hpp"
 #include "../helpers/signal/Signal.hpp"
 #include <unordered_map>

src/managers/SeatManager.cpp

@@ -6,6 +6,9 @@
 #include "../protocols/core/Compositor.hpp"
 #include "../Compositor.hpp"
 #include "../devices/IKeyboard.hpp"
+#include "../desktop/LayerSurface.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/HookSystemManager.hpp"
 #include "wlr-layer-shell-unstable-v1.hpp"
 #include <algorithm>
 #include <ranges>

src/managers/SeatManager.hpp

@@ -2,7 +2,6 @@
 
 #include <cstdint>
 #include <wayland-server-protocol.h>
-#include "../macros.hpp"
 #include "../helpers/signal/Signal.hpp"
 #include "../helpers/math/Math.hpp"
 #include "../protocols/types/DataDevice.hpp"

src/managers/SessionLockManager.cpp

@@ -4,6 +4,8 @@
 #include "../protocols/FractionalScale.hpp"
 #include "../protocols/SessionLock.hpp"
 #include "../managers/SeatManager.hpp"
+#include "../render/Renderer.hpp"
+#include "../managers/input/InputManager.hpp"
 #include <algorithm>
 #include <ranges>
 
@@ -185,4 +187,4 @@ bool CSessionLockManager::shallConsiderLockMissing() {
     static auto LOCKDEAD_SCREEN_DELAY = CConfigValue<Hyprlang::INT>("misc:lockdead_screen_delay");
 
     return m_pSessionLock->mLockTimer.getMillis() > *LOCKDEAD_SCREEN_DELAY;
-}
+}

src/managers/input/InputManager.cpp

@@ -5,6 +5,7 @@
 #include <ranges>
 #include "../../config/ConfigValue.hpp"
 #include "../../desktop/Window.hpp"
+#include "../../desktop/LayerSurface.hpp"
 #include "../../protocols/CursorShape.hpp"
 #include "../../protocols/IdleInhibit.hpp"
 #include "../../protocols/RelativePointer.hpp"
@@ -29,6 +30,10 @@
 #include "../../managers/PointerManager.hpp"
 #include "../../managers/SeatManager.hpp"
 #include "../../managers/KeybindManager.hpp"
+#include "../../render/Renderer.hpp"
+#include "../../managers/HookSystemManager.hpp"
+#include "../../managers/EventManager.hpp"
+#include "../../managers/LayoutManager.hpp"
 
 #include <aquamarine/input/Input.hpp>
 

src/managers/input/InputMethodPopup.cpp

@@ -4,6 +4,8 @@
 #include "../../protocols/FractionalScale.hpp"
 #include "../../protocols/InputMethodV2.hpp"
 #include "../../protocols/core/Compositor.hpp"
+#include "../../helpers/Monitor.hpp"
+#include "../../render/Renderer.hpp"
 
 CInputPopup::CInputPopup(SP<CInputMethodPopupV2> popup_) : popup(popup_) {
     listeners.commit  = popup_->events.commit.registerListener([this](std::any d) { onCommit(); });

src/managers/input/InputMethodRelay.cpp

@@ -5,6 +5,7 @@
 #include "../../protocols/TextInputV1.hpp"
 #include "../../protocols/InputMethodV2.hpp"
 #include "../../protocols/core/Compositor.hpp"
+#include "../../managers/HookSystemManager.hpp"
 
 CInputMethodRelay::CInputMethodRelay() {
     static auto P =

src/managers/input/Swipe.cpp

@@ -1,6 +1,9 @@
 #include "InputManager.hpp"
 #include "../../Compositor.hpp"
+#include "../../desktop/LayerSurface.hpp"
 #include "../../config/ConfigValue.hpp"
+#include "../../managers/HookSystemManager.hpp"
+#include "../../render/Renderer.hpp"
 
 void CInputManager::onSwipeBegin(IPointer::SSwipeBeginEvent e) {
     static auto PSWIPE           = CConfigValue<Hyprlang::INT>("gestures:workspace_swipe");

src/managers/input/Tablets.cpp

@@ -1,5 +1,5 @@
 #include "InputManager.hpp"
-#include "../../Compositor.hpp"
+#include "../../desktop/Window.hpp"
 #include "../../protocols/Tablet.hpp"
 #include "../../devices/Tablet.hpp"
 #include "../../managers/PointerManager.hpp"

src/managers/input/TextInput.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../macros.hpp"
 #include "../../helpers/math/Math.hpp"
 #include "../../helpers/signal/Signal.hpp"
+#include "../../helpers/memory/Memory.hpp"
 #include <memory>
 
 struct wl_client;

src/managers/input/Touch.cpp

@@ -1,9 +1,11 @@
 #include "InputManager.hpp"
 #include "../../Compositor.hpp"
+#include "../../desktop/LayerSurface.hpp"
 #include "../../config/ConfigValue.hpp"
 #include "../../devices/ITouch.hpp"
 #include "../SeatManager.hpp"
 #include "managers/AnimationManager.hpp"
+#include "../HookSystemManager.hpp"
 
 void CInputManager::onTouchDown(ITouch::SDownEvent e) {
     m_bLastInputTouch = true;

src/plugins/HookSystem.cpp

@@ -2,7 +2,7 @@
 #include "../debug/Log.hpp"
 #include "../helpers/varlist/VarList.hpp"
 #include "../managers/TokenManager.hpp"
-#include "../Compositor.hpp"
+#include "../helpers/MiscFunctions.hpp"
 
 #define register
 #include <udis86.h>
@@ -383,4 +383,4 @@ uint64_t CHookSystem::getAddressForTrampo() {
     Debug::log(LOG, "getAddressForTrampo: Returning addr 0x{:x} for page at 0x{:x}", ADDRFORCONSUMER, page->addr);
 
     return ADDRFORCONSUMER;
-}
+}

src/plugins/PluginAPI.cpp

@@ -1,6 +1,11 @@
 #include "PluginAPI.hpp"
 #include "../Compositor.hpp"
 #include "../debug/HyprCtl.hpp"
+#include "../plugins/PluginSystem.hpp"
+#include "../managers/HookSystemManager.hpp"
+#include "../managers/LayoutManager.hpp"
+#include "../config/ConfigManager.hpp"
+#include "../debug/HyprNotificationOverlay.hpp"
 #include <dlfcn.h>
 #include <filesystem>
 

src/plugins/PluginSystem.cpp

@@ -2,7 +2,9 @@
 
 #include <dlfcn.h>
 #include <ranges>
-#include "../Compositor.hpp"
+#include "../config/ConfigManager.hpp"
+#include "../managers/LayoutManager.hpp"
+#include "../managers/HookSystemManager.hpp"
 
 CPluginSystem::CPluginSystem() {
     g_pFunctionHookSystem = std::make_unique<CHookSystem>();

src/protocols/CTMControl.cpp

@@ -4,6 +4,7 @@
 #include "core/Output.hpp"
 #include "../config/ConfigValue.hpp"
 #include "managers/AnimationManager.hpp"
+#include "../helpers/Monitor.hpp"
 
 CHyprlandCTMControlResource::CHyprlandCTMControlResource(SP<CHyprlandCtmControlManagerV1> resource_) : resource(resource_) {
     if (!good())

src/protocols/DRMLease.cpp

@@ -1,5 +1,6 @@
 #include "DRMLease.hpp"
 #include "../Compositor.hpp"
+#include "../helpers/Monitor.hpp"
 #include "managers/eventLoop/EventLoopManager.hpp"
 #include <aquamarine/backend/DRM.hpp>
 #include <fcntl.h>

src/protocols/ForeignToplevel.cpp

@@ -1,5 +1,6 @@
 #include "ForeignToplevel.hpp"
 #include "../Compositor.hpp"
+#include "../managers/HookSystemManager.hpp"
 
 CForeignToplevelHandle::CForeignToplevelHandle(SP<CExtForeignToplevelHandleV1> resource_, PHLWINDOW pWindow_) : resource(resource_), pWindow(pWindow_) {
     if (!resource_->resource())

src/protocols/ForeignToplevelWlr.cpp

@@ -3,6 +3,7 @@
 #include "../Compositor.hpp"
 #include "protocols/core/Output.hpp"
 #include "render/Renderer.hpp"
+#include "../managers/HookSystemManager.hpp"
 
 CForeignToplevelHandleWlr::CForeignToplevelHandleWlr(SP<CZwlrForeignToplevelHandleV1> resource_, PHLWINDOW pWindow_) : resource(resource_), pWindow(pWindow_) {
     if (!resource_->resource())

src/protocols/GammaControl.cpp

@@ -2,8 +2,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include "../helpers/Monitor.hpp"
-#include "../Compositor.hpp"
 #include "../protocols/core/Output.hpp"
+#include "../render/Renderer.hpp"
 
 CGammaControl::CGammaControl(SP<CZwlrGammaControlV1> resource_, wl_resource* output) : resource(resource_) {
     if (!resource_->resource())

src/protocols/GlobalShortcuts.cpp

@@ -1,5 +1,4 @@
 #include "GlobalShortcuts.hpp"
-#include "../Compositor.hpp"
 
 CShortcutClient::CShortcutClient(SP<CHyprlandGlobalShortcutsManagerV1> resource_) : resource(resource_) {
     if (!good())

src/protocols/LayerShell.cpp

@@ -1,8 +1,10 @@
 #include "LayerShell.hpp"
 #include "../Compositor.hpp"
+#include "../desktop/LayerSurface.hpp"
 #include "XDGShell.hpp"
 #include "core/Compositor.hpp"
 #include "core/Output.hpp"
+#include "../helpers/Monitor.hpp"
 
 void CLayerShellResource::SState::reset() {
     anchor        = 0;

src/protocols/MesaDRM.cpp

@@ -3,6 +3,7 @@
 #include <xf86drm.h>
 #include "../Compositor.hpp"
 #include "types/WLBuffer.hpp"
+#include "../render/OpenGL.hpp"
 
 CMesaDRMBufferResource::CMesaDRMBufferResource(uint32_t id, wl_client* client, Aquamarine::SDMABUFAttrs attrs_) {
     LOGM(LOG, "Creating a Mesa dmabuf, with id {}: size {}, fmt {}, planes {}", id, attrs_.size, attrs_.format, attrs_.planes);

src/protocols/OutputManagement.cpp

@@ -1,6 +1,9 @@
 #include "OutputManagement.hpp"
 #include <algorithm>
 #include "../Compositor.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/HookSystemManager.hpp"
+#include "../config/ConfigManager.hpp"
 
 using namespace Aquamarine;
 

src/protocols/OutputPower.cpp

@@ -1,6 +1,6 @@
 #include "OutputPower.hpp"
-#include "../Compositor.hpp"
 #include "core/Output.hpp"
+#include "../helpers/Monitor.hpp"
 
 COutputPower::COutputPower(SP<CZwlrOutputPowerV1> resource_, PHLMONITOR pMonitor_) : resource(resource_), pMonitor(pMonitor_) {
     if (!resource->resource())

src/protocols/PointerConstraints.cpp

@@ -4,6 +4,9 @@
 #include "../config/ConfigValue.hpp"
 #include "../managers/SeatManager.hpp"
 #include "core/Compositor.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../render/Renderer.hpp"
+#include "../helpers/Monitor.hpp"
 
 CPointerConstraint::CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region_, zwpPointerConstraintsV1Lifetime lifetime_) :
     resourceL(resource_), locked(true), lifetime(lifetime_) {

src/protocols/PointerGestures.cpp

@@ -1,5 +1,4 @@
 #include "PointerGestures.hpp"
-#include "../Compositor.hpp"
 #include "../managers/SeatManager.hpp"
 #include "core/Seat.hpp"
 #include "core/Compositor.hpp"

src/protocols/RelativePointer.cpp

@@ -1,5 +1,4 @@
 #include "RelativePointer.hpp"
-#include "../Compositor.hpp"
 #include "../managers/SeatManager.hpp"
 #include "core/Seat.hpp"
 #include <algorithm>
@@ -71,4 +70,4 @@ void CRelativePointerProtocol::sendRelativeMotion(uint64_t time, const Vector2D&
 
         rp->sendRelativeMotion(time, delta, deltaUnaccel);
     }
-}
+}

src/protocols/Screencopy.cpp

@@ -2,6 +2,10 @@
 #include "../Compositor.hpp"
 #include "../managers/eventLoop/EventLoopManager.hpp"
 #include "../managers/PointerManager.hpp"
+#include "../managers/EventManager.hpp"
+#include "../render/Renderer.hpp"
+#include "../render/OpenGL.hpp"
+#include "../helpers/Monitor.hpp"
 #include "core/Output.hpp"
 #include "types/WLBuffer.hpp"
 #include "types/Buffer.hpp"

src/protocols/SessionLock.cpp

@@ -4,6 +4,7 @@
 #include "FractionalScale.hpp"
 #include "core/Compositor.hpp"
 #include "core/Output.hpp"
+#include "../helpers/Monitor.hpp"
 
 CSessionLockSurface::CSessionLockSurface(SP<CExtSessionLockSurfaceV1> resource_, SP<CWLSurfaceResource> surface_, PHLMONITOR pMonitor_, WP<CSessionLock> owner_) :
     resource(resource_), sessionLock(owner_), pSurface(surface_), pMonitor(pMonitor_) {
@@ -208,4 +209,4 @@ void CSessionLockProtocol::onGetLockSurface(CExtSessionLockV1* lock, uint32_t id
 
 bool CSessionLockProtocol::isLocked() {
     return locked;
-}
+}

src/protocols/SinglePixel.cpp

@@ -1,4 +1,5 @@
 #include "SinglePixel.hpp"
+#include "../desktop/LayerSurface.hpp"
 #include <limits>
 #include "render/Renderer.hpp"
 

src/protocols/Tablet.cpp

@@ -2,6 +2,7 @@
 #include "../devices/Tablet.hpp"
 #include "../Compositor.hpp"
 #include "../managers/SeatManager.hpp"
+#include "../managers/input/InputManager.hpp"
 #include "core/Seat.hpp"
 #include "core/Compositor.hpp"
 #include <algorithm>

src/protocols/TearingControl.cpp

@@ -3,6 +3,7 @@
 #include "../desktop/Window.hpp"
 #include "../Compositor.hpp"
 #include "core/Compositor.hpp"
+#include "../managers/HookSystemManager.hpp"
 
 CTearingControlProtocol::CTearingControlProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) {
     static auto P =

src/protocols/TextInputV1.cpp

@@ -1,6 +1,5 @@
 #include "TextInputV1.hpp"
 
-#include "../Compositor.hpp"
 #include "core/Compositor.hpp"
 
 CTextInputV1::~CTextInputV1() {

src/protocols/ToplevelExport.cpp

@@ -6,6 +6,9 @@
 #include "types/WLBuffer.hpp"
 #include "types/Buffer.hpp"
 #include "../helpers/Format.hpp"
+#include "../managers/EventManager.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../render/Renderer.hpp"
 
 #include <algorithm>
 

src/protocols/XDGOutput.cpp

@@ -1,7 +1,7 @@
 #include "XDGOutput.hpp"
-#include "../Compositor.hpp"
 #include "../config/ConfigValue.hpp"
 #include "../xwayland/XWayland.hpp"
+#include "../managers/HookSystemManager.hpp"
 #include "core/Output.hpp"
 
 #define OUTPUT_MANAGER_VERSION                   3
@@ -119,4 +119,4 @@ void CXDGOutput::sendDetails() {
 
     if (resource->version() < OUTPUT_DONE_DEPRECATED_SINCE_VERSION)
         resource->sendDone();
-}
+}

src/protocols/XDGShell.cpp

@@ -3,6 +3,7 @@
 #include <algorithm>
 #include "../Compositor.hpp"
 #include "../managers/SeatManager.hpp"
+#include "../helpers/Monitor.hpp"
 #include "core/Seat.hpp"
 #include "core/Compositor.hpp"
 #include "protocols/core/Output.hpp"

src/protocols/core/DataDevice.cpp

@@ -9,6 +9,10 @@
 #include "Compositor.hpp"
 #include "../../xwayland/XWayland.hpp"
 #include "../../xwayland/Server.hpp"
+#include "../../managers/input/InputManager.hpp"
+#include "../../managers/HookSystemManager.hpp"
+#include "../../helpers/Monitor.hpp"
+#include "../../render/Renderer.hpp"
 
 CWLDataOfferResource::CWLDataOfferResource(SP<CWlDataOffer> resource_, SP<IDataSource> source_) : source(source_), resource(resource_) {
     if (!good())

src/protocols/core/Shm.cpp

@@ -5,8 +5,8 @@
 #include <drm_fourcc.h>
 #include "../../render/Texture.hpp"
 #include "../types/WLBuffer.hpp"
-#include "../../Compositor.hpp"
 #include "../../helpers/Format.hpp"
+#include "../../render/Renderer.hpp"
 
 CWLSHMBuffer::CWLSHMBuffer(SP<CWLSHMPoolResource> pool_, uint32_t id, int32_t offset_, const Vector2D& size_, int32_t stride_, uint32_t fmt_) {
     if (!pool_->pool->data)

src/protocols/types/DMABuffer.cpp

@@ -1,5 +1,6 @@
 #include "DMABuffer.hpp"
 #include "WLBuffer.hpp"
+#include "../../desktop/LayerSurface.hpp"
 #include "../../render/Renderer.hpp"
 #include "../../helpers/Format.hpp"
 

src/protocols/types/WLBuffer.cpp

@@ -3,7 +3,6 @@
 #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_) {

src/render/OpenGL.cpp

@@ -2,12 +2,15 @@
 #include <pango/pangocairo.h>
 #include "Shaders.hpp"
 #include "OpenGL.hpp"
+#include "Renderer.hpp"
 #include "../Compositor.hpp"
 #include "../helpers/MiscFunctions.hpp"
 #include "../config/ConfigValue.hpp"
 #include "../desktop/LayerSurface.hpp"
 #include "../protocols/LayerShell.hpp"
 #include "../protocols/core/Compositor.hpp"
+#include "../managers/HookSystemManager.hpp"
+#include "../managers/input/InputManager.hpp"
 #include "pass/TexPassElement.hpp"
 #include "pass/RectPassElement.hpp"
 #include "pass/PreBlurElement.hpp"

src/render/OpenGL.hpp

@@ -17,7 +17,6 @@
 #include "Shader.hpp"
 #include "Texture.hpp"
 #include "Framebuffer.hpp"
-#include "Transformer.hpp"
 #include "Renderbuffer.hpp"
 #include "pass/Pass.hpp"
 

src/render/Renderbuffer.cpp

@@ -1,4 +1,5 @@
 #include "Renderbuffer.hpp"
+#include "Renderer.hpp"
 #include "OpenGL.hpp"
 #include "../Compositor.hpp"
 #include "../protocols/types/Buffer.hpp"
@@ -76,4 +77,4 @@ void CRenderbuffer::unbind() {
 
 CFramebuffer* CRenderbuffer::getFB() {
     return &m_sFramebuffer;
-}
+}

src/render/Renderer.cpp

@@ -8,6 +8,10 @@
 #include "../config/ConfigValue.hpp"
 #include "../managers/CursorManager.hpp"
 #include "../managers/PointerManager.hpp"
+#include "../managers/input/InputManager.hpp"
+#include "../managers/HookSystemManager.hpp"
+#include "../managers/AnimationManager.hpp"
+#include "../managers/LayoutManager.hpp"
 #include "../desktop/Window.hpp"
 #include "../desktop/LayerSurface.hpp"
 #include "../protocols/SessionLock.hpp"
@@ -19,6 +23,9 @@
 #include "../protocols/DRMSyncobj.hpp"
 #include "../protocols/LinuxDMABUF.hpp"
 #include "../helpers/sync/SyncTimeline.hpp"
+#include "../hyprerror/HyprError.hpp"
+#include "../debug/HyprDebugOverlay.hpp"
+#include "../debug/HyprNotificationOverlay.hpp"
 #include "pass/TexPassElement.hpp"
 #include "pass/ClearPassElement.hpp"
 #include "pass/RectPassElement.hpp"

src/render/Renderer.hpp

@@ -3,6 +3,7 @@
 #include "../defines.hpp"
 #include <list>
 #include "../helpers/Monitor.hpp"
+#include "../desktop/LayerSurface.hpp"
 #include "OpenGL.hpp"
 #include "Renderbuffer.hpp"
 #include "../helpers/Timer.hpp"

src/render/decorations/CHyprBorderDecoration.cpp

@@ -3,6 +3,8 @@
 #include "../../config/ConfigValue.hpp"
 #include "../../managers/eventLoop/EventLoopManager.hpp"
 #include "../pass/BorderPassElement.hpp"
+#include "../Renderer.hpp"
+#include "../../managers/HookSystemManager.hpp"
 
 CHyprBorderDecoration::CHyprBorderDecoration(PHLWINDOW pWindow) : IHyprWindowDecoration(pWindow), m_pWindow(pWindow) {
     ;

src/render/decorations/CHyprDropShadowDecoration.cpp

@@ -3,6 +3,7 @@
 #include "../../Compositor.hpp"
 #include "../../config/ConfigValue.hpp"
 #include "../pass/ShadowPassElement.hpp"
+#include "../Renderer.hpp"
 
 CHyprDropShadowDecoration::CHyprDropShadowDecoration(PHLWINDOW pWindow) : IHyprWindowDecoration(pWindow), m_pWindow(pWindow) {
     ;

src/render/decorations/CHyprGroupBarDecoration.cpp

@@ -6,6 +6,8 @@
 #include <pango/pangocairo.h>
 #include "../pass/TexPassElement.hpp"
 #include "../pass/RectPassElement.hpp"
+#include "../Renderer.hpp"
+#include "../../managers/input/InputManager.hpp"
 
 // shared things to conserve VRAM
 static SP<CTexture> m_tGradientActive         = makeShared<CTexture>();

src/render/decorations/DecorationPositioner.cpp

@@ -1,5 +1,7 @@
 #include "DecorationPositioner.hpp"
-#include "../../Compositor.hpp"
+#include "../../desktop/Window.hpp"
+#include "../../managers/HookSystemManager.hpp"
+#include "../../managers/LayoutManager.hpp"
 
 CDecorationPositioner::CDecorationPositioner() {
     static auto P = g_pHookSystem->hookDynamic("closeWindow", [this](void* call, SCallbackInfo& info, std::any data) {

src/render/pass/Pass.cpp

@@ -6,6 +6,7 @@
 #include "../../desktop/WLSurface.hpp"
 #include "../../managers/SeatManager.hpp"
 #include "../../managers/eventLoop/EventLoopManager.hpp"
+#include "../../render/Renderer.hpp"
 #include "../../Compositor.hpp"
 
 bool CRenderPass::empty() const {

src/render/pass/SurfacePassElement.cpp

@@ -1,6 +1,7 @@
 #include "SurfacePassElement.hpp"
 #include "../OpenGL.hpp"
 #include "../../desktop/WLSurface.hpp"
+#include "../../desktop/Window.hpp"
 #include "../../protocols/core/Compositor.hpp"
 #include "../../protocols/DRMSyncobj.hpp"
 #include "../../managers/input/InputManager.hpp"

src/xwayland/XSurface.cpp

@@ -6,7 +6,6 @@
 #ifndef NO_XWAYLAND
 
 #include <ranges>
-#include "../Compositor.hpp"
 
 CXWaylandSurface::CXWaylandSurface(uint32_t xID_, CBox geometry_, bool OR) : xID(xID_), geometry(geometry_), overrideRedirect(OR) {
     xcb_res_query_client_ids_cookie_t client_id_cookie = {0};

src/xwayland/XWM.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "../macros.hpp"
 #include "XDataSource.hpp"
 #include "Dnd.hpp"
 #include "../helpers/memory/Memory.hpp"