Improve includes of EditorNode (and everything else)

Also start organizing editor-specific GUI components
into a dedicated folder, `editor/gui`.
Also move `editor_file_server` next to the rest of debugger classes.

editor/SCsub

@@ -119,7 +119,7 @@ if env.editor_build:
 
     SConscript("debugger/SCsub")
     SConscript("export/SCsub")
-    SConscript("fileserver/SCsub")
+    SConscript("gui/SCsub")
     SConscript("icons/SCsub")
     SConscript("import/SCsub")
     SConscript("plugins/SCsub")

editor/animation_track_editor.cpp

@@ -37,12 +37,20 @@
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_spin_slider.h"
+#include "editor/gui/scene_tree_editor.h"
 #include "editor/inspector_dock.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
 #include "scene/animation/animation_player.h"
 #include "scene/animation/tween.h"
+#include "scene/gui/check_box.h"
 #include "scene/gui/grid_container.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/panel_container.h"
 #include "scene/gui/separator.h"
+#include "scene/gui/slider.h"
+#include "scene/gui/spin_box.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/window.h"
 #include "scene/scene_string_names.h"

editor/animation_track_editor.h

@@ -33,25 +33,24 @@
 
 #include "editor/editor_data.h"
 #include "editor/editor_properties.h"
-#include "editor/editor_spin_slider.h"
 #include "editor/property_selector.h"
-
 #include "scene/3d/node_3d.h"
-#include "scene/gui/check_box.h"
 #include "scene/gui/control.h"
 #include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/panel_container.h"
 #include "scene/gui/scroll_bar.h"
-#include "scene/gui/slider.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/tab_container.h"
-#include "scene/gui/texture_rect.h"
+#include "scene/gui/tree.h"
 #include "scene/resources/animation.h"
-#include "scene_tree_editor.h"
 
 class AnimationTrackEditor;
 class AnimationTrackEdit;
