Remove unused header in drivers and modules.

Co-authored-by: Thaddeus Crews <repiteo@outlook.com>

drivers/alsamidi/midi_driver_alsamidi.cpp

@@ -33,7 +33,6 @@
 #include "midi_driver_alsamidi.h"
 
 #include "core/os/os.h"
-#include "core/string/print_string.h"
 
 #include <errno.h>
 

drivers/alsamidi/midi_driver_alsamidi.h

@@ -45,8 +45,6 @@
 #include <alsa/asoundlib.h>
 #endif
 
-#include <stdio.h>
-
 class MIDIDriverALSAMidi : public MIDIDriver {
 	Thread thread;
 	Mutex mutex;

drivers/egl/egl_manager.cpp

@@ -30,6 +30,8 @@
 
 #include "egl_manager.h"
 
+#include "core/crypto/crypto_core.h"
+#include "core/io/dir_access.h"
 #include "drivers/gles3/rasterizer_gles3.h"
 
 #ifdef EGL_ENABLED

drivers/egl/egl_manager.h

@@ -36,10 +36,6 @@
 // These must come first to avoid windows.h mess.
 #include "platform_gl.h"
 
-#include "core/config/project_settings.h"
-#include "core/crypto/crypto_core.h"
-#include "core/io/dir_access.h"
-#include "core/io/file_access.h"
 #include "core/templates/local_vector.h"
 #include "servers/display_server.h"
 

drivers/gles3/rasterizer_canvas_gles3.cpp

@@ -32,7 +32,6 @@
 
 #ifdef GLES3_ENABLED
 
-#include "core/os/os.h"
 #include "rasterizer_gles3.h"
 #include "rasterizer_scene_gles3.h"
 

drivers/gles3/shader_gles3.cpp

@@ -32,7 +32,6 @@
 
 #ifdef GLES3_ENABLED
 
-#include "core/io/compression.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 

drivers/gles3/shader_gles3.h

@@ -36,17 +36,13 @@
 #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"
 
 #ifdef GLES3_ENABLED
 
 #include "platform_gl.h"
 
-#include <stdio.h>
-
 class ShaderGLES3 {
 public:
 	struct TextureUniformData {

drivers/gles3/storage/config.cpp

@@ -33,7 +33,6 @@
 #include "config.h"
 
 #include "../rasterizer_gles3.h"
-#include "texture_storage.h"
 
 #ifdef WEB_ENABLED
 #include <emscripten/html5_webgl.h>

drivers/gles3/storage/config.h

@@ -36,7 +36,6 @@
 #include "core/config/project_settings.h"
 #include "core/string/ustring.h"
 #include "core/templates/hash_set.h"
-#include "core/templates/vector.h"
 
 #include "platform_gl.h"
 

drivers/gles3/storage/mesh_storage.cpp

@@ -32,7 +32,6 @@
 
 #include "mesh_storage.h"
 #include "config.h"
-#include "material_storage.h"
 #include "texture_storage.h"
 #include "utilities.h"
 

drivers/gles3/storage/particles_storage.cpp

@@ -38,7 +38,7 @@
 #include "texture_storage.h"
 #include "utilities.h"
 
-#include "servers/rendering/rendering_server_default.h"
+#include "servers/rendering/rendering_server_globals.h"
 
 using namespace GLES3;
 

drivers/gles3/storage/utilities.cpp

@@ -40,8 +40,6 @@
 #include "particles_storage.h"
 #include "texture_storage.h"
 
-#include "servers/rendering/rendering_server_globals.h"
-
 using namespace GLES3;
 
 Utilities *Utilities::singleton = nullptr;

drivers/png/image_loader_png.cpp

@@ -30,8 +30,6 @@
 
 #include "image_loader_png.h"
 
-#include "core/os/os.h"
-#include "core/string/print_string.h"
 #include "drivers/png/png_driver_common.h"
 
 #include <string.h>

drivers/png/png_driver_common.cpp

@@ -30,7 +30,7 @@
 
 #include "png_driver_common.h"
 
-#include "core/os/os.h"
+#include "core/config/engine.h"
 
 #include <png.h>
 #include <string.h>

drivers/register_driver_types.cpp

@@ -30,7 +30,6 @@
 
 #include "register_driver_types.h"
 
-#include "core/extension/gdextension_manager.h"
 #include "drivers/png/image_loader_png.h"
 #include "drivers/png/resource_saver_png.h"
 

modules/csg/csg.cpp

@@ -30,14 +30,6 @@
 
 #include "csg.h"
 
-#include "core/math/geometry_2d.h"
-#include "core/math/math_funcs.h"
-#include "core/templates/sort_array.h"
-#include "scene/resources/mesh_data_tool.h"
-#include "scene/resources/surface_tool.h"
-
-#include "thirdparty/manifold/include/manifold/manifold.h"
-
 // CSGBrush
 
 void CSGBrush::build_from_faces(const Vector<Vector3> &p_vertices, const Vector<Vector2> &p_uvs, const Vector<bool> &p_smooth, const Vector<Ref<Material>> &p_materials, const Vector<bool> &p_flip_faces) {

modules/csg/csg.h

@@ -32,13 +32,10 @@
 #define CSG_H
 
 #include "core/math/aabb.h"
-#include "core/math/plane.h"
 #include "core/math/transform_3d.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/object/ref_counted.h"
-#include "core/templates/list.h"
-#include "core/templates/oa_hash_map.h"
 #include "core/templates/vector.h"
 #include "scene/resources/material.h"
 

modules/csg/editor/csg_gizmos.cpp

@@ -40,7 +40,6 @@
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/physics/collision_shape_3d.h"
-#include "scene/3d/physics/static_body_3d.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"
 

modules/enet/enet_multiplayer_peer.cpp

@@ -30,10 +30,6 @@
 
 #include "enet_multiplayer_peer.h"
 
-#include "core/io/ip.h"
-#include "core/io/marshalls.h"
-#include "core/os/os.h"
-
 void ENetMultiplayerPeer::set_target_peer(int p_peer) {
 	target_peer = p_peer;
 }

modules/fbx/register_types.cpp

@@ -38,7 +38,6 @@
 
 #include "core/config/project_settings.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 
 static void _editor_init() {
 	Ref<EditorSceneFormatImporterUFBX> import_fbx;

modules/gdscript/editor/gdscript_highlighter.cpp

@@ -36,6 +36,7 @@
 #include "core/config/project_settings.h"
 #include "editor/editor_settings.h"
 #include "editor/themes/editor_theme_manager.h"
+#include "scene/gui/text_edit.h"
 
 Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_line) {
 	Dictionary color_map;

modules/gdscript/editor/gdscript_highlighter.h

@@ -32,7 +32,6 @@
 #define GDSCRIPT_HIGHLIGHTER_H
 
 #include "editor/plugins/script_editor_plugin.h"
-#include "scene/gui/text_edit.h"
 
 class GDScriptSyntaxHighlighter : public EditorSyntaxHighlighter {
 	GDCLASS(GDScriptSyntaxHighlighter, EditorSyntaxHighlighter)

modules/gdscript/gdscript.cpp

@@ -50,8 +50,6 @@
 #include "core/config/project_settings.h"
 #include "core/core_constants.h"
 #include "core/io/file_access.h"
-#include "core/io/file_access_encrypted.h"
-#include "core/os/os.h"
 
 #include "scene/resources/packed_scene.h"
 #include "scene/scene_string_names.h"

modules/gdscript/gdscript_analyzer.cpp

@@ -42,7 +42,7 @@
 #include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/templates/hash_map.h"
-#include "scene/resources/packed_scene.h"
+#include "scene/main/node.h"
 
 #if defined(TOOLS_ENABLED) && !defined(DISABLE_DEPRECATED)
 #define SUGGEST_GODOT4_RENAMES

modules/gdscript/gdscript_analyzer.h

@@ -36,7 +36,6 @@
 
 #include "core/object/object.h"
 #include "core/object/ref_counted.h"
-#include "core/templates/hash_set.h"
 
 class GDScriptAnalyzer {
 	GDScriptParser *parser = nullptr;

modules/gdscript/gdscript_parser.cpp

@@ -34,13 +34,11 @@
 #include "gdscript_tokenizer_buffer.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"
 #include "scene/main/multiplayer_api.h"
 
 #ifdef DEBUG_ENABLED
-#include "core/os/os.h"
 #include "core/string/string_builder.h"
 #include "servers/text_server.h"
 #endif

modules/gdscript/gdscript_parser.h

@@ -45,7 +45,6 @@
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/list.h"
-#include "core/templates/rb_map.h"
 #include "core/templates/vector.h"
 #include "core/variant/variant.h"
 

modules/gdscript/gdscript_tokenizer.h

@@ -32,7 +32,6 @@
 #define GDSCRIPT_TOKENIZER_H
 
 #include "core/templates/hash_map.h"
-#include "core/templates/hash_set.h"
 #include "core/templates/list.h"
 #include "core/templates/vector.h"
 #include "core/variant/variant.h"

modules/gdscript/gdscript_utility_callable.cpp

@@ -30,8 +30,6 @@
 
 #include "gdscript_utility_callable.h"
 
-#include "core/templates/hashfuncs.h"
-
 bool GDScriptUtilityCallable::compare_equal(const CallableCustom *p_a, const CallableCustom *p_b) {
 	return p_a->hash() == p_b->hash();
 }

modules/gdscript/language_server/gdscript_language_protocol.h

@@ -33,9 +33,7 @@
 
 #include "gdscript_text_document.h"
 #include "gdscript_workspace.h"
-#include "godot_lsp.h"
 
-#include "core/io/stream_peer.h"
 #include "core/io/stream_peer_tcp.h"
 #include "core/io/tcp_server.h"
 

modules/gdscript/language_server/gdscript_language_server.cpp

@@ -30,7 +30,6 @@
 
 #include "gdscript_language_server.h"
 
-#include "core/io/file_access.h"
 #include "core/os/os.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"

modules/gdscript/language_server/gdscript_language_server.h

@@ -31,7 +31,6 @@
 #ifndef GDSCRIPT_LANGUAGE_SERVER_H
 #define GDSCRIPT_LANGUAGE_SERVER_H
 
-#include "../gdscript_parser.h"
 #include "gdscript_language_protocol.h"
 
 #include "editor/plugins/editor_plugin.h"

modules/gdscript/language_server/gdscript_text_document.cpp

@@ -34,7 +34,6 @@
 #include "gdscript_extend_parser.h"
 #include "gdscript_language_protocol.h"
 
-#include "core/os/os.h"
 #include "editor/editor_settings.h"
 #include "editor/plugins/script_text_editor.h"
 #include "servers/display_server.h"

modules/gdscript/register_types.cpp

@@ -31,9 +31,8 @@
 #include "register_types.h"
 
 #include "gdscript.h"
-#include "gdscript_analyzer.h"
 #include "gdscript_cache.h"
-#include "gdscript_tokenizer.h"
+#include "gdscript_parser.h"
 #include "gdscript_tokenizer_buffer.h"
 #include "gdscript_utility_functions.h"
 
@@ -50,14 +49,11 @@
 #include "tests/test_gdscript.h"
 #endif
 
-#include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/io/file_access_encrypted.h"
 #include "core/io/resource_loader.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_translation_parser.h"
 #include "editor/export/editor_export.h"
 

modules/godot_physics_2d/godot_body_2d.cpp

@@ -32,6 +32,7 @@
 
 #include "godot_area_2d.h"
 #include "godot_body_direct_state_2d.h"
+#include "godot_constraint_2d.h"
 #include "godot_space_2d.h"
 
 void GodotBody2D::_mass_properties_changed() {

modules/godot_physics_2d/godot_body_direct_state_2d.cpp

@@ -31,7 +31,6 @@
 #include "godot_body_direct_state_2d.h"
 
 #include "godot_body_2d.h"
-#include "godot_physics_server_2d.h"
 #include "godot_space_2d.h"
 
 Vector2 GodotPhysicsDirectBodyState2D::get_total_gravity() const {

modules/godot_physics_2d/godot_space_2d.cpp

@@ -33,8 +33,9 @@
 #include "godot_collision_solver_2d.h"
 #include "godot_physics_server_2d.h"
 
-#include "core/os/os.h"
-#include "core/templates/pair.h"
+#include "core/config/project_settings.h"
+#include "godot_area_pair_2d.h"
+#include "godot_body_pair_2d.h"
 
 #define TEST_MOTION_MARGIN_MIN_VALUE 0.0001
 #define TEST_MOTION_MIN_CONTACT_DEPTH_FACTOR 0.05

modules/godot_physics_2d/godot_space_2d.h

@@ -32,14 +32,10 @@
 #define GODOT_SPACE_2D_H
 
 #include "godot_area_2d.h"
-#include "godot_area_pair_2d.h"
 #include "godot_body_2d.h"
-#include "godot_body_pair_2d.h"
 #include "godot_broad_phase_2d.h"
 #include "godot_collision_object_2d.h"
 
-#include "core/config/project_settings.h"
-#include "core/templates/hash_map.h"
 #include "core/typedefs.h"
 
 class GodotPhysicsDirectSpaceState2D : public PhysicsDirectSpaceState2D {

modules/godot_physics_2d/godot_step_2d.cpp

@@ -32,6 +32,7 @@
 
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"
+#include "godot_constraint_2d.h"
 
 #define BODY_ISLAND_COUNT_RESERVE 128
 #define BODY_ISLAND_SIZE_RESERVE 512

modules/godot_physics_2d/register_types.cpp

@@ -30,6 +30,7 @@
 
 #include "register_types.h"
 
+#include "core/config/project_settings.h"
 #include "godot_physics_server_2d.h"
 #include "servers/physics_server_2d.h"
 #include "servers/physics_server_2d_wrap_mt.h"

modules/godot_physics_3d/godot_body_3d.cpp

@@ -32,6 +32,7 @@
 
 #include "godot_area_3d.h"
 #include "godot_body_direct_state_3d.h"
+#include "godot_constraint_3d.h"
 #include "godot_space_3d.h"
 
 void GodotBody3D::_mass_properties_changed() {

modules/godot_physics_3d/godot_body_pair_3d.cpp

@@ -33,8 +33,6 @@
 #include "godot_collision_solver_3d.h"
 #include "godot_space_3d.h"
 
-#include "core/os/os.h"
-
 #define MIN_VELOCITY 0.0001
 #define MAX_BIAS_ROTATION (Math_PI / 8)
 

modules/godot_physics_3d/godot_soft_body_3d.cpp

@@ -33,7 +33,6 @@
 #include "godot_space_3d.h"
 
 #include "core/math/geometry_3d.h"
-#include "core/templates/rb_map.h"
 #include "servers/rendering_server.h"
 
 // Based on Bullet soft body.

modules/godot_physics_3d/godot_space_3d.cpp

@@ -34,6 +34,8 @@
 #include "godot_physics_server_3d.h"
 
 #include "core/config/project_settings.h"
+#include "godot_area_pair_3d.h"
+#include "godot_body_pair_3d.h"
 
 #define TEST_MOTION_MARGIN_MIN_VALUE 0.0001
 #define TEST_MOTION_MIN_CONTACT_DEPTH_FACTOR 0.05

modules/godot_physics_3d/godot_space_3d.h

@@ -32,15 +32,11 @@
 #define GODOT_SPACE_3D_H
 
 #include "godot_area_3d.h"
-#include "godot_area_pair_3d.h"
 #include "godot_body_3d.h"
-#include "godot_body_pair_3d.h"
 #include "godot_broad_phase_3d.h"
 #include "godot_collision_object_3d.h"
 #include "godot_soft_body_3d.h"
 
-#include "core/config/project_settings.h"
-#include "core/templates/hash_map.h"
 #include "core/typedefs.h"
 
 class GodotPhysicsDirectSpaceState3D : public PhysicsDirectSpaceState3D {

modules/gridmap/editor/grid_map_editor_plugin.cpp

@@ -32,7 +32,6 @@
 
 #ifdef TOOLS_ENABLED
 
-#include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_command_palette.h"
 #include "editor/editor_main_screen.h"

modules/gridmap/grid_map.cpp

@@ -31,9 +31,7 @@
 #include "grid_map.h"
 
 #include "core/io/marshalls.h"
-#include "scene/3d/light_3d.h"
 #include "scene/resources/3d/mesh_library.h"
-#include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/physics_material.h"
 #include "scene/resources/surface_tool.h"
 #include "servers/navigation_server_3d.h"

modules/hdr/image_loader_hdr.cpp

@@ -30,9 +30,6 @@
 
 #include "image_loader_hdr.h"
 
-#include "core/os/os.h"
-#include "core/string/print_string.h"
-
 Error ImageLoaderHDR::load_image(Ref<Image> p_image, Ref<FileAccess> f, BitField<ImageFormatLoader::LoaderFlags> p_flags, float p_scale) {
 	String header = f->get_token();
 

modules/interactive_music/audio_stream_interactive.cpp

@@ -31,7 +31,6 @@
 #include "audio_stream_interactive.h"
 
 #include "core/math/math_funcs.h"
-#include "core/string/print_string.h"
 
 AudioStreamInteractive::AudioStreamInteractive() {
 }

modules/interactive_music/audio_stream_playlist.cpp

@@ -31,7 +31,6 @@
 #include "audio_stream_playlist.h"
 
 #include "core/math/math_funcs.h"
-#include "core/string/print_string.h"
 
 Ref<AudioStreamPlayback> AudioStreamPlaylist::instantiate_playback() {
 	Ref<AudioStreamPlaybackPlaylist> playback_playlist;

modules/interactive_music/audio_stream_synchronized.cpp

@@ -31,7 +31,6 @@
 #include "audio_stream_synchronized.h"
 
 #include "core/math/math_funcs.h"
-#include "core/string/print_string.h"
 
 AudioStreamSynchronized::AudioStreamSynchronized() {
 }

modules/jpg/image_loader_jpegd.cpp

@@ -30,9 +30,6 @@
 
 #include "image_loader_jpegd.h"
 
-#include "core/os/os.h"
-#include "core/string/print_string.h"
-
 #include <jpgd.h>
 #include <jpge.h>
 

modules/mbedtls/crypto_mbedtls.cpp

@@ -30,17 +30,11 @@
 
 #include "crypto_mbedtls.h"
 
-#include "core/config/engine.h"
-#include "core/config/project_settings.h"
 #include "core/io/certs_compressed.gen.h"
 #include "core/io/compression.h"
 #include "core/io/file_access.h"
 #include "core/os/os.h"
 
-#ifdef TOOLS_ENABLED
-#include "editor/editor_settings.h"
-#endif
-
 #include <mbedtls/debug.h>
 #include <mbedtls/md.h>
 #include <mbedtls/pem.h>

modules/mbedtls/crypto_mbedtls.h

@@ -32,7 +32,6 @@
 #define CRYPTO_MBEDTLS_H
 
 #include "core/crypto/crypto.h"
-#include "core/io/resource.h"
 
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>

modules/mbedtls/packet_peer_mbed_dtls.cpp

@@ -30,9 +30,6 @@
 
 #include "packet_peer_mbed_dtls.h"
 
-#include "core/io/file_access.h"
-#include "core/io/stream_peer_tls.h"
-
 int PacketPeerMbedDTLS::bio_send(void *ctx, const unsigned char *buf, size_t len) {
 	if (buf == nullptr || len == 0) {
 		return 0;

modules/mbedtls/stream_peer_mbedtls.cpp

@@ -30,7 +30,6 @@
 
 #include "stream_peer_mbedtls.h"
 
-#include "core/io/file_access.h"
 #include "core/io/stream_peer_tcp.h"
 
 int StreamPeerMbedTLS::bio_send(void *ctx, const unsigned char *buf, size_t len) {

modules/mbedtls/tls_context_mbedtls.h

@@ -33,7 +33,6 @@
 
 #include "crypto_mbedtls.h"
 
-#include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
 
 #include <mbedtls/ctr_drbg.h>

modules/minimp3/audio_stream_mp3.cpp

@@ -34,8 +34,6 @@
 
 #include "audio_stream_mp3.h"
 
-#include "core/io/file_access.h"
-
 int AudioStreamPlaybackMP3::_mix_internal(AudioFrame *p_buffer, int p_frames) {
 	if (!active) {
 		return 0;

modules/minimp3/audio_stream_mp3.h

@@ -31,7 +31,6 @@
 #ifndef AUDIO_STREAM_MP3_H
 #define AUDIO_STREAM_MP3_H
 
-#include "core/io/resource_loader.h"
 #include "servers/audio/audio_stream.h"
 
 #include <minimp3_ex.h>

modules/minimp3/resource_importer_mp3.cpp

@@ -32,7 +32,6 @@
 
 #include "core/io/file_access.h"
 #include "core/io/resource_saver.h"
-#include "scene/resources/texture.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/import/audio_stream_import_settings.h"

modules/mobile_vr/mobile_vr_interface.cpp

@@ -33,7 +33,7 @@
 #include "core/input/input.h"
 #include "core/os/os.h"
 #include "servers/display_server.h"
-#include "servers/rendering/rendering_server_globals.h"
+#include "servers/rendering/renderer_compositor.h"
 
 StringName MobileVRInterface::get_name() const {
 	return "Native mobile";

modules/multiplayer/editor/editor_network_profiler.cpp

@@ -30,7 +30,6 @@
 
 #include "editor_network_profiler.h"
 
-#include "core/os/os.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_run_bar.h"

modules/multiplayer/editor/replication_editor.cpp

@@ -37,7 +37,6 @@
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/scene_tree_editor.h"
-#include "editor/inspector_dock.h"
 #include "editor/property_selector.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"

modules/multiplayer/multiplayer_debugger.h

@@ -32,7 +32,6 @@
 #define MULTIPLAYER_DEBUGGER_H
 
 #include "core/debugger/engine_profiler.h"
-#include "core/os/os.h"
 
 class MultiplayerSynchronizer;
 

modules/multiplayer/multiplayer_spawner.cpp

@@ -30,9 +30,7 @@
 
 #include "multiplayer_spawner.h"
 
-#include "core/io/marshalls.h"
 #include "scene/main/multiplayer_api.h"
-#include "scene/main/window.h"
 
 #ifdef TOOLS_ENABLED
 /* This is editor only */

modules/multiplayer/multiplayer_spawner.h

@@ -31,10 +31,7 @@
 #ifndef MULTIPLAYER_SPAWNER_H
 #define MULTIPLAYER_SPAWNER_H
 
-#include "scene_replication_config.h"
-
 #include "core/templates/local_vector.h"
-#include "core/variant/typed_array.h"
 #include "scene/main/node.h"
 #include "scene/resources/packed_scene.h"
 

modules/multiplayer/scene_cache_interface.h

@@ -31,7 +31,7 @@
 #ifndef SCENE_CACHE_INTERFACE_H
 #define SCENE_CACHE_INTERFACE_H
 
-#include "scene/main/multiplayer_api.h"
+#include "core/object/ref_counted.h"
 
 class Node;
 class SceneMultiplayer;

modules/multiplayer/scene_replication_config.cpp

@@ -30,9 +30,6 @@
 
 #include "scene_replication_config.h"
 
-#include "scene/main/multiplayer_api.h"
-#include "scene/main/node.h"
-
 bool SceneReplicationConfig::_set(const StringName &p_name, const Variant &p_value) {
 	String prop_name = p_name;
 

modules/navigation/3d/nav_mesh_generator_3d.cpp

@@ -49,7 +49,6 @@
 #include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/3d/shape_3d.h"
 #include "scene/resources/3d/sphere_shape_3d.h"
-#include "scene/resources/3d/world_boundary_shape_3d.h"
 #include "scene/resources/navigation_mesh.h"
 
 #include "modules/modules_enabled.gen.h" // For csg, gridmap.

modules/navigation/editor/navigation_mesh_editor_plugin.cpp

@@ -32,11 +32,8 @@
 
 #ifdef TOOLS_ENABLED
 
-#include "core/io/marshalls.h"
-#include "core/io/resource_saver.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
-#include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/navigation_region_3d.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"

modules/navigation/nav_agent.h

@@ -34,7 +34,6 @@
 #include "nav_rid.h"
 
 #include "core/object/class_db.h"
-#include "core/templates/local_vector.h"
 #include "core/templates/self_list.h"
 
 #include <Agent2d.h>

modules/navigation/nav_obstacle.h

@@ -34,7 +34,6 @@
 #include "nav_rid.h"
 
 #include "core/object/class_db.h"
-#include "core/templates/local_vector.h"
 #include "core/templates/self_list.h"
 
 class NavAgent;

modules/noise/fastnoise_lite.h

@@ -33,10 +33,6 @@
 
 #include "noise.h"
 
-#include "core/io/image.h"
-#include "core/object/ref_counted.h"
-#include "scene/resources/gradient.h"
-
 #include <thirdparty/noise/FastNoiseLite.h>
 
 typedef fastnoiselite::FastNoiseLite _FastNoiseLite;

modules/openxr/editor/openxr_action_map_editor.cpp

@@ -32,10 +32,8 @@
 
 #include "core/config/project_settings.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #include "editor/gui/editor_bottom_panel.h"
 #include "editor/gui/editor_file_dialog.h"
-#include "editor/themes/editor_scale.h"
 
 HashMap<String, String> OpenXRActionMapEditor::interaction_profile_editors;
 HashMap<String, String> OpenXRActionMapEditor::binding_modifier_editors;

modules/openxr/editor/openxr_binding_modifiers_dialog.cpp

@@ -30,7 +30,6 @@
 
 #include "openxr_binding_modifiers_dialog.h"
 #include "../action_map/openxr_interaction_profile_metadata.h"
-#include "editor/editor_string_names.h"
 #include "openxr_action_map_editor.h"
 
 void OpenXRBindingModifiersDialog::_bind_methods() {

modules/openxr/editor/openxr_interaction_profile_editor.cpp

@@ -31,7 +31,6 @@
 #include "openxr_interaction_profile_editor.h"
 #include "../openxr_api.h"
 #include "editor/editor_string_names.h"
-#include "openxr_action_map_editor.h"
 
 ///////////////////////////////////////////////////////////////////////////
 // Interaction profile editor base

modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp

@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "openxr_select_interaction_profile_dialog.h"
+
+#include "../action_map/openxr_interaction_profile_metadata.h"
 #include "../openxr_api.h"
 
 void OpenXRSelectInteractionProfileDialog::_bind_methods() {

modules/openxr/editor/openxr_select_interaction_profile_dialog.h

@@ -31,16 +31,10 @@
 #ifndef OPENXR_SELECT_INTERACTION_PROFILE_DIALOG_H
 #define OPENXR_SELECT_INTERACTION_PROFILE_DIALOG_H
 
-#include "../action_map/openxr_interaction_profile_metadata.h"
-
 #include "scene/gui/box_container.h"
-#include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
-#include "scene/gui/line_edit.h"
 #include "scene/gui/scroll_container.h"
-#include "scene/gui/separator.h"
-#include "scene/gui/text_edit.h"
 
 class OpenXRSelectInteractionProfileDialog : public ConfirmationDialog {
 	GDCLASS(OpenXRSelectInteractionProfileDialog, ConfirmationDialog);

modules/openxr/editor/openxr_select_runtime.cpp

@@ -33,7 +33,6 @@
 #include "core/io/dir_access.h"
 #include "core/os/os.h"
 #include "editor/editor_settings.h"
-#include "editor/editor_string_names.h"
 
 void OpenXRSelectRuntime::_update_items() {
 	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);

modules/openxr/extensions/openxr_dpad_binding_extension.cpp

@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "openxr_dpad_binding_extension.h"
-#include "../action_map/openxr_interaction_profile_metadata.h"
 #include "../openxr_api.h"
 #include "core/math/math_funcs.h"
 

modules/openxr/extensions/openxr_extension_wrapper_extension.h

@@ -35,7 +35,6 @@
 #include "openxr_extension_wrapper.h"
 
 #include "core/object/ref_counted.h"
-#include "core/os/os.h"
 #include "core/os/thread_safe.h"
 #include "core/variant/native_ptr.h"
 #include "core/variant/typed_array.h"

modules/openxr/extensions/openxr_local_floor_extension.cpp

@@ -30,8 +30,6 @@
 
 #include "openxr_local_floor_extension.h"
 
-#include "core/string/print_string.h"
-
 OpenXRLocalFloorExtension *OpenXRLocalFloorExtension::singleton = nullptr;
 
 OpenXRLocalFloorExtension *OpenXRLocalFloorExtension::get_singleton() {

modules/openxr/extensions/openxr_palm_pose_extension.cpp

@@ -30,8 +30,6 @@
 
 #include "openxr_palm_pose_extension.h"
 
-#include "core/string/print_string.h"
-
 OpenXRPalmPoseExtension *OpenXRPalmPoseExtension::singleton = nullptr;
 
 OpenXRPalmPoseExtension *OpenXRPalmPoseExtension::get_singleton() {

modules/openxr/openxr_api.cpp

@@ -39,10 +39,6 @@
 #include "core/os/memory.h"
 #include "core/version.h"
 
-#ifdef TOOLS_ENABLED
-#include "editor/editor_settings.h"
-#endif
-
 #include "openxr_platform_inc.h"
 
 #ifdef VULKAN_ENABLED

modules/openxr/openxr_api.h

@@ -40,10 +40,7 @@
 #include "core/math/projection.h"
 #include "core/math/transform_3d.h"
 #include "core/math/vector2.h"
-#include "core/os/memory.h"
-#include "core/string/print_string.h"
 #include "core/string/ustring.h"
-#include "core/templates/rb_map.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/vector.h"
 #include "servers/rendering_server.h"

modules/openxr/openxr_api_extension.h

@@ -34,7 +34,6 @@
 #include "openxr_api.h"
 
 #include "core/object/ref_counted.h"
-#include "core/os/os.h"
 #include "core/os/thread_safe.h"
 #include "core/variant/native_ptr.h"
 

modules/openxr/openxr_interface.cpp

@@ -32,10 +32,10 @@
 
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "servers/rendering/rendering_server_globals.h"
 
 #include "extensions/openxr_eye_gaze_interaction.h"
 #include "extensions/openxr_hand_interaction_extension.h"
+#include "servers/rendering/renderer_compositor.h"
 
 #include <openxr/openxr.h>
 

modules/openxr/scene/openxr_composition_layer_cylinder.cpp

@@ -30,12 +30,8 @@
 
 #include "openxr_composition_layer_cylinder.h"
 
-#include "../extensions/openxr_composition_layer_extension.h"
-#include "../openxr_api.h"
 #include "../openxr_interface.h"
 
-#include "scene/3d/mesh_instance_3d.h"
-#include "scene/main/viewport.h"
 #include "scene/resources/mesh.h"
 
 OpenXRCompositionLayerCylinder::OpenXRCompositionLayerCylinder() :

modules/openxr/scene/openxr_composition_layer_equirect.cpp

@@ -30,12 +30,8 @@
 
 #include "openxr_composition_layer_equirect.h"
 
-#include "../extensions/openxr_composition_layer_extension.h"
-#include "../openxr_api.h"
 #include "../openxr_interface.h"
 
-#include "scene/3d/mesh_instance_3d.h"
-#include "scene/main/viewport.h"
 #include "scene/resources/mesh.h"
 
 OpenXRCompositionLayerEquirect::OpenXRCompositionLayerEquirect() :

modules/openxr/scene/openxr_composition_layer_quad.cpp

@@ -30,12 +30,8 @@
 
 #include "openxr_composition_layer_quad.h"
 
-#include "../extensions/openxr_composition_layer_extension.h"
-#include "../openxr_api.h"
 #include "../openxr_interface.h"
 
-#include "scene/3d/mesh_instance_3d.h"
-#include "scene/main/viewport.h"
 #include "scene/resources/3d/primitive_meshes.h"
 
 OpenXRCompositionLayerQuad::OpenXRCompositionLayerQuad() :

modules/raycast/raycast_occlusion_cull.h

@@ -31,13 +31,9 @@
 #ifndef RAYCAST_OCCLUSION_CULL_H
 #define RAYCAST_OCCLUSION_CULL_H
 
-#include "core/io/image.h"
 #include "core/math/projection.h"
-#include "core/object/object.h"
-#include "core/object/ref_counted.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
-#include "scene/resources/mesh.h"
 #include "servers/rendering/renderer_scene_occlusion_cull.h"
 
 #include <embree4/rtcore.h>

modules/text_server_adv/text_server_adv.cpp

@@ -50,7 +50,6 @@ using namespace godot;
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/string/print_string.h"
 #include "core/string/translation_server.h"
 #include "scene/resources/image_texture.h"
 

modules/text_server_adv/text_server_adv.h

@@ -83,7 +83,6 @@ using namespace godot;
 // Headers for building as built-in module.
 
 #include "core/extension/ext_wrappers.gen.inc"
-#include "core/object/worker_thread_pool.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/safe_refcount.h"

modules/tga/image_loader_tga.cpp

@@ -33,8 +33,6 @@
 #include "core/error/error_macros.h"
 #include "core/io/file_access_memory.h"
 #include "core/io/image.h"
-#include "core/os/os.h"
-#include "core/string/print_string.h"
 
 Error ImageLoaderTGA::decode_tga_rle(const uint8_t *p_compressed_buffer, size_t p_pixel_size, uint8_t *p_uncompressed_buffer, size_t p_output_size, size_t p_input_size) {
 	Error error;

modules/theora/video_stream_theora.cpp

@@ -32,7 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/image.h"
-#include "core/os/os.h"
 #include "scene/resources/image_texture.h"
 
 #include "thirdparty/misc/yuv2rgb.h"

modules/theora/video_stream_theora.h

@@ -33,12 +33,8 @@
 
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
-#include "core/os/semaphore.h"
 #include "core/os/thread.h"
-#include "core/templates/ring_buffer.h"
-#include "core/templates/safe_refcount.h"
 #include "scene/resources/video_stream.h"
-#include "servers/audio_server.h"
 
 #include <theora/theoradec.h>
 #include <vorbis/codec.h>

modules/tinyexr/image_loader_tinyexr.cpp

@@ -30,9 +30,6 @@
 
 #include "image_loader_tinyexr.h"
 
-#include "core/os/os.h"
-#include "core/string/print_string.h"
-
 #include <zlib.h> // Should come before including tinyexr.
 
 #include "thirdparty/tinyexr/tinyexr.h"

modules/tinyexr/image_saver_tinyexr.cpp

@@ -30,8 +30,8 @@
 
 #include "image_saver_tinyexr.h"
 
+#include "core/io/file_access.h"
 #include "core/math/math_funcs.h"
-#include "core/os/os.h"
 
 #include <zlib.h> // Should come before including tinyexr.
 

modules/upnp/register_types.cpp

@@ -38,8 +38,6 @@
 #include "upnp_miniupnp.h"
 #endif
 
-#include "core/error/error_macros.h"
-
 void initialize_upnp_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
 		return;

modules/vorbis/audio_stream_ogg_vorbis.cpp

@@ -30,9 +30,6 @@
 
 #include "audio_stream_ogg_vorbis.h"
 
-#include "core/io/file_access.h"
-#include "core/variant/typed_array.h"
-
 #include "modules/vorbis/resource_importer_ogg_vorbis.h"
 #include <ogg/ogg.h>