diff --git a/drivers/gles3/environment/fog.cpp b/drivers/gles3/environment/fog.cpp
index 40152c0f18..7435f3a5c7 100644
--- a/drivers/gles3/environment/fog.cpp
+++ b/drivers/gles3/environment/fog.cpp
@@ -32,6 +32,9 @@
 
 #ifdef GLES3_ENABLED
 
+#include "core/math/aabb.h"
+#include "core/templates/rid.h"
+
 using namespace GLES3;
 
 /* FOG */
diff --git a/drivers/gles3/environment/gi.cpp b/drivers/gles3/environment/gi.cpp
index b18fb172cc..6b6d774ca4 100644
--- a/drivers/gles3/environment/gi.cpp
+++ b/drivers/gles3/environment/gi.cpp
@@ -32,6 +32,12 @@
 
 #ifdef GLES3_ENABLED
 
+#include "core/math/aabb.h"
+#include "core/math/transform_3d.h"
+#include "core/math/vector3i.h"
+#include "core/templates/rid.h"
+#include "core/templates/vector.h"
+
 using namespace GLES3;
 
 /* VOXEL GI API */
diff --git a/servers/rendering/dummy/rasterizer_dummy.h b/servers/rendering/dummy/rasterizer_dummy.h
index e95871510b..e800f40bd7 100644
--- a/servers/rendering/dummy/rasterizer_dummy.h
+++ b/servers/rendering/dummy/rasterizer_dummy.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "servers/display/display_server.h"
 #include "servers/rendering/dummy/environment/fog.h"
 #include "servers/rendering/dummy/environment/gi.h"
 #include "servers/rendering/dummy/rasterizer_canvas_dummy.h"
@@ -41,6 +42,7 @@
 #include "servers/rendering/dummy/storage/texture_storage.h"
 #include "servers/rendering/dummy/storage/utilities.h"
 #include "servers/rendering/renderer_compositor.h"
