From 33817b186faedd857bfb3c827a6fb159ab6a0090 Mon Sep 17 00:00:00 2001 From: Yufeng Ying Date: Sun, 22 Dec 2024 01:19:26 +0800 Subject: [PATCH] Remove unused header in drivers and modules. Co-authored-by: Thaddeus Crews --- drivers/alsamidi/midi_driver_alsamidi.cpp | 1 - drivers/alsamidi/midi_driver_alsamidi.h | 2 -- drivers/egl/egl_manager.cpp | 2 ++ drivers/egl/egl_manager.h | 4 ---- drivers/gles3/rasterizer_canvas_gles3.cpp | 1 - drivers/gles3/shader_gles3.cpp | 1 - drivers/gles3/shader_gles3.h | 4 ---- drivers/gles3/storage/config.cpp | 1 - drivers/gles3/storage/config.h | 1 - drivers/gles3/storage/mesh_storage.cpp | 1 - drivers/gles3/storage/particles_storage.cpp | 2 +- drivers/gles3/storage/utilities.cpp | 2 -- drivers/png/image_loader_png.cpp | 2 -- drivers/png/png_driver_common.cpp | 2 +- drivers/register_driver_types.cpp | 1 - modules/csg/csg.cpp | 8 -------- modules/csg/csg.h | 3 --- modules/csg/editor/csg_gizmos.cpp | 1 - modules/enet/enet_multiplayer_peer.cpp | 4 ---- modules/fbx/register_types.cpp | 1 - modules/gdscript/editor/gdscript_highlighter.cpp | 1 + modules/gdscript/editor/gdscript_highlighter.h | 1 - modules/gdscript/gdscript.cpp | 2 -- modules/gdscript/gdscript_analyzer.cpp | 2 +- modules/gdscript/gdscript_analyzer.h | 1 - modules/gdscript/gdscript_parser.cpp | 2 -- modules/gdscript/gdscript_parser.h | 1 - modules/gdscript/gdscript_tokenizer.h | 1 - modules/gdscript/gdscript_utility_callable.cpp | 2 -- .../gdscript/language_server/gdscript_language_protocol.h | 2 -- .../gdscript/language_server/gdscript_language_server.cpp | 1 - .../gdscript/language_server/gdscript_language_server.h | 1 - .../gdscript/language_server/gdscript_text_document.cpp | 1 - modules/gdscript/register_types.cpp | 6 +----- modules/godot_physics_2d/godot_body_2d.cpp | 1 + modules/godot_physics_2d/godot_body_direct_state_2d.cpp | 1 - modules/godot_physics_2d/godot_space_2d.cpp | 5 +++-- modules/godot_physics_2d/godot_space_2d.h | 4 ---- modules/godot_physics_2d/godot_step_2d.cpp | 1 + modules/godot_physics_2d/register_types.cpp | 1 + modules/godot_physics_3d/godot_body_3d.cpp | 1 + modules/godot_physics_3d/godot_body_pair_3d.cpp | 2 -- modules/godot_physics_3d/godot_soft_body_3d.cpp | 1 - modules/godot_physics_3d/godot_space_3d.cpp | 2 ++ modules/godot_physics_3d/godot_space_3d.h | 4 ---- modules/gridmap/editor/grid_map_editor_plugin.cpp | 1 - modules/gridmap/grid_map.cpp | 2 -- modules/hdr/image_loader_hdr.cpp | 3 --- modules/interactive_music/audio_stream_interactive.cpp | 1 - modules/interactive_music/audio_stream_playlist.cpp | 1 - modules/interactive_music/audio_stream_synchronized.cpp | 1 - modules/jpg/image_loader_jpegd.cpp | 3 --- modules/mbedtls/crypto_mbedtls.cpp | 6 ------ modules/mbedtls/crypto_mbedtls.h | 1 - modules/mbedtls/packet_peer_mbed_dtls.cpp | 3 --- modules/mbedtls/stream_peer_mbedtls.cpp | 1 - modules/mbedtls/tls_context_mbedtls.h | 1 - modules/minimp3/audio_stream_mp3.cpp | 2 -- modules/minimp3/audio_stream_mp3.h | 1 - modules/minimp3/resource_importer_mp3.cpp | 1 - modules/mobile_vr/mobile_vr_interface.cpp | 2 +- modules/multiplayer/editor/editor_network_profiler.cpp | 1 - modules/multiplayer/editor/replication_editor.cpp | 1 - modules/multiplayer/multiplayer_debugger.h | 1 - modules/multiplayer/multiplayer_spawner.cpp | 2 -- modules/multiplayer/multiplayer_spawner.h | 3 --- modules/multiplayer/scene_cache_interface.h | 2 +- modules/multiplayer/scene_replication_config.cpp | 3 --- modules/navigation/3d/nav_mesh_generator_3d.cpp | 1 - .../navigation/editor/navigation_mesh_editor_plugin.cpp | 3 --- modules/navigation/nav_agent.h | 1 - modules/navigation/nav_obstacle.h | 1 - modules/noise/fastnoise_lite.h | 4 ---- modules/openxr/editor/openxr_action_map_editor.cpp | 2 -- modules/openxr/editor/openxr_binding_modifiers_dialog.cpp | 1 - .../openxr/editor/openxr_interaction_profile_editor.cpp | 1 - .../editor/openxr_select_interaction_profile_dialog.cpp | 2 ++ .../editor/openxr_select_interaction_profile_dialog.h | 6 ------ modules/openxr/editor/openxr_select_runtime.cpp | 1 - .../openxr/extensions/openxr_dpad_binding_extension.cpp | 1 - .../extensions/openxr_extension_wrapper_extension.h | 1 - .../openxr/extensions/openxr_local_floor_extension.cpp | 2 -- modules/openxr/extensions/openxr_palm_pose_extension.cpp | 2 -- modules/openxr/openxr_api.cpp | 4 ---- modules/openxr/openxr_api.h | 3 --- modules/openxr/openxr_api_extension.h | 1 - modules/openxr/openxr_interface.cpp | 2 +- .../openxr/scene/openxr_composition_layer_cylinder.cpp | 4 ---- .../openxr/scene/openxr_composition_layer_equirect.cpp | 4 ---- modules/openxr/scene/openxr_composition_layer_quad.cpp | 4 ---- modules/raycast/raycast_occlusion_cull.h | 4 ---- modules/text_server_adv/text_server_adv.cpp | 1 - modules/text_server_adv/text_server_adv.h | 1 - modules/tga/image_loader_tga.cpp | 2 -- modules/theora/video_stream_theora.cpp | 1 - modules/theora/video_stream_theora.h | 4 ---- modules/tinyexr/image_loader_tinyexr.cpp | 3 --- modules/tinyexr/image_saver_tinyexr.cpp | 2 +- modules/upnp/register_types.cpp | 2 -- modules/vorbis/audio_stream_ogg_vorbis.cpp | 3 --- modules/vorbis/resource_importer_ogg_vorbis.cpp | 1 - modules/webp/image_loader_webp.cpp | 7 ------- modules/webp/webp_common.cpp | 1 - modules/webrtc/webrtc_multiplayer_peer.cpp | 3 --- modules/webrtc/webrtc_peer_connection.h | 2 -- modules/webrtc/webrtc_peer_connection_extension.h | 1 - .../websocket/editor/editor_debugger_server_websocket.cpp | 1 - modules/websocket/register_types.cpp | 1 - modules/websocket/websocket_multiplayer_peer.cpp | 1 + modules/websocket/websocket_multiplayer_peer.h | 1 - modules/websocket/wsl_peer.h | 2 -- modules/webxr/webxr_interface.cpp | 2 -- 112 files changed, 23 insertions(+), 208 deletions(-) diff --git a/drivers/alsamidi/midi_driver_alsamidi.cpp b/drivers/alsamidi/midi_driver_alsamidi.cpp index 445fc4a9936..04b866007e8 100644 --- a/drivers/alsamidi/midi_driver_alsamidi.cpp +++ b/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 diff --git a/drivers/alsamidi/midi_driver_alsamidi.h b/drivers/alsamidi/midi_driver_alsamidi.h index 45811bec478..e906db6d8f7 100644 --- a/drivers/alsamidi/midi_driver_alsamidi.h +++ b/drivers/alsamidi/midi_driver_alsamidi.h @@ -45,8 +45,6 @@ #include #endif -#include - class MIDIDriverALSAMidi : public MIDIDriver { Thread thread; Mutex mutex; diff --git a/drivers/egl/egl_manager.cpp b/drivers/egl/egl_manager.cpp index 8ca0aa5943e..c545de39a63 100644 --- a/drivers/egl/egl_manager.cpp +++ b/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 diff --git a/drivers/egl/egl_manager.h b/drivers/egl/egl_manager.h index 2e1ae6ec53f..f8ef5ca866d 100644 --- a/drivers/egl/egl_manager.h +++ b/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" diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index d04c9d68d94..38ced316a13 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/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" diff --git a/drivers/gles3/shader_gles3.cpp b/drivers/gles3/shader_gles3.cpp index 83f74865f67..1537035c07b 100644 --- a/drivers/gles3/shader_gles3.cpp +++ b/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" diff --git a/drivers/gles3/shader_gles3.h b/drivers/gles3/shader_gles3.h index 9ee939e3439..cb92a03fd22 100644 --- a/drivers/gles3/shader_gles3.h +++ b/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 - class ShaderGLES3 { public: struct TextureUniformData { diff --git a/drivers/gles3/storage/config.cpp b/drivers/gles3/storage/config.cpp index 07dd5f58c1a..18a01a0bb1f 100644 --- a/drivers/gles3/storage/config.cpp +++ b/drivers/gles3/storage/config.cpp @@ -33,7 +33,6 @@ #include "config.h" #include "../rasterizer_gles3.h" -#include "texture_storage.h" #ifdef WEB_ENABLED #include diff --git a/drivers/gles3/storage/config.h b/drivers/gles3/storage/config.h index 51f6714320d..e4dfe6a35ee 100644 --- a/drivers/gles3/storage/config.h +++ b/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" diff --git a/drivers/gles3/storage/mesh_storage.cpp b/drivers/gles3/storage/mesh_storage.cpp index f999c5e601d..a3362942320 100644 --- a/drivers/gles3/storage/mesh_storage.cpp +++ b/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" diff --git a/drivers/gles3/storage/particles_storage.cpp b/drivers/gles3/storage/particles_storage.cpp index 5f919c867f8..1c6df43cb72 100644 --- a/drivers/gles3/storage/particles_storage.cpp +++ b/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; diff --git a/drivers/gles3/storage/utilities.cpp b/drivers/gles3/storage/utilities.cpp index 7f0be364663..baf06c02bb1 100644 --- a/drivers/gles3/storage/utilities.cpp +++ b/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; diff --git a/drivers/png/image_loader_png.cpp b/drivers/png/image_loader_png.cpp index 6f98f072dd1..902ece1b041 100644 --- a/drivers/png/image_loader_png.cpp +++ b/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 diff --git a/drivers/png/png_driver_common.cpp b/drivers/png/png_driver_common.cpp index a789d5c5b3e..d66fd40d8db 100644 --- a/drivers/png/png_driver_common.cpp +++ b/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 #include diff --git a/drivers/register_driver_types.cpp b/drivers/register_driver_types.cpp index d5524fcc2f2..55660ffe06f 100644 --- a/drivers/register_driver_types.cpp +++ b/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" diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp index f04748a54ea..138233876b7 100644 --- a/modules/csg/csg.cpp +++ b/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 &p_vertices, const Vector &p_uvs, const Vector &p_smooth, const Vector> &p_materials, const Vector &p_flip_faces) { diff --git a/modules/csg/csg.h b/modules/csg/csg.h index b771e60e89e..3c1d4d8fbee 100644 --- a/modules/csg/csg.h +++ b/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" diff --git a/modules/csg/editor/csg_gizmos.cpp b/modules/csg/editor/csg_gizmos.cpp index 7e1c2e39b38..9a5d8fa0b0a 100644 --- a/modules/csg/editor/csg_gizmos.cpp +++ b/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" diff --git a/modules/enet/enet_multiplayer_peer.cpp b/modules/enet/enet_multiplayer_peer.cpp index 6f87a398c76..9915caa94de 100644 --- a/modules/enet/enet_multiplayer_peer.cpp +++ b/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; } diff --git a/modules/fbx/register_types.cpp b/modules/fbx/register_types.cpp index 7e404847ec9..d8c5b70655e 100644 --- a/modules/fbx/register_types.cpp +++ b/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 import_fbx; diff --git a/modules/gdscript/editor/gdscript_highlighter.cpp b/modules/gdscript/editor/gdscript_highlighter.cpp index b8851e5bf21..622e39620b9 100644 --- a/modules/gdscript/editor/gdscript_highlighter.cpp +++ b/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; diff --git a/modules/gdscript/editor/gdscript_highlighter.h b/modules/gdscript/editor/gdscript_highlighter.h index 655557b3d9d..ec471956d5f 100644 --- a/modules/gdscript/editor/gdscript_highlighter.h +++ b/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) diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 48d0ce45aa8..c842c0a99b3 100644 --- a/modules/gdscript/gdscript.cpp +++ b/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" diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index af92450835d..ead87bfa0c6 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/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 diff --git a/modules/gdscript/gdscript_analyzer.h b/modules/gdscript/gdscript_analyzer.h index 15738c9738a..6acc34101f2 100644 --- a/modules/gdscript/gdscript_analyzer.h +++ b/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; diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index c0c627cb911..cd37cd0452f 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/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 diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h index f2869ab0216..22b14e8bb5c 100644 --- a/modules/gdscript/gdscript_parser.h +++ b/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" diff --git a/modules/gdscript/gdscript_tokenizer.h b/modules/gdscript/gdscript_tokenizer.h index 08e74179225..5812199b8af 100644 --- a/modules/gdscript/gdscript_tokenizer.h +++ b/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" diff --git a/modules/gdscript/gdscript_utility_callable.cpp b/modules/gdscript/gdscript_utility_callable.cpp index edd7e05b22f..677b32e7942 100644 --- a/modules/gdscript/gdscript_utility_callable.cpp +++ b/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(); } diff --git a/modules/gdscript/language_server/gdscript_language_protocol.h b/modules/gdscript/language_server/gdscript_language_protocol.h index f29abaa337b..7f3f1d6d077 100644 --- a/modules/gdscript/language_server/gdscript_language_protocol.h +++ b/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" diff --git a/modules/gdscript/language_server/gdscript_language_server.cpp b/modules/gdscript/language_server/gdscript_language_server.cpp index 731988148dd..e5630d30837 100644 --- a/modules/gdscript/language_server/gdscript_language_server.cpp +++ b/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" diff --git a/modules/gdscript/language_server/gdscript_language_server.h b/modules/gdscript/language_server/gdscript_language_server.h index 4ae5ab6cbf2..481ea9ebbde 100644 --- a/modules/gdscript/language_server/gdscript_language_server.h +++ b/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" diff --git a/modules/gdscript/language_server/gdscript_text_document.cpp b/modules/gdscript/language_server/gdscript_text_document.cpp index 2b422bb9552..177bf3e1847 100644 --- a/modules/gdscript/language_server/gdscript_text_document.cpp +++ b/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" diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp index 055f8e41102..7ae81db1340 100644 --- a/modules/gdscript/register_types.cpp +++ b/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" diff --git a/modules/godot_physics_2d/godot_body_2d.cpp b/modules/godot_physics_2d/godot_body_2d.cpp index c401e6eee79..35d021e3cfd 100644 --- a/modules/godot_physics_2d/godot_body_2d.cpp +++ b/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() { diff --git a/modules/godot_physics_2d/godot_body_direct_state_2d.cpp b/modules/godot_physics_2d/godot_body_direct_state_2d.cpp index b34c70831d3..dc8739c656a 100644 --- a/modules/godot_physics_2d/godot_body_direct_state_2d.cpp +++ b/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 { diff --git a/modules/godot_physics_2d/godot_space_2d.cpp b/modules/godot_physics_2d/godot_space_2d.cpp index df3c9d82659..b3d7cea4877 100644 --- a/modules/godot_physics_2d/godot_space_2d.cpp +++ b/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 diff --git a/modules/godot_physics_2d/godot_space_2d.h b/modules/godot_physics_2d/godot_space_2d.h index ded3b08d5bf..c9fb66a0cf6 100644 --- a/modules/godot_physics_2d/godot_space_2d.h +++ b/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 { diff --git a/modules/godot_physics_2d/godot_step_2d.cpp b/modules/godot_physics_2d/godot_step_2d.cpp index 2d8f69e13fc..8bdaed386f5 100644 --- a/modules/godot_physics_2d/godot_step_2d.cpp +++ b/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 diff --git a/modules/godot_physics_2d/register_types.cpp b/modules/godot_physics_2d/register_types.cpp index 57422b18140..356d14b307b 100644 --- a/modules/godot_physics_2d/register_types.cpp +++ b/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" diff --git a/modules/godot_physics_3d/godot_body_3d.cpp b/modules/godot_physics_3d/godot_body_3d.cpp index 669c4b985b8..1edc01aeb4c 100644 --- a/modules/godot_physics_3d/godot_body_3d.cpp +++ b/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() { diff --git a/modules/godot_physics_3d/godot_body_pair_3d.cpp b/modules/godot_physics_3d/godot_body_pair_3d.cpp index d689271ac75..101a7a95f3e 100644 --- a/modules/godot_physics_3d/godot_body_pair_3d.cpp +++ b/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) diff --git a/modules/godot_physics_3d/godot_soft_body_3d.cpp b/modules/godot_physics_3d/godot_soft_body_3d.cpp index e8be227d09d..bbee0ecf71f 100644 --- a/modules/godot_physics_3d/godot_soft_body_3d.cpp +++ b/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. diff --git a/modules/godot_physics_3d/godot_space_3d.cpp b/modules/godot_physics_3d/godot_space_3d.cpp index 4969915bea0..9f7bd5c35f4 100644 --- a/modules/godot_physics_3d/godot_space_3d.cpp +++ b/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 diff --git a/modules/godot_physics_3d/godot_space_3d.h b/modules/godot_physics_3d/godot_space_3d.h index f476be59342..ef2c21d7989 100644 --- a/modules/godot_physics_3d/godot_space_3d.h +++ b/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 { diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index 3aac92fe17f..bc1a1e53168 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/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" diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index df97821ece2..5431ea97a8c 100644 --- a/modules/gridmap/grid_map.cpp +++ b/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" diff --git a/modules/hdr/image_loader_hdr.cpp b/modules/hdr/image_loader_hdr.cpp index ba59bb25eee..91b3e0b436b 100644 --- a/modules/hdr/image_loader_hdr.cpp +++ b/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 p_image, Ref f, BitField p_flags, float p_scale) { String header = f->get_token(); diff --git a/modules/interactive_music/audio_stream_interactive.cpp b/modules/interactive_music/audio_stream_interactive.cpp index 64288b8fbd2..da9f3520aa7 100644 --- a/modules/interactive_music/audio_stream_interactive.cpp +++ b/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() { } diff --git a/modules/interactive_music/audio_stream_playlist.cpp b/modules/interactive_music/audio_stream_playlist.cpp index eb77a4a8d35..69e9c46ca2a 100644 --- a/modules/interactive_music/audio_stream_playlist.cpp +++ b/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 AudioStreamPlaylist::instantiate_playback() { Ref playback_playlist; diff --git a/modules/interactive_music/audio_stream_synchronized.cpp b/modules/interactive_music/audio_stream_synchronized.cpp index ad67e778eec..b475a3f9a40 100644 --- a/modules/interactive_music/audio_stream_synchronized.cpp +++ b/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() { } diff --git a/modules/jpg/image_loader_jpegd.cpp b/modules/jpg/image_loader_jpegd.cpp index 53046de7405..2e615f55e85 100644 --- a/modules/jpg/image_loader_jpegd.cpp +++ b/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 #include diff --git a/modules/mbedtls/crypto_mbedtls.cpp b/modules/mbedtls/crypto_mbedtls.cpp index be7aaef9d45..ff61ba9063e 100644 --- a/modules/mbedtls/crypto_mbedtls.cpp +++ b/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 #include #include diff --git a/modules/mbedtls/crypto_mbedtls.h b/modules/mbedtls/crypto_mbedtls.h index d24f00723f9..fb0c5798844 100644 --- a/modules/mbedtls/crypto_mbedtls.h +++ b/modules/mbedtls/crypto_mbedtls.h @@ -32,7 +32,6 @@ #define CRYPTO_MBEDTLS_H #include "core/crypto/crypto.h" -#include "core/io/resource.h" #include #include diff --git a/modules/mbedtls/packet_peer_mbed_dtls.cpp b/modules/mbedtls/packet_peer_mbed_dtls.cpp index 62d27405d87..5efe0c4a43c 100644 --- a/modules/mbedtls/packet_peer_mbed_dtls.cpp +++ b/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; diff --git a/modules/mbedtls/stream_peer_mbedtls.cpp b/modules/mbedtls/stream_peer_mbedtls.cpp index 3af66f6d832..afb39fdca33 100644 --- a/modules/mbedtls/stream_peer_mbedtls.cpp +++ b/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) { diff --git a/modules/mbedtls/tls_context_mbedtls.h b/modules/mbedtls/tls_context_mbedtls.h index b8a9e80b9fc..ef964d35e52 100644 --- a/modules/mbedtls/tls_context_mbedtls.h +++ b/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 diff --git a/modules/minimp3/audio_stream_mp3.cpp b/modules/minimp3/audio_stream_mp3.cpp index 4963cfdf1af..06f6d3e72e5 100644 --- a/modules/minimp3/audio_stream_mp3.cpp +++ b/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; diff --git a/modules/minimp3/audio_stream_mp3.h b/modules/minimp3/audio_stream_mp3.h index bb4c7f524cf..c2e557dd450 100644 --- a/modules/minimp3/audio_stream_mp3.h +++ b/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 diff --git a/modules/minimp3/resource_importer_mp3.cpp b/modules/minimp3/resource_importer_mp3.cpp index f1f0a771ad1..153c05b559d 100644 --- a/modules/minimp3/resource_importer_mp3.cpp +++ b/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" diff --git a/modules/mobile_vr/mobile_vr_interface.cpp b/modules/mobile_vr/mobile_vr_interface.cpp index e5f1a940ece..dcaa1a12a47 100644 --- a/modules/mobile_vr/mobile_vr_interface.cpp +++ b/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"; diff --git a/modules/multiplayer/editor/editor_network_profiler.cpp b/modules/multiplayer/editor/editor_network_profiler.cpp index 5ab3812180c..1f9444ed72b 100644 --- a/modules/multiplayer/editor/editor_network_profiler.cpp +++ b/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" diff --git a/modules/multiplayer/editor/replication_editor.cpp b/modules/multiplayer/editor/replication_editor.cpp index 191369d1de2..b474c6063d6 100644 --- a/modules/multiplayer/editor/replication_editor.cpp +++ b/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" diff --git a/modules/multiplayer/multiplayer_debugger.h b/modules/multiplayer/multiplayer_debugger.h index 96764ced062..e2e022d5e03 100644 --- a/modules/multiplayer/multiplayer_debugger.h +++ b/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; diff --git a/modules/multiplayer/multiplayer_spawner.cpp b/modules/multiplayer/multiplayer_spawner.cpp index 5ed32015cd7..639ea1587f5 100644 --- a/modules/multiplayer/multiplayer_spawner.cpp +++ b/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 */ diff --git a/modules/multiplayer/multiplayer_spawner.h b/modules/multiplayer/multiplayer_spawner.h index 0e94b781eaa..4f649d6169c 100644 --- a/modules/multiplayer/multiplayer_spawner.h +++ b/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" diff --git a/modules/multiplayer/scene_cache_interface.h b/modules/multiplayer/scene_cache_interface.h index fbe618f4ad1..675bd073200 100644 --- a/modules/multiplayer/scene_cache_interface.h +++ b/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; diff --git a/modules/multiplayer/scene_replication_config.cpp b/modules/multiplayer/scene_replication_config.cpp index ab92f7d90f5..de4337de4a1 100644 --- a/modules/multiplayer/scene_replication_config.cpp +++ b/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; diff --git a/modules/navigation/3d/nav_mesh_generator_3d.cpp b/modules/navigation/3d/nav_mesh_generator_3d.cpp index 3d0697a7cf9..e263a0ec512 100644 --- a/modules/navigation/3d/nav_mesh_generator_3d.cpp +++ b/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. diff --git a/modules/navigation/editor/navigation_mesh_editor_plugin.cpp b/modules/navigation/editor/navigation_mesh_editor_plugin.cpp index b78093b5902..4b723323b65 100644 --- a/modules/navigation/editor/navigation_mesh_editor_plugin.cpp +++ b/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" diff --git a/modules/navigation/nav_agent.h b/modules/navigation/nav_agent.h index 187929d46c4..06c038433eb 100644 --- a/modules/navigation/nav_agent.h +++ b/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 diff --git a/modules/navigation/nav_obstacle.h b/modules/navigation/nav_obstacle.h index 9836b1300a9..686a82ca49c 100644 --- a/modules/navigation/nav_obstacle.h +++ b/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; diff --git a/modules/noise/fastnoise_lite.h b/modules/noise/fastnoise_lite.h index 06a2b39abe3..fcf81fc2bb3 100644 --- a/modules/noise/fastnoise_lite.h +++ b/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 typedef fastnoiselite::FastNoiseLite _FastNoiseLite; diff --git a/modules/openxr/editor/openxr_action_map_editor.cpp b/modules/openxr/editor/openxr_action_map_editor.cpp index 23d793aefe0..6b33966bda8 100644 --- a/modules/openxr/editor/openxr_action_map_editor.cpp +++ b/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 OpenXRActionMapEditor::interaction_profile_editors; HashMap OpenXRActionMapEditor::binding_modifier_editors; diff --git a/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp b/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp index f12d465b46a..de6411e3ba5 100644 --- a/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp +++ b/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() { diff --git a/modules/openxr/editor/openxr_interaction_profile_editor.cpp b/modules/openxr/editor/openxr_interaction_profile_editor.cpp index e1a6be15620..1e9fe3cadcc 100644 --- a/modules/openxr/editor/openxr_interaction_profile_editor.cpp +++ b/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 diff --git a/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp b/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp index ffb7fb64641..009acb123ab 100644 --- a/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp +++ b/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() { diff --git a/modules/openxr/editor/openxr_select_interaction_profile_dialog.h b/modules/openxr/editor/openxr_select_interaction_profile_dialog.h index d85e4cd4d61..bfcdce1638f 100644 --- a/modules/openxr/editor/openxr_select_interaction_profile_dialog.h +++ b/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); diff --git a/modules/openxr/editor/openxr_select_runtime.cpp b/modules/openxr/editor/openxr_select_runtime.cpp index 5be2383d9df..25251aa5c41 100644 --- a/modules/openxr/editor/openxr_select_runtime.cpp +++ b/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 da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); diff --git a/modules/openxr/extensions/openxr_dpad_binding_extension.cpp b/modules/openxr/extensions/openxr_dpad_binding_extension.cpp index 54e5cfe89bc..505e5d36317 100644 --- a/modules/openxr/extensions/openxr_dpad_binding_extension.cpp +++ b/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" diff --git a/modules/openxr/extensions/openxr_extension_wrapper_extension.h b/modules/openxr/extensions/openxr_extension_wrapper_extension.h index 350bcb98307..f9b4c36fd78 100644 --- a/modules/openxr/extensions/openxr_extension_wrapper_extension.h +++ b/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" diff --git a/modules/openxr/extensions/openxr_local_floor_extension.cpp b/modules/openxr/extensions/openxr_local_floor_extension.cpp index 8e06dd8ed50..5e17ba715b7 100644 --- a/modules/openxr/extensions/openxr_local_floor_extension.cpp +++ b/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() { diff --git a/modules/openxr/extensions/openxr_palm_pose_extension.cpp b/modules/openxr/extensions/openxr_palm_pose_extension.cpp index 07446c8def4..7f8e771fcd0 100644 --- a/modules/openxr/extensions/openxr_palm_pose_extension.cpp +++ b/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() { diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp index 484becba8de..c84454037d0 100644 --- a/modules/openxr/openxr_api.cpp +++ b/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 diff --git a/modules/openxr/openxr_api.h b/modules/openxr/openxr_api.h index e47c99b8fbc..868a6f876a3 100644 --- a/modules/openxr/openxr_api.h +++ b/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" diff --git a/modules/openxr/openxr_api_extension.h b/modules/openxr/openxr_api_extension.h index 6519aea7f1a..58a88d122d9 100644 --- a/modules/openxr/openxr_api_extension.h +++ b/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" diff --git a/modules/openxr/openxr_interface.cpp b/modules/openxr/openxr_interface.cpp index f79dba72b8f..35af2609b18 100644 --- a/modules/openxr/openxr_interface.cpp +++ b/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 diff --git a/modules/openxr/scene/openxr_composition_layer_cylinder.cpp b/modules/openxr/scene/openxr_composition_layer_cylinder.cpp index 727586467a6..a1a1fb23e04 100644 --- a/modules/openxr/scene/openxr_composition_layer_cylinder.cpp +++ b/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() : diff --git a/modules/openxr/scene/openxr_composition_layer_equirect.cpp b/modules/openxr/scene/openxr_composition_layer_equirect.cpp index 2fce26c9656..d89d7077a65 100644 --- a/modules/openxr/scene/openxr_composition_layer_equirect.cpp +++ b/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() : diff --git a/modules/openxr/scene/openxr_composition_layer_quad.cpp b/modules/openxr/scene/openxr_composition_layer_quad.cpp index 4a00fd371e6..e1b4d3640a8 100644 --- a/modules/openxr/scene/openxr_composition_layer_quad.cpp +++ b/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() : diff --git a/modules/raycast/raycast_occlusion_cull.h b/modules/raycast/raycast_occlusion_cull.h index b9562efb49b..f5b7011abb8 100644 --- a/modules/raycast/raycast_occlusion_cull.h +++ b/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 diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp index ebe82c65175..00f303d80ff 100644 --- a/modules/text_server_adv/text_server_adv.cpp +++ b/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" diff --git a/modules/text_server_adv/text_server_adv.h b/modules/text_server_adv/text_server_adv.h index 96db44ab069..86fbfb70b06 100644 --- a/modules/text_server_adv/text_server_adv.h +++ b/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" diff --git a/modules/tga/image_loader_tga.cpp b/modules/tga/image_loader_tga.cpp index b205dbbbf26..6d7d0ed705e 100644 --- a/modules/tga/image_loader_tga.cpp +++ b/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; diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp index 11492d189f6..8c7d639a6b9 100644 --- a/modules/theora/video_stream_theora.cpp +++ b/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" diff --git a/modules/theora/video_stream_theora.h b/modules/theora/video_stream_theora.h index 1e7fd088cc2..5e6630f1e2f 100644 --- a/modules/theora/video_stream_theora.h +++ b/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 #include diff --git a/modules/tinyexr/image_loader_tinyexr.cpp b/modules/tinyexr/image_loader_tinyexr.cpp index 8720ca56f6e..2a9d4323d88 100644 --- a/modules/tinyexr/image_loader_tinyexr.cpp +++ b/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 // Should come before including tinyexr. #include "thirdparty/tinyexr/tinyexr.h" diff --git a/modules/tinyexr/image_saver_tinyexr.cpp b/modules/tinyexr/image_saver_tinyexr.cpp index b0a977f6478..9cd19155cdd 100644 --- a/modules/tinyexr/image_saver_tinyexr.cpp +++ b/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 // Should come before including tinyexr. diff --git a/modules/upnp/register_types.cpp b/modules/upnp/register_types.cpp index fdf39c0b334..49fdd331cce 100644 --- a/modules/upnp/register_types.cpp +++ b/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; diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp index c89534a60c4..32a358a3e1f 100644 --- a/modules/vorbis/audio_stream_ogg_vorbis.cpp +++ b/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 diff --git a/modules/vorbis/resource_importer_ogg_vorbis.cpp b/modules/vorbis/resource_importer_ogg_vorbis.cpp index a7423e2d7be..0e43a6bd409 100644 --- a/modules/vorbis/resource_importer_ogg_vorbis.cpp +++ b/modules/vorbis/resource_importer_ogg_vorbis.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" diff --git a/modules/webp/image_loader_webp.cpp b/modules/webp/image_loader_webp.cpp index c3aa8605893..d0b156bdd74 100644 --- a/modules/webp/image_loader_webp.cpp +++ b/modules/webp/image_loader_webp.cpp @@ -32,16 +32,9 @@ #include "webp_common.h" -#include "core/config/project_settings.h" -#include "core/io/marshalls.h" -#include "core/os/os.h" -#include "core/string/print_string.h" - #include #include -#include - static Ref _webp_mem_loader_func(const uint8_t *p_webp_data, int p_size) { Ref img; img.instantiate(); diff --git a/modules/webp/webp_common.cpp b/modules/webp/webp_common.cpp index 0284eec574b..11c86238749 100644 --- a/modules/webp/webp_common.cpp +++ b/modules/webp/webp_common.cpp @@ -31,7 +31,6 @@ #include "webp_common.h" #include "core/config/project_settings.h" -#include "core/os/os.h" #include #include diff --git a/modules/webrtc/webrtc_multiplayer_peer.cpp b/modules/webrtc/webrtc_multiplayer_peer.cpp index 45fa9f46ca4..5b4b393adaf 100644 --- a/modules/webrtc/webrtc_multiplayer_peer.cpp +++ b/modules/webrtc/webrtc_multiplayer_peer.cpp @@ -30,9 +30,6 @@ #include "webrtc_multiplayer_peer.h" -#include "core/io/marshalls.h" -#include "core/os/os.h" - void WebRTCMultiplayerPeer::_bind_methods() { ClassDB::bind_method(D_METHOD("create_server", "channels_config"), &WebRTCMultiplayerPeer::create_server, DEFVAL(Array())); ClassDB::bind_method(D_METHOD("create_client", "peer_id", "channels_config"), &WebRTCMultiplayerPeer::create_client, DEFVAL(Array())); diff --git a/modules/webrtc/webrtc_peer_connection.h b/modules/webrtc/webrtc_peer_connection.h index 33c95ccd0f7..142ab812a06 100644 --- a/modules/webrtc/webrtc_peer_connection.h +++ b/modules/webrtc/webrtc_peer_connection.h @@ -33,8 +33,6 @@ #include "webrtc_data_channel.h" -#include "core/io/packet_peer.h" - class WebRTCPeerConnection : public RefCounted { GDCLASS(WebRTCPeerConnection, RefCounted); diff --git a/modules/webrtc/webrtc_peer_connection_extension.h b/modules/webrtc/webrtc_peer_connection_extension.h index 05d88e0f658..9afef314a36 100644 --- a/modules/webrtc/webrtc_peer_connection_extension.h +++ b/modules/webrtc/webrtc_peer_connection_extension.h @@ -35,7 +35,6 @@ #include "core/extension/ext_wrappers.gen.inc" #include "core/object/gdvirtual.gen.inc" -#include "core/variant/native_ptr.h" class WebRTCPeerConnectionExtension : public WebRTCPeerConnection { GDCLASS(WebRTCPeerConnectionExtension, WebRTCPeerConnection); diff --git a/modules/websocket/editor/editor_debugger_server_websocket.cpp b/modules/websocket/editor/editor_debugger_server_websocket.cpp index 344a0356c5a..ed51280ab70 100644 --- a/modules/websocket/editor/editor_debugger_server_websocket.cpp +++ b/modules/websocket/editor/editor_debugger_server_websocket.cpp @@ -34,7 +34,6 @@ #include "../remote_debugger_peer_websocket.h" -#include "core/config/project_settings.h" #include "editor/editor_log.h" #include "editor/editor_node.h" #include "editor/editor_settings.h" diff --git a/modules/websocket/register_types.cpp b/modules/websocket/register_types.cpp index c57210c8c91..f945684c8a2 100644 --- a/modules/websocket/register_types.cpp +++ b/modules/websocket/register_types.cpp @@ -44,7 +44,6 @@ #include "editor/editor_debugger_server_websocket.h" #endif -#include "core/config/project_settings.h" #include "core/debugger/engine_debugger.h" #include "core/error/error_macros.h" diff --git a/modules/websocket/websocket_multiplayer_peer.cpp b/modules/websocket/websocket_multiplayer_peer.cpp index 332cf93d360..1da78f215f6 100644 --- a/modules/websocket/websocket_multiplayer_peer.cpp +++ b/modules/websocket/websocket_multiplayer_peer.cpp @@ -30,6 +30,7 @@ #include "websocket_multiplayer_peer.h" +#include "core/io/stream_peer_tls.h" #include "core/os/os.h" WebSocketMultiplayerPeer::WebSocketMultiplayerPeer() { diff --git a/modules/websocket/websocket_multiplayer_peer.h b/modules/websocket/websocket_multiplayer_peer.h index f793cb375ed..2cb3489dd3f 100644 --- a/modules/websocket/websocket_multiplayer_peer.h +++ b/modules/websocket/websocket_multiplayer_peer.h @@ -34,7 +34,6 @@ #include "websocket_peer.h" #include "core/error/error_list.h" -#include "core/io/stream_peer_tls.h" #include "core/io/tcp_server.h" #include "core/templates/list.h" #include "scene/main/multiplayer_peer.h" diff --git a/modules/websocket/wsl_peer.h b/modules/websocket/wsl_peer.h index 45cca48224d..516fc882209 100644 --- a/modules/websocket/wsl_peer.h +++ b/modules/websocket/wsl_peer.h @@ -38,9 +38,7 @@ #include "core/crypto/crypto_core.h" #include "core/error/error_list.h" -#include "core/io/packet_peer.h" #include "core/io/stream_peer_tcp.h" -#include "core/templates/ring_buffer.h" #include diff --git a/modules/webxr/webxr_interface.cpp b/modules/webxr/webxr_interface.cpp index 4795fcdcd6c..a33a28a77a2 100644 --- a/modules/webxr/webxr_interface.cpp +++ b/modules/webxr/webxr_interface.cpp @@ -31,8 +31,6 @@ #include "webxr_interface.h" #include "webxr_interface.compat.inc" -#include - void WebXRInterface::_bind_methods() { ClassDB::bind_method(D_METHOD("is_session_supported", "session_mode"), &WebXRInterface::is_session_supported); ClassDB::bind_method(D_METHOD("set_session_mode", "session_mode"), &WebXRInterface::set_session_mode);