diff --git a/Editor/src/ComponentsPanel/NavMeshVolumePanel.h b/Editor/src/ComponentsPanel/NavMeshVolumePanel.h
index 9fe7fae7..b6c8e878 100644
--- a/Editor/src/ComponentsPanel/NavMeshVolumePanel.h
+++ b/Editor/src/ComponentsPanel/NavMeshVolumePanel.h
@@ -3,6 +3,8 @@
 
 #include <src/Scene/Entities/ImGuiHelper.h>
 #include <src/Scene/Components/NavMeshVolumeComponent.h>
+#include "src/AI/NavManager.h"
+#include "src/Scene/Components/QuakeMap.h"
 #include <src/Core/Maths.h>
 #include <src/AI/RecastConfig.h>
 
@@ -384,4 +386,4 @@ public:
         }
         EndComponentTable();
     }
-};
\ No newline at end of file
+};
diff --git a/Editor/src/Misc/GizmoDrawer.cpp b/Editor/src/Misc/GizmoDrawer.cpp
index e8aaadea..8571bdd1 100644
--- a/Editor/src/Misc/GizmoDrawer.cpp
+++ b/Editor/src/Misc/GizmoDrawer.cpp
@@ -8,6 +8,7 @@
 #include <src/Scene/Components/SphereCollider.h>
 #include <src/Scene/Components/CharacterControllerComponent.h>
 #include <src/Scene/Components/BoxCollider.h>
+#include "src/Scene/Components/RigidbodyComponent.h"
 
 #include <src/Resource/ModelLoader.h>
 #include <src/Rendering/RenderList.h>
@@ -26,7 +27,6 @@
 #include <DetourDebugDraw.h>
 #include <src/Scene/Components/BSPBrushComponent.h>
 
-
 GizmoDrawer::GizmoDrawer(EditorInterface* editor)
 {
 	m_LineShader = Nuake::ShaderManager::GetShader("Resources/Shaders/line.shader");
diff --git a/Editor/src/Windows/EditorSelectionPanel.cpp b/Editor/src/Windows/EditorSelectionPanel.cpp
index 0e66433d..c4f35310 100644
--- a/Editor/src/Windows/EditorSelectionPanel.cpp
+++ b/Editor/src/Windows/EditorSelectionPanel.cpp
@@ -4,6 +4,7 @@
 #include "../Misc/ImGuiTextHelper.h"
 #include <src/Scene/Components.h>
 #include "src/Scene/Components/FieldTypes.h"
+#include "../ComponentsPanel/MaterialEditor.h"
 
 #include <src/Rendering/Textures/Material.h>
 #include <src/Resource/ResourceLoader.h>
diff --git a/Editor/src/Windows/EditorSelectionPanel.h b/Editor/src/Windows/EditorSelectionPanel.h
index 8788ff56..3594f801 100644
--- a/Editor/src/Windows/EditorSelectionPanel.h
+++ b/Editor/src/Windows/EditorSelectionPanel.h
@@ -13,7 +13,6 @@
 #include "../ComponentsPanel/BoxColliderPanel.h"
 #include "../ComponentsPanel/CapsuleColliderPanel.h"
 #include "../ComponentsPanel/CylinderColliderPanel.h"
-#include "../ComponentsPanel/SphereColliderPanel.h"
 #include "../ComponentsPanel/MeshColliderPanel.h"
 #include "../ComponentsPanel/CharacterControllerPanel.h"
 #include "../ComponentsPanel/BonePanel.h"