Merge pull request #100739 from YYF233333/iwyu5

Remove unused headers

core/variant/binder_common.h

@@ -34,7 +34,6 @@
 #include "core/input/input_enums.h"
 #include "core/object/object.h"
 #include "core/os/keyboard.h"
-#include "core/templates/list.h"
 #include "core/templates/simple_type.h"
 #include "core/typedefs.h"
 #include "core/variant/method_ptrcall.h"

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"
 

editor/add_metadata_dialog.cpp

@@ -30,6 +30,8 @@
 
 #include "add_metadata_dialog.h"
 
+#include "editor/themes/editor_scale.h"
+
 AddMetadataDialog::AddMetadataDialog() {
 	VBoxContainer *vbc = memnew(VBoxContainer);
 	add_child(vbc);

editor/add_metadata_dialog.h

@@ -31,17 +31,10 @@
 #ifndef ADD_METADATA_DIALOG_H
 #define ADD_METADATA_DIALOG_H
 
-#include "core/object/callable_method_pointer.h"
-#include "editor/editor_help.h"
-#include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_validation_panel.h"
-#include "editor/themes/editor_scale.h"
-#include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
-#include "scene/gui/item_list.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/option_button.h"
-#include "scene/gui/tree.h"
 
 class AddMetadataDialog : public ConfirmationDialog {
 	GDCLASS(AddMetadataDialog, ConfirmationDialog);

editor/animation_track_editor_plugins.cpp

@@ -39,7 +39,6 @@
 #include "scene/2d/sprite_2d.h"
 #include "scene/3d/sprite_3d.h"
 #include "scene/animation/animation_player.h"
-#include "scene/resources/text_line.h"
 #include "servers/audio/audio_stream.h"
 
 /// BOOL ///

editor/create_dialog.cpp

@@ -31,7 +31,6 @@
 #include "create_dialog.h"
 
 #include "core/object/class_db.h"
-#include "core/os/keyboard.h"
 #include "editor/editor_feature_profile.h"
 #include "editor/editor_node.h"
 #include "editor/editor_paths.h"

editor/debugger/debug_adapter/debug_adapter_server.cpp

@@ -30,7 +30,6 @@
 
 #include "debug_adapter_server.h"
 
-#include "core/os/os.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"

editor/debugger/editor_debugger_server.cpp

@@ -30,9 +30,7 @@
 
 #include "editor_debugger_server.h"
 
-#include "core/io/marshalls.h"
 #include "core/io/tcp_server.h"
-#include "core/os/mutex.h"
 #include "core/os/thread.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"

editor/debugger/editor_file_server.cpp

@@ -31,7 +31,6 @@
 #include "editor_file_server.h"
 
 #include "../editor_settings.h"
-#include "core/io/marshalls.h"
 #include "editor/editor_node.h"
 #include "editor/export/editor_export_platform.h"
 

editor/debugger/editor_file_server.h

@@ -31,9 +31,7 @@
 #ifndef EDITOR_FILE_SERVER_H
 #define EDITOR_FILE_SERVER_H
 
-#include "core/io/packet_peer.h"
 #include "core/io/tcp_server.h"
-#include "core/object/class_db.h"
 #include "core/os/thread.h"
 #include "editor/editor_file_system.h"
 

editor/debugger/editor_performance_profiler.h

@@ -32,7 +32,6 @@
 #define EDITOR_PERFORMANCE_PROFILER_H
 
 #include "core/templates/hash_map.h"
-#include "core/templates/rb_map.h"
 #include "main/performance.h"
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"

editor/debugger/editor_profiler.cpp

@@ -31,12 +31,10 @@
 #include "editor_profiler.h"
 
 #include "core/io/image.h"
-#include "core/os/os.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_run_bar.h"
 #include "editor/themes/editor_scale.h"
-#include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/check_box.h"
 #include "scene/resources/image_texture.h"
 

editor/debugger/editor_visual_profiler.cpp

@@ -31,7 +31,6 @@
 #include "editor_visual_profiler.h"
 
 #include "core/io/image.h"
-#include "core/os/os.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_run_bar.h"

editor/debugger/script_editor_debugger.cpp

@@ -61,13 +61,10 @@
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/rich_text_label.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
-#include "scene/gui/texture_button.h"
 #include "scene/gui/tree.h"
-#include "scene/resources/packed_scene.h"
 #include "servers/debugger/servers_debugger.h"
 #include "servers/display_server.h"
 

editor/dependency_editor.h

@@ -34,7 +34,6 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
-#include "scene/gui/tab_container.h"
 #include "scene/gui/tree.h"
 
 class EditorFileDialog;

editor/directory_create_dialog.cpp

@@ -31,7 +31,6 @@
 #include "directory_create_dialog.h"
 
 #include "core/io/dir_access.h"
-#include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "editor/gui/editor_validation_panel.h"
 #include "editor/themes/editor_scale.h"

editor/doc_tools.cpp

@@ -35,12 +35,11 @@
 #include "core/core_constants.h"
 #include "core/io/compression.h"
 #include "core/io/dir_access.h"
-#include "core/io/marshalls.h"
 #include "core/io/resource_importer.h"
 #include "core/object/script_language.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_settings.h"
-#include "editor/export/editor_export.h"
+#include "editor/export/editor_export_platform.h"
 #include "scene/resources/theme.h"
 #include "scene/theme/theme_db.h"
 

editor/editor_about.cpp

@@ -37,6 +37,9 @@
 #include "editor/gui/editor_version_button.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/item_list.h"
+#include "scene/gui/separator.h"
+#include "scene/gui/split_container.h"
+#include "scene/gui/tab_container.h"
 #include "scene/resources/style_box.h"
 
 void EditorAbout::_notification(int p_what) {

editor/editor_about.h

@@ -35,9 +35,6 @@
 #include "scene/gui/item_list.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/scroll_container.h"
-#include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
 

editor/editor_atlas_packer.cpp

@@ -33,6 +33,7 @@
 #include "core/math/geometry_2d.h"
 #include "core/math/vector2.h"
 #include "core/math/vector2i.h"
+#include "scene/resources/bit_map.h"
 
 void EditorAtlasPacker::chart_pack(Vector<Chart> &charts, int &r_width, int &r_height, int p_atlas_max_size, int p_cell_resolution) {
 	int divide_by = MIN(64, p_cell_resolution);

editor/editor_atlas_packer.h

@@ -31,11 +31,9 @@
 #ifndef EDITOR_ATLAS_PACKER_H
 #define EDITOR_ATLAS_PACKER_H
 
+#include "core/math/vector2.h"
+#include "core/math/vector2i.h"
 #include "core/templates/vector.h"
-#include "scene/resources/bit_map.h"
-
-struct Vector2;
-struct Vector2i;
 
 class EditorAtlasPacker {
 public:

editor/editor_autoload_settings.cpp

@@ -38,7 +38,6 @@
 #include "editor/filesystem_dock.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/project_settings_editor.h"
-#include "editor/themes/editor_scale.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 

editor/editor_build_profile.cpp

@@ -30,16 +30,15 @@
 
 #include "editor_build_profile.h"
 
-#include "core/io/dir_access.h"
 #include "core/io/json.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "editor/editor_paths.h"
-#include "editor/editor_property_name_processor.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/separator.h"
 
 const char *EditorBuildProfile::build_option_identifiers[BUILD_OPTION_MAX] = {
 	// This maps to SCons build options.

editor/editor_build_profile.h

@@ -31,13 +31,9 @@
 #ifndef EDITOR_BUILD_PROFILE_H
 #define EDITOR_BUILD_PROFILE_H
 
-#include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
 #include "editor/editor_help.h"
 #include "scene/gui/dialogs.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/separator.h"
-#include "scene/gui/split_container.h"
 #include "scene/gui/tree.h"
 
 class EditorBuildProfile : public RefCounted {

editor/editor_command_palette.h

@@ -32,7 +32,6 @@
 #define EDITOR_COMMAND_PALETTE_H
 
 #include "core/input/shortcut.h"
-#include "core/os/thread_safe.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
 

editor/editor_data.cpp

@@ -33,17 +33,12 @@
 #include "core/config/project_settings.h"
 #include "core/extension/gdextension_manager.h"
 #include "core/io/file_access.h"
-#include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"
 #include "editor/editor_node.h"
-#include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/multi_node_edit.h"
 #include "editor/plugins/editor_context_menu_plugin.h"
 #include "editor/plugins/editor_plugin.h"
-#include "editor/plugins/script_editor_plugin.h"
-#include "editor/themes/editor_scale.h"
-#include "scene/gui/popup_menu.h"
 #include "scene/resources/packed_scene.h"
 
 void EditorSelectionHistory::cleanup_history() {

editor/editor_feature_profile.cpp

@@ -39,6 +39,7 @@
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/separator.h"
 
 const char *EditorFeatureProfile::feature_names[FEATURE_MAX] = {
 	TTRC("3D Editor"),

editor/editor_feature_profile.h

@@ -31,12 +31,10 @@
 #ifndef EDITOR_FEATURE_PROFILE_H
 #define EDITOR_FEATURE_PROFILE_H
 
-#include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
 #include "editor/editor_help.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/option_button.h"
-#include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tree.h"
 

editor/editor_help.h

@@ -32,15 +32,12 @@
 #define EDITOR_HELP_H
 
 #include "core/os/thread.h"
-#include "editor/code_editor.h"
 #include "editor/doc_tools.h"
 #include "editor/plugins/editor_plugin.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/panel_container.h"
+#include "scene/gui/dialogs.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/split_container.h"
-#include "scene/gui/tab_container.h"
 #include "scene/gui/text_edit.h"
 #include "scene/main/timer.h"
 

editor/editor_help_search.cpp

@@ -30,7 +30,6 @@
 
 #include "editor_help_search.h"
 
-#include "core/os/keyboard.h"
 #include "editor/editor_feature_profile.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"

editor/editor_help_search.h

@@ -31,10 +31,8 @@
 #ifndef EDITOR_HELP_SEARCH_H
 #define EDITOR_HELP_SEARCH_H
 
-#include "core/templates/rb_map.h"
-#include "editor/code_editor.h"
-#include "editor/editor_help.h"
 #include "editor/plugins/editor_plugin.h"
+#include "scene/gui/dialogs.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/tree.h"
 

editor/editor_inspector.cpp

@@ -48,6 +48,7 @@
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/margin_container.h"
+#include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/property_utils.h"

editor/editor_interface.cpp

@@ -55,7 +55,6 @@
 #include "plugins/editor_preview_plugins.h"
 #include "scene/3d/light_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/3d/world_environment.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
 #include "scene/main/window.h"

editor/editor_log.cpp

@@ -38,7 +38,6 @@
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/gui/center_container.h"
 #include "scene/gui/separator.h"
 #include "scene/resources/font.h"
 

editor/editor_log.h

@@ -34,12 +34,8 @@
 #include "core/os/thread.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
-#include "scene/gui/panel_container.h"
 #include "scene/gui/rich_text_label.h"
-#include "scene/gui/texture_button.h"
-#include "scene/gui/texture_rect.h"
 
 class UndoRedo;
 

editor/editor_native_shader_source_visualizer.cpp

@@ -30,10 +30,10 @@
 
 #include "editor_native_shader_source_visualizer.h"
 
-#include "editor/code_editor.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/code_edit.h"
 #include "scene/gui/text_edit.h"
 #include "servers/rendering/shader_language.h"
 

editor/editor_node.cpp

@@ -48,16 +48,15 @@
 #include "editor/editor_string_names.h"
 #include "editor/plugins/editor_context_menu_plugin.h"
 #include "main/main.h"
+#include "scene/2d/node_2d.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/animation/animation_tree.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/file_dialog.h"
-#include "scene/gui/link_button.h"
 #include "scene/gui/menu_bar.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
-#include "scene/gui/panel_container.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/split_container.h"
@@ -97,8 +96,6 @@
 #include "editor/editor_property_name_processor.h"
 #include "editor/editor_resource_picker.h"
 #include "editor/editor_resource_preview.h"
-#include "editor/editor_run.h"
-#include "editor/editor_run_native.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_settings_dialog.h"
 #include "editor/editor_translation_parser.h"
@@ -167,7 +164,6 @@
 #include "editor/themes/editor_theme_manager.h"
 #include "editor/window_wrapper.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "modules/modules_enabled.gen.h" // For gdscript, mono.

editor/editor_properties.cpp

@@ -47,7 +47,6 @@
 #include "editor/property_selector.h"
 #include "editor/scene_tree_dock.h"
 #include "editor/themes/editor_scale.h"
-#include "editor/themes/editor_theme_manager.h"
 #include "scene/2d/gpu_particles_2d.h"
 #include "scene/3d/fog_volume.h"
 #include "scene/3d/gpu_particles_3d.h"
@@ -56,7 +55,6 @@
 #include "scene/main/window.h"
 #include "scene/resources/font.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/packed_scene.h"
 #include "scene/resources/visual_shader_nodes.h"
 
 ///////////////////// Nil /////////////////////////

editor/editor_properties_array_dict.cpp

@@ -32,6 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/io/marshalls.h"
+#include "editor/editor_file_system.h"
 #include "editor/editor_properties.h"
 #include "editor/editor_properties_vector.h"
 #include "editor/editor_settings.h"
@@ -39,10 +40,8 @@
 #include "editor/gui/editor_spin_slider.h"
 #include "editor/inspector_dock.h"
 #include "editor/themes/editor_scale.h"
-#include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/button.h"
 #include "scene/gui/margin_container.h"
-#include "scene/resources/packed_scene.h"
 
 bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_value) {
 	String name = p_name;

editor/editor_properties_array_dict.h

@@ -33,7 +33,6 @@
 
 #include "editor/editor_inspector.h"
 #include "editor/editor_locale_dialog.h"
-#include "editor/filesystem_dock.h"
 
 class Button;
 class EditorSpinSlider;

editor/editor_resource_preview.cpp

@@ -42,7 +42,7 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/main/window.h"
 #include "scene/resources/image_texture.h"
-#include "servers/rendering/rendering_server_default.h"
+#include "servers/rendering/rendering_server_globals.h"
 
 bool EditorResourcePreviewGenerator::handles(const String &p_type) const {
 	bool success = false;

editor/editor_settings.h

@@ -35,7 +35,6 @@
 #include "core/io/config_file.h"
 #include "core/io/resource.h"
 #include "core/os/thread_safe.h"
-#include "core/templates/rb_set.h"
 
 class EditorPlugin;
 

editor/editor_settings_dialog.cpp

@@ -50,6 +50,7 @@
 #include "scene/gui/panel_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
+#include "scene/gui/tree.h"
 
 void EditorSettingsDialog::ok_pressed() {
 	if (!EditorSettings::get_singleton()) {

editor/editor_translation.h

@@ -32,7 +32,6 @@
 #define EDITOR_TRANSLATION_H
 
 #include "core/string/ustring.h"
-#include "core/templates/list.h"
 #include "core/templates/vector.h"
 
 Vector<String> get_editor_locales();

editor/editor_undo_redo_manager.cpp

@@ -32,7 +32,6 @@
 
 #include "core/io/resource.h"
 #include "core/os/os.h"
-#include "core/templates/local_vector.h"
 #include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/editor_log.h"

editor/editor_undo_redo_manager.h

@@ -31,7 +31,6 @@
 #ifndef EDITOR_UNDO_REDO_MANAGER_H
 #define EDITOR_UNDO_REDO_MANAGER_H
 
-#include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "core/object/undo_redo.h"
 

editor/editor_vcs_interface.h

@@ -31,10 +31,8 @@
 #ifndef EDITOR_VCS_INTERFACE_H
 #define EDITOR_VCS_INTERFACE_H
 
-#include "core/object/class_db.h"
 #include "core/object/gdvirtual.gen.inc"
 #include "core/string/ustring.h"
-#include "core/variant/type_info.h"
 #include "core/variant/typed_array.h"
 
 class EditorVCSInterface : public Object {

editor/engine_update_label.cpp

@@ -31,12 +31,8 @@
 #include "engine_update_label.h"
 
 #include "core/io/json.h"
-#include "core/os/time.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
-#include "editor/themes/editor_scale.h"
-#include "scene/gui/box_container.h"
-#include "scene/gui/button.h"
 #include "scene/main/http_request.h"
 
 bool EngineUpdateLabel::_can_check_updates() const {

editor/export/codesign.cpp

@@ -30,13 +30,13 @@
 
 #include "codesign.h"
 
+#include "core/crypto/crypto_core.h"
+#include "core/io/dir_access.h"
 #include "lipo.h"
 #include "macho.h"
 
 #include "core/io/plist.h"
-#include "core/os/os.h"
 #include "editor/editor_paths.h"
-#include "editor/editor_settings.h"
 
 #include "modules/modules_enabled.gen.h" // For regex.
 
@@ -44,6 +44,8 @@
 
 #ifdef MODULE_REGEX_ENABLED
 
+#include "modules/regex/regex.h"
+
 /*************************************************************************/
 /* CodeSignCodeResources                                                 */
 /*************************************************************************/

editor/export/codesign.h

@@ -41,16 +41,10 @@
 //  - Requirements code generator is not implemented (only hard-coded requirements for the ad-hoc signing is supported).
 //  - RFC5652/CMS blob generation is not implemented, supports ad-hoc signing only.
 
-#include "core/crypto/crypto_core.h"
-#include "core/io/dir_access.h"
 #include "core/io/file_access.h"
-#include "core/io/plist.h"
 #include "core/object/ref_counted.h"
 
 #include "modules/modules_enabled.gen.h" // For regex.
-#ifdef MODULE_REGEX_ENABLED
-#include "modules/regex/regex.h"
-#endif
 
 #ifdef MODULE_REGEX_ENABLED
 

editor/export/editor_export_plugin.cpp

@@ -31,12 +31,7 @@
 #include "editor_export_plugin.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/dir_access.h"
-#include "core/io/file_access.h"
-#include "editor/editor_paths.h"
-#include "editor/editor_settings.h"
 #include "editor/export/editor_export_platform.h"
-#include "scene/resources/resource_format_text.h"
 
 void EditorExportPlugin::set_export_preset(const Ref<EditorExportPreset> &p_preset) {
 	if (p_preset.is_valid()) {

editor/export/editor_export_plugin.h

@@ -31,7 +31,6 @@
 #ifndef EDITOR_EXPORT_PLUGIN_H
 #define EDITOR_EXPORT_PLUGIN_H
 
-#include "core/extension/gdextension.h"
 #include "core/os/shared_object.h"
 #include "editor_export_platform.h"
 #include "editor_export_preset.h"

editor/export/export_template_manager.cpp

@@ -39,7 +39,7 @@
 #include "editor/editor_paths.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
-#include "editor/export/editor_export.h"
+#include "editor/export/editor_export_preset.h"
 #include "editor/progress_dialog.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/file_dialog.h"

editor/export/lipo.cpp

@@ -30,6 +30,8 @@
 
 #include "lipo.h"
 
+#include "macho.h"
+
 bool LipO::is_lipo(const String &p_path) {
 	Ref<FileAccess> fb = FileAccess::open(p_path, FileAccess::READ);
 	ERR_FAIL_COND_V_MSG(fb.is_null(), false, vformat("LipO: Can't open file: \"%s\".", p_path));

editor/export/lipo.h

@@ -33,8 +33,6 @@
 
 // Universal / Universal 2 fat binary file creator and extractor.
 
-#include "macho.h"
-
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
 

editor/export/macho.cpp

@@ -30,6 +30,8 @@
 
 #include "macho.h"
 
+#include "core/crypto/crypto_core.h"
+
 uint32_t MachO::seg_align(uint64_t p_vmaddr, uint32_t p_min, uint32_t p_max) {
 	uint32_t salign = p_max;
 	if (p_vmaddr != 0) {

editor/export/macho.h

@@ -33,8 +33,6 @@
 
 // Mach-O binary object file format parser and editor.
 
-#include "core/crypto/crypto.h"
-#include "core/crypto/crypto_core.h"
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
 

editor/export/project_export.cpp

@@ -41,7 +41,6 @@
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/import/resource_importer_texture_settings.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/link_button.h"

editor/file_info.h

@@ -31,7 +31,8 @@
 #ifndef FILE_INFO_H
 #define FILE_INFO_H
 
-#include "core/variant/variant.h"
+#include "core/string/string_name.h"
+#include "core/templates/list.h"
 
 enum class FileSortOption {
 	FILE_SORT_NAME = 0,

editor/gui/scene_tree_editor.cpp

@@ -43,6 +43,7 @@
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/2d/node_2d.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/texture_rect.h"

editor/import/3d/collada.cpp

@@ -30,7 +30,7 @@
 
 #include "collada.h"
 
-#include <stdio.h>
+#include "core/config/project_settings.h"
 
 //#define DEBUG_DEFAULT_ANIMATION
 //#define DEBUG_COLLADA

editor/import/3d/collada.h

@@ -31,10 +31,7 @@
 #ifndef COLLADA_H
 #define COLLADA_H
 
-#include "core/config/project_settings.h"
 #include "core/io/xml_parser.h"
-#include "core/templates/rb_map.h"
-#include "scene/resources/material.h"
 
 class Collada {
 public:

editor/import/3d/editor_import_collada.cpp

@@ -30,20 +30,17 @@
 
 #include "editor_import_collada.h"
 
-#include "core/os/os.h"
-#include "editor/editor_node.h"
+#include "core/config/project_settings.h"
 #include "editor/import/3d/collada.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/light_3d.h"
-#include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/node_3d.h"
 #include "scene/3d/path_3d.h"
 #include "scene/3d/skeleton_3d.h"
 #include "scene/animation/animation_player.h"
 #include "scene/resources/3d/importer_mesh.h"
 #include "scene/resources/animation.h"
-#include "scene/resources/packed_scene.h"
 #include "scene/resources/surface_tool.h"
 
 struct ColladaImport {

editor/import/3d/post_import_plugin_skeleton_renamer.cpp

@@ -30,7 +30,6 @@
 
 #include "post_import_plugin_skeleton_renamer.h"
 
-#include "editor/import/3d/scene_import_settings.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/skeleton_3d.h"

editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp

@@ -30,7 +30,6 @@
 
 #include "post_import_plugin_skeleton_rest_fixer.h"
 
-#include "editor/import/3d/scene_import_settings.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/retarget_modifier_3d.h"

editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp

@@ -30,7 +30,6 @@
 
 #include "post_import_plugin_skeleton_track_organizer.h"
 
-#include "editor/import/3d/scene_import_settings.h"
 #include "scene/3d/skeleton_3d.h"
 #include "scene/animation/animation_player.h"
 #include "scene/resources/bone_map.h"

editor/import/3d/resource_importer_obj.cpp

@@ -33,7 +33,6 @@
 #include "core/io/file_access.h"
 #include "core/io/resource_saver.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
-#include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/node_3d.h"
 #include "scene/resources/3d/importer_mesh.h"
 #include "scene/resources/mesh.h"

editor/import/3d/resource_importer_scene.cpp

@@ -44,7 +44,6 @@
 #include "scene/3d/occluder_instance_3d.h"
 #include "scene/3d/physics/area_3d.h"
 #include "scene/3d/physics/collision_shape_3d.h"
-#include "scene/3d/physics/physics_body_3d.h"
 #include "scene/3d/physics/static_body_3d.h"
 #include "scene/3d/physics/vehicle_body_3d.h"
 #include "scene/animation/animation_player.h"
@@ -57,7 +56,6 @@
 #include "scene/resources/bone_map.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/resource_format_text.h"
-#include "scene/resources/surface_tool.h"
 
 uint32_t EditorSceneFormatImporter::get_import_flags() const {
 	uint32_t ret;

editor/import/3d/resource_importer_scene.h

@@ -39,7 +39,6 @@
 #include "scene/resources/3d/capsule_shape_3d.h"
 #include "scene/resources/3d/cylinder_shape_3d.h"
 #include "scene/resources/3d/importer_mesh.h"
-#include "scene/resources/3d/skin.h"
 #include "scene/resources/3d/sphere_shape_3d.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/mesh.h"

editor/import/3d/scene_import_settings.cpp

@@ -41,6 +41,7 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/animation/animation_player.h"
+#include "scene/gui/subviewport_container.h"
 #include "scene/resources/3d/importer_mesh.h"
 #include "scene/resources/surface_tool.h"
 

editor/import/3d/scene_import_settings.h

@@ -37,13 +37,11 @@
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/skeleton_3d.h"
 #include "scene/gui/dialogs.h"
-#include "scene/gui/item_list.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/split_container.h"
-#include "scene/gui/subviewport_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/tree.h"
 #include "scene/resources/3d/primitive_meshes.h"

editor/import/dynamic_font_import_settings.cpp

@@ -31,16 +31,15 @@
 #include "dynamic_font_import_settings.h"
 
 #include "core/config/project_settings.h"
-#include "core/string/translation_server.h"
+#include "core/string/translation.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_inspector.h"
 #include "editor/editor_locale_dialog.h"
 #include "editor/editor_node.h"
-#include "editor/editor_property_name_processor.h"
-#include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/split_container.h"
 
 /*************************************************************************/
 /* Settings data                                                         */

editor/import/dynamic_font_import_settings.h

@@ -31,19 +31,13 @@
 #ifndef DYNAMIC_FONT_IMPORT_SETTINGS_H
 #define DYNAMIC_FONT_IMPORT_SETTINGS_H
 
-#include "editor/import/resource_importer_dynamic_font.h"
+#include "core/io/resource_importer.h"
 
-#include "core/templates/rb_set.h"
 #include "scene/gui/dialogs.h"
-#include "scene/gui/item_list.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/subviewport_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/text_edit.h"
 #include "scene/gui/tree.h"
 #include "scene/resources/font.h"
-#include "servers/text_server.h"
 
 class DynamicFontImportSettingsDialog;
 

editor/import/resource_importer_image.cpp

@@ -32,8 +32,6 @@
 
 #include "core/io/file_access.h"
 #include "core/io/image_loader.h"
-#include "core/io/resource_saver.h"
-#include "scene/resources/texture.h"
 
 String ResourceImporterImage::get_importer_name() const {
 	return "image";

editor/import/resource_importer_layered_texture.cpp

@@ -32,15 +32,12 @@
 
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
-#include "core/io/config_file.h"
 #include "core/io/image_loader.h"
 #include "core/object/ref_counted.h"
 #include "editor/editor_file_system.h"
-#include "editor/editor_node.h"
 #include "editor/import/resource_importer_texture.h"
 #include "editor/import/resource_importer_texture_settings.h"
 #include "scene/resources/compressed_texture.h"
-#include "scene/resources/texture.h"
 
 String ResourceImporterLayeredTexture::get_importer_name() const {
 	switch (mode) {

editor/import/resource_importer_shader_file.cpp

@@ -31,7 +31,6 @@
 #include "resource_importer_shader_file.h"
 
 #include "core/io/file_access.h"
-#include "core/io/marshalls.h"
 #include "core/io/resource_saver.h"
 #include "editor/editor_node.h"
 #include "editor/plugins/shader_file_editor_plugin.h"

editor/import/resource_importer_texture.cpp

@@ -35,7 +35,6 @@
 #include "core/io/image_loader.h"
 #include "core/version.h"
 #include "editor/editor_file_system.h"
-#include "editor/editor_node.h"
 #include "editor/gui/editor_toaster.h"
 #include "editor/import/resource_importer_texture_settings.h"
 #include "editor/themes/editor_scale.h"

editor/import/resource_importer_texture.h

@@ -34,7 +34,6 @@
 #include "core/io/file_access.h"
 #include "core/io/image.h"
 #include "core/io/resource_importer.h"
-#include "scene/resources/texture.h"
 #include "servers/rendering_server.h"
 
 class CompressedTexture2D;

editor/import/resource_importer_texture_atlas.cpp

@@ -32,12 +32,12 @@
 
 #include "atlas_import_failed.xpm"
 #include "core/config/project_settings.h"
-#include "core/io/file_access.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/math/geometry_2d.h"
 #include "editor/editor_atlas_packer.h"
 #include "scene/resources/atlas_texture.h"
+#include "scene/resources/bit_map.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/mesh_texture.h"

editor/import/resource_importer_wav.cpp

@@ -30,8 +30,6 @@
 
 #include "resource_importer_wav.h"
 
-#include "core/io/file_access.h"
-#include "core/io/marshalls.h"
 #include "core/io/resource_saver.h"
 
 String ResourceImporterWAV::get_importer_name() const {

editor/localization_editor.cpp

@@ -38,6 +38,7 @@
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/pot_generator.h"
 #include "scene/gui/control.h"
+#include "scene/gui/tab_container.h"
 
 void LocalizationEditor::_notification(int p_what) {
 	switch (p_what) {

editor/multi_node_edit.h

@@ -31,7 +31,7 @@
 #ifndef MULTI_NODE_EDIT_H
 #define MULTI_NODE_EDIT_H
 
-#include "scene/main/node.h"
+#include "core/object/ref_counted.h"
 
 class MultiNodeEdit : public RefCounted {
 	GDCLASS(MultiNodeEdit, RefCounted);

editor/node_dock.cpp

@@ -31,7 +31,6 @@
 #include "node_dock.h"
 
 #include "editor/connections_dialog.h"
-#include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"
 
 void NodeDock::show_groups() {

editor/plugins/abstract_polygon_2d_editor.cpp

@@ -40,7 +40,6 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
-#include "scene/gui/separator.h"
 
 bool AbstractPolygon2DEditor::Vertex::operator==(const AbstractPolygon2DEditor::Vertex &p_vertex) const {
 	return polygon == p_vertex.polygon && vertex == p_vertex.vertex;

editor/plugins/abstract_polygon_2d_editor.h

@@ -32,7 +32,7 @@
 #define ABSTRACT_POLYGON_2D_EDITOR_H
 
 #include "editor/plugins/editor_plugin.h"
-#include "scene/2d/polygon_2d.h"
+#include "scene/2d/node_2d.h"
 #include "scene/gui/box_container.h"
 
 class Button;

editor/plugins/animation_blend_space_1d_editor.h

@@ -35,7 +35,6 @@
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_blend_space_1d.h"
 #include "scene/gui/graph_edit.h"
-#include "scene/gui/popup.h"
 
 class Button;
 class CheckBox;