diff --git a/src/SharedDefs.hpp b/src/SharedDefs.hpp
index 4b1524b3..da7f6938 100644
--- a/src/SharedDefs.hpp
+++ b/src/SharedDefs.hpp
@@ -24,6 +24,14 @@ enum eRenderStage {
     RENDER_POST_WINDOW,  /* After rendering a window (any pass) */
 };
 
+enum eInputType {
+    INPUT_TYPE_AXIS = 0,
+    INPUT_TYPE_BUTTON,
+    INPUT_TYPE_DRAG_START,
+    INPUT_TYPE_DRAG_END,
+    INPUT_TYPE_MOTION
+};
+
 struct SCallbackInfo {
     bool cancelled = false; /* on cancellable events, will cancel the event. */
 };
diff --git a/src/managers/input/InputManager.hpp b/src/managers/input/InputManager.hpp
index 2b948bb4..5fa5824e 100644
--- a/src/managers/input/InputManager.hpp
+++ b/src/managers/input/InputManager.hpp
@@ -32,14 +32,6 @@ enum eBorderIconDirection {
     BORDERICON_DOWN_RIGHT,
 };
 
-enum eInputType {
-    INPUT_TYPE_AXIS = 0,
-    INPUT_TYPE_BUTTON,
-    INPUT_TYPE_DRAG_START,
-    INPUT_TYPE_DRAG_END,
-    INPUT_TYPE_MOTION
-};
-
 struct STouchData {
     CWindow*       touchFocusWindow  = nullptr;
     SLayerSurface* touchFocusLS      = nullptr;
diff --git a/src/render/Renderer.hpp b/src/render/Renderer.hpp
index e236c54a..bc914558 100644
--- a/src/render/Renderer.hpp
+++ b/src/render/Renderer.hpp
@@ -76,13 +76,13 @@ class CHyprRenderer {
     bool      beginRender(CMonitor* pMonitor, CRegion& damage, eRenderMode mode = RENDER_MODE_NORMAL, wlr_buffer* buffer = nullptr, CFramebuffer* fb = nullptr);
     void      endRender();
 
-    bool      m_bBlockSurfaceFeedback      = false;
-    bool      m_bRenderingSnapshot         = false;
-    CWindow*  m_pLastScanout               = nullptr;
-    CMonitor* m_pMostHzMonitor             = nullptr;
-    bool      m_bDirectScanoutBlocked      = false;
-    bool      m_bSoftwareCursorsLocked     = false;
-    bool      m_bTearingEnvSatisfied       = false;
+    bool      m_bBlockSurfaceFeedback  = false;
+    bool      m_bRenderingSnapshot     = false;
+    CWindow*  m_pLastScanout           = nullptr;
+    CMonitor* m_pMostHzMonitor         = nullptr;
+    bool      m_bDirectScanoutBlocked  = false;
+    bool      m_bSoftwareCursorsLocked = false;
+    bool      m_bTearingEnvSatisfied   = false;
 
     DAMAGETRACKINGMODES
     damageTrackingModeFromStr(const std::string&);
diff --git a/src/render/decorations/IHyprWindowDecoration.hpp b/src/render/decorations/IHyprWindowDecoration.hpp
index b457adf4..d3d1a5dd 100644
--- a/src/render/decorations/IHyprWindowDecoration.hpp
+++ b/src/render/decorations/IHyprWindowDecoration.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <any>
 #include "../../defines.hpp"
 #include "../../helpers/Region.hpp"
-#include "../../managers/input/InputManager.hpp"
 #include "DecorationPositioner.hpp"
 
 enum eDecorationType {