+class CheckBox;
+class EditorSpinSlider;
+class HSlider;
+class OptionButton;
+class PanelContainer;
+class SceneTreeDialog;
+class SpinBox;
+class TextureRect;
 class ViewPanner;
 
 class AnimationTrackKeyEdit : public Object {

editor/connections_dialog.cpp

@@ -33,12 +33,21 @@
 #include "core/config/project_settings.h"
 #include "editor/doc_tools.h"
 #include "editor/editor_help.h"
+#include "editor/editor_inspector.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/scene_tree_editor.h"
 #include "editor/scene_tree_dock.h"
 #include "plugins/script_editor_plugin.h"
+#include "scene/gui/button.h"
+#include "scene/gui/check_box.h"
+#include "scene/gui/label.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/spin_box.h"
 #include "scene/resources/packed_scene.h"
 
 static Node *_find_first_script(Node *p_root, Node *p_node) {

editor/connections_dialog.h

@@ -31,22 +31,20 @@
 #ifndef CONNECTIONS_DIALOG_H
 #define CONNECTIONS_DIALOG_H
 
-#include "editor/editor_inspector.h"
-#include "editor/scene_tree_editor.h"
-#include "scene/gui/button.h"
-#include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/dialogs.h"
-#include "scene/gui/label.h"
-#include "scene/gui/line_edit.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/popup.h"
-#include "scene/gui/popup_menu.h"
-#include "scene/gui/spin_box.h"
 #include "scene/gui/tree.h"
 
+class Button;
+class CheckBox;
 class ConnectDialogBinds;
+class EditorInspector;
+class Label;
+class LineEdit;
+class OptionButton;
+class PopupMenu;
+class SceneTreeEditor;
+class SpinBox;
 
 class ConnectDialog : public ConfirmationDialog {
 	GDCLASS(ConnectDialog, ConfirmationDialog);

editor/debugger/editor_debugger_tree.cpp

@@ -30,8 +30,8 @@
 
 #include "editor_debugger_tree.h"
 
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/scene_tree_dock.h"
 #include "scene/debugger/scene_debugger.h"
 #include "scene/gui/texture_rect.h"

editor/debugger/script_editor_debugger.cpp

@@ -40,13 +40,13 @@
 #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_file_system.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
 #include "editor/editor_property_name_processor.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/inspector_dock.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "editor/plugins/editor_debugger_plugin.h"

editor/dependency_editor.cpp

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

editor/editor_audio_buses.cpp

@@ -34,12 +34,12 @@
 #include "core/input/input.h"
 #include "core/io/resource_saver.h"
 #include "core/os/keyboard.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "filesystem_dock.h"
+#include "editor/filesystem_dock.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "scene/gui/separator.h"
 #include "scene/resources/font.h"
 #include "servers/audio_server.h"

editor/editor_autoload_settings.cpp

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

editor/editor_build_profile.cpp

@@ -32,13 +32,13 @@
 
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
-#include "editor/editor_file_dialog.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_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/gui/editor_file_dialog.h"
 
 const char *EditorBuildProfile::build_option_identifiers[BUILD_OPTION_MAX] = {
 	// This maps to SCons build options.

editor/editor_feature_profile.cpp

@@ -32,12 +32,12 @@
 
 #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_paths.h"
 #include "editor/editor_property_name_processor.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/gui/editor_file_dialog.h"
 
 const char *EditorFeatureProfile::feature_names[FEATURE_MAX] = {
 	TTRC("3D Editor"),

editor/editor_node.cpp

@@ -72,12 +72,12 @@
 #include "editor/editor_command_palette.h"
 #include "editor/editor_data.h"
 #include "editor/editor_feature_profile.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_folding.h"
 #include "editor/editor_help.h"
 #include "editor/editor_inspector.h"
 #include "editor/editor_layouts_dialog.h"
 #include "editor/editor_log.h"
+#include "editor/editor_native_shader_source_visualizer.h"
 #include "editor/editor_paths.h"
 #include "editor/editor_plugin.h"
 #include "editor/editor_properties.h"
@@ -90,7 +90,6 @@
 #include "editor/editor_settings.h"
 #include "editor/editor_settings_dialog.h"
 #include "editor/editor_themes.h"
-#include "editor/editor_toaster.h"
 #include "editor/editor_translation_parser.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/export/editor_export.h"
@@ -98,6 +97,9 @@
 #include "editor/export/project_export.h"
 #include "editor/fbx_importer_manager.h"
 #include "editor/filesystem_dock.h"
+#include "editor/gui/editor_file_dialog.h"
+#include "editor/gui/editor_title_bar.h"
+#include "editor/gui/editor_toaster.h"
 #include "editor/history_dock.h"
 #include "editor/import/audio_stream_import_settings.h"
 #include "editor/import/dynamic_font_import_settings.h"

editor/editor_node.h

@@ -34,10 +34,8 @@
 #include "core/templates/safe_refcount.h"
 #include "editor/editor_data.h"
 #include "editor/editor_folding.h"
-#include "editor/editor_native_shader_source_visualizer.h"
 #include "editor/editor_plugin.h"
 #include "editor/editor_run.h"
-#include "editor/editor_title_bar.h"
 #include "editor/export/editor_export.h"
 
 typedef void (*EditorNodeInitCallback)();
@@ -46,62 +44,21 @@ typedef bool (*EditorBuildCallback)();
 
 class AcceptDialog;
 class AcceptDialogAutoReparent;
-class AudioStreamPreviewGenerator;
-class BackgroundProgress;
 class CenterContainer;
 class CheckBox;
 class ColorPicker;
 class ConfirmationDialog;
 class Control;
-class DependencyEditor;
-class DependencyErrorDialog;
-class DynamicFontImportSettings;
-class EditorAbout;
-class EditorCommandPalette;
-class EditorExport;
-class EditorExtensionManager;
-class EditorFeatureProfileManager;
-class EditorFileDialog;
-class EditorFileServer;
-class EditorFolding;
-class EditorInspector;
-class EditorLayoutsDialog;
-class EditorLog;
-class EditorPluginList;
-class EditorQuickOpen;
-class EditorPropertyResource;
-class EditorResourcePreview;
-class EditorResourceConversionPlugin;
-class EditorRun;
-class EditorRunNative;
-class EditorSelectionHistory;
-class EditorSettingsDialog;
-class EditorToaster;
-class EditorUndoRedoManager;
-class ExportTemplateManager;
-class FBXImporterManager;
 class FileDialog;
-class FileSystemDock;
-class HistoryDock;
+class HBoxContainer;
 class HSplitContainer;
-class ImportDock;
 class LinkButton;
 class MenuBar;
 class MenuButton;
 class Node2D;
-class NodeDock;
 class OptionButton;
-class OrphanResourcesDialog;
 class Panel;
 class PanelContainer;
-class PluginConfigDialog;
-class ProgressDialog;
-class ProjectExportDialog;
-class ProjectSettingsEditor;
-class RunSettingsDialog;
-class SceneImportSettings;
-class AudioStreamImportSettings;
-class ScriptCreateDialog;
 class SubViewport;
 class TabBar;
 class TabContainer;
@@ -110,7 +67,50 @@ class TextureProgressBar;
 class Tree;
 class VSplitContainer;
 class Window;
+
+class AudioStreamImportSettings;
+class AudioStreamPreviewGenerator;
+class BackgroundProgress;
+class DependencyEditor;
+class DependencyErrorDialog;
+class DynamicFontImportSettings;
+class EditorAbout;
 class EditorBuildProfileManager;
+class EditorCommandPalette;
+class EditorExport;
+class EditorExtensionManager;
+class EditorFeatureProfileManager;
+class EditorFileDialog;
+class EditorFolding;
+class EditorInspector;
+class EditorLayoutsDialog;
+class EditorLog;
+class EditorNativeShaderSourceVisualizer;
+class EditorPluginList;
+class EditorQuickOpen;
+class EditorPropertyResource;
+class EditorResourcePreview;
+class EditorResourceConversionPlugin;
+class EditorRunNative;
+class EditorSelectionHistory;
+class EditorSettingsDialog;
+class EditorTitleBar;
+class EditorToaster;
+class EditorUndoRedoManager;
+class ExportTemplateManager;
+class FBXImporterManager;
+class FileSystemDock;
+class HistoryDock;
+class ImportDock;
+class NodeDock;
+class OrphanResourcesDialog;
+class PluginConfigDialog;
+class ProgressDialog;
+class ProjectExportDialog;
+class ProjectSettingsEditor;
+class RunSettingsDialog;
+class SceneImportSettings;
+class ScriptCreateDialog;
 
 class EditorNode : public Node {
 	GDCLASS(EditorNode, Node);
@@ -738,7 +738,7 @@ public:
 	static EditorData &get_editor_data() { return singleton->editor_data; }
 	static EditorFolding &get_editor_folding() { return singleton->editor_folding; }
 
-	static HBoxContainer *get_menu_hb() { return singleton->menu_hb; }
+	static EditorTitleBar *get_menu_hb() { return singleton->menu_hb; }
 	static VSplitContainer *get_top_split() { return singleton->top_split; }
 
 	static String adjust_scene_name_casing(const String &root_name);

editor/editor_plugin.cpp

@@ -40,6 +40,7 @@
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/export/editor_export.h"
 #include "editor/filesystem_dock.h"
+#include "editor/gui/editor_title_bar.h"
 #include "editor/import/editor_import_plugin.h"
 #include "editor/import/resource_importer_scene.h"
 #include "editor/inspector_dock.h"

editor/editor_properties.cpp

@@ -33,17 +33,18 @@
 #include "core/config/project_settings.h"
 #include "core/core_string_names.h"
 #include "editor/create_dialog.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_properties_array_dict.h"
 #include "editor/editor_resource_picker.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/gui/editor_file_dialog.h"
+#include "editor/gui/editor_spin_slider.h"
+#include "editor/gui/scene_tree_editor.h"
 #include "editor/inspector_dock.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/project_settings_editor.h"
 #include "editor/property_selector.h"
-#include "editor/scene_tree_editor.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

@@ -35,7 +35,9 @@
 #include "editor/editor_properties.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/gui/editor_spin_slider.h"
 #include "editor/inspector_dock.h"
+#include "scene/gui/button.h"
 
 bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_value) {
 	String name = p_name;

editor/editor_properties_array_dict.h

@@ -33,9 +33,10 @@
 
 #include "editor/editor_inspector.h"
 #include "editor/editor_locale_dialog.h"
-#include "editor/editor_spin_slider.h"
 #include "editor/filesystem_dock.h"
-#include "scene/gui/button.h"
+
+class Button;
+class EditorSpinSlider;
 
 class EditorPropertyArrayObject : public RefCounted {
 	GDCLASS(EditorPropertyArrayObject, RefCounted);

editor/editor_resource_picker.cpp

@@ -31,13 +31,13 @@
 #include "editor_resource_picker.h"
 
 #include "editor/audio_stream_preview.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_quick_open.h"
 #include "editor/editor_resource_preview.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/filesystem_dock.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/plugins/editor_resource_conversion_plugin.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/scene_tree_dock.h"

editor/export/project_export.cpp

@@ -32,13 +32,13 @@
 
 #include "core/config/project_settings.h"
 #include "core/version.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "editor/editor_properties.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/export/editor_export.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/item_list.h"
@@ -47,6 +47,7 @@
 #include "scene/gui/option_button.h"
 #include "scene/gui/popup_menu.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/fbx_importer_manager.h

@@ -31,7 +31,7 @@
 #ifndef FBX_IMPORTER_MANAGER_H
 #define FBX_IMPORTER_MANAGER_H
 
-#include "editor/editor_file_dialog.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/line_edit.h"
 

editor/filesystem_dock.cpp

@@ -37,17 +37,22 @@
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/templates/list.h"
+#include "editor/create_dialog.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/gui/editor_dir_dialog.h"
 #include "editor/import/resource_importer_scene.h"
 #include "editor/import_dock.h"
 #include "editor/scene_create_dialog.h"
 #include "editor/scene_tree_dock.h"
 #include "editor/shader_create_dialog.h"
+#include "scene/gui/item_list.h"
 #include "scene/gui/label.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/progress_bar.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 #include "servers/display_server.h"

editor/filesystem_dock.h

@@ -31,22 +31,22 @@
 #ifndef FILESYSTEM_DOCK_H
 #define FILESYSTEM_DOCK_H
 
-#include "editor/create_dialog.h"
 #include "editor/dependency_editor.h"
-#include "editor/editor_dir_dialog.h"
 #include "editor/editor_file_system.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/script_create_dialog.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
 #include "scene/gui/dialogs.h"
-#include "scene/gui/item_list.h"
-#include "scene/gui/line_edit.h"
 #include "scene/gui/menu_button.h"
-#include "scene/gui/progress_bar.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tree.h"
 
+class CreateDialog;
+class EditorDirDialog;
+class ItemList;
+class LineEdit;
+class ProgressBar;
 class SceneCreateDialog;
 class ShaderCreateDialog;
 

editor/groups_editor.cpp

@@ -33,10 +33,12 @@
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/scene_tree_editor.h"
 #include "editor/scene_tree_dock.h"
-#include "editor/scene_tree_editor.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/tree.h"
 #include "scene/resources/packed_scene.h"
 
 static bool can_edit(Node *p_node, String p_group) {

editor/groups_editor.h

@@ -31,13 +31,12 @@
 #ifndef GROUPS_EDITOR_H
 #define GROUPS_EDITOR_H
 
-#include "editor/scene_tree_editor.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/popup.h"
-#include "scene/gui/tree.h"
+
+class Button;
+class LineEdit;
+class Tree;
+class TreeItem;
 
 class GroupDialog : public AcceptDialog {
 	GDCLASS(GroupDialog, AcceptDialog);

editor/gui/editor_file_dialog.cpp

@@ -34,7 +34,7 @@
 #include "core/io/file_access.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "dependency_editor.h"
+#include "editor/dependency_editor.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "editor/editor_resource_preview.h"

editor/gui/editor_object_selector.cpp

@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  editor_path.cpp                                                       */
+/*  editor_object_selector.cpp                                            */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,20 +28,20 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "editor_path.h"
+#include "editor_object_selector.h"
 
 #include "editor/editor_data.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/multi_node_edit.h"
 
-Size2 EditorPath::get_minimum_size() const {
+Size2 EditorObjectSelector::get_minimum_size() const {
 	Ref<Font> font = get_theme_font(SNAME("font"));
 	int font_size = get_theme_font_size(SNAME("font_size"));
 	return Button::get_minimum_size() + Size2(0, font->get_height(font_size));
 }
 
-void EditorPath::_add_children_to_popup(Object *p_obj, int p_depth) {
+void EditorObjectSelector::_add_children_to_popup(Object *p_obj, int p_depth) {
 	if (p_depth > 8) {
 		return;
 	}
@@ -86,7 +86,7 @@ void EditorPath::_add_children_to_popup(Object *p_obj, int p_depth) {
 	}
 }
 
-void EditorPath::_show_popup() {
+void EditorObjectSelector::_show_popup() {
 	if (sub_objects_menu->is_visible()) {
 		sub_objects_menu->hide();
 		return;
@@ -106,7 +106,7 @@ void EditorPath::_show_popup() {
 	sub_objects_menu->popup();
 }
 
-void EditorPath::_about_to_show() {
+void EditorObjectSelector::_about_to_show() {
 	Object *obj = ObjectDB::get_instance(history->get_path_object(history->get_path_size() - 1));
 	if (!obj) {
 		return;
@@ -121,7 +121,7 @@ void EditorPath::_about_to_show() {
 	}
 }
 
-void EditorPath::update_path() {
+void EditorObjectSelector::update_path() {
 	for (int i = 0; i < history->get_path_size(); i++) {
 		Object *obj = ObjectDB::get_instance(history->get_path_object(i));
 		if (!obj) {
@@ -170,7 +170,7 @@ void EditorPath::update_path() {
 	}
 }
 
-void EditorPath::clear_path() {
+void EditorObjectSelector::clear_path() {
 	set_disabled(true);
 	set_tooltip_text("");
 
@@ -179,12 +179,12 @@ void EditorPath::clear_path() {
 	sub_objects_icon->hide();
 }
 
-void EditorPath::enable_path() {
+void EditorObjectSelector::enable_path() {
 	set_disabled(false);
 	sub_objects_icon->show();
 }
 
-void EditorPath::_id_pressed(int p_idx) {
+void EditorObjectSelector::_id_pressed(int p_idx) {
 	ERR_FAIL_INDEX(p_idx, objects.size());
 
 	Object *obj = ObjectDB::get_instance(objects[p_idx]);
@@ -195,7 +195,7 @@ void EditorPath::_id_pressed(int p_idx) {
 	EditorNode::get_singleton()->push_item(obj);
 }
 
-void EditorPath::_notification(int p_what) {
+void EditorObjectSelector::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE:
 		case NOTIFICATION_THEME_CHANGED: {
@@ -210,15 +210,15 @@ void EditorPath::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_READY: {
-			connect("pressed", callable_mp(this, &EditorPath::_show_popup));
+			connect("pressed", callable_mp(this, &EditorObjectSelector::_show_popup));
 		} break;
 	}
 }
 
-void EditorPath::_bind_methods() {
+void EditorObjectSelector::_bind_methods() {
 }
 
-EditorPath::EditorPath(EditorSelectionHistory *p_history) {
+EditorObjectSelector::EditorObjectSelector(EditorSelectionHistory *p_history) {
 	history = p_history;
 
 	MarginContainer *main_mc = memnew(MarginContainer);
@@ -249,8 +249,8 @@ EditorPath::EditorPath(EditorSelectionHistory *p_history) {
 	sub_objects_menu = memnew(PopupMenu);
 	sub_objects_menu->set_auto_translate(false);
 	add_child(sub_objects_menu);
-	sub_objects_menu->connect("about_to_popup", callable_mp(this, &EditorPath::_about_to_show));
-	sub_objects_menu->connect("id_pressed", callable_mp(this, &EditorPath::_id_pressed));
+	sub_objects_menu->connect("about_to_popup", callable_mp(this, &EditorObjectSelector::_about_to_show));
+	sub_objects_menu->connect("id_pressed", callable_mp(this, &EditorObjectSelector::_id_pressed));
 
 	set_tooltip_text(TTR("Open a list of sub-resources."));
 }

editor/gui/editor_object_selector.h

@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  editor_path.h                                                         */
+/*  editor_object_selector.h                                              */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_PATH_H
-#define EDITOR_PATH_H
+#ifndef EDITOR_OBJECT_SELECTOR_H
+#define EDITOR_OBJECT_SELECTOR_H
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
@@ -39,8 +39,8 @@
 
 class EditorSelectionHistory;
 
-class EditorPath : public Button {
-	GDCLASS(EditorPath, Button);
+class EditorObjectSelector : public Button {
+	GDCLASS(EditorObjectSelector, Button);
 
 	EditorSelectionHistory *history = nullptr;
 
@@ -67,7 +67,7 @@ public:
 	void clear_path();
 	void enable_path();
 
-	EditorPath(EditorSelectionHistory *p_history);
+	EditorObjectSelector(EditorSelectionHistory *p_history);
 };
 
-#endif // EDITOR_PATH_H
+#endif // EDITOR_OBJECT_SELECTOR_H

editor/gui/editor_title_bar.cpp

@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "editor/editor_title_bar.h"
+#include "editor_title_bar.h"
 
 void EditorTitleBar::gui_input(const Ref<InputEvent> &p_event) {
 	if (!can_move) {

editor/gui/scene_tree_editor.cpp

@@ -42,6 +42,8 @@
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "scene/gui/label.h"
+#include "scene/gui/tab_container.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 

editor/import/dynamic_font_import_settings.cpp

@@ -31,7 +31,6 @@
 #include "dynamic_font_import_settings.h"
 
 #include "core/config/project_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"
@@ -39,6 +38,7 @@
 #include "editor/editor_property_name_processor.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/gui/editor_file_dialog.h"
 
 /*************************************************************************/
 /* Settings data                                                         */

editor/import/scene_import_settings.cpp

@@ -31,12 +31,12 @@
 #include "scene_import_settings.h"
 
 #include "core/config/project_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 "editor/editor_settings.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/animation/animation_player.h"
 #include "scene/resources/importer_mesh.h"

editor/inspector_dock.cpp

@@ -30,12 +30,13 @@
 
 #include "inspector_dock.h"
 
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/filesystem_dock.h"
+#include "editor/gui/editor_file_dialog.h"
+#include "editor/gui/editor_object_selector.h"
 #include "editor/plugins/script_editor_plugin.h"
 
 InspectorDock *InspectorDock::singleton = nullptr;
@@ -510,7 +511,7 @@ void InspectorDock::update(Object *p_object) {
 	if (editor_history->get_history_len() > 0) {
 		history_menu->set_disabled(false);
 	}
-	editor_path->update_path();
+	object_selector->update_path();
 
 	current = p_object;
 
@@ -530,11 +531,11 @@ void InspectorDock::update(Object *p_object) {
 
 	if (!is_object || is_text_file) {
 		info->hide();
-		editor_path->clear_path();
+		object_selector->clear_path();
 		return;
 	}
 
-	editor_path->enable_path();
+	object_selector->enable_path();
 
 	PopupMenu *p = object_menu->get_popup();
 
@@ -689,9 +690,9 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
 
 	HBoxContainer *subresource_hb = memnew(HBoxContainer);
 	add_child(subresource_hb);
-	editor_path = memnew(EditorPath(EditorNode::get_singleton()->get_editor_selection_history()));
-	editor_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	subresource_hb->add_child(editor_path);
+	object_selector = memnew(EditorObjectSelector(EditorNode::get_singleton()->get_editor_selection_history()));
+	object_selector->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	subresource_hb->add_child(object_selector);
 
 	open_docs_button = memnew(Button);
 	open_docs_button->set_flat(true);

editor/inspector_dock.h

@@ -34,7 +34,6 @@
 #include "editor/create_dialog.h"
 #include "editor/editor_data.h"
 #include "editor/editor_inspector.h"
-#include "editor/editor_path.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
@@ -43,6 +42,7 @@
 #include "scene/gui/tree.h"
 
 class EditorFileDialog;
+class EditorObjectSelector;
 
 class InspectorDock : public VBoxContainer {
 	GDCLASS(InspectorDock, VBoxContainer);
@@ -92,7 +92,7 @@ class InspectorDock : public VBoxContainer {
 
 	Button *open_docs_button = nullptr;
 	MenuButton *object_menu = nullptr;
-	EditorPath *editor_path = nullptr;
+	EditorObjectSelector *object_selector = nullptr;
 
 	bool info_is_warning = false; // Display in yellow and use warning icon if true.
 	Button *info = nullptr;

editor/localization_editor.cpp

@@ -32,11 +32,11 @@
 
 #include "core/config/project_settings.h"
 #include "core/string/translation.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_translation_parser.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/filesystem_dock.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/pot_generator.h"
 #include "scene/gui/control.h"
 

editor/plugins/abstract_polygon_2d_editor.cpp

@@ -37,6 +37,8 @@
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.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 {

editor/plugins/abstract_polygon_2d_editor.h

@@ -35,6 +35,7 @@
 #include "scene/2d/polygon_2d.h"
 #include "scene/gui/box_container.h"
 
+class Button;
 class CanvasItemEditor;
 class ConfirmationDialog;
 

editor/plugins/animation_blend_space_1d_editor.cpp

@@ -31,11 +31,11 @@
 #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 "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/option_button.h"

editor/plugins/animation_blend_space_2d_editor.cpp

@@ -35,11 +35,11 @@
 #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 "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/check_box.h"

editor/plugins/animation_blend_tree_editor_plugin.cpp

@@ -34,12 +34,12 @@
 #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 "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/menu_button.h"

editor/plugins/animation_library_editor.cpp

@@ -29,11 +29,11 @@
 /**************************************************************************/
 
 #include "animation_library_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/editor_undo_redo_manager.h"
+#include "editor/gui/editor_file_dialog.h"
 
 void AnimationLibraryEditor::set_animation_player(Object *p_player) {
 	player = p_player;

editor/plugins/animation_player_editor_plugin.cpp

@@ -35,11 +35,11 @@
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/os/keyboard.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/inspector_dock.h"
 #include "editor/plugins/canvas_item_editor_plugin.h" // For onion skinning.
 #include "editor/plugins/node_3d_editor_plugin.h" // For onion skinning.

editor/plugins/animation_state_machine_editor.cpp

@@ -35,11 +35,11 @@
 #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 "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/menu_button.h"

editor/plugins/animation_tree_editor_plugin.cpp

@@ -39,9 +39,9 @@
 #include "core/io/resource_loader.h"
 #include "core/math/delaunay_2d.h"
 #include "core/os/keyboard.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/menu_button.h"

editor/plugins/asset_library_editor_plugin.cpp

@@ -35,11 +35,11 @@
 #include "core/io/stream_peer_tls.h"
 #include "core/os/keyboard.h"
 #include "core/version.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_paths.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/project_settings_editor.h"
 #include "scene/gui/menu_button.h"
 

editor/plugins/canvas_item_editor_plugin.cpp

@@ -37,9 +37,9 @@
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "editor/editor_toaster.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "editor/editor_zoom_widget.h"
+#include "editor/gui/editor_toaster.h"
+#include "editor/gui/editor_zoom_widget.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/scene_tree_dock.h"
@@ -56,6 +56,7 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/subviewport_container.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/window.h"

editor/plugins/cpu_particles_2d_editor_plugin.cpp

@@ -32,8 +32,8 @@
 
 #include "canvas_item_editor_plugin.h"
 #include "core/io/image_loader.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "scene/2d/cpu_particles_2d.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/menu_button.h"

editor/plugins/cpu_particles_3d_editor_plugin.cpp

@@ -31,8 +31,8 @@
 #include "cpu_particles_3d_editor_plugin.h"
 
 #include "editor/editor_node.h"
+#include "editor/gui/scene_tree_editor.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
-#include "editor/scene_tree_editor.h"
 #include "scene/gui/menu_button.h"
 
 void CPUParticles3DEditor::_node_removed(Node *p_node) {

editor/plugins/debugger_editor_plugin.cpp

@@ -33,10 +33,10 @@
 #include "core/os/keyboard.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/editor_debugger_server.h"
+#include "editor/debugger/editor_file_server.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "editor/fileserver/editor_file_server.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "scene/gui/menu_button.h"
 

editor/plugins/gpu_particles_2d_editor_plugin.cpp

@@ -32,9 +32,9 @@
 
 #include "canvas_item_editor_plugin.h"
 #include "core/io/image_loader.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/scene_tree_dock.h"
 #include "scene/2d/cpu_particles_2d.h"
 #include "scene/gui/menu_button.h"

editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp

@@ -30,8 +30,8 @@
 
 #include "gpu_particles_collision_sdf_editor_plugin.h"
 
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
+#include "editor/gui/editor_file_dialog.h"
 
 void GPUParticlesCollisionSDF3DEditorPlugin::_bake() {
 	if (col_sdf) {

editor/plugins/gradient_texture_2d_editor_plugin.cpp

@@ -33,7 +33,9 @@
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_spin_slider.h"
 #include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/separator.h"
 

editor/plugins/gradient_texture_2d_editor_plugin.h

@@ -33,7 +33,9 @@
 
 #include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
-#include "editor/editor_spin_slider.h"
+
+class Button;
+class EditorSpinSlider;
 
 class GradientTexture2DEditorRect : public Control {
 	GDCLASS(GradientTexture2DEditorRect, Control);

editor/plugins/lightmap_gi_editor_plugin.cpp

@@ -30,8 +30,8 @@
 
 #include "lightmap_gi_editor_plugin.h"
 
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
+#include "editor/gui/editor_file_dialog.h"
 
 void LightmapGIEditorPlugin::_bake_select_file(const String &p_file) {
 	if (lightmap) {

editor/plugins/material_editor_plugin.cpp

@@ -35,7 +35,13 @@
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "scene/3d/camera_3d.h"
+#include "scene/3d/light_3d.h"
+#include "scene/3d/mesh_instance_3d.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/color_rect.h"
 #include "scene/gui/subviewport_container.h"
+#include "scene/gui/texture_button.h"
 #include "scene/resources/fog_material.h"
 #include "scene/resources/particle_process_material.h"
 #include "scene/resources/sky_material.h"

editor/plugins/material_editor_plugin.h

@@ -34,13 +34,14 @@
 #include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
 #include "editor/plugins/editor_resource_conversion_plugin.h"
-#include "scene/3d/camera_3d.h"
-#include "scene/3d/light_3d.h"
-#include "scene/3d/mesh_instance_3d.h"
-#include "scene/gui/color_rect.h"
 #include "scene/resources/material.h"
 #include "scene/resources/primitive_meshes.h"
 
+class Camera3D;
+class ColorRect;
+class DirectionalLight3D;
+class HBoxContainer;
+class MeshInstance3D;
 class SubViewport;
 class SubViewportContainer;
 class TextureButton;

editor/plugins/mesh_instance_3d_editor_plugin.cpp

@@ -33,12 +33,14 @@
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "node_3d_editor_plugin.h"
+#include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/3d/collision_shape_3d.h"
 #include "scene/3d/navigation_region_3d.h"
 #include "scene/3d/physics_body_3d.h"
 #include "scene/gui/box_container.h"
+#include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"
+#include "scene/gui/spin_box.h"
 #include "scene/resources/concave_polygon_shape_3d.h"
 #include "scene/resources/convex_polygon_shape_3d.h"
 #include "scene/scene_string_names.h"

editor/plugins/mesh_instance_3d_editor_plugin.h

@@ -33,11 +33,11 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/gui/spin_box.h"
 
 class AcceptDialog;
 class ConfirmationDialog;
 class MenuButton;
+class SpinBox;
 
 class MeshInstance3DEditor : public Control {
 	GDCLASS(MeshInstance3DEditor, Control);

editor/plugins/mesh_library_editor_plugin.cpp

@@ -30,12 +30,12 @@
 
 #include "mesh_library_editor_plugin.h"
 
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/inspector_dock.h"
+#include "editor/plugins/node_3d_editor_plugin.h"
 #include "main/main.h"
-#include "node_3d_editor_plugin.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/navigation_region_3d.h"
 #include "scene/3d/physics_body_3d.h"

editor/plugins/multimesh_editor_plugin.cpp

@@ -31,8 +31,8 @@
 #include "multimesh_editor_plugin.h"
 
 #include "editor/editor_node.h"
-#include "editor/scene_tree_editor.h"
-#include "node_3d_editor_plugin.h"
+#include "editor/gui/scene_tree_editor.h"
+#include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/menu_button.h"

editor/plugins/node_3d_editor_plugin.cpp

@@ -40,6 +40,7 @@
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_spin_slider.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
 #include "editor/plugins/node_3d_editor_gizmos.h"
 #include "editor/scene_tree_dock.h"

editor/plugins/occluder_instance_3d_editor_plugin.cpp

@@ -30,8 +30,8 @@
 
 #include "occluder_instance_3d_editor_plugin.h"
 
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
+#include "editor/gui/editor_file_dialog.h"
 
 void OccluderInstance3DEditorPlugin::_bake_select_file(const String &p_file) {
 	if (occluder_instance) {

editor/plugins/polygon_2d_editor_plugin.cpp

@@ -39,7 +39,10 @@
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "scene/2d/skeleton_2d.h"
 #include "scene/gui/check_box.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/label.h"
 #include "scene/gui/menu_button.h"
+#include "scene/gui/panel.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/slider.h"

editor/plugins/polygon_2d_editor_plugin.h

@@ -37,6 +37,7 @@ class AcceptDialog;
 class ButtonGroup;
 class HScrollBar;
 class HSlider;
+class Label;
 class MenuButton;
 class Panel;
 class ScrollContainer;

editor/plugins/polygon_3d_editor_plugin.cpp

@@ -30,7 +30,6 @@
 
 #include "polygon_3d_editor_plugin.h"
 
-#include "canvas_item_editor_plugin.h"
 #include "core/core_string_names.h"
 #include "core/input/input.h"
 #include "core/io/file_access.h"
@@ -39,7 +38,8 @@
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "node_3d_editor_plugin.h"
+#include "editor/plugins/canvas_item_editor_plugin.h"
+#include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/gui/separator.h"
 

editor/plugins/resource_preloader_editor_plugin.cpp

@@ -32,11 +32,11 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_file_dialog.h"
 
 void ResourcePreloaderEditor::_notification(int p_what) {
 	switch (p_what) {

editor/plugins/root_motion_editor_plugin.cpp

@@ -32,6 +32,8 @@
 #include "editor/editor_node.h"
 #include "scene/animation/animation_player.h"
 #include "scene/animation/animation_tree.h"
+#include "scene/gui/button.h"
+#include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
 #include "scene/main/window.h"
 

editor/plugins/root_motion_editor_plugin.h

@@ -33,10 +33,13 @@
 
 #include "editor/editor_inspector.h"
 
+class Button;
+class ConfirmationDialog;
 class Tree;
 
 class EditorPropertyRootMotion : public EditorProperty {
 	GDCLASS(EditorPropertyRootMotion, EditorProperty);
+
 	Button *assign = nullptr;
 	Button *clear = nullptr;
 	NodePath base_hint;

editor/plugins/script_editor_plugin.cpp

@@ -40,7 +40,6 @@
 #include "core/version.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_help_search.h"
 #include "editor/editor_node.h"
 #include "editor/editor_paths.h"
@@ -49,6 +48,7 @@
 #include "editor/editor_settings.h"
 #include "editor/filesystem_dock.h"
 #include "editor/find_in_files.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/inspector_dock.h"
 #include "editor/node_dock.h"
 #include "editor/plugins/shader_editor_plugin.h"

editor/plugins/skeleton_2d_editor_plugin.cpp

@@ -30,11 +30,11 @@
 
 #include "skeleton_2d_editor_plugin.h"
 
-#include "canvas_item_editor_plugin.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/plugins/canvas_item_editor_plugin.h"
 #include "scene/2d/mesh_instance_2d.h"
-#include "scene/gui/box_container.h"
+#include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"
 #include "thirdparty/misc/clipper.hpp"
 

editor/plugins/skeleton_2d_editor_plugin.h

@@ -33,7 +33,6 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/2d/skeleton_2d.h"
-#include "scene/gui/spin_box.h"
 
 class AcceptDialog;
 class MenuButton;

editor/plugins/skeleton_3d_editor_plugin.cpp

@@ -43,6 +43,7 @@
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/physics_body_3d.h"
 #include "scene/gui/separator.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/resources/capsule_shape_3d.h"
 #include "scene/resources/skeleton_profile.h"
 #include "scene/resources/sphere_shape_3d.h"

editor/plugins/skeleton_3d_editor_plugin.h

@@ -31,10 +31,10 @@
 #ifndef SKELETON_3D_EDITOR_PLUGIN_H
 #define SKELETON_3D_EDITOR_PLUGIN_H
 
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_plugin.h"
 #include "editor/editor_properties.h"
-#include "node_3d_editor_plugin.h"
+#include "editor/gui/editor_file_dialog.h"
+#include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/skeleton_3d.h"

editor/plugins/skeleton_ik_3d_editor_plugin.cpp

@@ -32,6 +32,7 @@
 
 #include "editor/editor_node.h"
 #include "scene/3d/skeleton_ik_3d.h"
+#include "scene/gui/button.h"
 
 void SkeletonIK3DEditorPlugin::_play() {
 	if (!skeleton_ik) {

editor/plugins/skeleton_ik_3d_editor_plugin.h

@@ -33,6 +33,7 @@
 
 #include "editor/editor_plugin.h"
 
+class Button;
 class SkeletonIK3D;
 
 class SkeletonIK3DEditorPlugin : public EditorPlugin {

editor/plugins/sprite_frames_editor_plugin.cpp

@@ -33,12 +33,12 @@
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
 #include "core/os/keyboard.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/scene_tree_dock.h"
 #include "scene/gui/center_container.h"
 #include "scene/gui/margin_container.h"

editor/plugins/theme_editor_plugin.cpp

@@ -31,15 +31,22 @@
 #include "theme_editor_plugin.h"
 
 #include "core/os/keyboard.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_resource_picker.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_undo_redo_manager.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/progress_dialog.h"
+#include "scene/gui/check_button.h"
 #include "scene/gui/color_picker.h"
+#include "scene/gui/item_list.h"
+#include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
+#include "scene/gui/scroll_container.h"
 #include "scene/gui/split_container.h"
+#include "scene/gui/tab_bar.h"
+#include "scene/gui/tab_container.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/theme/theme_db.h"
 
 void ThemeItemImportTree::_update_items_tree() {

editor/plugins/theme_editor_plugin.h

@@ -33,20 +33,21 @@
 
 #include "editor/editor_plugin.h"
 #include "editor/plugins/theme_editor_preview.h"
-#include "scene/gui/check_button.h"
 #include "scene/gui/dialogs.h"
-#include "scene/gui/item_list.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/scroll_container.h"
-#include "scene/gui/tab_bar.h"
-#include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
 #include "scene/resources/theme.h"
 
+class Button;
+class CheckButton;
 class EditorFileDialog;
+class ItemList;
+class Label;
+class OptionButton;
 class PanelContainer;
+class TabBar;
 class TabContainer;
+class TextureRect;
 
 class ThemeItemImportTree : public VBoxContainer {
 	GDCLASS(ThemeItemImportTree, VBoxContainer);

editor/plugins/theme_editor_preview.cpp

@@ -39,7 +39,11 @@
 #include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/color_picker.h"
+#include "scene/gui/color_rect.h"
+#include "scene/gui/margin_container.h"
 #include "scene/gui/progress_bar.h"
+#include "scene/gui/scroll_container.h"
+#include "scene/gui/tab_container.h"
 #include "scene/gui/text_edit.h"
 #include "scene/gui/tree.h"
 #include "scene/resources/packed_scene.h"

editor/plugins/theme_editor_preview.h

@@ -32,13 +32,13 @@
 #define THEME_EDITOR_PREVIEW_H
 
 #include "scene/gui/box_container.h"
-#include "scene/gui/button.h"
-#include "scene/gui/color_rect.h"
-#include "scene/gui/margin_container.h"
-#include "scene/gui/scroll_container.h"
 #include "scene/resources/theme.h"
 
+class Button;
 class ColorPickerButton;
+class ColorRect;
+class MarginContainer;
+class ScrollContainer;
 
 class ThemeEditorPreview : public VBoxContainer {
 	GDCLASS(ThemeEditorPreview, VBoxContainer);

editor/plugins/tiles/atlas_merging_dialog.cpp

@@ -30,10 +30,9 @@
 
 #include "atlas_merging_dialog.h"
 
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_undo_redo_manager.h"
-
+#include "editor/gui/editor_file_dialog.h"
 #include "scene/gui/control.h"
 #include "scene/gui/split_container.h"
 

editor/plugins/tiles/tile_atlas_view.h

@@ -31,7 +31,7 @@
 #ifndef TILE_ATLAS_VIEW_H
 #define TILE_ATLAS_VIEW_H
 
-#include "editor/editor_zoom_widget.h"
+#include "editor/gui/editor_zoom_widget.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/center_container.h"

editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp

@@ -38,7 +38,9 @@
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
 
+#include "scene/gui/button.h"
 #include "scene/gui/item_list.h"
+#include "scene/gui/label.h"
 #include "scene/gui/split_container.h"
 
 #include "core/core_string_names.h"

editor/plugins/tiles/tile_set_scenes_collection_source_editor.h

@@ -33,10 +33,12 @@
 
 #include "editor/editor_inspector.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/button.h"
-#include "scene/gui/item_list.h"
 #include "scene/resources/tile_set.h"
 
+class Button;
+class ItemList;
+class Label;
+
 class TileSetScenesCollectionSourceEditor : public HBoxContainer {
 	GDCLASS(TileSetScenesCollectionSourceEditor, HBoxContainer);
 

editor/plugins/voxel_gi_editor_plugin.cpp

@@ -30,8 +30,8 @@
 
 #include "voxel_gi_editor_plugin.h"
 
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
+#include "editor/gui/editor_file_dialog.h"
 
 void VoxelGIEditorPlugin::_bake() {
 	if (voxel_gi) {

editor/project_manager.cpp

@@ -41,12 +41,12 @@
 #include "core/os/os.h"
 #include "core/string/translation.h"
 #include "core/version.h"
-#include "editor/editor_file_dialog.h"
 #include "editor/editor_paths.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_themes.h"
 #include "editor/editor_vcs_interface.h"
+#include "editor/gui/editor_file_dialog.h"
 #include "editor/plugins/asset_library_editor_plugin.h"
 #include "main/main.h"
 #include "scene/gui/center_container.h"