Remove unused headers in servers.

Co-authored-by: bruvzg <[email protected]>

drivers/gles3/environment/fog.h

@@ -33,9 +33,6 @@
 
 #ifdef GLES3_ENABLED
 
-#include "core/templates/local_vector.h"
-#include "core/templates/rid_owner.h"
-#include "core/templates/self_list.h"
 #include "servers/rendering/environment/renderer_fog.h"
 
 namespace GLES3 {

drivers/gles3/environment/gi.h

@@ -33,13 +33,8 @@
 
 #ifdef GLES3_ENABLED
 
-#include "core/templates/local_vector.h"
-#include "core/templates/rid_owner.h"
-#include "core/templates/self_list.h"
 #include "servers/rendering/environment/renderer_gi.h"
 
-#include "platform_gl.h"
-
 namespace GLES3 {
 
 class GI : public RendererGI {

drivers/gles3/storage/light_storage.cpp

@@ -33,7 +33,6 @@
 #include "light_storage.h"
 #include "../rasterizer_gles3.h"
 #include "../rasterizer_scene_gles3.h"
-#include "config.h"
 #include "core/config/project_settings.h"
 #include "texture_storage.h"
 

drivers/gles3/storage/light_storage.h

@@ -38,9 +38,7 @@
 
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
-#include "core/templates/self_list.h"
 #include "drivers/gles3/storage/texture_storage.h"
-#include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/storage/light_storage.h"
 #include "servers/rendering/storage/utilities.h"
 

drivers/gles3/storage/material_storage.h

@@ -33,10 +33,8 @@
 
 #ifdef GLES3_ENABLED
 
-#include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
-#include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/shader_compiler.h"
 #include "servers/rendering/shader_language.h"
 #include "servers/rendering/storage/material_storage.h"

drivers/gles3/storage/particles_storage.h

@@ -33,7 +33,6 @@
 
 #ifdef GLES3_ENABLED
 
-#include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
 #include "drivers/gles3/shaders/particles_copy.glsl.gen.h"

main/main.cpp

@@ -66,6 +66,7 @@
 #include "scene/register_scene_types.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/theme/theme_db.h"
+#include "servers/audio/audio_driver_dummy.h"
 #include "servers/audio_server.h"
 #include "servers/camera_server.h"
 #include "servers/display_server.h"

modules/camera/camera_feed_linux.cpp

@@ -30,6 +30,8 @@
 
 #include "camera_feed_linux.h"
 
+#include "servers/rendering_server.h"
+
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>

platform/ios/keyboard_input_view.mm

@@ -184,7 +184,7 @@
 
 	NSInteger skip = 0;
 	if (substringToDelete != nil) {
-		for (NSInteger i = 0; i < MIN([substringToDelete length], [substringToEnter length]); i++) {
+		for (NSUInteger i = 0; i < MIN([substringToDelete length], [substringToEnter length]); i++) {
 			if ([substringToDelete characterAtIndex:i] == [substringToEnter characterAtIndex:i]) {
 				skip++;
 			} else {

scene/resources/sky.cpp

@@ -30,8 +30,6 @@
 
 #include "sky.h"
 
-#include "core/io/image_loader.h"
-
 void Sky::set_radiance_size(RadianceSize p_size) {
 	ERR_FAIL_INDEX(p_size, RADIANCE_SIZE_MAX);
 

scene/resources/sky.h

@@ -33,7 +33,6 @@
 
 #include "core/os/thread.h"
 #include "scene/resources/material.h"
-#include "scene/resources/texture.h"
 
 class Sky : public Resource {
 	GDCLASS(Sky, Resource);

servers/audio/audio_driver_dummy.cpp

@@ -30,7 +30,6 @@
 
 #include "audio_driver_dummy.h"
 
-#include "core/config/project_settings.h"
 #include "core/os/os.h"
 
 AudioDriverDummy *AudioDriverDummy::singleton = nullptr;

servers/audio/audio_filter_sw.cpp

@@ -30,6 +30,8 @@
 
 #include "audio_filter_sw.h"
 
+#include "core/math/math_funcs.h"
+
 void AudioFilterSW::set_mode(Mode p_mode) {
 	mode = p_mode;
 }

servers/audio/audio_filter_sw.h

@@ -31,7 +31,7 @@
 #ifndef AUDIO_FILTER_SW_H
 #define AUDIO_FILTER_SW_H
 
-#include "core/math/math_funcs.h"
+#include "core/typedefs.h"
 
 class AudioFilterSW {
 public:

servers/audio/audio_rb_resampler.cpp

@@ -29,9 +29,9 @@
 /**************************************************************************/
 
 #include "audio_rb_resampler.h"
-#include "core/math/math_funcs.h"
-#include "core/os/os.h"
-#include "servers/audio_server.h"
+
+#include "core/math/audio_frame.h"
+#include "core/os/memory.h"
 
 int AudioRBResampler::get_channel_count() const {
 	if (!rb) {

servers/audio/audio_rb_resampler.h

@@ -31,10 +31,9 @@
 #ifndef AUDIO_RB_RESAMPLER_H
 #define AUDIO_RB_RESAMPLER_H
 
-#include "core/os/memory.h"
+#include "core/math/audio_frame.h"
 #include "core/templates/safe_refcount.h"
 #include "core/typedefs.h"
-#include "servers/audio_server.h"
 
 struct AudioRBResampler {
 	uint32_t rb_bits;

servers/audio/audio_stream.cpp

@@ -31,7 +31,6 @@
 #include "audio_stream.h"
 
 #include "core/config/project_settings.h"
-#include "core/os/os.h"
 
 void AudioStreamPlayback::start(double p_from_pos) {
 	if (GDVIRTUAL_CALL(_start, p_from_pos)) {

servers/audio/audio_stream.h

@@ -31,10 +31,8 @@
 #ifndef AUDIO_STREAM_H
 #define AUDIO_STREAM_H
 
-#include "core/io/image.h"
 #include "core/io/resource.h"
 #include "scene/property_list_helper.h"
-#include "servers/audio/audio_filter_sw.h"
 #include "servers/audio_server.h"
 
 #include "core/object/gdvirtual.gen.inc"

servers/audio/effects/audio_effect_capture.cpp

@@ -30,6 +30,8 @@
 
 #include "audio_effect_capture.h"
 
+#include "servers/audio_server.h"
+
 bool AudioEffectCapture::can_get_buffer(int p_frames) const {
 	return buffer.data_left() >= p_frames;
 }

servers/audio/effects/audio_effect_capture.h

@@ -31,13 +31,10 @@
 #ifndef AUDIO_EFFECT_CAPTURE_H
 #define AUDIO_EFFECT_CAPTURE_H
 
-#include "core/config/engine.h"
 #include "core/math/audio_frame.h"
 #include "core/object/ref_counted.h"
 #include "core/templates/ring_buffer.h"
-#include "core/templates/vector.h"
 #include "servers/audio/audio_effect.h"
-#include "servers/audio_server.h"
 
 class AudioEffectCapture;
 

servers/audio/effects/audio_effect_phaser.cpp

@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "audio_effect_phaser.h"
-#include "core/math/math_funcs.h"
 #include "servers/audio_server.h"
 
 void AudioEffectPhaserInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {

servers/audio/effects/audio_effect_record.cpp

@@ -30,6 +30,8 @@
 
 #include "audio_effect_record.h"
 
+#include "core/io/marshalls.h"
+
 void AudioEffectRecordInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	if (!is_recording) {
 		for (int i = 0; i < p_frame_count; i++) {

servers/audio/effects/audio_effect_record.h

@@ -31,9 +31,6 @@
 #ifndef AUDIO_EFFECT_RECORD_H
 #define AUDIO_EFFECT_RECORD_H
 
-#include "core/io/file_access.h"
-#include "core/io/marshalls.h"
-#include "core/os/os.h"
 #include "core/os/thread.h"
 #include "scene/resources/audio_stream_wav.h"
 #include "servers/audio/audio_effect.h"

servers/audio/effects/eq_filter.cpp

@@ -31,7 +31,7 @@
 #include "eq_filter.h"
 
 #include "core/error/error_macros.h"
-#include "core/math/math_funcs.h"
+#include "core/math/math_defs.h"
 
 #include <math.h>
 

servers/audio/effects/eq_filter.h

@@ -32,7 +32,6 @@
 #define EQ_FILTER_H
 
 #include "core/templates/vector.h"
-#include "core/typedefs.h"
 
 class EQ {
 public:

servers/audio/effects/reverb_filter.cpp

@@ -30,7 +30,8 @@
 
 #include "reverb_filter.h"
 
-#include "core/math/math_funcs.h"
+#include "core/math/audio_frame.h"
+#include "core/os/memory.h"
 
 #include <math.h>
 

servers/audio/effects/reverb_filter.h

@@ -31,10 +31,6 @@
 #ifndef REVERB_FILTER_H
 #define REVERB_FILTER_H
 
-#include "core/math/audio_frame.h"
-#include "core/os/memory.h"
-#include "core/typedefs.h"
-
 class Reverb {
 public:
 	enum {

servers/audio_server.cpp

@@ -33,15 +33,14 @@
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/error/error_macros.h"
-#include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/math/audio_frame.h"
 #include "core/os/os.h"
 #include "core/string/string_name.h"
 #include "core/templates/pair.h"
-#include "scene/resources/audio_stream_wav.h"
 #include "scene/scene_string_names.h"
 #include "servers/audio/audio_driver_dummy.h"
+#include "servers/audio/audio_stream.h"
 #include "servers/audio/effects/audio_effect_compressor.h"
 
 #include <cstring>

servers/camera/camera_feed.h

@@ -34,7 +34,6 @@
 #include "core/io/image.h"
 #include "core/math/transform_2d.h"
 #include "servers/camera_server.h"
-#include "servers/rendering_server.h"
 
 /**
 	The camera server is a singleton object that gives access to the various

servers/debugger/servers_debugger.cpp

@@ -33,7 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/engine_profiler.h"
-#include "core/io/marshalls.h"
+#include "core/object/script_language.h"
 #include "servers/display_server.h"
 
 #define CHECK_SIZE(arr, expected, what) ERR_FAIL_COND_V_MSG((uint32_t)arr.size() < (uint32_t)(expected), false, String("Malformed ") + what + " message from script debugger, message too short. Expected size: " + itos(expected) + ", actual size: " + itos(arr.size()))

servers/debugger/servers_debugger.h

@@ -31,8 +31,6 @@
 #ifndef SERVERS_DEBUGGER_H
 #define SERVERS_DEBUGGER_H
 
-#include "core/debugger/debugger_marshalls.h"
-
 #include "servers/rendering_server.h"
 
 class ServersDebugger {

servers/display/native_menu.h

@@ -32,8 +32,6 @@
 #define NATIVE_MENU_H
 
 #include "core/input/input.h"
-#include "core/io/resource.h"
-#include "core/os/os.h"
 #include "core/variant/callable.h"
 
 class Texture2D;

servers/extensions/physics_server_2d_extension.h

@@ -34,7 +34,6 @@
 #include "core/extension/ext_wrappers.gen.inc"
 #include "core/object/gdvirtual.gen.inc"
 #include "core/variant/native_ptr.h"
-#include "core/variant/type_info.h"
 #include "core/variant/typed_array.h"
 #include "servers/physics_server_2d.h"
 

servers/extensions/physics_server_3d_extension.h

@@ -34,7 +34,6 @@
 #include "core/extension/ext_wrappers.gen.inc"
 #include "core/object/script_language.h"
 #include "core/variant/native_ptr.h"
-#include "core/variant/type_info.h"
 #include "core/variant/typed_array.h"
 #include "servers/physics_server_3d.h"
 

servers/movie_writer/movie_writer.cpp

@@ -32,6 +32,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/os/time.h"
+#include "servers/audio/audio_driver_dummy.h"
 #include "servers/display_server.h"
 #include "servers/rendering_server.h"
 

servers/movie_writer/movie_writer.h

@@ -33,7 +33,6 @@
 
 #include "core/io/image.h"
 #include "core/templates/local_vector.h"
-#include "servers/audio/audio_driver_dummy.h"
 #include "servers/audio_server.h"
 
 class MovieWriter : public Object {

servers/physics_server_2d.cpp

@@ -31,7 +31,6 @@
 #include "physics_server_2d.h"
 
 #include "core/config/project_settings.h"
-#include "core/string/print_string.h"
 #include "core/variant/typed_array.h"
 
 PhysicsServer2D *PhysicsServer2D::singleton = nullptr;

servers/physics_server_2d_wrap_mt.cpp

@@ -30,8 +30,6 @@
 
 #include "physics_server_2d_wrap_mt.h"
 
-#include "core/os/os.h"
-
 void PhysicsServer2DWrapMT::_assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id) {
 	server_thread = Thread::get_caller_id();
 	server_task_id = p_pump_task_id;

servers/physics_server_2d_wrap_mt.h

@@ -31,11 +31,9 @@
 #ifndef PHYSICS_SERVER_2D_WRAP_MT_H
 #define PHYSICS_SERVER_2D_WRAP_MT_H
 
-#include "core/config/project_settings.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/thread.h"
 #include "core/templates/command_queue_mt.h"
-#include "core/templates/safe_refcount.h"
 #include "servers/physics_server_2d.h"
 
 #ifdef DEBUG_SYNC

servers/physics_server_3d.cpp

@@ -33,7 +33,6 @@
 #include "physics_server_3d.h"
 
 #include "core/config/project_settings.h"
-#include "core/string/print_string.h"
 #include "core/variant/typed_array.h"
 
 void PhysicsServer3DRenderingServerHandler::set_vertex(int p_vertex_id, const Vector3 &p_vertex) {

servers/physics_server_3d.h

@@ -34,9 +34,7 @@
 #ifndef _3D_DISABLED
 
 #include "core/io/resource.h"
-#include "core/object/class_db.h"
 #include "core/object/gdvirtual.gen.inc"
-#include "core/variant/native_ptr.h"
 
 class PhysicsDirectSpaceState3D;
 template <typename T>

servers/physics_server_3d_wrap_mt.cpp

@@ -30,8 +30,6 @@
 
 #include "physics_server_3d_wrap_mt.h"
 
-#include "core/os/os.h"
-
 void PhysicsServer3DWrapMT::_assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id) {
 	server_thread = Thread::get_caller_id();
 	server_task_id = p_pump_task_id;

servers/register_server_types.cpp

@@ -62,7 +62,6 @@
 #include "movie_writer/movie_writer.h"
 #include "movie_writer/movie_writer_mjpeg.h"
 #include "movie_writer/movie_writer_pngwav.h"
-#include "rendering/renderer_compositor.h"
 #include "rendering/renderer_rd/framebuffer_cache_rd.h"
 #include "rendering/renderer_rd/storage_rd/render_data_rd.h"
 #include "rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
@@ -84,7 +83,6 @@
 #include "navigation_server_2d.h"
 #include "physics_server_2d.h"
 #include "physics_server_2d_dummy.h"
-#include "physics_server_2d_wrap_mt.h"
 #include "servers/extensions/physics_server_2d_extension.h"
 
 // 3D physics and navigation (3D navigation is needed for 2D).
@@ -92,7 +90,6 @@
 #ifndef _3D_DISABLED
 #include "physics_server_3d.h"
 #include "physics_server_3d_dummy.h"
-#include "physics_server_3d_wrap_mt.h"
 #include "servers/extensions/physics_server_3d_extension.h"
 #include "xr/xr_body_tracker.h"
 #include "xr/xr_controller_tracker.h"

servers/rendering/dummy/rasterizer_scene_dummy.h

@@ -33,6 +33,7 @@
 
 #include "core/templates/paged_allocator.h"
 #include "servers/rendering/renderer_scene_render.h"
+#include "servers/rendering/rendering_server_globals.h"
 #include "storage/utilities.h"
 
 class RasterizerSceneDummy : public RendererSceneRender {

servers/rendering/dummy/storage/mesh_storage.h

@@ -31,7 +31,6 @@
 #ifndef MESH_STORAGE_DUMMY_H
 #define MESH_STORAGE_DUMMY_H
 
-#include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
 #include "servers/rendering/storage/mesh_storage.h"
 

servers/rendering/dummy/storage/texture_storage.h

@@ -31,7 +31,6 @@
 #ifndef TEXTURE_STORAGE_DUMMY_H
 #define TEXTURE_STORAGE_DUMMY_H
 
-#include "servers/rendering/rendering_server_globals.h"
 #include "servers/rendering/storage/texture_storage.h"
 
 namespace RendererDummy {

servers/rendering/renderer_canvas_render.h

@@ -130,8 +130,6 @@ public:
 
 	//easier wrap to avoid mistakes
 
-	struct Item;
-
 	typedef uint64_t PolygonID;
 	virtual PolygonID request_polygon(const Vector<int> &p_indices, const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs = Vector<Point2>(), const Vector<int> &p_bones = Vector<int>(), const Vector<float> &p_weights = Vector<float>()) = 0;
 	virtual void free_polygon(PolygonID p_polygon) = 0;

servers/rendering/renderer_compositor.h

@@ -34,15 +34,12 @@
 #include "servers/rendering/environment/renderer_fog.h"
 #include "servers/rendering/environment/renderer_gi.h"
 #include "servers/rendering/renderer_canvas_render.h"
-#include "servers/rendering/rendering_method.h"
-#include "servers/rendering/storage/camera_attributes_storage.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"
-#include "servers/rendering_server.h"
 
 class RendererSceneRender;
 struct BlitToScreen {

servers/rendering/renderer_geometry_instance.h

@@ -33,7 +33,6 @@
 
 #include "core/math/rect2.h"
 #include "core/math/transform_3d.h"
-#include "core/math/vector3.h"
 #include "core/templates/rid.h"
 #include "storage/utilities.h"
 

servers/rendering/renderer_rd/effects/bokeh_dof.cpp

@@ -30,10 +30,8 @@
 
 #include "bokeh_dof.h"
 #include "copy_effects.h"
-#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
-#include "servers/rendering/rendering_server_default.h"
 #include "servers/rendering/storage/camera_attributes_storage.h"
 
 using namespace RendererRD;

servers/rendering/renderer_rd/effects/bokeh_dof.h

@@ -34,9 +34,6 @@
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/bokeh_dof.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/bokeh_dof_raster.glsl.gen.h"
-#include "servers/rendering/renderer_scene_render.h"
-
-#include "servers/rendering_server.h"
 
 namespace RendererRD {
 

servers/rendering/renderer_rd/effects/debug_effects.cpp

@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "debug_effects.h"
-#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"

servers/rendering/renderer_rd/effects/debug_effects.h

@@ -34,9 +34,6 @@
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/motion_vectors.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/shadow_frustum.glsl.gen.h"
-#include "servers/rendering/renderer_scene_render.h"
-
-#include "servers/rendering_server.h"
 
 namespace RendererRD {
 

servers/rendering/renderer_rd/effects/fsr.h

@@ -31,11 +31,8 @@
 #ifndef FSR_RD_H
 #define FSR_RD_H
 
-#include "../pipeline_cache_rd.h"
 #include "../storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/fsr_upscale.glsl.gen.h"
-#include "servers/rendering/renderer_scene_render.h"
-#include "servers/rendering_server.h"
 
 namespace RendererRD {
 

servers/rendering/renderer_rd/effects/luminance.h

@@ -35,9 +35,6 @@
 #include "servers/rendering/renderer_rd/shaders/effects/luminance_reduce.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/luminance_reduce_raster.glsl.gen.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
-#include "servers/rendering/renderer_scene_render.h"
-
-#include "servers/rendering_server.h"
 
 #define RB_LUMINANCE_BUFFERS SNAME("luminance_buffers")
 

servers/rendering/renderer_rd/effects/resolve.cpp

@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "resolve.h"
-#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
 

servers/rendering/renderer_rd/effects/resolve.h

@@ -31,11 +31,7 @@
 #ifndef RESOLVE_RD_H
 #define RESOLVE_RD_H
 
-#include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/resolve.glsl.gen.h"
-#include "servers/rendering/renderer_scene_render.h"
-
-#include "servers/rendering_server.h"
 
 namespace RendererRD {
 

servers/rendering/renderer_rd/effects/roughness_limiter.h

@@ -31,11 +31,7 @@
 #ifndef ROUGHNESS_LIMITER_RD_H
 #define ROUGHNESS_LIMITER_RD_H
 
-#include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/roughness_limiter.glsl.gen.h"
-#include "servers/rendering/renderer_scene_render.h"
-
-#include "servers/rendering_server.h"
 
 namespace RendererRD {
 

servers/rendering/renderer_rd/effects/sort_effects.cpp

@@ -30,8 +30,6 @@
 
 #include "sort_effects.h"
 // #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
-#include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
-#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
 
 using namespace RendererRD;
 

servers/rendering/renderer_rd/effects/sort_effects.h

@@ -31,11 +31,7 @@
 #ifndef SORT_EFFECTS_RD_H
 #define SORT_EFFECTS_RD_H
 
-#include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/sort.glsl.gen.h"
-#include "servers/rendering/renderer_scene_render.h"
-
-#include "servers/rendering_server.h"
 
 namespace RendererRD {
 

servers/rendering/renderer_rd/effects/ss_effects.cpp

@@ -31,7 +31,6 @@
 #include "ss_effects.h"
 
 #include "core/config/project_settings.h"
-#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"

servers/rendering/renderer_rd/effects/ss_effects.h

@@ -31,7 +31,6 @@
 #ifndef SS_EFFECTS_RD_H
 #define SS_EFFECTS_RD_H
 
-#include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/screen_space_reflection.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_filter.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_scale.glsl.gen.h"
@@ -45,7 +44,6 @@
 #include "servers/rendering/renderer_rd/shaders/effects/ssil_importance_map.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/ssil_interleave.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/subsurface_scattering.glsl.gen.h"
-#include "servers/rendering/renderer_scene_render.h"
 #include "servers/rendering_server.h"
 
 #define RB_SCOPE_SSDS SNAME("rb_ssds")

servers/rendering/renderer_rd/effects/taa.h

@@ -31,12 +31,8 @@
 #ifndef TAA_RD_H
 #define TAA_RD_H
 
-#include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/taa_resolve.glsl.gen.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
-#include "servers/rendering/renderer_scene_render.h"
-
-#include "servers/rendering_server.h"
 
 namespace RendererRD {
 

servers/rendering/renderer_rd/effects/tone_mapper.h

@@ -33,7 +33,6 @@
 
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/tonemap.glsl.gen.h"
-#include "servers/rendering/renderer_scene_render.h"
 
 #include "servers/rendering_server.h"
 

servers/rendering/renderer_rd/effects/vrs.h

@@ -33,9 +33,6 @@
 
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/vrs.glsl.gen.h"
-#include "servers/rendering/renderer_scene_render.h"
-
-#include "servers/rendering_server.h"
 
 namespace RendererRD {
 

servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp

@@ -30,10 +30,8 @@
 
 #include "render_forward_clustered.h"
 #include "core/config/project_settings.h"
-#include "core/object/worker_thread_pool.h"
-#include "scene/resources/material.h"
+#include "servers/rendering/renderer_rd/environment/fog.h"
 #include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
-#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/mesh_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/particles_storage.h"

servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h

@@ -38,11 +38,8 @@
 #include "servers/rendering/renderer_rd/effects/ss_effects.h"
 #include "servers/rendering/renderer_rd/effects/taa.h"
 #include "servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h"
-#include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/shaders/forward_clustered/best_fit_normal.glsl.gen.h"
-#include "servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl.gen.h"
-#include "servers/rendering/renderer_rd/storage_rd/utilities.h"
 
 #define RB_SCOPE_FORWARD_CLUSTERED SNAME("forward_clustered")
 

servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h

@@ -31,8 +31,8 @@
 #ifndef SCENE_SHADER_FORWARD_CLUSTERED_H
 #define SCENE_SHADER_FORWARD_CLUSTERED_H
 
+#include "../storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/pipeline_hash_map_rd.h"
-#include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl.gen.h"
 
 namespace RendererSceneRenderImplementation {

servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp

@@ -30,7 +30,7 @@
 
 #include "render_forward_mobile.h"
 #include "core/config/project_settings.h"
-#include "core/object/worker_thread_pool.h"
+#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/mesh_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/particles_storage.h"

servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h

@@ -33,9 +33,7 @@
 
 #include "core/templates/paged_allocator.h"
 #include "servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h"
-#include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
-#include "servers/rendering/renderer_rd/storage_rd/utilities.h"
 
 #define RB_SCOPE_MOBILE SNAME("mobile")
 

servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h

@@ -31,8 +31,8 @@
 #ifndef SCENE_SHADER_FORWARD_MOBILE_H
 #define SCENE_SHADER_FORWARD_MOBILE_H
 
+#include "../storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/pipeline_hash_map_rd.h"
-#include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl.gen.h"
 
 namespace RendererSceneRenderImplementation {

servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp

@@ -35,8 +35,8 @@
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/transform_interpolator.h"
-#include "renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
+#include "servers/rendering/renderer_rd/storage_rd/mesh_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/particles_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
 #include "servers/rendering/rendering_server_default.h"

servers/rendering/renderer_rd/renderer_canvas_render_rd.h

@@ -33,8 +33,6 @@
 
 #include "core/templates/lru.h"
 #include "servers/rendering/renderer_canvas_render.h"
-#include "servers/rendering/renderer_compositor.h"
-#include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/pipeline_hash_map_rd.h"
 #include "servers/rendering/renderer_rd/shaders/canvas.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/canvas_occlusion.glsl.gen.h"

servers/rendering/renderer_rd/renderer_compositor_rd.cpp

@@ -33,6 +33,9 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 
+#include "servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h"
+#include "servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h"
+
 void RendererCompositorRD::blit_render_targets_to_screen(DisplayServer::WindowID p_screen, const BlitToScreen *p_render_targets, int p_amount) {
 	Error err = RD::get_singleton()->screen_prepare_for_drawing(p_screen);
 	if (err != OK) {

servers/rendering/renderer_rd/renderer_compositor_rd.h

@@ -32,13 +32,11 @@
 #define RENDERER_COMPOSITOR_RD_H
 
 #include "core/io/image.h"
-#include "core/os/os.h"
 #include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/renderer_rd/environment/fog.h"
-#include "servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h"
-#include "servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h"
 #include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
 #include "servers/rendering/renderer_rd/renderer_canvas_render_rd.h"
+#include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/shaders/blit.glsl.gen.h"
 #include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"

servers/rendering/renderer_rd/renderer_scene_render_rd.cpp

@@ -32,13 +32,11 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/image.h"
-#include "core/os/os.h"
 #include "renderer_compositor_rd.h"
 #include "servers/rendering/renderer_rd/environment/fog.h"
 #include "servers/rendering/renderer_rd/shaders/decal_data_inc.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/light_data_inc.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/scene_data_inc.glsl.gen.h"
-#include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
 #include "servers/rendering/rendering_server_default.h"
 #include "servers/rendering/shader_include_db.h"

servers/rendering/renderer_rd/renderer_scene_render_rd.h

@@ -31,10 +31,7 @@
 #ifndef RENDERER_SCENE_RENDER_RD_H
 #define RENDERER_SCENE_RENDER_RD_H
 
-#include "core/templates/local_vector.h"
-#include "core/templates/rid_owner.h"
 #include "servers/rendering/renderer_compositor.h"
-#include "servers/rendering/renderer_rd/cluster_builder_rd.h"
 #include "servers/rendering/renderer_rd/effects/bokeh_dof.h"
 #include "servers/rendering/renderer_rd/effects/copy_effects.h"
 #include "servers/rendering/renderer_rd/effects/debug_effects.h"
@@ -42,14 +39,11 @@
 #include "servers/rendering/renderer_rd/effects/luminance.h"
 #include "servers/rendering/renderer_rd/effects/tone_mapper.h"
 #include "servers/rendering/renderer_rd/effects/vrs.h"
-#include "servers/rendering/renderer_rd/environment/fog.h"
 #include "servers/rendering/renderer_rd/environment/gi.h"
 #include "servers/rendering/renderer_rd/environment/sky.h"
-#include "servers/rendering/renderer_rd/framebuffer_cache_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_data_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
-#include "servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h"
 #include "servers/rendering/renderer_scene_render.h"
 #include "servers/rendering/rendering_device.h"
 #include "servers/rendering/rendering_method.h"

servers/rendering/renderer_rd/shader_rd.cpp

@@ -30,15 +30,12 @@
 
 #include "shader_rd.h"
 
-#include "core/io/compression.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/version.h"
-#include "renderer_compositor_rd.h"
 #include "servers/rendering/rendering_device.h"
 #include "servers/rendering/shader_include_db.h"
-#include "thirdparty/misc/smolv.h"
 
 #define ENABLE_SHADER_CACHE 1
 

servers/rendering/renderer_rd/shader_rd.h

@@ -35,9 +35,7 @@
 #include "core/string/string_builder.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/local_vector.h"
-#include "core/templates/rb_map.h"
 #include "core/templates/rid_owner.h"
-#include "core/variant/variant.h"
 #include "servers/rendering_server.h"
 
 class ShaderRD {

servers/rendering/renderer_rd/storage_rd/forward_id_storage.h

@@ -31,7 +31,7 @@
 #ifndef FORWARD_ID_STORAGE_H
 #define FORWARD_ID_STORAGE_H
 
-#include "servers/rendering/storage/utilities.h"
+#include <stdint.h>
 
 class RendererSceneRenderRD;
 

servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp

@@ -31,8 +31,6 @@
 #include "render_scene_buffers_rd.h"
 #include "render_scene_buffers_rd.compat.inc"
 
-#include "core/config/project_settings.h"
-#include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
 
 RenderSceneBuffersRD::RenderSceneBuffersRD() {

servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h

@@ -31,15 +31,12 @@
 #ifndef RENDER_SCENE_BUFFERS_RD_H
 #define RENDER_SCENE_BUFFERS_RD_H
 
-#include "../effects/fsr2.h"
 #include "../effects/vrs.h"
-#include "../framebuffer_cache_rd.h"
 #include "core/templates/hash_map.h"
 #include "material_storage.h"
 #include "render_buffer_custom_data_rd.h"
 #include "servers/rendering/rendering_device.h"
 #include "servers/rendering/rendering_device_binds.h"
-#include "servers/rendering/rendering_method.h"
 #include "servers/rendering/storage/render_scene_buffers.h"
 
 #define RB_SCOPE_BUFFERS SNAME("render_buffers")

servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.cpp

@@ -32,7 +32,6 @@
 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/light_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
-#include "servers/rendering/rendering_server_default.h"
 
 Transform3D RenderSceneDataRD::get_cam_transform() const {
 	return cam_transform;

servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h

@@ -31,9 +31,7 @@
 #ifndef RENDER_SCENE_DATA_RD_H
 #define RENDER_SCENE_DATA_RD_H
 
-#include "render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_scene_render.h"
-#include "servers/rendering/rendering_device.h"
 #include "servers/rendering/storage/render_scene_data.h"
 
 // This is a container for data related to rendering a single frame of a viewport where we load this data into a UBO

servers/rendering/renderer_rd/storage_rd/texture_storage.h

@@ -31,7 +31,6 @@
 #ifndef TEXTURE_STORAGE_RD_H
 #define TEXTURE_STORAGE_RD_H
 
-#include "core/templates/local_vector.h"
 #include "core/templates/paged_array.h"
 #include "core/templates/rid_owner.h"
 #include "servers/rendering/renderer_rd/shaders/canvas_sdf.glsl.gen.h"

servers/rendering/renderer_scene_cull.cpp

@@ -32,13 +32,9 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/os.h"
 #include "rendering_light_culler.h"
-#include "rendering_server_constants.h"
 #include "rendering_server_default.h"
 
-#include <new>
-
 #if defined(DEBUG_ENABLED) && defined(TOOLS_ENABLED)
 // This is used only to obtain node paths for user-friendly physics interpolation warnings.
 #include "scene/main/node.h"

servers/rendering/renderer_scene_render.h

@@ -38,7 +38,6 @@
 #include "servers/rendering/storage/compositor_storage.h"
 #include "servers/rendering/storage/environment_storage.h"
 #include "storage/render_scene_buffers.h"
-#include "storage/utilities.h"
 
 class RendererSceneRender {
 private:

servers/rendering/renderer_viewport.h

@@ -31,9 +31,7 @@
 #ifndef RENDERER_VIEWPORT_H
 #define RENDERER_VIEWPORT_H
 
-#include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
-#include "core/templates/self_list.h"
 #include "servers/rendering/renderer_scene_render.h"
 #include "servers/rendering/rendering_method.h"
 #include "servers/rendering_server.h"

servers/rendering/rendering_context_driver.h

@@ -31,7 +31,6 @@
 #ifndef RENDERING_CONTEXT_DRIVER_H
 #define RENDERING_CONTEXT_DRIVER_H
 
-#include "core/object/object.h"
 #include "servers/display_server.h"
 
 class RenderingDeviceDriver;

servers/rendering/rendering_device.h

@@ -31,12 +31,10 @@
 #ifndef RENDERING_DEVICE_H
 #define RENDERING_DEVICE_H
 
-#include "core/object/class_db.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/condition_variable.h"
 #include "core/os/thread_safe.h"
 #include "core/templates/local_vector.h"
-#include "core/templates/oa_hash_map.h"
 #include "core/templates/rid_owner.h"
 #include "core/variant/typed_array.h"
 #include "servers/display_server.h"

servers/rendering/rendering_device_driver.h

@@ -48,7 +48,6 @@
 
 #include "core/object/object.h"
 #include "core/variant/type_info.h"
-#include "servers/display_server.h"
 #include "servers/rendering/rendering_context_driver.h"
 #include "servers/rendering/rendering_device_commons.h"
 

servers/rendering/rendering_server_default.cpp

@@ -30,10 +30,7 @@
 
 #include "rendering_server_default.h"
 
-#include "core/config/project_settings.h"
-#include "core/io/marshalls.h"
 #include "core/os/os.h"
-#include "core/templates/sort_array.h"
 #include "renderer_canvas_cull.h"
 #include "renderer_scene_cull.h"
 #include "rendering_server_globals.h"

servers/rendering/rendering_server_default.h

@@ -36,7 +36,6 @@
 #include "core/templates/command_queue_mt.h"
 #include "core/templates/hash_map.h"
 #include "renderer_canvas_cull.h"
-#include "renderer_scene_cull.h"
 #include "renderer_viewport.h"
 #include "rendering_server_globals.h"
 #include "servers/rendering/renderer_compositor.h"

servers/rendering/shader_compiler.cpp

@@ -30,8 +30,6 @@
 
 #include "shader_compiler.h"
 
-#include "core/config/project_settings.h"
-#include "core/os/os.h"
 #include "servers/rendering/rendering_server_globals.h"
 #include "servers/rendering/shader_types.h"
 

servers/rendering/shader_language.cpp

@@ -31,7 +31,6 @@
 #include "shader_language.h"
 
 #include "core/os/os.h"
-#include "core/string/print_string.h"
 #include "core/templates/local_vector.h"
 #include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering_server.h"

servers/rendering/shader_preprocessor.h

@@ -36,12 +36,8 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/rb_map.h"
 #include "core/templates/rb_set.h"
-#include "core/typedefs.h"
 
-#include "core/io/resource_loader.h"
 #include "core/object/script_language.h"
-#include "core/os/os.h"
-#include "scene/resources/shader.h"
 #include "scene/resources/shader_include.h"
 
 class ShaderPreprocessor {

servers/rendering/shader_types.cpp

@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "shader_types.h"
-#include "core/math/math_defs.h"
 
 const HashMap<StringName, ShaderLanguage::FunctionInfo> &ShaderTypes::get_functions(RS::ShaderMode p_mode) const {
 	return shader_modes[p_mode].functions;

servers/rendering/shader_types.h

@@ -31,7 +31,6 @@
 #ifndef SHADER_TYPES_H
 #define SHADER_TYPES_H
 
-#include "core/templates/rb_map.h"
 #include "servers/rendering_server.h"
 #include "shader_language.h"
 

servers/rendering/shader_warnings.h

@@ -35,8 +35,6 @@
 
 #include "core/string/string_name.h"
 #include "core/templates/hash_map.h"
-#include "core/templates/list.h"
-#include "core/templates/rb_map.h"
 #include "core/variant/variant.h"
 
 class ShaderWarning {

servers/rendering_server.cpp

@@ -32,9 +32,7 @@
 #include "rendering_server.compat.inc"
 
 #include "core/config/project_settings.h"
-#include "core/object/worker_thread_pool.h"
 #include "core/variant/typed_array.h"
-#include "servers/rendering/rendering_server_globals.h"
 #include "servers/rendering/shader_language.h"
 #include "servers/rendering/shader_warnings.h"