Merge pull request #57641 from Geometror/compilation-time-improvements-1

core/config/project_settings.cpp

@@ -39,7 +39,6 @@
 #include "core/io/file_access_pack.h"
 #include "core/io/marshalls.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "core/variant/variant_parser.h"
 #include "core/version.h"
 

core/core_bind.cpp

@@ -39,7 +39,6 @@
 #include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
 #include "core/os/keyboard.h"
-#include "core/os/os.h"
 
 namespace core_bind {
 

core/debugger/local_debugger.cpp

@@ -31,7 +31,6 @@
 #include "local_debugger.h"
 
 #include "core/debugger/script_debugger.h"
-#include "core/os/os.h"
 #include "scene/main/scene_tree.h"
 
 struct LocalDebugger::ScriptsProfiler {

core/os/midi_driver.cpp

@@ -31,7 +31,6 @@
 #include "midi_driver.h"
 
 #include "core/input/input.h"
-#include "core/os/os.h"
 
 uint8_t MIDIDriver::last_received_message = 0x00;
 MIDIDriver *MIDIDriver::singleton = nullptr;

core/os/os.h

@@ -34,7 +34,6 @@
 #include "core/config/engine.h"
 #include "core/io/image.h"
 #include "core/io/logger.h"
-#include "core/os/main_loop.h"
 #include "core/string/ustring.h"
 #include "core/templates/list.h"
 #include "core/templates/vector.h"

core/os/threaded_array_processor.h

@@ -31,7 +31,6 @@
 #ifndef THREADED_ARRAY_PROCESSOR_H
 #define THREADED_ARRAY_PROCESSOR_H
 
-#include "core/os/mutex.h"
 #include "core/os/os.h"
 #include "core/os/thread.h"
 #include "core/os/thread_safe.h"

core/variant/typed_array.h

@@ -31,8 +31,10 @@
 #ifndef TYPED_ARRAY_H
 #define TYPED_ARRAY_H
 
+#include "core/object/object.h"
 #include "core/variant/array.h"
 #include "core/variant/method_ptrcall.h"
+#include "core/variant/type_info.h"
 #include "core/variant/variant.h"
 
 template <class T>

editor/action_map_editor.cpp

@@ -33,6 +33,7 @@
 #include "core/os/keyboard.h"
 #include "editor/editor_scale.h"
 #include "scene/gui/center_container.h"
+#include "scene/gui/separator.h"
 
 /////////////////////////////////////////
 

editor/action_map_editor.h

@@ -32,7 +32,7 @@
 #define ACTION_MAP_EDITOR_H
 
 #include "editor/editor_data.h"
-#include <scene/gui/color_rect.h>
+#include "scene/gui/color_rect.h"
 
 // Confirmation Dialog used when configuring an input event.
 // Separate from ActionMapEditor for code cleanliness and separation of responsibilities.

editor/animation_bezier_editor.cpp

@@ -31,7 +31,7 @@
 #include "animation_bezier_editor.h"
 
 #include "editor/editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_scale.h"
 #include "scene/gui/view_panner.h"
 #include "scene/resources/text_line.h"
 

editor/animation_track_editor.cpp

@@ -33,9 +33,9 @@
 #include "animation_track_editor_plugins.h"
 #include "core/input/input.h"
 #include "editor/animation_bezier_editor.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
-#include "editor_node.h"
-#include "editor_scale.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/window.h"

editor/animation_track_editor.h

@@ -37,7 +37,6 @@
 #include "editor/property_selector.h"
 
 #include "scene/gui/control.h"
-#include "scene/gui/file_dialog.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/scroll_bar.h"
 #include "scene/gui/slider.h"

editor/animation_track_editor_plugins.cpp

@@ -31,8 +31,8 @@
 #include "animation_track_editor_plugins.h"
 
 #include "editor/audio_stream_preview.h"
-#include "editor_resource_preview.h"
-#include "editor_scale.h"
+#include "editor/editor_resource_preview.h"
+#include "editor/editor_scale.h"
 #include "scene/2d/animated_sprite_2d.h"
 #include "scene/2d/sprite_2d.h"
 #include "scene/3d/sprite_3d.h"

editor/array_property_edit.cpp

@@ -31,7 +31,7 @@
 #include "array_property_edit.h"
 
 #include "core/io/marshalls.h"
-#include "editor_node.h"
+#include "editor/editor_node.h"
 
 #define ITEMS_PER_PAGE 100
 

editor/code_editor.cpp

@@ -34,9 +34,9 @@
 #include "core/object/message_queue.h"
 #include "core/os/keyboard.h"
 #include "core/string/string_builder.h"
+#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
-#include "editor_node.h"
-#include "editor_settings.h"
+#include "editor/editor_settings.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/separator.h"
 #include "scene/resources/font.h"

editor/connections_dialog.cpp

@@ -32,9 +32,10 @@
 
 #include "core/string/print_string.h"
 #include "editor/doc_tools.h"
-#include "editor_node.h"
-#include "editor_scale.h"
-#include "editor_settings.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
+#include "editor/scene_tree_dock.h"
 #include "plugins/script_editor_plugin.h"
 #include "scene/gui/label.h"
 #include "scene/gui/popup_menu.h"

editor/create_dialog.cpp

@@ -32,10 +32,10 @@
 
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "editor_feature_profile.h"
-#include "editor_node.h"
-#include "editor_scale.h"
-#include "editor_settings.h"
+#include "editor/editor_feature_profile.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
 
 void CreateDialog::popup_create(bool p_dont_clear, bool p_replace_mode, const String &p_select_type) {
 	_fill_type_list();

editor/create_dialog.h

@@ -31,7 +31,7 @@
 #ifndef CREATE_DIALOG_H
 #define CREATE_DIALOG_H
 
-#include "editor_help.h"
+#include "editor/editor_help.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"

editor/debugger/editor_debugger_node.cpp

@@ -36,6 +36,7 @@
 #include "editor/editor_node.h"
 #include "editor/plugins/editor_debugger_plugin.h"
 #include "editor/plugins/script_editor_plugin.h"
+#include "editor/scene_tree_dock.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/tab_container.h"
 

editor/debugger/editor_debugger_tree.cpp

@@ -30,7 +30,9 @@
 
 #include "editor_debugger_tree.h"
 
+#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
+#include "editor/scene_tree_dock.h"
 #include "scene/debugger/scene_debugger.h"
 #include "scene/resources/packed_scene.h"
 #include "servers/display_server.h"

editor/debugger/script_editor_debugger.cpp

@@ -41,6 +41,7 @@
 #include "editor/debugger/editor_performance_profiler.h"
 #include "editor/debugger/editor_profiler.h"
 #include "editor/debugger/editor_visual_profiler.h"
+#include "editor/editor_file_dialog.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"

editor/debugger/script_editor_debugger.h

@@ -35,7 +35,6 @@
 #include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/editor_debugger_server.h"
-#include "editor/editor_file_dialog.h"
 #include "scene/gui/button.h"
 #include "scene/gui/margin_container.h"
 
@@ -50,6 +49,7 @@ class TreeItem;
 class HSplitContainer;
 class ItemList;
 class EditorProfiler;
+class EditorFileDialog;
 class EditorVisualProfiler;
 class EditorNetworkProfiler;
 class EditorPerformanceProfiler;

editor/dependency_editor.cpp

@@ -30,10 +30,13 @@
 
 #include "dependency_editor.h"
 
+#include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
-#include "editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_file_system.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "scene/gui/margin_container.h"
 
 void DependencyEditor::_searched(const String &p_path) {

editor/dependency_editor.h

@@ -31,8 +31,8 @@
 #ifndef DEPENDENCY_EDITOR_H
 #define DEPENDENCY_EDITOR_H
 
-#include "editor_file_dialog.h"
 #include "scene/gui/dialogs.h"
+#include "scene/gui/item_list.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/tree.h"
 

editor/dictionary_property_edit.cpp

@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "dictionary_property_edit.h"
-#include "editor_node.h"
+#include "editor/editor_node.h"
 
 void DictionaryPropertyEdit::_notif_change() {
 	notify_property_list_changed();

editor/editor_about.cpp

@@ -34,7 +34,7 @@
 #include "core/donors.gen.h"
 #include "core/license.gen.h"
 #include "core/version.h"
-#include "editor_node.h"
+#include "editor/editor_node.h"
 
 // The metadata key used to store and retrieve the version text to copy to the clipboard.
 static const String META_TEXT_TO_COPY = "text_to_copy";

editor/editor_about.h

@@ -31,7 +31,6 @@
 #ifndef EDITOR_ABOUT_H
 #define EDITOR_ABOUT_H
 
-#include "scene/gui/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/link_button.h"
@@ -43,7 +42,7 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
 
-#include "editor_scale.h"
+#include "editor/editor_scale.h"
 
 /**
  * NOTE: Do not assume the EditorNode singleton to be available in this class' methods.

editor/editor_asset_installer.cpp

@@ -33,8 +33,9 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/zip_io.h"
-#include "editor_node.h"
-#include "progress_dialog.h"
+#include "editor/editor_file_system.h"
+#include "editor/editor_node.h"
+#include "editor/progress_dialog.h"
 
 void EditorAssetInstaller::_item_edited() {
 	if (updating) {

editor/editor_audio_buses.cpp

@@ -30,11 +30,13 @@
 
 #include "editor_audio_buses.h"
 
+#include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/io/resource_saver.h"
 #include "core/os/keyboard.h"
-#include "editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "filesystem_dock.h"
 #include "scene/resources/font.h"
 #include "servers/audio_server.h"

editor/editor_audio_buses.h

@@ -31,8 +31,7 @@
 #ifndef EDITORAUDIOBUSES_H
 #define EDITORAUDIOBUSES_H
 
-#include "editor/editor_file_dialog.h"
-#include "editor_plugin.h"
+#include "editor/editor_plugin.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/control.h"

editor/editor_autoload_settings.cpp

@@ -32,8 +32,9 @@
 
 #include "core/config/project_settings.h"
 #include "core/core_constants.h"
-#include "editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "project_settings_editor.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"

editor/editor_autoload_settings.h

@@ -31,9 +31,11 @@
 #ifndef EDITOR_AUTOLOAD_SETTINGS_H
 #define EDITOR_AUTOLOAD_SETTINGS_H
 
+#include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
 #include "scene/gui/tree.h"
 
-#include "editor_file_dialog.h"
+class EditorFileDialog;
 
 class EditorAutoloadSettings : public VBoxContainer {
 	GDCLASS(EditorAutoloadSettings, VBoxContainer);

editor/editor_data.cpp

@@ -34,8 +34,8 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
-#include "editor_node.h"
-#include "editor_settings.h"
+#include "editor/editor_node.h"
+#include "editor/editor_settings.h"
 #include "scene/resources/packed_scene.h"
 
 void EditorHistory::cleanup_history() {

editor/editor_dir_dialog.cpp

@@ -33,8 +33,8 @@
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "editor/editor_file_system.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "editor_scale.h"
 #include "servers/display_server.h"
 
 void EditorDirDialog::_update_dir(TreeItem *p_item, EditorFileSystemDirectory *p_dir, const String &p_select_path) {

editor/editor_export.cpp

@@ -44,9 +44,9 @@
 #include "core/object/script_language.h"
 #include "core/version.h"
 #include "editor/editor_file_system.h"
+#include "editor/editor_node.h"
+#include "editor/editor_settings.h"
 #include "editor/plugins/script_editor_plugin.h"
-#include "editor_node.h"
-#include "editor_settings.h"
 #include "scene/resources/resource_format_text.h"
 
 static int _get_pad(int p_alignment, int p_n) {

editor/editor_feature_profile.cpp

@@ -32,9 +32,10 @@
 
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "editor_node.h"
-#include "editor_scale.h"
 
 const char *EditorFeatureProfile::feature_names[FEATURE_MAX] = {
 	TTRC("3D Editor"),

editor/editor_feature_profile.h

@@ -33,8 +33,7 @@
 
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
-#include "editor/editor_file_dialog.h"
-#include "editor_help.h"
+#include "editor/editor_help.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"

editor/editor_file_dialog.cpp

@@ -30,15 +30,16 @@
 
 #include "editor_file_dialog.h"
 
+#include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "dependency_editor.h"
-#include "editor_file_system.h"
-#include "editor_resource_preview.h"
-#include "editor_scale.h"
-#include "editor_settings.h"
+#include "editor/editor_file_system.h"
+#include "editor/editor_resource_preview.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
 #include "scene/gui/center_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/margin_container.h"

editor/editor_file_system.cpp

@@ -38,9 +38,9 @@
 #include "core/io/resource_saver.h"
 #include "core/os/os.h"
 #include "core/variant/variant_parser.h"
-#include "editor_node.h"
-#include "editor_resource_preview.h"
-#include "editor_settings.h"
+#include "editor/editor_node.h"
+#include "editor/editor_resource_preview.h"
+#include "editor/editor_settings.h"
 
 EditorFileSystem *EditorFileSystem::singleton = nullptr;
 //the name is the version, to keep compatibility with different versions of Godot

editor/editor_folding.cpp

@@ -31,8 +31,8 @@
 #include "editor_folding.h"
 
 #include "core/io/file_access.h"
-#include "editor_inspector.h"
-#include "editor_settings.h"
+#include "editor/editor_inspector.h"
+#include "editor/editor_settings.h"
 
 Vector<String> EditorFolding::_get_unfolds(const Object *p_object) {
 	Vector<String> sections;

editor/editor_fonts.cpp

@@ -32,8 +32,8 @@
 
 #include "builtin_fonts.gen.h"
 #include "core/io/dir_access.h"
-#include "editor_scale.h"
-#include "editor_settings.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
 #include "scene/resources/default_theme/default_theme.h"
 #include "scene/resources/font.h"
 

editor/editor_help.cpp

@@ -35,10 +35,10 @@
 #include "core/os/keyboard.h"
 #include "core/version_generated.gen.h"
 #include "doc_data_compressed.gen.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
 #include "editor/plugins/script_editor_plugin.h"
-#include "editor_node.h"
-#include "editor_scale.h"
-#include "editor_settings.h"
 
 #define CONTRIBUTE_URL vformat("%s/community/contributing/updating_the_class_reference.html", VERSION_DOCS_URL)
 

editor/editor_help_search.cpp

@@ -31,9 +31,9 @@
 #include "editor_help_search.h"
 
 #include "core/os/keyboard.h"
-#include "editor_feature_profile.h"
-#include "editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_feature_profile.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 
 void EditorHelpSearch::_update_icons() {
 	search_box->set_right_icon(results_tree->get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));

editor/editor_inspector.cpp

@@ -34,10 +34,10 @@
 #include "core/os/keyboard.h"
 #include "dictionary_property_edit.h"
 #include "editor/doc_tools.h"
-#include "editor_feature_profile.h"
-#include "editor_node.h"
-#include "editor_scale.h"
-#include "editor_settings.h"
+#include "editor/editor_feature_profile.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
 #include "multi_node_edit.h"
 #include "scene/property_utils.h"
 #include "scene/resources/packed_scene.h"

editor/editor_locale_dialog.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_locale_dialog.h"
 
+#include "core/config/project_settings.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "scene/gui/check_button.h"

editor/editor_log.cpp

@@ -32,8 +32,8 @@
 
 #include "core/os/keyboard.h"
 #include "core/version.h"
-#include "editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "scene/gui/center_container.h"
 #include "scene/resources/font.h"
 

editor/editor_log.h

@@ -34,7 +34,6 @@
 #include "core/os/thread.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/panel_container.h"

editor/editor_node.cpp

@@ -76,9 +76,12 @@
 #include "editor/editor_about.h"
 #include "editor/editor_audio_buses.h"
 #include "editor/editor_command_palette.h"
+#include "editor/editor_data.h"
 #include "editor/editor_export.h"
 #include "editor/editor_feature_profile.h"
+#include "editor/editor_file_dialog.h"
 #include "editor/editor_file_system.h"
+#include "editor/editor_folding.h"
 #include "editor/editor_help.h"
 #include "editor/editor_inspector.h"
 #include "editor/editor_layouts_dialog.h"
@@ -88,6 +91,7 @@
 #include "editor/editor_properties.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_run_script.h"
 #include "editor/editor_scale.h"
@@ -193,6 +197,7 @@
 #include "editor/project_settings_editor.h"
 #include "editor/quick_open.h"
 #include "editor/register_exporters.h"
+#include "editor/scene_tree_dock.h"
 
 #include <stdio.h>
 #include <stdlib.h>

editor/editor_node.h

@@ -32,16 +32,12 @@
 #define EDITOR_NODE_H
 
 #include "core/templates/safe_refcount.h"
-#include "editor/editor_data.h"
 #include "editor/editor_export.h"
 #include "editor/editor_folding.h"
 #include "editor/editor_native_shader_source_visualizer.h"
 #include "editor/editor_run.h"
-#include "editor/editor_toaster.h"
 #include "editor/inspector_dock.h"
 #include "editor/property_editor.h"
-#include "editor/scene_tree_dock.h"
-#include "scene/gui/link_button.h"
 
 typedef void (*EditorNodeInitCallback)();
 typedef void (*EditorPluginInitializeCallback)();
@@ -50,16 +46,20 @@ typedef bool (*EditorBuildCallback)();
 class AcceptDialog;
 class AudioStreamPreviewGenerator;
 class BackgroundProgress;
+class Button;
 class CenterContainer;
 class ConfirmationDialog;
 class Control;
 class DependencyEditor;
 class DependencyErrorDialog;
+class DynamicFontImportSettings;
 class EditorAbout;
 class EditorCommandPalette;
 class EditorExport;
+class EditorExtensionManager;
 class EditorFeatureProfileManager;
 class EditorFileServer;
+class EditorFolding;
 class EditorInspector;
 class EditorLayoutsDialog;
 class EditorLog;
@@ -67,12 +67,16 @@ class EditorPlugin;
 class EditorPluginList;
 class EditorQuickOpen;
 class EditorResourcePreview;
+class EditorRun;
 class EditorRunNative;
 class EditorSettingsDialog;
+class EditorToaster;
 class ExportTemplateManager;
+class FileDialog;
 class FileSystemDock;
 class HSplitContainer;
 class ImportDock;
+class LinkButton;
 class MenuButton;
 class NodeDock;
 class OrphanResourcesDialog;
@@ -83,17 +87,14 @@ class ProgressDialog;
 class ProjectExportDialog;
 class ProjectSettingsEditor;
 class RunSettingsDialog;
+class SceneImportSettings;
 class ScriptCreateDialog;
-class TabContainer;
+class SubViewport;
 class TabBar;
+class TabContainer;
 class TextureProgressBar;
-class Button;
 class VSplitContainer;
 class Window;
-class SubViewport;
-class SceneImportSettings;
-class EditorExtensionManager;
-class DynamicFontImportSettings;
 
 class EditorNode : public Node {
 	GDCLASS(EditorNode, Node);

editor/editor_path.cpp

@@ -30,8 +30,8 @@
 
 #include "editor_path.h"
 
-#include "editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 
 void EditorPath::_add_children_to_popup(Object *p_obj, int p_depth) {
 	if (p_depth > 8) {

editor/editor_path.h

@@ -31,7 +31,7 @@
 #ifndef EDITOR_PATH_H
 #define EDITOR_PATH_H
 
-#include "editor_data.h"
+#include "editor/editor_data.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/popup_menu.h"

editor/editor_plugin.cpp

@@ -34,10 +34,11 @@
 #include "editor/editor_export.h"
 #include "editor/editor_node.h"
 #include "editor/editor_paths.h"
+#include "editor/editor_resource_preview.h"
 #include "editor/editor_settings.h"
 #include "editor/filesystem_dock.h"
 #include "editor/project_settings_editor.h"
-#include "editor_resource_preview.h"
+#include "editor/scene_tree_dock.h"
 #include "main/main.h"
 #include "plugins/canvas_item_editor_plugin.h"
 #include "plugins/node_3d_editor_plugin.h"

editor/editor_plugin_settings.cpp

@@ -34,8 +34,8 @@
 #include "core/io/config_file.h"
 #include "core/io/file_access.h"
 #include "core/os/main_loop.h"
-#include "editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "scene/gui/margin_container.h"
 
 void EditorPluginSettings::_notification(int p_what) {

editor/editor_plugin_settings.h

@@ -32,8 +32,8 @@
 #define EDITORPLUGINSETTINGS_H
 
 #include "core/object/undo_redo.h"
+#include "editor/editor_data.h"
 #include "editor/plugin_config_dialog.h"
-#include "editor_data.h"
 #include "property_editor.h"
 #include "scene/gui/dialogs.h"
 

editor/editor_properties.cpp

@@ -30,11 +30,13 @@
 
 #include "editor_properties.h"
 
+#include "core/config/project_settings.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_node.h"
+#include "editor/editor_properties_array_dict.h"
 #include "editor/editor_resource_preview.h"
+#include "editor/editor_scale.h"
 #include "editor/filesystem_dock.h"
-#include "editor_node.h"
-#include "editor_properties_array_dict.h"
-#include "editor_scale.h"
 #include "scene/2d/gpu_particles_2d.h"
 #include "scene/3d/fog_volume.h"
 #include "scene/3d/gpu_particles_3d.h"

editor/editor_properties_array_dict.cpp

@@ -33,8 +33,8 @@
 #include "core/input/input.h"
 #include "core/io/marshalls.h"
 #include "editor/editor_node.h"
+#include "editor/editor_properties.h"
 #include "editor/editor_scale.h"
-#include "editor_properties.h"
 
 bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_value) {
 	String name = p_name;

editor/editor_resource_picker.cpp

@@ -30,11 +30,13 @@
 
 #include "editor_resource_picker.h"
 
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_node.h"
 #include "editor/editor_resource_preview.h"
-#include "editor_node.h"
-#include "editor_scale.h"
-#include "editor_settings.h"
-#include "filesystem_dock.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
+#include "editor/filesystem_dock.h"
+#include "editor/scene_tree_dock.h"
 
 HashMap<StringName, List<StringName>> EditorResourcePicker::allowed_types_cache;
 

editor/editor_resource_picker.h

@@ -31,13 +31,14 @@
 #ifndef EDITOR_RESOURCE_PICKER_H
 #define EDITOR_RESOURCE_PICKER_H
 
-#include "editor_file_dialog.h"
 #include "quick_open.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/texture_rect.h"
 
+class EditorFileDialog;
+
 class EditorResourcePicker : public HBoxContainer {
 	GDCLASS(EditorResourcePicker, HBoxContainer);
 

editor/editor_resource_preview.cpp

@@ -35,9 +35,9 @@
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/object/message_queue.h"
-#include "editor_node.h"
-#include "editor_scale.h"
-#include "editor_settings.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
 
 bool EditorResourcePreviewGenerator::handles(const String &p_type) const {
 	bool success;

editor/editor_run.cpp

@@ -32,7 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "editor/editor_node.h"
-#include "editor_settings.h"
+#include "editor/editor_settings.h"
 #include "servers/display_server.h"
 
 EditorRun::Status EditorRun::get_status() const {

editor/editor_run_native.cpp

@@ -30,9 +30,9 @@
 
 #include "editor_run_native.h"
 
-#include "editor_export.h"
-#include "editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_export.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 
 void EditorRunNative::_notification(int p_what) {
 	if (p_what == NOTIFICATION_ENTER_TREE) {

editor/editor_run_script.cpp

@@ -30,7 +30,7 @@
 
 #include "editor_run_script.h"
 
-#include "editor_node.h"
+#include "editor/editor_node.h"
 
 void EditorScript::add_root_node(Node *p_node) {
 	if (!editor) {

editor/editor_run_script.h

@@ -32,7 +32,7 @@
 #define EDITOR_RUN_SCRIPT_H
 
 #include "core/object/ref_counted.h"
-#include "editor_plugin.h"
+#include "editor/editor_plugin.h"
 class EditorNode;
 class EditorScript : public RefCounted {
 	GDCLASS(EditorScript, RefCounted);

editor/editor_sectioned_inspector.cpp

@@ -30,7 +30,7 @@
 
 #include "editor_sectioned_inspector.h"
 
-#include "editor_scale.h"
+#include "editor/editor_scale.h"
 
 class SectionedInspectorFilter : public Object {
 	GDCLASS(SectionedInspectorFilter, Object);

editor/editor_settings_dialog.cpp

@@ -34,11 +34,11 @@
 #include "core/input/input_map.h"
 #include "core/os/keyboard.h"
 #include "editor/debugger/editor_debugger_node.h"
-#include "editor_file_system.h"
-#include "editor_log.h"
-#include "editor_node.h"
-#include "editor_scale.h"
-#include "editor_settings.h"
+#include "editor/editor_file_system.h"
+#include "editor/editor_log.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
 #include "scene/gui/margin_container.h"
 
 void EditorSettingsDialog::ok_pressed() {

editor/editor_settings_dialog.h

@@ -32,8 +32,8 @@
 #define EDITOR_SETTINGS_DIALOG_H
 
 #include "editor/action_map_editor.h"
+#include "editor/editor_inspector.h"
 #include "editor/editor_sectioned_inspector.h"
-#include "editor_inspector.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/rich_text_label.h"

editor/editor_spin_slider.cpp

@@ -33,8 +33,8 @@
 #include "core/input/input.h"
 #include "core/math/expression.h"
 #include "core/os/keyboard.h"
-#include "editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 
 String EditorSpinSlider::get_tooltip(const Point2 &p_pos) const {
 	if (grabber->is_visible()) {

editor/editor_themes.cpp

@@ -33,10 +33,10 @@
 #include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/variant/dictionary.h"
-#include "editor_fonts.h"
-#include "editor_icons.gen.h"
-#include "editor_scale.h"
-#include "editor_settings.h"
+#include "editor/editor_fonts.h"
+#include "editor/editor_icons.gen.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
 
 #include "modules/modules_enabled.gen.h" // For svg.
 #ifdef MODULE_SVG_ENABLED

editor/editor_toaster.cpp

@@ -28,13 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#include "editor_toaster.h"
+
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
+#include "scene/gui/button.h"
 #include "scene/gui/label.h"
 #include "scene/gui/panel_container.h"
 
-#include "editor_toaster.h"
-
 EditorToaster *EditorToaster::singleton = nullptr;
 
 void EditorToaster::_notification(int p_what) {

editor/editor_toaster.h

@@ -31,12 +31,12 @@
 #ifndef EDITOR_TOASTER_H
 #define EDITOR_TOASTER_H
 
-#include "scene/gui/box_container.h"
-#include "scene/gui/button.h"
-#include "scene/gui/popup.h"
-
 #include "core/string/ustring.h"
 #include "core/templates/local_vector.h"
+#include "scene/gui/box_container.h"
+
+class Button;
+class PanelContainer;
 
 class EditorToaster : public HBoxContainer {
 	GDCLASS(EditorToaster, HBoxContainer);

editor/export_template_manager.cpp

@@ -36,8 +36,8 @@
 #include "core/io/zip_io.h"
 #include "core/os/keyboard.h"
 #include "core/version.h"
-#include "editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "progress_dialog.h"
 #include "scene/gui/link_button.h"
 

editor/filesystem_dock.cpp

@@ -37,11 +37,12 @@
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/templates/list.h"
-#include "editor_feature_profile.h"
-#include "editor_node.h"
-#include "editor_resource_preview.h"
-#include "editor_scale.h"
-#include "editor_settings.h"
+#include "editor/editor_feature_profile.h"
+#include "editor/editor_node.h"
+#include "editor/editor_resource_preview.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
+#include "editor/scene_tree_dock.h"
 #include "import_dock.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"

editor/filesystem_dock.h

@@ -49,8 +49,8 @@
 #include "create_dialog.h"
 
 #include "dependency_editor.h"
-#include "editor_dir_dialog.h"
-#include "editor_file_system.h"
+#include "editor/editor_dir_dialog.h"
+#include "editor/editor_file_system.h"
 #include "script_create_dialog.h"
 
 class EditorNode;

editor/find_in_files.cpp

@@ -30,10 +30,11 @@
 
 #include "find_in_files.h"
 
+#include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/os/os.h"
-#include "editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/check_box.h"

editor/groups_editor.cpp

@@ -30,9 +30,10 @@
 
 #include "groups_editor.h"
 
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
+#include "editor/scene_tree_dock.h"
 #include "editor/scene_tree_editor.h"
-#include "editor_node.h"
-#include "editor_scale.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"
 #include "scene/resources/packed_scene.h"

editor/import/dynamicfont_import_settings.cpp

@@ -30,6 +30,10 @@
 
 #include "dynamicfont_import_settings.h"
 
+#include "editor/editor_file_dialog.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_scale.h"
 

editor/import/dynamicfont_import_settings.h

@@ -31,10 +31,6 @@
 #ifndef FONTDATA_IMPORT_SETTINGS_H
 #define FONTDATA_IMPORT_SETTINGS_H
 
-#include "editor/editor_file_dialog.h"
-#include "editor/editor_inspector.h"
-#include "editor/editor_locale_dialog.h"
-
 #include "editor/import/resource_importer_dynamicfont.h"
 
 #include "scene/gui/dialogs.h"
@@ -50,6 +46,9 @@
 #include "servers/text_server.h"
 
 class DynamicFontImportSettingsData;
+class EditorFileDialog;
+class EditorInspector;
+class EditorLocaleDialog;
 
 class DynamicFontImportSettings : public ConfirmationDialog {
 	GDCLASS(DynamicFontImportSettings, ConfirmationDialog)

editor/import/editor_import_plugin.cpp

@@ -29,6 +29,7 @@
 /*************************************************************************/
 
 #include "editor_import_plugin.h"
+
 #include "core/object/script_language.h"
 
 EditorImportPlugin::EditorImportPlugin() {

editor/import/resource_importer_layered_texture.cpp

@@ -30,8 +30,7 @@
 
 #include "resource_importer_layered_texture.h"
 
-#include "resource_importer_texture.h"
-
+#include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/io/image_loader.h"

editor/import/resource_importer_texture.cpp

@@ -30,6 +30,7 @@
 
 #include "resource_importer_texture.h"
 
+#include "core/config/project_settings.h"
 #include "core/io/config_file.h"
 #include "core/io/image_loader.h"
 #include "core/version.h"

editor/import/scene_import_settings.cpp

@@ -29,9 +29,14 @@
 /*************************************************************************/
 
 #include "scene_import_settings.h"
+
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_file_system.h"
+#include "editor/editor_inspector.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
+#include "scene/animation/animation_player.h"
 #include "scene/resources/importer_mesh.h"
 #include "scene/resources/surface_tool.h"
 

editor/import/scene_import_settings.h

@@ -31,8 +31,6 @@
 #ifndef SCENEIMPORTSETTINGS_H
 #define SCENEIMPORTSETTINGS_H
 
-#include "editor/editor_file_dialog.h"
-#include "editor/editor_inspector.h"
 #include "editor/import/resource_importer_scene.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/light_3d.h"
@@ -47,6 +45,8 @@
 #include "scene/gui/tree.h"
 #include "scene/resources/primitive_meshes.h"
 
+class EditorFileDialog;
+class EditorInspector;
 class SceneImportSettingsData;
 
 class SceneImportSettings : public ConfirmationDialog {

editor/import_defaults_editor.cpp

@@ -30,6 +30,15 @@
 
 #include "import_defaults_editor.h"
 
+#include "core/config/project_settings.h"
+#include "editor/action_map_editor.h"
+#include "editor/editor_autoload_settings.h"
+#include "editor/editor_plugin_settings.h"
+#include "editor/editor_sectioned_inspector.h"
+#include "editor/localization_editor.h"
+#include "editor/shader_globals_editor.h"
+#include "scene/gui/center_container.h"
+
 class ImportDefaultsEditorSettings : public Object {
 	GDCLASS(ImportDefaultsEditorSettings, Object)
 	friend class ImportDefaultsEditor;

editor/import_defaults_editor.h

@@ -31,18 +31,11 @@
 #ifndef IMPORT_DEFAULTS_EDITOR_H
 #define IMPORT_DEFAULTS_EDITOR_H
 
-#include "core/object/undo_redo.h"
-#include "editor/action_map_editor.h"
-#include "editor/editor_data.h"
-#include "editor/editor_plugin_settings.h"
-#include "editor/editor_sectioned_inspector.h"
-#include "editor/localization_editor.h"
-#include "editor/shader_globals_editor.h"
-#include "editor_autoload_settings.h"
-#include "scene/gui/center_container.h"
+#include "scene/gui/box_container.h"
 #include "scene/gui/option_button.h"
 
 class ImportDefaultsEditorSettings;
+class EditorInspector;
 
 class ImportDefaultsEditor : public VBoxContainer {
 	GDCLASS(ImportDefaultsEditor, VBoxContainer)

editor/import_dock.cpp

@@ -29,9 +29,11 @@
 /*************************************************************************/
 
 #include "import_dock.h"
-#include "editor_node.h"
-#include "editor_resource_preview.h"
-#include "editor_scale.h"
+
+#include "core/config/project_settings.h"
+#include "editor/editor_node.h"
+#include "editor/editor_resource_preview.h"
+#include "editor/editor_scale.h"
 
 class ImportDockParameters : public Object {
 	GDCLASS(ImportDockParameters, Object);

editor/inspector_dock.cpp

@@ -30,6 +30,8 @@
 
 #include "inspector_dock.h"
 
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
 

editor/inspector_dock.h

@@ -38,9 +38,9 @@
 #include "editor/editor_path.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
-#include "scene/gui/control.h"
 
 class EditorNode;
+class EditorFileDialog;
 
 class InspectorDock : public VBoxContainer {
 	GDCLASS(InspectorDock, VBoxContainer);

editor/localization_editor.cpp

@@ -30,11 +30,13 @@
 
 #include "localization_editor.h"
 
+#include "core/config/project_settings.h"
 #include "core/string/translation.h"
-#include "editor_node.h"
-#include "editor_scale.h"
-#include "editor_translation_parser.h"
-#include "pot_generator.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_translation_parser.h"
+#include "editor/pot_generator.h"
 #include "scene/gui/control.h"
 
 void LocalizationEditor::_notification(int p_what) {

editor/localization_editor.h

@@ -32,10 +32,11 @@
 #define LOCALIZATION_EDITOR_H
 
 #include "core/object/undo_redo.h"
-#include "editor_file_dialog.h"
-#include "editor_locale_dialog.h"
+#include "editor/editor_locale_dialog.h"
 #include "scene/gui/tree.h"
 
+class EditorFileDialog;
+
 class LocalizationEditor : public VBoxContainer {
 	GDCLASS(LocalizationEditor, VBoxContainer);
 

editor/multi_node_edit.cpp

@@ -31,7 +31,7 @@
 #include "multi_node_edit.h"
 
 #include "core/math/math_fieldwise.h"
-#include "editor_node.h"
+#include "editor/editor_node.h"
 
 bool MultiNodeEdit::_set(const StringName &p_name, const Variant &p_value) {
 	return _set_impl(p_name, p_value, "");

editor/node_dock.cpp

@@ -31,8 +31,8 @@
 #include "node_dock.h"
 
 #include "connections_dialog.h"
-#include "editor_node.h"
-#include "editor_scale.h"
+#include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 
 void NodeDock::show_groups() {
 	groups_button->set_pressed(true);

editor/plugins/abstract_polygon_2d_editor.cpp

@@ -33,6 +33,7 @@
 #include "canvas_item_editor_plugin.h"
 #include "core/math/geometry_2d.h"
 #include "core/os/keyboard.h"
+#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 
 bool AbstractPolygon2DEditor::Vertex::operator==(const AbstractPolygon2DEditor::Vertex &p_vertex) const {

editor/plugins/abstract_polygon_2d_editor.h

@@ -31,10 +31,11 @@
 #ifndef ABSTRACT_POLYGON_2D_EDITOR_H
 #define ABSTRACT_POLYGON_2D_EDITOR_H
 
-#include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
 #include "scene/2d/polygon_2d.h"
+#include "scene/gui/box_container.h"
 
+class EditorNode;
 class CanvasItemEditor;
 
 class AbstractPolygon2DEditor : public HBoxContainer {

editor/plugins/animation_blend_space_1d_editor.cpp

@@ -31,6 +31,8 @@
 #include "animation_blend_space_1d_editor.h"
 
 #include "core/os/keyboard.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
 

editor/plugins/animation_blend_space_1d_editor.h

@@ -31,7 +31,6 @@
 #ifndef ANIMATION_BLEND_SPACE_1D_EDITOR_H
 #define ANIMATION_BLEND_SPACE_1D_EDITOR_H
 
-#include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "editor/property_editor.h"

editor/plugins/animation_blend_space_2d_editor.cpp

@@ -35,6 +35,8 @@
 #include "core/io/resource_loader.h"
 #include "core/math/geometry_2d.h"
 #include "core/os/keyboard.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/animation/animation_player.h"

editor/plugins/animation_blend_space_2d_editor.h

@@ -31,7 +31,6 @@
 #ifndef ANIMATION_BLEND_SPACE_2D_EDITOR_H
 #define ANIMATION_BLEND_SPACE_2D_EDITOR_H
 
-#include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "editor/property_editor.h"

editor/plugins/animation_blend_tree_editor_plugin.cpp

@@ -34,7 +34,9 @@
 #include "core/input/input.h"
 #include "core/io/resource_loader.h"
 #include "core/os/keyboard.h"
+#include "editor/editor_file_dialog.h"
 #include "editor/editor_inspector.h"
+#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/menu_button.h"

editor/plugins/animation_blend_tree_editor_plugin.h

@@ -31,7 +31,6 @@
 #ifndef ANIMATION_BLEND_TREE_EDITOR_PLUGIN_H
 #define ANIMATION_BLEND_TREE_EDITOR_PLUGIN_H
 
-#include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "editor/property_editor.h"
@@ -41,7 +40,9 @@
 #include "scene/gui/popup.h"
 #include "scene/gui/tree.h"
 
+class EditorNode;
 class ProgressBar;
+class EditorFileDialog;
 
 class AnimationNodeBlendTreeEditor : public AnimationTreeNodeEditorPlugin {
 	GDCLASS(AnimationNodeBlendTreeEditor, AnimationTreeNodeEditorPlugin);

editor/plugins/animation_player_editor_plugin.cpp

@@ -36,10 +36,13 @@
 #include "core/io/resource_saver.h"
 #include "core/os/keyboard.h"
 #include "editor/animation_track_editor.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/plugins/canvas_item_editor_plugin.h" // For onion skinning.
 #include "editor/plugins/node_3d_editor_plugin.h" // For onion skinning.
+#include "editor/scene_tree_dock.h"
 #include "scene/main/window.h"
 #include "scene/resources/animation.h"
 #include "scene/scene_string_names.h"