Editor: Cleanup some includes dependencies

Removes some unnecessary includes from `editor_node.h`, and instead add
those where they're used.

Removes unnecessary `editor_node.h` includes in various editor classes.

Renames `dynamicfont` to `dynamic_font` in a couple files.

Misc cleanup while jumping through that rabbit hole.

editor/action_map_editor.cpp

@@ -29,10 +29,10 @@
 /*************************************************************************/
 
 #include "action_map_editor.h"
+
 #include "core/input/input_map.h"
 #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

@@ -31,8 +31,14 @@
 #ifndef ACTION_MAP_EDITOR_H
 #define ACTION_MAP_EDITOR_H
 
-#include "editor/editor_data.h"
+#include "scene/gui/check_box.h"
+#include "scene/gui/check_button.h"
 #include "scene/gui/color_rect.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/label.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/tab_container.h"
+#include "scene/gui/tree.h"
 
 // Confirmation Dialog used when configuring an input event.
 // Separate from ActionMapEditor for code cleanliness and separation of responsibilities.

editor/code_editor.cpp

@@ -31,14 +31,11 @@
 #include "code_editor.h"
 
 #include "core/input/input.h"
-#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/editor_settings.h"
-#include "scene/gui/margin_container.h"
-#include "scene/gui/separator.h"
+#include "editor/plugins/script_editor_plugin.h"
 #include "scene/resources/font.h"
 
 void GotoLineDialog::popup_find_line(CodeEdit *p_edit) {

editor/code_editor.h

@@ -31,11 +31,12 @@
 #ifndef CODE_EDITOR_H
 #define CODE_EDITOR_H
 
-#include "editor/editor_plugin.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
 #include "scene/gui/check_box.h"
-#include "scene/gui/check_button.h"
 #include "scene/gui/code_edit.h"
 #include "scene/gui/dialogs.h"
+#include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/main/timer.h"
 

editor/connections_dialog.cpp

@@ -30,16 +30,12 @@
 
 #include "connections_dialog.h"
 
-#include "core/string/print_string.h"
 #include "editor/doc_tools.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"
-#include "scene/gui/spin_box.h"
 
 static Node *_find_first_script(Node *p_root, Node *p_node) {
 	if (p_node != p_root && p_node->get_owner() != p_root) {

editor/connections_dialog.h

@@ -35,16 +35,19 @@
 #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 PopupMenu;
 class ConnectDialogBinds;
-class SpinBox;
 
 class ConnectDialog : public ConfirmationDialog {
 	GDCLASS(ConnectDialog, ConfirmationDialog);

editor/debugger/debug_adapter/debug_adapter_parser.cpp

@@ -34,6 +34,7 @@
 #include "editor/debugger/script_editor_debugger.h"
 #include "editor/editor_node.h"
 #include "editor/editor_run_native.h"
+#include "editor/plugins/script_editor_plugin.h"
 
 void DebugAdapterParser::_bind_methods() {
 	// Requests

editor/debugger/script_editor_debugger.h

@@ -39,7 +39,6 @@
 #include "scene/gui/margin_container.h"
 
 class Tree;
-class EditorNode;
 class LineEdit;
 class TabContainer;
 class RichTextLabel;

editor/editor_about.cpp

@@ -34,7 +34,6 @@
 #include "core/donors.gen.h"
 #include "core/license.gen.h"
 #include "core/version.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_data.cpp

@@ -31,11 +31,11 @@
 #include "editor_data.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
+#include "editor/editor_plugin.h"
+#include "editor/plugins/script_editor_plugin.h"
 #include "scene/resources/packed_scene.h"
 
 void EditorHistory::cleanup_history() {

editor/editor_data.h

@@ -33,11 +33,11 @@
 
 #include "core/object/undo_redo.h"
 #include "core/templates/list.h"
-#include "core/templates/pair.h"
-#include "editor/editor_plugin.h"
-#include "editor/plugins/script_editor_plugin.h"
 #include "scene/resources/texture.h"
 
+class ConfigFile;
+class EditorPlugin;
+
 class EditorHistory {
 	enum {
 		HISTORY_MAX = 64
@@ -59,8 +59,6 @@ class EditorHistory {
 	Vector<History> history;
 	int current;
 
-	//Vector<EditorPlugin*> editor_plugins;
-
 	struct PropertyData {
 		String name;
 		Variant value;

editor/editor_export.cpp

@@ -45,6 +45,7 @@
 #include "core/version.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
+#include "editor/editor_paths.h"
 #include "editor/editor_settings.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "scene/resources/resource_format_text.h"

editor/editor_node.cpp

@@ -69,6 +69,7 @@
 #include "servers/physics_server_2d.h"
 #include "servers/rendering/rendering_device.h"
 
+#include "editor/animation_track_editor.h"
 #include "editor/audio_stream_preview.h"
 #include "editor/debugger/debug_adapter/debug_adapter_server.h"
 #include "editor/debugger/editor_debugger_node.h"
@@ -103,12 +104,12 @@
 #include "editor/editor_translation_parser.h"
 #include "editor/export_template_manager.h"
 #include "editor/filesystem_dock.h"
-#include "editor/import/dynamicfont_import_settings.h"
+#include "editor/import/dynamic_font_import_settings.h"
 #include "editor/import/editor_import_collada.h"
 #include "editor/import/resource_importer_bitmask.h"
 #include "editor/import/resource_importer_bmfont.h"
 #include "editor/import/resource_importer_csv_translation.h"
-#include "editor/import/resource_importer_dynamicfont.h"
+#include "editor/import/resource_importer_dynamic_font.h"
 #include "editor/import/resource_importer_image.h"
 #include "editor/import/resource_importer_imagefont.h"
 #include "editor/import/resource_importer_layered_texture.h"

editor/editor_path.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_path.h"
 
+#include "editor/editor_data.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 

editor/editor_path.h

@@ -31,10 +31,13 @@
 #ifndef EDITOR_PATH_H
 #define EDITOR_PATH_H
 
-#include "editor/editor_data.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
+#include "scene/gui/label.h"
 #include "scene/gui/popup_menu.h"
+#include "scene/gui/texture_rect.h"
+
+class EditorHistory;
 
 class EditorPath : public Button {
 	GDCLASS(EditorPath, Button);

editor/editor_paths.cpp

@@ -34,7 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/os/os.h"
-#include "main/main.h" // For `is_project_manager`.
+#include "main/main.h"
 
 EditorPaths *EditorPaths::singleton = nullptr;
 

editor/editor_paths.h

@@ -32,6 +32,7 @@
 #define EDITOR_PATHS_H
 
 #include "core/object/class_db.h"
+#include "core/object/object.h"
 #include "core/string/ustring.h"
 
 class EditorPaths : public Object {

editor/editor_plugin.cpp

@@ -37,11 +37,12 @@
 #include "editor/editor_resource_preview.h"
 #include "editor/editor_settings.h"
 #include "editor/filesystem_dock.h"
+#include "editor/plugins/canvas_item_editor_plugin.h"
+#include "editor/plugins/node_3d_editor_plugin.h"
+#include "editor/plugins/script_editor_plugin.h"
 #include "editor/project_settings_editor.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"
 #include "scene/3d/camera_3d.h"
 #include "scene/gui/popup_menu.h"
 #include "servers/rendering_server.h"

editor/editor_properties_array_dict.cpp

@@ -32,9 +32,9 @@
 
 #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/inspector_dock.h"
 
 bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_value) {
 	String name = p_name;

editor/editor_resource_picker.cpp

@@ -36,6 +36,8 @@
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/filesystem_dock.h"
+#include "editor/plugins/script_editor_plugin.h"
+#include "editor/quick_open.h"
 #include "editor/scene_tree_dock.h"
 
 HashMap<StringName, List<StringName>> EditorResourcePicker::allowed_types_cache;

editor/editor_resource_picker.h

@@ -31,13 +31,13 @@
 #ifndef EDITOR_RESOURCE_PICKER_H
 #define EDITOR_RESOURCE_PICKER_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 EditorQuickOpen;
 
 class EditorResourcePicker : public HBoxContainer {
 	GDCLASS(EditorResourcePicker, HBoxContainer);

editor/editor_resource_preview.cpp

@@ -36,6 +36,7 @@
 #include "core/io/resource_saver.h"
 #include "core/object/message_queue.h"
 #include "editor/editor_node.h"
+#include "editor/editor_paths.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 

editor/editor_run_script.h

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

editor/editor_settings.cpp

@@ -31,18 +31,22 @@
 #include "editor_settings.h"
 
 #include "core/config/project_settings.h"
+#include "core/input/input_event.h"
 #include "core/input/input_map.h"
+#include "core/input/shortcut.h"
 #include "core/io/certs_compressed.gen.h"
-#include "core/io/config_file.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/ip.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
+#include "core/string/translation.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
+#include "editor/editor_paths.h"
 #include "editor/editor_translation.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"

editor/editor_settings.h

@@ -31,15 +31,13 @@
 #ifndef EDITOR_SETTINGS_H
 #define EDITOR_SETTINGS_H
 
-#include "core/input/shortcut.h"
 #include "core/io/config_file.h"
 #include "core/io/resource.h"
-#include "core/object/class_db.h"
 #include "core/os/thread_safe.h"
-#include "core/string/translation.h"
-#include "editor/editor_paths.h"
 
 class EditorPlugin;
+class InputEvent;
+class Shortcut;
 
 class EditorSettings : public Resource {
 	GDCLASS(EditorSettings, Resource);

editor/editor_spin_slider.cpp

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

editor/editor_toaster.cpp

@@ -30,8 +30,8 @@
 
 #include "editor_toaster.h"
 
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
 #include "scene/gui/panel_container.h"

editor/export_template_manager.cpp

@@ -37,6 +37,7 @@
 #include "core/os/keyboard.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
+#include "editor/editor_paths.h"
 #include "editor/editor_scale.h"
 #include "progress_dialog.h"
 #include "scene/gui/link_button.h"

editor/filesystem_dock.cpp

@@ -42,12 +42,13 @@
 #include "editor/editor_resource_preview.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/import_dock.h"
 #include "editor/scene_tree_dock.h"
-#include "import_dock.h"
+#include "editor/shader_create_dialog.h"
+#include "scene/gui/label.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 #include "servers/display_server.h"
-#include "shader_create_dialog.h"
 
 FileSystemDock *FileSystemDock::singleton = nullptr;
 

editor/filesystem_dock.h

@@ -31,29 +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/label.h"
+#include "scene/gui/line_edit.h"
 #include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/progress_bar.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tree.h"
-#include "scene/main/timer.h"
 
-#include "core/io/dir_access.h"
-#include "core/os/thread.h"
-
-#include "create_dialog.h"
-
-#include "dependency_editor.h"
-#include "editor/editor_dir_dialog.h"
-#include "editor/editor_file_system.h"
-#include "script_create_dialog.h"
-
-class EditorNode;
 class ShaderCreateDialog;
 
 class FileSystemDock : public VBoxContainer {

editor/import/dynamic_font_import_settings.cpp

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  dynamicfont_import_settings.cpp                                      */
+/*  dynamic_font_import_settings.cpp                                     */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "dynamicfont_import_settings.h"
+#include "dynamic_font_import_settings.h"
 
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_file_system.h"

editor/import/dynamic_font_import_settings.h

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  dynamicfont_import_settings.h                                        */
+/*  dynamic_font_import_settings.h                                       */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,10 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef FONTDATA_IMPORT_SETTINGS_H
-#define FONTDATA_IMPORT_SETTINGS_H
+#ifndef DYNAMIC_FONT_IMPORT_SETTINGS_H
+#define DYNAMIC_FONT_IMPORT_SETTINGS_H
 
-#include "editor/import/resource_importer_dynamicfont.h"
+#include "editor/import/resource_importer_dynamic_font.h"
 
 #include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
@@ -41,7 +41,6 @@
 #include "scene/gui/tab_container.h"
 #include "scene/gui/text_edit.h"
 #include "scene/gui/tree.h"
-
 #include "scene/resources/font.h"
 #include "servers/text_server.h"
 
@@ -179,4 +178,4 @@ public:
 	DynamicFontImportSettings();
 };
 
-#endif // FONTDATA_IMPORT_SETTINGS_H
+#endif // DYNAMIC_FONT_IMPORT_SETTINGS_H

editor/import/resource_importer_bitmask.cpp

@@ -29,13 +29,11 @@
 /*************************************************************************/
 
 #include "resource_importer_bitmask.h"
-#include "core/io/config_file.h"
+
 #include "core/io/image.h"
 #include "core/io/image_loader.h"
-#include "editor/editor_file_system.h"
-#include "editor/editor_node.h"
+#include "core/io/resource_saver.h"
 #include "scene/resources/bit_map.h"
-#include "scene/resources/texture.h"
 
 String ResourceImporterBitMap::get_importer_name() const {
 	return "bitmap";

editor/import/resource_importer_bitmask.h

@@ -31,11 +31,8 @@
 #ifndef RESOURCE_IMPORTER_BITMASK_H
 #define RESOURCE_IMPORTER_BITMASK_H
 
-#include "core/io/image.h"
 #include "core/io/resource_importer.h"
 
-class StreamBitMap;
-
 class ResourceImporterBitMap : public ResourceImporter {
 	GDCLASS(ResourceImporterBitMap, ResourceImporter);
 

editor/import/resource_importer_dynamic_font.cpp

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  resource_importer_dynamicfont.cpp                                    */
+/*  resource_importer_dynamic_font.cpp                                   */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,12 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "resource_importer_dynamicfont.h"
+#include "resource_importer_dynamic_font.h"
 
 #include "core/io/file_access.h"
 #include "core/io/resource_saver.h"
-#include "dynamicfont_import_settings.h"
-#include "editor/editor_node.h"
+#include "editor/import/dynamic_font_import_settings.h"
+#include "scene/resources/font.h"
+#include "servers/text_server.h"
 
 #include "modules/modules_enabled.gen.h" // For freetype.
 

editor/import/resource_importer_dynamic_font.h

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  resource_importer_dynamicfont.h                                      */
+/*  resource_importer_dynamic_font.h                                     */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,12 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_FONT_DATA_H
-#define RESOURCE_IMPORTER_FONT_DATA_H
+#ifndef RESOURCE_IMPORTER_DYNAMIC_FONT_H
+#define RESOURCE_IMPORTER_DYNAMIC_FONT_H
 
 #include "core/io/resource_importer.h"
-#include "scene/resources/font.h"
-#include "servers/text_server.h"
 
 class ResourceImporterDynamicFont : public ResourceImporter {
 	GDCLASS(ResourceImporterDynamicFont, ResourceImporter);
@@ -68,4 +66,4 @@ public:
 	ResourceImporterDynamicFont();
 };
 
-#endif // RESOURCE_IMPORTER_FONTDATA_H
+#endif // RESOURCE_IMPORTER_DYNAMIC_FONT_H

editor/import_defaults_editor.cpp

@@ -31,6 +31,7 @@
 #include "import_defaults_editor.h"
 
 #include "core/config/project_settings.h"
+#include "core/io/resource_importer.h"
 #include "editor/action_map_editor.h"
 #include "editor/editor_autoload_settings.h"
 #include "editor/editor_plugin_settings.h"

editor/import_defaults_editor.h

@@ -32,6 +32,7 @@
 #define IMPORT_DEFAULTS_EDITOR_H
 
 #include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
 #include "scene/gui/option_button.h"
 
 class ImportDefaultsEditorSettings;

editor/inspector_dock.cpp

@@ -33,7 +33,7 @@
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
-#include "editor/plugins/animation_player_editor_plugin.h"
+#include "editor/plugins/script_editor_plugin.h"
 
 InspectorDock *InspectorDock::singleton = nullptr;
 

editor/inspector_dock.h

@@ -31,15 +31,17 @@
 #ifndef INSPECTOR_DOCK_H
 #define INSPECTOR_DOCK_H
 
-#include "editor/animation_track_editor.h"
 #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"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/tree.h"
 
-class EditorNode;
 class EditorFileDialog;
 
 class InspectorDock : public VBoxContainer {

editor/plugins/abstract_polygon_2d_editor.h

@@ -35,7 +35,6 @@
 #include "scene/2d/polygon_2d.h"
 #include "scene/gui/box_container.h"
 
-class EditorNode;
 class CanvasItemEditor;
 
 class AbstractPolygon2DEditor : public HBoxContainer {

editor/plugins/animation_blend_tree_editor_plugin.h

@@ -40,7 +40,6 @@
 #include "scene/gui/popup.h"
 #include "scene/gui/tree.h"
 
-class EditorNode;
 class ProgressBar;
 class EditorFileDialog;
 

editor/plugins/animation_player_editor_plugin.cpp

@@ -35,7 +35,6 @@
 #include "core/io/resource_loader.h"
 #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"

editor/plugins/animation_player_editor_plugin.h

@@ -31,6 +31,7 @@
 #ifndef ANIMATION_PLAYER_EDITOR_PLUGIN_H
 #define ANIMATION_PLAYER_EDITOR_PLUGIN_H
 
+#include "editor/animation_track_editor.h"
 #include "editor/editor_plugin.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/dialogs.h"
@@ -39,9 +40,7 @@
 #include "scene/gui/texture_button.h"
 #include "scene/gui/tree.h"
 
-class EditorNode;
 class EditorFileDialog;
-class AnimationTrackEditor;
 class AnimationPlayerEditorPlugin;
 
 class AnimationPlayerEditor : public VBoxContainer {

editor/plugins/animation_tree_editor_plugin.h

@@ -39,8 +39,8 @@
 #include "scene/gui/popup.h"
 #include "scene/gui/tree.h"
 
-class EditorNode;
 class EditorFileDialog;
+
 class AnimationTreeNodeEditorPlugin : public VBoxContainer {
 	GDCLASS(AnimationTreeNodeEditorPlugin, VBoxContainer);
 

editor/plugins/asset_library_editor_plugin.cpp

@@ -36,6 +36,7 @@
 #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/project_settings_editor.h"

editor/plugins/audio_stream_editor_plugin.h

@@ -36,7 +36,6 @@
 #include "scene/gui/color_rect.h"
 #include "scene/resources/texture.h"
 
-class EditorNode;
 class AudioStreamEditor : public ColorRect {
 	GDCLASS(AudioStreamEditor, ColorRect);
 

editor/plugins/audio_stream_randomizer_editor_plugin.cpp

@@ -30,6 +30,8 @@
 
 #include "audio_stream_randomizer_editor_plugin.h"
 
+#include "editor/editor_node.h"
+
 void AudioStreamRandomizerEditorPlugin::edit(Object *p_object) {
 }
 

editor/plugins/audio_stream_randomizer_editor_plugin.h

@@ -31,7 +31,6 @@
 #ifndef AUDIO_STREAM_RANDOMIZER_EDITOR_PLUGIN_H
 #define AUDIO_STREAM_RANDOMIZER_EDITOR_PLUGIN_H
 
-#include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
 #include "servers/audio/audio_stream.h"
 

editor/plugins/camera_3d_editor_plugin.h

@@ -34,8 +34,6 @@
 #include "editor/editor_plugin.h"
 #include "scene/3d/camera_3d.h"
 
-class EditorNode;
-
 class Camera3DEditor : public Control {
 	GDCLASS(Camera3DEditor, Control);
 

editor/plugins/canvas_item_editor_plugin.h

@@ -42,7 +42,6 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/main/canvas_item.h"
 
-class EditorNode;
 class EditorData;
 class CanvasItemEditorViewport;
 class ViewPanner;

editor/plugins/collision_shape_2d_editor_plugin.h

@@ -32,10 +32,8 @@
 #define COLLISION_SHAPE_2D_EDITOR_PLUGIN_H
 
 #include "editor/editor_plugin.h"
-
 #include "scene/2d/collision_shape_2d.h"
 
-class EditorNode;
 class CanvasItemEditor;
 
 class CollisionShape2DEditor : public Control {

editor/plugins/control_editor_plugin.cpp

@@ -30,6 +30,7 @@
 
 #include "control_editor_plugin.h"
 
+#include "editor/editor_node.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
 
 void ControlPositioningWarning::_update_warning() {

editor/plugins/control_editor_plugin.h

@@ -31,9 +31,7 @@
 #ifndef CONTROL_EDITOR_PLUGIN_H
 #define CONTROL_EDITOR_PLUGIN_H
 
-#include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
-
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/control.h"

editor/plugins/cpu_particles_2d_editor_plugin.h

@@ -36,7 +36,6 @@
 #include "scene/2d/cpu_particles_2d.h"
 #include "scene/gui/box_container.h"
 
-class EditorNode;
 class EditorPlugin;
 class SpinBox;
 class EditorFileDialog;

editor/plugins/cpu_particles_3d_editor_plugin.h

@@ -34,8 +34,6 @@
 #include "editor/plugins/gpu_particles_3d_editor_plugin.h"
 #include "scene/3d/cpu_particles_3d.h"
 
-class EditorNode;
-
 class CPUParticles3DEditor : public GPUParticles3DEditorBase {
 	GDCLASS(CPUParticles3DEditor, GPUParticles3DEditorBase);
 

editor/plugins/curve_editor_plugin.h

@@ -35,8 +35,6 @@
 #include "editor/editor_resource_preview.h"
 #include "scene/resources/curve.h"
 
-class EditorNode;
-
 // Edits a y(x) curve
 class CurveEditor : public Control {
 	GDCLASS(CurveEditor, Control);

editor/plugins/debugger_editor_plugin.cpp

@@ -36,6 +36,7 @@
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/fileserver/editor_file_server.h"
+#include "editor/plugins/script_editor_plugin.h"
 #include "scene/gui/menu_button.h"
 
 DebuggerEditorPlugin::DebuggerEditorPlugin(MenuButton *p_debug_menu) {

editor/plugins/debugger_editor_plugin.h

@@ -33,7 +33,6 @@
 
 #include "editor/editor_plugin.h"
 
-class EditorNode;
 class EditorFileServer;
 class MenuButton;
 class PopupMenu;

editor/plugins/editor_preview_plugins.cpp

@@ -34,7 +34,7 @@
 #include "core/io/file_access_memory.h"
 #include "core/io/resource_loader.h"
 #include "core/os/os.h"
-#include "editor/editor_node.h"
+#include "editor/editor_paths.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "scene/resources/bit_map.h"

editor/plugins/editor_preview_plugins.h

@@ -31,9 +31,8 @@
 #ifndef EDITORPREVIEWPLUGINS_H
 #define EDITORPREVIEWPLUGINS_H
 
-#include "editor/editor_resource_preview.h"
-
 #include "core/templates/safe_refcount.h"
+#include "editor/editor_resource_preview.h"
 
 void post_process_preview(Ref<Image> p_image);
 

editor/plugins/font_editor_plugin.cpp

@@ -30,7 +30,6 @@
 
 #include "font_editor_plugin.h"
 
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 
 void FontDataPreview::_notification(int p_what) {

editor/plugins/font_editor_plugin.h

@@ -35,8 +35,6 @@
 #include "scene/resources/font.h"
 #include "scene/resources/text_line.h"
 
-class EditorNode;
-
 class FontDataPreview : public Control {
 	GDCLASS(FontDataPreview, Control);
 

editor/plugins/gpu_particles_2d_editor_plugin.h

@@ -37,7 +37,6 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/spin_box.h"
 
-class EditorNode;
 class EditorFileDialog;
 
 class GPUParticles2DEditorPlugin : public EditorPlugin {

editor/plugins/gpu_particles_3d_editor_plugin.h

@@ -35,7 +35,6 @@
 #include "scene/3d/gpu_particles_3d.h"
 #include "scene/gui/spin_box.h"
 
-class EditorNode;
 class SceneTreeDialog;
 
 class GPUParticles3DEditorBase : public Control {

editor/plugins/gpu_particles_collision_sdf_editor_plugin.h

@@ -35,7 +35,6 @@
 #include "scene/3d/gpu_particles_collision_3d.h"
 #include "scene/resources/material.h"
 
-class EditorNode;
 struct EditorProgress;
 class EditorFileDialog;
 

editor/plugins/gradient_editor_plugin.h

@@ -34,8 +34,6 @@
 #include "editor/editor_plugin.h"
 #include "scene/gui/gradient_edit.h"
 
-class EditorNode;
-
 class GradientEditor : public GradientEdit {
 	GDCLASS(GradientEditor, GradientEdit);
 

editor/plugins/input_event_editor_plugin.cpp

@@ -30,8 +30,6 @@
 
 #include "input_event_editor_plugin.h"
 
-#include "editor/editor_node.h"
-
 void InputEventConfigContainer::_bind_methods() {
 }
 

editor/plugins/input_event_editor_plugin.h

@@ -33,8 +33,7 @@
 
 #include "editor/action_map_editor.h"
 #include "editor/editor_inspector.h"
-
-class EditorNode;
+#include "editor/editor_plugin.h"
 
 class InputEventConfigContainer : public HBoxContainer {
 	GDCLASS(InputEventConfigContainer, HBoxContainer);

editor/plugins/lightmap_gi_editor_plugin.h

@@ -35,7 +35,6 @@
 #include "scene/3d/lightmap_gi.h"
 #include "scene/resources/material.h"
 
-class EditorNode;
 struct EditorProgress;
 class EditorFileDialog;
 

editor/plugins/material_editor_plugin.h

@@ -31,17 +31,15 @@
 #ifndef MATERIAL_EDITOR_PLUGIN_H
 #define MATERIAL_EDITOR_PLUGIN_H
 
-#include "editor/property_editor.h"
-#include "scene/resources/primitive_meshes.h"
-
 #include "editor/editor_plugin.h"
+#include "editor/property_editor.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 EditorNode;
 class SubViewportContainer;
 
 class MaterialEditor : public Control {

editor/plugins/mesh_editor_plugin.cpp

@@ -30,7 +30,6 @@
 
 #include "mesh_editor_plugin.h"
 
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 
 void MeshEditor::gui_input(const Ref<InputEvent> &p_event) {

editor/plugins/mesh_editor_plugin.h

@@ -38,8 +38,6 @@
 #include "scene/gui/subviewport_container.h"
 #include "scene/resources/material.h"
 
-class EditorNode;
-
 class MeshEditor : public SubViewportContainer {
 	GDCLASS(MeshEditor, SubViewportContainer);
 

editor/plugins/mesh_instance_3d_editor_plugin.h

@@ -35,8 +35,6 @@
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/gui/spin_box.h"
 
-class EditorNode;
-
 class MeshInstance3DEditor : public Control {
 	GDCLASS(MeshInstance3DEditor, Control);
 

editor/plugins/mesh_library_editor_plugin.h

@@ -34,7 +34,6 @@
 #include "editor/editor_plugin.h"
 #include "scene/resources/mesh_library.h"
 
-class EditorNode;
 class EditorFileDialog;
 class ConfirmationDialog;
 class MenuButton;

editor/plugins/multimesh_editor_plugin.h

@@ -36,7 +36,6 @@
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
 
-class EditorNode;
 class SceneTreeDialog;
 
 class MultiMeshEditor : public Control {

editor/plugins/node_3d_editor_plugin.h

@@ -47,7 +47,6 @@
 #include "scene/resources/fog_material.h"
 #include "scene/resources/sky_material.h"
 
-class EditorNode;
 class EditorData;
 class Node3DEditor;
 class Node3DEditorViewport;

editor/plugins/occluder_instance_3d_editor_plugin.h

@@ -35,8 +35,6 @@
 #include "scene/3d/occluder_instance_3d.h"
 #include "scene/resources/material.h"
 
-class EditorNode;
-struct EditorProgress;
 class EditorFileDialog;
 
 class OccluderInstance3DEditorPlugin : public EditorPlugin {

editor/plugins/ot_features_plugin.cpp

@@ -30,9 +30,6 @@
 
 #include "ot_features_plugin.h"
 
-#include "editor/editor_node.h"
-#include "editor/editor_scale.h"
-
 void OpenTypeFeaturesEditor::_value_changed(double val) {
 	if (setting) {
 		return;

editor/plugins/ot_features_plugin.h

@@ -34,8 +34,6 @@
 #include "editor/editor_plugin.h"
 #include "editor/editor_properties.h"
 
-class EditorNode;
-
 /*************************************************************************/
 
 class OpenTypeFeaturesEditor : public EditorProperty {

editor/plugins/path_2d_editor_plugin.h

@@ -35,7 +35,6 @@
 #include "scene/2d/path_2d.h"
 #include "scene/gui/separator.h"
 
-class EditorNode;
 class CanvasItemEditor;
 
 class Path2DEditor : public HBoxContainer {

editor/plugins/path_3d_editor_plugin.h

@@ -37,8 +37,6 @@
 #include "scene/3d/path_3d.h"
 #include "scene/gui/separator.h"
 
-class EditorNode;
-
 class Path3DGizmo : public EditorNode3DGizmo {
 	GDCLASS(Path3DGizmo, EditorNode3DGizmo);
 

editor/plugins/physical_bone_3d_editor_plugin.cpp

@@ -30,9 +30,7 @@
 
 #include "physical_bone_3d_editor_plugin.h"
 
-#include "editor/editor_node.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
-#include "scene/3d/physics_body_3d.h"
 
 void PhysicalBone3DEditor::_bind_methods() {
 }

editor/plugins/physical_bone_3d_editor_plugin.h

@@ -36,8 +36,6 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 
-class EditorNode;
-
 class PhysicalBone3DEditor : public Object {
 	GDCLASS(PhysicalBone3DEditor, Object);
 

editor/plugins/polygon_2d_editor_plugin.cpp

@@ -30,13 +30,11 @@
 
 #include "polygon_2d_editor_plugin.h"
 
-#include "canvas_item_editor_plugin.h"
-#include "core/input/input.h"
-#include "core/io/file_access.h"
+#include "core/input/input_event.h"
 #include "core/math/geometry_2d.h"
-#include "core/os/keyboard.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/plugins/canvas_item_editor_plugin.h"
 #include "scene/2d/skeleton_2d.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/scroll_container.h"

editor/plugins/polygon_2d_editor_plugin.h

@@ -33,11 +33,11 @@
 
 #include "editor/plugins/abstract_polygon_2d_editor.h"
 
-class ViewPanner;
-class ScrollContainer;
-class Panel;
 class HSlider;
+class Panel;
+class ScrollContainer;
 class SpinBox;
+class ViewPanner;
 
 class Polygon2DEditor : public AbstractPolygon2DEditor {
 	GDCLASS(Polygon2DEditor, AbstractPolygon2DEditor);

editor/plugins/polygon_3d_editor_plugin.h

@@ -36,7 +36,6 @@
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/resources/immediate_mesh.h"
 
-class EditorNode;
 class CanvasItemEditor;
 
 class Polygon3DEditor : public HBoxContainer {

editor/plugins/replication_editor_plugin.cpp

@@ -30,6 +30,7 @@
 
 #include "replication_editor_plugin.h"
 
+#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/inspector_dock.h"
 #include "scene/gui/dialogs.h"

editor/plugins/replication_editor_plugin.h

@@ -31,7 +31,6 @@
 #ifndef REPLICATION_EDITOR_PLUGIN_H
 #define REPLICATION_EDITOR_PLUGIN_H
 
-#include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
 #include "scene/resources/scene_replication_config.h"
 

editor/plugins/resource_preloader_editor_plugin.h

@@ -36,8 +36,6 @@
 #include "scene/gui/tree.h"
 #include "scene/main/resource_preloader.h"
 
-class EditorNode;
-struct EditorProgress;
 class EditorFileDialog;
 
 class ResourcePreloaderEditor : public PanelContainer {

editor/plugins/script_editor_plugin.h

@@ -47,8 +47,6 @@
 #include "scene/main/timer.h"
 #include "scene/resources/text_file.h"
 
-class EditorNode;
-struct EditorProgress;
 class EditorFileDialog;
 
 class EditorSyntaxHighlighter : public SyntaxHighlighter {

editor/plugins/skeleton_2d_editor_plugin.h

@@ -35,8 +35,6 @@
 #include "scene/2d/skeleton_2d.h"
 #include "scene/gui/spin_box.h"
 
-class EditorNode;
-
 class Skeleton2DEditor : public Control {
 	GDCLASS(Skeleton2DEditor, Control);
 

editor/plugins/skeleton_3d_editor_plugin.h

@@ -39,7 +39,6 @@
 #include "scene/3d/skeleton_3d.h"
 #include "scene/resources/immediate_mesh.h"
 
-class EditorNode;
 class EditorInspectorPluginSkeleton;
 class Joint;
 class PhysicalBone3D;

editor/plugins/skeleton_ik_3d_editor_plugin.h

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

editor/plugins/sprite_2d_editor_plugin.h

@@ -35,8 +35,6 @@
 #include "scene/2d/sprite_2d.h"
 #include "scene/gui/spin_box.h"
 
-class EditorNode;
-
 class Sprite2DEditor : public Control {
 	GDCLASS(Sprite2DEditor, Control);
 

editor/plugins/sprite_frames_editor_plugin.h

@@ -43,8 +43,6 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
 
-class EditorNode;
-struct EditorProgress;
 class EditorFileDialog;
 
 class SpriteFramesEditor : public HSplitContainer {

editor/plugins/style_box_editor_plugin.cpp

@@ -30,7 +30,6 @@
 
 #include "style_box_editor_plugin.h"
 
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 
 bool EditorInspectorPluginStyleBox::can_handle(Object *p_object) {

editor/plugins/style_box_editor_plugin.h

@@ -37,8 +37,6 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/style_box.h"
 
-class EditorNode;
-
 class StyleBoxPreview : public VBoxContainer {
 	GDCLASS(StyleBoxPreview, VBoxContainer);
 

editor/plugins/sub_viewport_preview_editor_plugin.cpp

@@ -30,8 +30,6 @@
 
 #include "sub_viewport_preview_editor_plugin.h"
 
-#include "editor/editor_node.h"
-
 bool EditorInspectorPluginSubViewportPreview::can_handle(Object *p_object) {
 	return Object::cast_to<SubViewport>(p_object) != nullptr;
 }

editor/plugins/sub_viewport_preview_editor_plugin.h

@@ -35,8 +35,6 @@
 #include "editor/plugins/texture_editor_plugin.h"
 #include "scene/main/viewport.h"
 
-class EditorNode;
-
 class EditorInspectorPluginSubViewportPreview : public EditorInspectorPluginTexture {
 	GDCLASS(EditorInspectorPluginSubViewportPreview, EditorInspectorPluginTexture);