+#include "servers/rendering/rendering_server_enums.h"
 
 class RasterizerDummy : public RendererCompositor {
 private:
diff --git a/servers/rendering/dummy/rasterizer_scene_dummy.h b/servers/rendering/dummy/rasterizer_scene_dummy.h
index 02f74f72dc..bfc74bea80 100644
--- a/servers/rendering/dummy/rasterizer_scene_dummy.h
+++ b/servers/rendering/dummy/rasterizer_scene_dummy.h
@@ -31,9 +31,9 @@
 #pragma once
 
 #include "core/templates/paged_allocator.h"
+#include "servers/rendering/dummy/storage/utilities.h"
 #include "servers/rendering/renderer_scene_render.h"
 #include "servers/rendering/rendering_server_globals.h"
-#include "storage/utilities.h"
 
 class RasterizerSceneDummy : public RendererSceneRender {
 public:
diff --git a/servers/rendering/dummy/storage/material_storage.h b/servers/rendering/dummy/storage/material_storage.h
index 46ac7b1bd5..3d7e5a9cc9 100644
--- a/servers/rendering/dummy/storage/material_storage.h
+++ b/servers/rendering/dummy/storage/material_storage.h
@@ -35,7 +35,8 @@
 #include "servers/rendering/shader_compiler.h"
 #include "servers/rendering/shader_language.h"
 #include "servers/rendering/storage/material_storage.h"
-#include "servers/rendering/storage/utilities.h"
+
+class DependencyTracker;
 
 namespace RendererDummy {
 
diff --git a/servers/rendering/dummy/storage/utilities.cpp b/servers/rendering/dummy/storage/utilities.cpp
index 2d6babec51..a4c114c3be 100644
--- a/servers/rendering/dummy/storage/utilities.cpp
+++ b/servers/rendering/dummy/storage/utilities.cpp
@@ -30,10 +30,10 @@
 
 #include "utilities.h"
 
-#include "light_storage.h"
-#include "material_storage.h"
-#include "mesh_storage.h"
-#include "texture_storage.h"
+#include "servers/rendering/dummy/storage/light_storage.h"
+#include "servers/rendering/dummy/storage/material_storage.h"
+#include "servers/rendering/dummy/storage/mesh_storage.h"
+#include "servers/rendering/dummy/storage/texture_storage.h"
 
 using namespace RendererDummy;
 
diff --git a/servers/rendering/environment/renderer_fog.h b/servers/rendering/environment/renderer_fog.h
index 334e562990..693cfcbcd4 100644
--- a/servers/rendering/environment/renderer_fog.h
+++ b/servers/rendering/environment/renderer_fog.h
@@ -30,7 +30,11 @@
 
 #pragma once
 
-#include "servers/rendering/rendering_server.h"
+#include "servers/rendering/rendering_server_enums.h"
+
+class RID;
+struct AABB;
+struct Vector3;
 
 class RendererFog {
 public:
diff --git a/servers/rendering/environment/renderer_gi.h b/servers/rendering/environment/renderer_gi.h
index 7f2c21cb1e..972b12e123 100644
--- a/servers/rendering/environment/renderer_gi.h
+++ b/servers/rendering/environment/renderer_gi.h
@@ -30,7 +30,16 @@
 
 #pragma once
 
-#include "servers/rendering/rendering_server.h"
+#include <cstdint>
+
+class RID;
+struct AABB;
+struct Transform3D;
+struct Vector3;
+struct Vector3i;
+
+template <typename T>
+class Vector;
 
 class RendererGI {
 public:
diff --git a/servers/rendering/renderer_canvas_cull.h b/servers/rendering/renderer_canvas_cull.h
index 401e1acb29..7fad91fc24 100644
--- a/servers/rendering/renderer_canvas_cull.h
+++ b/servers/rendering/renderer_canvas_cull.h
@@ -31,10 +31,10 @@
 #pragma once
 
 #include "core/templates/paged_allocator.h"
-#include "renderer_compositor.h"
-#include "renderer_viewport.h"
 #include "servers/rendering/instance_uniforms.h"
-#include "servers/rendering/rendering_server.h"
+#include "servers/rendering/renderer_canvas_render.h"
+#include "servers/rendering/renderer_compositor.h"
+#include "servers/rendering/renderer_viewport.h"
 #include "servers/rendering/rendering_server_enums.h"
 
 class RendererCanvasCull {
diff --git a/servers/rendering/renderer_canvas_render.cpp b/servers/rendering/renderer_canvas_render.cpp
index 6eb7bab9c9..a6ad263d1d 100644
--- a/servers/rendering/renderer_canvas_render.cpp
+++ b/servers/rendering/renderer_canvas_render.cpp
@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "renderer_canvas_render.h"
+
 #include "servers/rendering/rendering_server_globals.h"
 
 RendererCanvasRender *RendererCanvasRender::singleton = nullptr;
diff --git a/servers/rendering/renderer_canvas_render.h b/servers/rendering/renderer_canvas_render.h
index 2db15b10a1..a810dcc725 100644
--- a/servers/rendering/renderer_canvas_render.h
+++ b/servers/rendering/renderer_canvas_render.h
@@ -31,9 +31,10 @@
 #pragma once
 
 #include "servers/rendering/rendering_method.h"
-#include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_enums.h"
 
+class RenderingServer;
+
 class RendererCanvasRender {
 public:
 	static RendererCanvasRender *singleton;
diff --git a/servers/rendering/renderer_compositor.h b/servers/rendering/renderer_compositor.h
index 78091ff309..964af9384a 100644
--- a/servers/rendering/renderer_compositor.h
+++ b/servers/rendering/renderer_compositor.h
@@ -30,17 +30,24 @@
 
 #pragma once
 
-#include "servers/rendering/environment/renderer_fog.h"
-#include "servers/rendering/environment/renderer_gi.h"
-#include "servers/rendering/renderer_canvas_render.h"
-#include "servers/rendering/renderer_scene_render.h"
+#include "servers/display/display_server.h"
+#include "servers/rendering/rendering_server_enums.h"
 #include "servers/rendering/rendering_server_types.h"
-#include "servers/rendering/storage/light_storage.h"
-#include "servers/rendering/storage/material_storage.h"
-#include "servers/rendering/storage/mesh_storage.h"
-#include "servers/rendering/storage/particles_storage.h"
-#include "servers/rendering/storage/texture_storage.h"
-#include "servers/rendering/storage/utilities.h"
+
+class RendererCanvasRender;
+class RendererSceneRender;
+
+class RendererFog;
+class RendererGI;
+class RendererLightStorage;
+class RendererMaterialStorage;
+class RendererMeshStorage;
+class RendererParticlesStorage;
+class RendererTextureStorage;
+class RendererUtilities;
+
+class Image;
+struct Color;
 
 class RendererCompositor {
 private:
diff --git a/servers/rendering/renderer_scene_render.cpp b/servers/rendering/renderer_scene_render.cpp
index fec5740ea3..597d520c07 100644
--- a/servers/rendering/renderer_scene_render.cpp
+++ b/servers/rendering/renderer_scene_render.cpp
@@ -30,6 +30,8 @@
 
 #include "renderer_scene_render.h"
 
+#include "core/variant/typed_array.h"
+
 /////////////////////////////////////////////////////////////////////////////
 // CameraData
 
diff --git a/servers/rendering/rendering_method.h b/servers/rendering/rendering_method.h
index c81a90e277..4e33fab912 100644
--- a/servers/rendering/rendering_method.h
+++ b/servers/rendering/rendering_method.h
@@ -30,9 +30,8 @@
 
 #pragma once
 
-#include "servers/rendering/rendering_server.h"
+#include "core/variant/variant.h"
 #include "servers/rendering/rendering_server_enums.h"
-#include "servers/rendering/storage/render_scene_buffers.h"
 
 #ifdef XR_DISABLED
 // RendererSceneCull::render_camera is empty when XR is disabled, but
@@ -42,6 +41,9 @@
 class XRInterface;
 #endif // XR_DISABLED
 
+class Image;
+class RenderSceneBuffers;
+
 class RenderingMethod {
 public:
 	virtual RID camera_allocate() = 0;