Ran include-what-you-use on the classes in the editor/ floder.

editor/animation_bezier_editor.cpp

@@ -32,6 +32,30 @@
 
 #include "editor/editor_node.h"
 #include "editor_scale.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/error_macros.h"
+#include "core/list.h"
+#include "core/math/math_defs.h"
+#include "core/math/math_funcs.h"
+#include "core/math/transform_2d.h"
+#include "core/node_path.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/pair.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "core/undo_redo.h"
+#include "editor/animation_track_editor.h"
+#include "editor/editor_settings.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/range.h"
+#include "scene/gui/shortcut.h"
+#include "scene/main/node.h"
+#include "scene/resources/font.h"
 
 float AnimationBezierTrackEdit::_bezier_h_to_pixel(float p_h) {
 	float h = p_h;

editor/animation_bezier_editor.h

@@ -31,6 +31,27 @@
 /*************************************************************************/
 
 #include "animation_track_editor.h"
+#include "core/map.h"
+#include "core/math/rect2.h"
+#include "core/math/vector2.h"
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/set.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
+#include "scene/gui/control.h"
+#include "scene/resources/animation.h"
+#include "scene/resources/texture.h"
+
+class AnimationTimelineEdit;
+class AnimationTrackEditor;
+class InputEvent;
+class Node;
+class OptionButton;
+class PopupMenu;
+class UndoRedo;
+struct Color;
 
 class AnimationBezierTrackEdit : public Control {
 	GDCLASS(AnimationBezierTrackEdit, Control);

editor/animation_track_editor.cpp

@@ -41,6 +41,55 @@
 #include "scene/main/node.h"
 #include "scene/main/viewport.h"
 #include "servers/audio/audio_stream.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/engine.h"
+#include "core/error_macros.h"
+#include "core/math/basis.h"
+#include "core/math/math_funcs.h"
+#include "core/math/quat.h"
+#include "core/math/transform.h"
+#include "core/math/transform_2d.h"
+#include "core/math/vector3.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/pair.h"
+#include "core/resource.h"
+#include "core/script_language.h"
+#include "core/set.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "core/undo_redo.h"
+#include "editor/editor_data.h"
+#include "editor/editor_inspector.h"
+#include "editor/editor_settings.h"
+#include "editor/editor_spin_slider.h"
+#include "editor/property_selector.h"
+#include "editor/scene_tree_editor.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/animation/animation_player.h"
+#include "scene/gui/button.h"
+#include "scene/gui/check_box.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/panel_container.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/scroll_bar.h"
+#include "scene/gui/scroll_container.h"
+#include "scene/gui/separator.h"
+#include "scene/gui/shortcut.h"
+#include "scene/gui/slider.h"
+#include "scene/gui/spin_box.h"
+#include "scene/gui/texture_rect.h"
+#include "scene/gui/tool_button.h"
+#include "scene/gui/tree.h"
+#include "scene/main/scene_tree.h"
+#include "scene/resources/font.h"
+#include "scene/resources/style_box.h"
 
 class AnimationTrackKeyEdit : public Object {
 	GDCLASS(AnimationTrackKeyEdit, Object);

editor/animation_track_editor.h

@@ -46,8 +46,48 @@
 #include "scene/gui/tool_button.h"
 #include "scene/resources/animation.h"
 #include "scene_tree_editor.h"
+#include "core/dictionary.h"
+#include "core/list.h"
+#include "core/map.h"
+#include "core/math/rect2.h"
+#include "core/math/vector2.h"
+#include "core/node_path.h"
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/range.h"
+#include "scene/resources/texture.h"
 
 class AnimationTrackEdit;
+class Button;
+class CheckBox;
+class ConfirmationDialog;
+class EditorSpinSlider;
+class HScrollBar;
+class HSlider;
+class InputEvent;
+class Label;
+class LineEdit;
+class MenuButton;
+class Node;
+class OptionButton;
+class PanelContainer;
+class PopupMenu;
+class PropertySelector;
+class SceneTreeDialog;
+class ScrollContainer;
+class Spatial;
+class SpinBox;
+class TextureRect;
+class ToolButton;
+class Transform;
+class Tree;
+class TreeItem;
+class UndoRedo;
+struct Color;
 
 class AnimationTimelineEdit : public Range {
 	GDCLASS(AnimationTimelineEdit, Range);

editor/animation_track_editor_plugins.cpp

@@ -31,13 +31,28 @@
 #include "animation_track_editor_plugins.h"
 
 #include "editor/audio_stream_preview.h"
-#include "editor_resource_preview.h"
 #include "editor_scale.h"
 #include "scene/2d/animated_sprite.h"
 #include "scene/2d/sprite.h"
 #include "scene/3d/sprite_3d.h"
 #include "scene/animation/animation_player.h"
 #include "servers/audio/audio_stream.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/dictionary.h"
+#include "core/io/resource_loader.h"
+#include "core/list.h"
+#include "core/math/math_funcs.h"
+#include "core/node_path.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "core/undo_redo.h"
+#include "core/vector.h"
+#include "scene/resources/animation.h"
+#include "scene/resources/font.h"
+#include "servers/visual_server.h"
 
 /// BOOL ///
 int AnimationTrackEditBool::get_key_height() const {

editor/animation_track_editor_plugins.h

@@ -31,6 +31,17 @@
 /*************************************************************************/
 
 #include "editor/animation_track_editor.h"
+#include "core/math/rect2.h"
+#include "core/math/vector2.h"
+#include "core/object.h"
+#include "core/object_id.h"
+#include "core/reference.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "scene/gui/control.h"
+#include "scene/resources/texture.h"
+
+class InputEvent;
 
 class AnimationTrackEditBool : public AnimationTrackEdit {
 	GDCLASS(AnimationTrackEditBool, AnimationTrackEdit);

editor/array_property_edit.cpp

@@ -32,6 +32,11 @@
 
 #include "core/io/marshalls.h"
 #include "editor_node.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/typedefs.h"
+#include "core/undo_redo.h"
+#include "scene/main/node.h"
 
 #define ITEMS_PER_PAGE 100
 

editor/array_property_edit.h

@@ -31,6 +31,15 @@
 /*************************************************************************/
 
 #include "scene/main/node.h"
+#include "core/list.h"
+#include "core/object.h"
+#include "core/object_id.h"
+#include "core/reference.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+
+class Node;
 
 class ArrayPropertyEdit : public Reference {
 	GDCLASS(ArrayPropertyEdit, Reference);

editor/audio_stream_preview.cpp

@@ -30,6 +30,16 @@
 
 #include "audio_stream_preview.h"
 
+#include "core/class_db.h"
+#include "core/error_macros.h"
+#include "core/list.h"
+#include "core/math/audio_frame.h"
+#include "core/os/memory.h"
+#include "core/os/thread.h"
+#include "core/typedefs.h"
+#include "core/variant.h"
+#include "servers/audio_server.h"
+
 /////////////////////
 
 float AudioStreamPreview::get_length() const {

editor/audio_stream_preview.h

@@ -34,6 +34,13 @@
 #include "core/safe_refcount.h"
 #include "scene/main/node.h"
 #include "servers/audio/audio_stream.h"
+#include "core/map.h"
+#include "core/object.h"
+#include "core/object_id.h"
+#include "core/reference.h"
+#include "core/vector.h"
+
+class Thread;
 
 class AudioStreamPreview : public Reference {
 	GDCLASS(AudioStreamPreview, Reference);

editor/code_editor.cpp

@@ -36,10 +36,34 @@
 #include "editor/editor_scale.h"
 #include "editor_node.h"
 #include "editor_settings.h"
-#include "scene/gui/margin_container.h"
-#include "scene/gui/separator.h"
 #include "scene/gui/texture_button.h"
 #include "scene/resources/dynamic_font.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/dictionary.h"
+#include "core/math/math_funcs.h"
+#include "core/math/vector2.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/resource.h"
+#include "core/script_language.h"
+#include "core/typedefs.h"
+#include "core/vector.h"
+#include "editor/plugins/script_editor_plugin.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/gui/button.h"
+#include "scene/gui/check_box.h"
+#include "scene/gui/control.h"
+#include "scene/gui/label.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/scroll_container.h"
+#include "scene/gui/shortcut.h"
+#include "scene/gui/text_edit.h"
+#include "scene/gui/tool_button.h"
+#include "scene/main/node.h"
+#include "scene/main/timer.h"
+#include "scene/resources/font.h"
+#include "scene/resources/texture.h"
 
 void GotoLineDialog::popup_find_line(TextEdit *p_edit) {
 	text_editor = p_edit;

editor/code_editor.h

@@ -38,6 +38,25 @@
 #include "scene/gui/text_edit.h"
 #include "scene/gui/tool_button.h"
 #include "scene/main/timer.h"
+#include "core/list.h"
+#include "core/math/math_defs.h"
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "scene/gui/box_container.h"
+
+class Button;
+class CheckBox;
+class InputEvent;
+class Label;
+class LineEdit;
+class TextEdit;
+class Texture;
+class TextureButton;
+class Timer;
+class ToolButton;
+struct ScriptCodeCompletionOption;
 
 class GotoLineDialog : public ConfirmationDialog {
 	GDCLASS(GotoLineDialog, ConfirmationDialog);

editor/connections_dialog.cpp

@@ -30,13 +30,48 @@
 
 #include "connections_dialog.h"
 
-#include "core/print_string.h"
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "editor_settings.h"
 #include "plugins/script_editor_plugin.h"
 #include "scene/gui/label.h"
 #include "scene/gui/popup_menu.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/dictionary.h"
+#include "core/error_macros.h"
+#include "core/list.h"
+#include "core/math/aabb.h"
+#include "core/math/basis.h"
+#include "core/math/plane.h"
+#include "core/math/quat.h"
+#include "core/math/rect2.h"
+#include "core/math/transform.h"
+#include "core/math/vector2.h"
+#include "core/math/vector3.h"
+#include "core/os/memory.h"
+#include "core/ref_ptr.h"
+#include "core/reference.h"
+#include "core/script_language.h"
+#include "core/typedefs.h"
+#include "core/undo_redo.h"
+#include "core/variant.h"
+#include "editor/doc/doc_data.h"
+#include "editor/editor_help.h"
+#include "editor/editor_inspector.h"
+#include "editor/scene_tree_dock.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/control.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/margin_container.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/rich_text_label.h"
+#include "scene/main/node.h"
+#include "scene/main/scene_tree.h"
+#include "scene/resources/texture.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

@@ -44,9 +44,30 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/tree.h"
+#include "core/map.h"
+#include "core/node_path.h"
+#include "core/object.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/vector.h"
+#include "scene/gui/box_container.h"
 
 class PopupMenu;
 class ConnectDialogBinds;
+class Button;
+class CheckBox;
+class CheckButton;
+class Control;
+class EditorInspector;
+class EditorNode;
+class Label;
+class LineEdit;
+class Node;
+class OptionButton;
+class SceneTreeEditor;
+class UndoRedo;
+class Variant;
+struct Vector2;
 
 class ConnectDialog : public ConfirmationDialog {
 	GDCLASS(ConnectDialog, ConfirmationDialog);

editor/create_dialog.cpp

@@ -32,12 +32,33 @@
 
 #include "core/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/print_string.h"
 #include "editor_help.h"
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "editor_settings.h"
 #include "scene/gui/box_container.h"
+#include "core/color.h"
+#include "core/dictionary.h"
+#include "core/map.h"
+#include "core/math/rect2.h"
+#include "core/os/file_access.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/script_language.h"
+#include "core/typedefs.h"
+#include "editor/doc/doc_data.h"
+#include "editor/editor_data.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/gui/button.h"
+#include "scene/gui/control.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/popup.h"
+#include "scene/gui/rich_text_label.h"
+#include "scene/gui/split_container.h"
+#include "scene/gui/tool_button.h"
+#include "scene/gui/tree.h"
+#include "scene/main/node.h"
+#include "scene/resources/texture.h"
 
 void CreateDialog::popup_create(bool p_dont_clear, bool p_replace_mode, const String &p_select_type) {
 	type_list.clear();

editor/create_dialog.h

@@ -37,6 +37,25 @@
 #include "scene/gui/label.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/tree.h"
+#include "core/hash_map.h"
+#include "core/list.h"
+#include "core/math/vector2.h"
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/resource.h"
+#include "core/set.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
+
+class Button;
+class Control;
+class EditorHelpBit;
+class InputEvent;
+class LineEdit;
+class Tree;
+class TreeItem;
 
 class CreateDialog : public ConfirmationDialog {
 	GDCLASS(CreateDialog, ConfirmationDialog);

editor/dependency_editor.cpp

@@ -35,8 +35,32 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "scene/gui/margin_container.h"
-
 #include "core/project_settings.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/math/vector2.h"
+#include "core/os/dir_access.h"
+#include "core/os/memory.h"
+#include "core/os/os.h"
+#include "core/print_string.h"
+#include "core/reference.h"
+#include "core/resource.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "core/variant.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_file_system.h"
+#include "editor/editor_settings.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
+#include "scene/gui/control.h"
+#include "scene/gui/item_list.h"
+#include "scene/gui/label.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/tree.h"
+#include "scene/resources/texture.h"
 
 void DependencyEditor::_searched(const String &p_path) {
 	Map<String, String> dep_rename;

editor/dependency_editor.h

@@ -34,10 +34,23 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/tree.h"
+#include "core/hash_map.h"
+#include "core/list.h"
+#include "core/map.h"
+#include "core/object.h"
+#include "core/ustring.h"
+#include "core/vector.h"
 
 class EditorFileDialog;
 class EditorFileSystemDirectory;
 class EditorNode;
+class Button;
+class ItemList;
+class Label;
+class PopupMenu;
+class Tree;
+class TreeItem;
+struct Vector2;
 
 class DependencyEditor : public AcceptDialog {
 	GDCLASS(DependencyEditor, AcceptDialog);

editor/dictionary_property_edit.cpp

@@ -29,7 +29,13 @@
 /*************************************************************************/
 
 #include "dictionary_property_edit.h"
+
 #include "editor_node.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/dictionary.h"
+#include "core/undo_redo.h"
+#include "scene/main/node.h"
 
 void DictionaryPropertyEdit::_notif_change() {
 	_change_notify();

editor/dictionary_property_edit.h

@@ -31,6 +31,15 @@
 /*************************************************************************/
 
 #include "scene/main/node.h"
+#include "core/list.h"
+#include "core/object.h"
+#include "core/object_id.h"
+#include "core/reference.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+
+class Node;
 
 class DictionaryPropertyEdit : public Reference {
 	GDCLASS(DictionaryPropertyEdit, Reference);

editor/doc/doc_data.cpp

@@ -33,7 +33,6 @@
 #include "core/engine.h"
 #include "core/global_constants.h"
 #include "core/io/compression.h"
-#include "core/io/marshalls.h"
 #include "core/os/dir_access.h"
 #include "core/project_settings.h"
 #include "core/script_language.h"
@@ -41,6 +40,19 @@
 #include "core/version.h"
 #include "scene/resources/theme.h"
 #include "core/io/xml_parser.h"
+#include "core/class_db.h"
+#include "core/error_macros.h"
+#include "core/list.h"
+#include "core/method_bind.h"
+#include "core/object.h"
+#include "core/os/file_access.h"
+#include "core/os/memory.h"
+#include "core/pair.h"
+#include "core/print_string.h"
+#include "core/set.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "core/variant.h"
 
 static String _get_indent(const String &p_text) {
 	String indent;

editor/doc/doc_data.h

@@ -33,6 +33,9 @@
 #include "core/map.h"
 #include "core/variant.h"
 #include "core/reference.h"
+#include "core/error_list.h"
+#include "core/ustring.h"
+#include "core/vector.h"
 
 class XMLParser;
 

editor/editor_about.cpp

@@ -34,7 +34,29 @@
 #include "core/donors.gen.h"
 #include "core/license.gen.h"
 #include "core/version.h"
-#include "editor_node.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/math/vector2.h"
+#include "core/os/memory.h"
+#include "core/os/os.h"
+#include "core/reference.h"
+#include "core/variant.h"
+#include "editor/editor_scale.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/control.h"
+#include "scene/gui/item_list.h"
+#include "scene/gui/label.h"
+#include "scene/gui/link_button.h"
+#include "scene/gui/rich_text_label.h"
+#include "scene/gui/scroll_container.h"
+#include "scene/gui/separator.h"
+#include "scene/gui/split_container.h"
+#include "scene/gui/tab_container.h"
+#include "scene/gui/texture_rect.h"
+#include "scene/gui/tree.h"
+#include "scene/main/node.h"
+#include "scene/resources/font.h"
+#include "scene/resources/texture.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

@@ -41,8 +41,16 @@
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
-
 #include "editor_scale.h"
+#include "core/list.h"
+#include "core/object.h"
+#include "core/ustring.h"
+
+class LinkButton;
+class RichTextLabel;
+class ScrollContainer;
+class TextureRect;
+class Tree;
 
 /**
  * NOTE: Do not assume the EditorNode singleton to be available in this class' methods.

editor/editor_atlas_packer.cpp

@@ -30,6 +30,11 @@
 
 #include "editor_atlas_packer.h"
 
+#include "core/math/rect2.h"
+#include "core/typedefs.h"
+#include "core/ustring.h"
+#include "scene/resources/bit_map.h"
+
 void EditorAtlasPacker::_plot_triangle(Ref<BitMap> p_bitmap, Vector2i *vertices) {
 	int width = p_bitmap->get_size().width;
 	int height = p_bitmap->get_size().height;

editor/editor_atlas_packer.h

@@ -31,9 +31,11 @@
 /*************************************************************************/
 
 #include "core/math/vector2.h"
-
 #include "core/vector.h"
 #include "scene/resources/bit_map.h"
+#include "core/reference.h"
+
+class BitMap;
 
 class EditorAtlasPacker {
 public:

editor/editor_audio_buses.cpp

@@ -38,8 +38,38 @@
 #include "filesystem_dock.h"
 #include "scene/resources/font.h"
 #include "servers/audio_server.h"
-
 #include "core/project_settings.h"
+#include "core/class_db.h"
+#include "core/dictionary.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/io/resource_loader.h"
+#include "core/math/math_defs.h"
+#include "core/math/math_funcs.h"
+#include "core/math/rect2.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/string_name.h"
+#include "core/undo_redo.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_settings.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/gui/button.h"
+#include "scene/gui/label.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/panel.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/scroll_container.h"
+#include "scene/gui/separator.h"
+#include "scene/gui/slider.h"
+#include "scene/gui/texture_progress.h"
+#include "scene/gui/tool_button.h"
+#include "scene/gui/tree.h"
+#include "scene/main/node.h"
+#include "scene/main/timer.h"
+#include "scene/resources/style_box.h"
+#include "servers/audio/audio_effect.h"
 
 void EditorAudioBus::_update_visible_channels() {
 	int i = 0;

editor/editor_audio_buses.h

@@ -46,8 +46,30 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/tree.h"
+#include "core/color.h"
+#include "core/list.h"
+#include "core/math/vector2.h"
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/typedefs.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "scene/resources/texture.h"
 
 class EditorAudioBuses;
+class Button;
+class EditorFileDialog;
+class InputEvent;
+class Label;
+class MenuButton;
+class OptionButton;
+class Panel;
+class PopupMenu;
+class ScrollContainer;
+class TextureProgress;
+class Timer;
+class Tree;
+class VSlider;
 
 class EditorAudioBus : public PanelContainer {
 	GDCLASS(EditorAudioBus, PanelContainer);

editor/editor_autoload_settings.cpp

@@ -37,6 +37,31 @@
 #include "project_settings_editor.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/packed_scene.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/dictionary.h"
+#include "core/error_macros.h"
+#include "core/io/resource_loader.h"
+#include "core/map.h"
+#include "core/math/math_funcs.h"
+#include "core/os/file_access.h"
+#include "core/os/memory.h"
+#include "core/pool_vector.h"
+#include "core/reference.h"
+#include "core/resource.h"
+#include "core/script_language.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "core/undo_redo.h"
+#include "core/vector.h"
+#include "editor/editor_file_dialog.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/tree.h"
+#include "scene/main/node.h"
+#include "scene/main/scene_tree.h"
 
 #define PREVIEW_LIST_MAX_SIZE 10
 

editor/editor_autoload_settings.h

@@ -31,8 +31,21 @@
 /*************************************************************************/
 
 #include "scene/gui/tree.h"
-
 #include "editor_file_dialog.h"
+#include "core/list.h"
+#include "core/math/vector2.h"
+#include "core/object.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "scene/gui/box_container.h"
+
+class Button;
+class Control;
+class EditorLineEditFileChooser;
+class Label;
+class LineEdit;
+class Node;
+class Tree;
 
 class EditorAutoloadSettings : public VBoxContainer {
 	GDCLASS(EditorAutoloadSettings, VBoxContainer);

editor/editor_data.cpp

@@ -31,12 +31,20 @@
 #include "editor_data.h"
 
 #include "core/io/resource_loader.h"
-#include "core/os/dir_access.h"
 #include "core/os/file_access.h"
 #include "core/project_settings.h"
 #include "editor_node.h"
-#include "editor_settings.h"
 #include "scene/resources/packed_scene.h"
+#include "core/class_db.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/io/config_file.h"
+#include "core/os/memory.h"
+#include "editor/editor_plugin.h"
+#include "editor/plugins/script_editor_plugin.h"
+#include "scene/main/node.h"
+
+class Resource;
 
 void EditorHistory::cleanup_history() {
 	for (int i = 0; i < history.size(); i++) {

editor/editor_data.h

@@ -36,6 +36,26 @@
 #include "editor/editor_plugin.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "scene/resources/texture.h"
+#include "core/array.h"
+#include "core/dictionary.h"
+#include "core/hash_map.h"
+#include "core/map.h"
+#include "core/node_path.h"
+#include "core/object.h"
+#include "core/object_id.h"
+#include "core/reference.h"
+#include "core/script_language.h"
+#include "core/set.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
+
+class ConfigFile;
+class EditorPlugin;
+class Node;
+class Resource;
 
 class EditorHistory {
 	enum {

editor/editor_dir_dialog.cpp

@@ -29,17 +29,24 @@
 /*************************************************************************/
 
 #include "editor_dir_dialog.h"
-
-#include "core/os/keyboard.h"
-#include "core/os/os.h"
 #include "editor/editor_dir_dialog.h"
-#include "editor/editor_file_dialog.h"
+
+#include "core/os/os.h"
 #include "editor/editor_file_system.h"
-#include "editor/editor_settings.h"
 #include "editor_scale.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/line_edit.h"
+#include "core/class_db.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/math/vector2.h"
+#include "core/os/dir_access.h"
+#include "core/os/memory.h"
+#include "core/variant.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/gui/tree.h"
+#include "scene/main/node.h"
 
 void EditorDirDialog::_update_dir(TreeItem *p_item, EditorFileSystemDirectory *p_dir, const String &p_select_path) {
 	updating = true;

editor/editor_dir_dialog.h

@@ -34,6 +34,15 @@
 #include "editor/editor_file_system.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
+#include "core/object.h"
+#include "core/set.h"
+#include "core/ustring.h"
+
+class Button;
+class EditorFileSystemDirectory;
+class LineEdit;
+class Tree;
+class TreeItem;
 
 class EditorDirDialog : public ConfirmationDialog {
 	GDCLASS(EditorDirDialog, ConfirmationDialog);

editor/editor_export.cpp

@@ -34,7 +34,6 @@
 #include "core/io/config_file.h"
 #include "core/io/file_access_pack.h" // PACK_HEADER_MAGIC, PACK_FORMAT_VERSION
 #include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
 #include "core/io/zip_io.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
@@ -46,6 +45,16 @@
 #include "editor_node.h"
 #include "editor_settings.h"
 #include "scene/resources/resource_format_text.h"
+#include "core/class_db.h"
+#include "core/error_macros.h"
+#include "core/os/memory.h"
+#include "core/os/os.h"
+#include "core/version_generated.gen.h"
+#include "scene/main/timer.h"
+#include "scene/resources/theme.h"
+#include "thirdparty/minizip/ioapi.h"
+#include "thirdparty/minizip/zip.h"
+#include "zlib.h"
 
 static int _get_pad(int p_alignment, int p_n) {
 	int rest = p_n % p_alignment;

editor/editor_export.h

@@ -35,11 +35,25 @@
 #include "scene/main/node.h"
 #include "scene/main/timer.h"
 #include "scene/resources/texture.h"
+#include "core/error_list.h"
+#include "core/list.h"
+#include "core/map.h"
+#include "core/object.h"
+#include "core/pool_vector.h"
+#include "core/reference.h"
+#include "core/set.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
 
 class FileAccess;
 class EditorExportPlatform;
 class EditorFileSystemDirectory;
 struct EditorProgress;
+class DirAccess;
+class Timer;
 
 class EditorExportPreset : public Reference {
 	GDCLASS(EditorExportPreset, Reference);

editor/editor_file_dialog.cpp

@@ -33,7 +33,6 @@
 #include "core/os/file_access.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/print_string.h"
 #include "dependency_editor.h"
 #include "editor_file_system.h"
 #include "editor_resource_preview.h"
@@ -41,12 +40,34 @@
 #include "editor_settings.h"
 #include "scene/gui/center_container.h"
 #include "scene/gui/label.h"
-#include "scene/gui/margin_container.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/scroll_bar.h"
-#include "scene/resources/world.h"
-
 #include "core/project_settings.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/dictionary.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/list.h"
+#include "core/math/vector2.h"
+#include "core/os/dir_access.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/pool_vector.h"
+#include "core/typedefs.h"
+#include "scene/gui/base_button.h"
+#include "scene/gui/button.h"
+#include "scene/gui/control.h"
+#include "scene/gui/item_list.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/popup.h"
+#include "scene/gui/separator.h"
+#include "scene/gui/split_container.h"
+#include "scene/gui/texture_rect.h"
+#include "scene/gui/tool_button.h"
+#include "scene/main/node.h"
+#include "scene/resources/texture.h"
 
 EditorFileDialog::GetIconFunc EditorFileDialog::get_icon_func = nullptr;
 EditorFileDialog::GetIconFunc EditorFileDialog::get_large_icon_func = nullptr;

editor/editor_file_dialog.h

@@ -40,8 +40,26 @@
 #include "scene/gui/split_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tool_button.h"
+#include "core/method_bind.h"
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
 
 class DependencyRemoveDialog;
+class Button;
+class DirAccess;
+class HSplitContainer;
+class InputEvent;
+class ItemList;
+class LineEdit;
+class OptionButton;
+class PopupMenu;
+class Texture;
+class TextureRect;
+class ToolButton;
+struct Vector2;
 
 class EditorFileDialog : public ConfirmationDialog {
 	GDCLASS(EditorFileDialog, ConfirmationDialog);

editor/editor_file_system.cpp

@@ -40,6 +40,20 @@
 #include "editor_node.h"
 #include "editor_resource_preview.h"
 #include "editor_settings.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/dictionary.h"
+#include "core/error_macros.h"
+#include "core/io/config_file.h"
+#include "core/os/dir_access.h"
+#include "core/os/memory.h"
+#include "core/print_string.h"
+#include "core/reference.h"
+#include "core/resource.h"
+#include "core/script_language.h"
+#include "core/typedefs.h"
+#include "core/variant.h"
+#include "editor/editor_data.h"
 
 EditorFileSystem *EditorFileSystem::singleton = nullptr;
 //the name is the version, to keep compatibility with different versions of Godot

editor/editor_file_system.h

@@ -36,10 +36,19 @@
 #include "core/safe_refcount.h"
 #include "core/set.h"
 #include "scene/main/node.h"
+#include "core/error_list.h"
+#include "core/hash_map.h"
+#include "core/list.h"
+#include "core/map.h"
+#include "core/object.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/vector.h"
 
 class FileAccess;
-
 struct EditorProgressBG;
+class DirAccess;
+
 class EditorFileSystemDirectory : public Object {
 	GDCLASS(EditorFileSystemDirectory, Object);
 

editor/editor_folding.cpp

@@ -33,6 +33,16 @@
 #include "core/os/file_access.h"
 #include "editor_inspector.h"
 #include "editor_settings.h"
+#include "core/array.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/io/config_file.h"
+#include "core/list.h"
+#include "core/node_path.h"
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/variant.h"
+#include "scene/main/node.h"
 
 PoolVector<String> EditorFolding::_get_unfolds(const Object *p_object) {
 	PoolVector<String> sections;

editor/editor_folding.h

@@ -31,6 +31,14 @@
 /*************************************************************************/
 
 #include "scene/main/node.h"
+#include "core/pool_vector.h"
+#include "core/resource.h"
+#include "core/set.h"
+#include "core/ustring.h"
+
+class Array;
+class Node;
+class Object;
 
 class EditorFolding {
 	PoolVector<String> _get_unfolds(const Object *p_object);

editor/editor_fonts.cpp

@@ -34,8 +34,12 @@
 #include "core/os/dir_access.h"
 #include "editor_scale.h"
 #include "editor_settings.h"
-#include "scene/resources/default_theme/default_theme.h"
 #include "scene/resources/dynamic_font.h"
+#include "core/os/memory.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "scene/resources/font.h"
+#include "scene/resources/theme.h"
 
 #define MAKE_FALLBACKS(m_name)          \
 	m_name->add_fallback(FontArabic);   \

editor/editor_fonts.h

@@ -31,6 +31,9 @@
 /*************************************************************************/
 
 #include "scene/resources/theme.h"
+#include "core/reference.h"
+
+class Theme;
 
 void editor_register_fonts(Ref<Theme> p_theme);
 

editor/editor_help.cpp

@@ -39,6 +39,30 @@
 #include "editor_scale.h"
 #include "editor_settings.h"
 #include "scene/gui/texture_button.h"
+#include "core/class_db.h"
+#include "core/io/resource_loader.h"
+#include "core/list.h"
+#include "core/math/math_defs.h"
+#include "core/math/math_funcs.h"
+#include "core/math/rect2.h"
+#include "core/math/vector2.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/os/os.h"
+#include "core/pair.h"
+#include "core/set.h"
+#include "core/typedefs.h"
+#include "core/variant.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/gui/control.h"
+#include "scene/gui/label.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/scroll_bar.h"
+#include "scene/gui/tool_button.h"
+#include "scene/main/node.h"
+#include "scene/resources/font.h"
+#include "scene/resources/style_box.h"
+#include "scene/resources/texture.h"
 
 #define CONTRIBUTE_URL vformat("%s/community/contributing/updating_the_class_reference.html", VERSION_DOCS_URL)
 

editor/editor_help.h

@@ -41,6 +41,23 @@
 #include "scene/gui/tab_container.h"
 #include "scene/gui/text_edit.h"
 #include "scene/main/timer.h"
+#include "core/color.h"
+#include "core/error_list.h"
+#include "core/map.h"
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/ustring.h"
+#include "core/vector.h"
+#include "scene/gui/box_container.h"
+
+class ConfirmationDialog;
+class HSplitContainer;
+class InputEvent;
+class Label;
+class LineEdit;
+class TextureButton;
+class ToolButton;
+template <class F, class S> struct Pair;
 
 class FindBar : public HBoxContainer {
 	GDCLASS(FindBar, HBoxContainer);

editor/editor_help_search.cpp

@@ -33,6 +33,26 @@
 #include "core/os/keyboard.h"
 #include "editor_node.h"
 #include "editor_scale.h"
+#include "core/class_db.h"
+#include "core/error_macros.h"
+#include "core/math/rect2.h"
+#include "core/math/vector2.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/os/os.h"
+#include "core/typedefs.h"
+#include "core/variant.h"
+#include "editor/editor_help.h"
+#include "editor/editor_settings.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
+#include "scene/gui/control.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/popup.h"
+#include "scene/gui/tool_button.h"
+#include "scene/gui/tree.h"
+#include "scene/main/node.h"
 
 void EditorHelpSearch::_update_icons() {
 	search_box->set_right_icon(get_icon("Search", "EditorIcons"));

editor/editor_help_search.h

@@ -36,6 +36,23 @@
 #include "editor/editor_plugin.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/tree.h"
+#include "core/color.h"
+#include "core/map.h"
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/ustring.h"
+#include "core/vector.h"
+#include "editor/doc/doc_data.h"
+#include "scene/gui/dialogs.h"
+#include "scene/resources/texture.h"
+
+class Control;
+class InputEvent;
+class LineEdit;
+class OptionButton;
+class ToolButton;
+class Tree;
+class TreeItem;
 
 class EditorHelpSearch : public ConfirmationDialog {
 	GDCLASS(EditorHelpSearch, ConfirmationDialog);
@@ -61,6 +78,7 @@ class EditorHelpSearch : public ConfirmationDialog {
 	String old_term;
 
 	class Runner;
+
 	Ref<Runner> search;
 
 	void _update_icons();

editor/editor_inspector.cpp

@@ -30,10 +30,8 @@
 
 #include "editor_inspector.h"
 
-#include "array_property_edit.h"
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
-#include "dictionary_property_edit.h"
 #include "editor_node.h"
 #include "editor_property_name_processor.h"
 #include "editor_scale.h"
@@ -41,6 +39,34 @@
 #include "multi_node_edit.h"
 #include "scene/property_utils.h"
 #include "scene/resources/packed_scene.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/dictionary.h"
+#include "core/error_macros.h"
+#include "core/hash_map.h"
+#include "core/math/math_defs.h"
+#include "core/math/math_funcs.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/os/os.h"
+#include "core/script_language.h"
+#include "core/typedefs.h"
+#include "core/undo_redo.h"
+#include "editor/doc/doc_data.h"
+#include "editor/editor_data.h"
+#include "editor/editor_help.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/label.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/rich_text_label.h"
+#include "scene/gui/scroll_bar.h"
+#include "scene/main/node.h"
+#include "scene/main/scene_tree.h"
+#include "scene/resources/font.h"
+#include "scene/resources/style_box.h"
+#include "servers/visual_server.h"
 
 Size2 EditorProperty::get_minimum_size() const {
 	Size2 ms;

editor/editor_inspector.h

@@ -33,8 +33,31 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/scroll_container.h"
+#include "core/color.h"
+#include "core/list.h"
+#include "core/map.h"
+#include "core/math/rect2.h"
+#include "core/math/vector2.h"
+#include "core/object.h"
+#include "core/object_id.h"
+#include "core/reference.h"
+#include "core/resource.h"
+#include "core/set.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
+#include "scene/gui/container.h"
+#include "scene/gui/control.h"
+#include "scene/resources/texture.h"
 
 class UndoRedo;
+class Array;
+class InputEvent;
+class LineEdit;
+class Node;
+class PopupMenu;
+class VBoxContainer;
 
 class EditorPropertyRevert {
 public:

editor/editor_layouts_dialog.cpp

@@ -29,6 +29,7 @@
 /*************************************************************************/
 
 #include "editor_layouts_dialog.h"
+
 #include "core/class_db.h"
 #include "core/io/config_file.h"
 #include "core/os/keyboard.h"
@@ -36,6 +37,15 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/line_edit.h"
+#include "core/error_list.h"
+#include "core/list.h"
+#include "core/math/math_defs.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
+#include "scene/gui/control.h"
 
 void EditorLayoutsDialog::_line_gui_input(const Ref<InputEvent> &p_event) {
 	Ref<InputEventKey> k = p_event;

editor/editor_layouts_dialog.h

@@ -31,10 +31,13 @@
 /*************************************************************************/
 
 #include "scene/gui/dialogs.h"
+#include "core/object.h"
+#include "core/reference.h"
 
 class LineEdit;
 class ItemList;
 class VBoxContainer;
+class InputEvent;
 
 class EditorLayoutsDialog : public ConfirmationDialog {
 	GDCLASS(EditorLayoutsDialog, ConfirmationDialog);

editor/editor_log.cpp

@@ -34,8 +34,22 @@
 #include "core/version.h"
 #include "editor_node.h"
 #include "editor_scale.h"
-#include "scene/gui/center_container.h"
 #include "scene/resources/dynamic_font.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/math/vector2.h"
+#include "core/os/memory.h"
+#include "core/os/os.h"
+#include "core/reference.h"
+#include "core/undo_redo.h"
+#include "editor/editor_settings.h"
+#include "scene/gui/button.h"
+#include "scene/gui/control.h"
+#include "scene/gui/label.h"
+#include "scene/gui/rich_text_label.h"
+#include "scene/gui/tool_button.h"
+#include "scene/main/node.h"
+#include "scene/resources/texture.h"
 
 void EditorLog::_error_handler(void *p_self, const char *p_func, const char *p_file, int p_line, const char *p_error, const char *p_errorexp, ErrorHandlerType p_type) {
 	EditorLog *self = (EditorLog *)p_self;

editor/editor_log.h

@@ -41,6 +41,14 @@
 #include "scene/gui/panel_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tool_button.h"
+#include "core/error_macros.h"
+#include "core/object.h"
+#include "core/ustring.h"
+
+class Button;
+class Label;
+class RichTextLabel;
+class ToolButton;
 
 class EditorLog : public VBoxContainer {
 	GDCLASS(EditorLog, VBoxContainer);

editor/editor_network_profiler.cpp

@@ -30,11 +30,21 @@
 
 #include "editor_network_profiler.h"
 
-#include "core/os/os.h"
 #include "editor_scale.h"
-#include "editor_settings.h"
 #include "scene/gui/line_edit.h"
 #include "scene/main/timer.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/math/vector2.h"
+#include "core/os/memory.h"
+#include "core/typedefs.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "scene/gui/button.h"
+#include "scene/gui/control.h"
+#include "scene/gui/label.h"
+#include "scene/gui/tree.h"
+#include "scene/main/node.h"
 
 void EditorNetworkProfiler::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_update_frame"), &EditorNetworkProfiler::_update_frame);

editor/editor_network_profiler.h

@@ -35,6 +35,15 @@
 #include "scene/gui/label.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tree.h"
+#include "core/io/multiplayer_api.h"
+#include "core/map.h"
+#include "core/object.h"
+#include "core/object_id.h"
+
+class Button;
+class LineEdit;
+class Timer;
+class Tree;
 
 class EditorNetworkProfiler : public VBoxContainer {
 	GDCLASS(EditorNetworkProfiler, VBoxContainer)

editor/editor_node.cpp

@@ -30,26 +30,23 @@
 
 #include "editor_node.h"
 
-#include "core/bind/core_bind.h"
+#include <stdlib.h>
+
 #include "core/class_db.h"
 #include "core/io/config_file.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/io/stream_peer_ssl.h"
-#include "core/message_queue.h"
 #include "core/os/file_access.h"
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/path_remap.h"
 #include "core/print_string.h"
 #include "core/project_settings.h"
 #include "core/translation.h"
 #include "core/version.h"
 #include "main/input_default.h"
 #include "main/main.h"
-#include "scene/gui/center_container.h"
 #include "scene/gui/control.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/file_dialog.h"
@@ -60,13 +57,10 @@
 #include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/tabs.h"
-#include "scene/gui/texture_progress.h"
 #include "scene/gui/tool_button.h"
 #include "scene/resources/packed_scene.h"
-#include "servers/navigation_2d_server.h"
 #include "servers/navigation_server.h"
 #include "servers/physics_2d_server.h"
-
 #include "editor/audio_stream_preview.h"
 #include "editor/dependency_editor.h"
 #include "editor/editor_about.h"
@@ -102,13 +96,8 @@
 #include "editor/import_dock.h"
 #include "editor/multi_node_edit.h"
 #include "editor/node_dock.h"
-#include "editor/pane_drag.h"
 #include "editor/plugin_config_dialog.h"
-#include "editor/plugins/animation_blend_space_1d_editor.h"
-#include "editor/plugins/animation_blend_space_2d_editor.h"
-#include "editor/plugins/animation_blend_tree_editor_plugin.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
-#include "editor/plugins/animation_state_machine_editor.h"
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "editor/plugins/animation_tree_player_editor_plugin.h"
 #include "editor/plugins/audio_stream_editor_plugin.h"
@@ -162,9 +151,49 @@
 #include "scene/resources/environment.h"
 #include "scene/resources/world.h"
 #include "scene/main/viewport.h"
+#include "core/array.h"
+#include "core/color.h"
+#include "core/engine.h"
+#include "core/error_macros.h"
+#include "core/image.h"
+#include "core/io/resource_importer.h"
+#include "core/math/math_defs.h"
+#include "core/math/vector2.h"
+#include "core/object_id.h"
+#include "core/os/dir_access.h"
+#include "core/os/input_event.h"
+#include "core/os/main_loop.h"
+#include "core/os/memory.h"
+#include "core/pool_vector.h"
+#include "core/script_language.h"
+#include "core/undo_redo.h"
+#include "core/version_generated.gen.h"
+#include "editor/animation_track_editor.h"
+#include "editor/doc/doc_data.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/import/editor_import_plugin.h"
+#include "editor/property_editor.h"
+#include "editor/scene_tree_editor.h"
+#include "editor/script_create_dialog.h"
+#include "scene/animation/animation_player.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
+#include "scene/gui/check_box.h"
+#include "scene/gui/label.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/popup.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/rich_text_label.h"
+#include "scene/gui/scroll_bar.h"
+#include "scene/gui/shortcut.h"
+#include "scene/gui/texture_rect.h"
+#include "scene/gui/tree.h"
+#include "scene/main/scene_tree.h"
+#include "scene/main/timer.h"
+#include "servers/physics_server.h"
+#include "servers/visual_server.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+class Camera;
 
 EditorNode *EditorNode::singleton = nullptr;
 

editor/editor_node.h

@@ -38,6 +38,54 @@
 #include "editor/property_editor.h"
 #include "editor/scene_tree_dock.h"
 #include "scene/gui/link_button.h"
+#include "core/dictionary.h"
+#include "core/error_list.h"
+#include "core/list.h"
+#include "core/map.h"
+#include "core/math/rect2.h"
+#include "core/node_path.h"
+#include "core/object.h"
+#include "core/os/mutex.h"
+#include "core/os/os.h"
+#include "core/os/thread.h"
+#include "core/print_string.h"
+#include "core/reference.h"
+#include "core/resource.h"
+#include "core/set.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
+#include "scene/gui/control.h"
+#include "scene/main/node.h"
+#include "scene/resources/texture.h"
+#include "scene/resources/theme.h"
+
+class Button;
+class Camera;
+class CheckBox;
+class ConfigFile;
+class Container;
+class EditorFileDialog;
+class EditorInterface;
+class EditorResourceConversionPlugin;
+class FileDialog;
+class HBoxContainer;
+class InputEvent;
+class LinkButton;
+class OptionButton;
+class PopupMenu;
+class PopupPanel;
+class RichTextLabel;
+class Script;
+class TextureRect;
+class Timer;
+class Tree;
+class UndoRedo;
+class VBoxContainer;
+class Viewport;
+template <class T> class PoolVector;
 
 typedef void (*EditorNodeInitCallback)();
 typedef void (*EditorPluginInitializeCallback)();

editor/editor_path.cpp

@@ -32,6 +32,26 @@
 
 #include "editor_node.h"
 #include "editor_scale.h"
+#include "core/class_db.h"
+#include "core/error_macros.h"
+#include "core/list.h"
+#include "core/math/rect2.h"
+#include "core/math/vector2.h"
+#include "core/os/memory.h"
+#include "core/reference.h"
+#include "core/resource.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "editor/editor_data.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/control.h"
+#include "scene/gui/label.h"
+#include "scene/gui/margin_container.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/texture_rect.h"
+#include "scene/main/node.h"
+#include "scene/resources/texture.h"
 
 void EditorPath::_add_children_to_popup(Object *p_obj, int p_depth) {
 	if (p_depth > 8) {

editor/editor_path.h

@@ -34,6 +34,14 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/popup_menu.h"
+#include "core/object.h"
+#include "core/object_id.h"
+#include "core/vector.h"
+
+class EditorHistory;
+class Label;
+class PopupMenu;
+class TextureRect;
 
 class EditorPath : public Button {
 	GDCLASS(EditorPath, Button);

editor/editor_plugin.cpp

@@ -42,6 +42,41 @@
 #include "scene/3d/camera.h"
 #include "scene/gui/popup_menu.h"
 #include "servers/visual_server.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/image.h"
+#include "core/io/resource_importer.h"
+#include "core/math/aabb.h"
+#include "core/math/basis.h"
+#include "core/math/math_defs.h"
+#include "core/math/transform.h"
+#include "core/math/vector3.h"
+#include "core/os/input_event.h"
+#include "core/pool_vector.h"
+#include "core/resource.h"
+#include "core/rid.h"
+#include "core/rid_handle.h"
+#include "core/script_language.h"
+#include "core/typedefs.h"
+#include "editor/editor_autoload_settings.h"
+#include "editor/editor_data.h"
+#include "editor/editor_file_system.h"
+#include "editor/editor_inspector.h"
+#include "editor/editor_scale.h"
+#include "editor/import/editor_import_plugin.h"
+#include "editor/import/resource_importer_scene.h"
+#include "editor/plugins/script_editor_plugin.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/container.h"
+#include "scene/gui/control.h"
+#include "scene/gui/split_container.h"
+#include "scene/gui/tab_container.h"
+#include "scene/resources/mesh.h"
+#include "scene/resources/texture.h"
+
+class ConfigFile;
+class ScriptCreateDialog;
+class ToolButton;
 
 Array EditorInterface::_make_mesh_previews(const Array &p_meshes, int p_preview_size) {
 	Vector<Ref<Mesh>> meshes;

editor/editor_plugin.h

@@ -39,6 +39,18 @@
 #include "scene/gui/tool_button.h"
 #include "scene/main/node.h"
 #include "scene/resources/texture.h"
+#include "core/array.h"
+#include "core/dictionary.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/list.h"
+#include "core/method_bind.h"
+#include "core/object.h"
+#include "core/os/memory.h"
+#include "core/reference.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
 
 class EditorNode;
 class Spatial;
@@ -54,6 +66,20 @@ class EditorFileSystem;
 class EditorToolAddons;
 class FileSystemDock;
 class ScriptEditor;
+class ConfigFile;
+class Control;
+class EditorInspector;
+class EditorInspectorPlugin;
+class EditorSceneImporter;
+class InputEvent;
+class Mesh;
+class Resource;
+class Script;
+class ScriptCreateDialog;
+class Texture;
+class ToolButton;
+class Transform;
+class UndoRedo;
 
 class EditorInterface : public Node {
 	GDCLASS(EditorInterface, Node);

editor/editor_plugin_settings.cpp

@@ -33,10 +33,21 @@
 #include "core/io/config_file.h"
 #include "core/os/file_access.h"
 #include "core/os/main_loop.h"
-#include "core/project_settings.h"
 #include "editor_node.h"
 #include "editor_scale.h"
-#include "scene/gui/margin_container.h"
+#include "core/class_db.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/os/dir_access.h"
+#include "core/os/memory.h"
+#include "core/reference.h"
+#include "core/variant.h"
+#include "editor/plugin_config_dialog.h"
+#include "scene/gui/button.h"
+#include "scene/gui/control.h"
+#include "scene/gui/label.h"
+#include "scene/gui/tree.h"
+#include "scene/main/node.h"
 
 void EditorPluginSettings::_notification(int p_what) {
 	if (p_what == MainLoop::NOTIFICATION_WM_FOCUS_IN) {

editor/editor_plugin_settings.h

@@ -35,6 +35,14 @@
 #include "editor_data.h"
 #include "property_editor.h"
 #include "scene/gui/dialogs.h"
+#include "core/object.h"
+#include "core/ustring.h"
+#include "core/vector.h"
+#include "scene/gui/box_container.h"
+
+class Button;
+class PluginConfigDialog;
+class Tree;
 
 class EditorPluginSettings : public VBoxContainer {
 	GDCLASS(EditorPluginSettings, VBoxContainer);

editor/editor_profiler.cpp

@@ -30,10 +30,26 @@
 
 #include "editor_profiler.h"
 
-#include "core/os/os.h"
 #include "editor_scale.h"
 #include "editor_settings.h"
 #include "scene/main/timer.h"
+#include "core/class_db.h"
+#include "core/error_macros.h"
+#include "core/image.h"
+#include "core/math/math_funcs.h"
+#include "core/math/vector2.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/variant.h"
+#include "scene/gui/button.h"
+#include "scene/gui/control.h"
+#include "scene/gui/label.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/spin_box.h"
+#include "scene/gui/split_container.h"
+#include "scene/gui/texture_rect.h"
+#include "scene/gui/tree.h"
+#include "scene/main/node.h"
 
 void EditorProfiler::_make_metric_ptrs(Metric &m) {
 	for (int i = 0; i < m.categories.size(); i++) {

editor/editor_profiler.h

@@ -38,6 +38,26 @@
 #include "scene/gui/split_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
+#include "core/color.h"
+#include "core/map.h"
+#include "core/object.h"
+#include "core/pool_vector.h"
+#include "core/reference.h"
+#include "core/set.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "core/ustring.h"
+#include "core/vector.h"
+#include "scene/resources/texture.h"
+
+class Button;
+class HSplitContainer;
+class InputEvent;
+class OptionButton;
+class SpinBox;
+class TextureRect;
+class Timer;
+class Tree;
 
 class EditorProfiler : public VBoxContainer {
 	GDCLASS(EditorProfiler, VBoxContainer);

editor/editor_properties.cpp

@@ -31,12 +31,58 @@
 #include "editor_properties.h"
 
 #include "core/project_settings.h"
-#include "editor/editor_resource_preview.h"
-#include "editor/filesystem_dock.h"
 #include "editor_node.h"
 #include "editor_properties_array_dict.h"
 #include "editor_scale.h"
 #include "scene/main/viewport.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/dictionary.h"
+#include "core/error_macros.h"
+#include "core/math/aabb.h"
+#include "core/math/basis.h"
+#include "core/math/math_defs.h"
+#include "core/math/math_funcs.h"
+#include "core/math/plane.h"
+#include "core/math/quat.h"
+#include "core/math/rect2.h"
+#include "core/math/transform.h"
+#include "core/math/transform_2d.h"
+#include "core/math/vector3.h"
+#include "core/object_id.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/rid.h"
+#include "core/script_language.h"
+#include "core/typedefs.h"
+#include "editor/create_dialog.h"
+#include "editor/editor_data.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_plugin.h"
+#include "editor/editor_resource_picker.h"
+#include "editor/editor_settings.h"
+#include "editor/editor_spin_slider.h"
+#include "editor/property_selector.h"
+#include "editor/scene_tree_editor.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
+#include "scene/gui/check_box.h"
+#include "scene/gui/color_picker.h"
+#include "scene/gui/control.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/grid_container.h"
+#include "scene/gui/label.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/option_button.h"
+#include "scene/gui/popup.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/text_edit.h"
+#include "scene/gui/tool_button.h"
+#include "scene/main/node.h"
+#include "scene/main/scene_tree.h"
+#include "scene/resources/font.h"
+#include "scene/resources/texture.h"
 
 ///////////////////// NULL /////////////////////////
 

editor/editor_properties.h

@@ -38,6 +38,37 @@
 #include "editor/scene_tree_editor.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/line_edit.h"
+#include "core/color.h"
+#include "core/math/vector2.h"
+#include "core/node_path.h"
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/resource.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
+
+class AcceptDialog;
+class Button;
+class CheckBox;
+class ColorPickerButton;
+class Control;
+class CreateDialog;
+class Dictionary;
+class EditorFileDialog;
+class EditorResourcePicker;
+class EditorSpinSlider;
+class HBoxContainer;
+class InputEvent;
+class Label;
+class LineEdit;
+class OptionButton;
+class PopupMenu;
+class PropertySelector;
+class SceneTreeDialog;
+class TextEdit;
+class VBoxContainer;
 
 class EditorPropertyNil : public EditorProperty {
 	GDCLASS(EditorPropertyNil, EditorProperty);

editor/editor_properties_array_dict.cpp

@@ -36,6 +36,28 @@
 #include "editor/editor_scale.h"
 #include "editor_properties.h"
 #include "scene/main/viewport.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/error_macros.h"
+#include "core/io/resource_loader.h"
+#include "core/math/math_defs.h"
+#include "core/math/rect2.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/resource.h"
+#include "core/typedefs.h"
+#include "core/vector.h"
+#include "editor/editor_file_system.h"
+#include "editor/editor_settings.h"
+#include "editor/editor_spin_slider.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/panel_container.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/main/node.h"
+#include "scene/resources/style_box.h"
 
 bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_value) {
 	String name = p_name;

editor/editor_properties_array_dict.h

@@ -34,6 +34,22 @@
 #include "editor/editor_spin_slider.h"
 #include "editor/filesystem_dock.h"
 #include "scene/gui/button.h"
+#include "core/dictionary.h"
+#include "core/math/vector2.h"
+#include "core/object.h"
+#include "core/object_id.h"
+#include "core/reference.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+
+class Button;
+class Control;
+class EditorSpinSlider;
+class HBoxContainer;
+class InputEvent;
+class PopupMenu;
+class VBoxContainer;
 
 class EditorPropertyArrayObject : public Reference {
 	GDCLASS(EditorPropertyArrayObject, Reference);

editor/editor_property_name_processor.cpp

@@ -31,6 +31,8 @@
 #include "editor_property_name_processor.h"
 
 #include "editor_settings.h"
+#include "core/error_macros.h"
+#include "core/typedefs.h"
 
 EditorPropertyNameProcessor *EditorPropertyNameProcessor::singleton = nullptr;
 

editor/editor_property_name_processor.h

@@ -31,6 +31,9 @@
 /*************************************************************************/
 
 #include "scene/main/node.h"
+#include "core/map.h"
+#include "core/object.h"
+#include "core/ustring.h"
 
 class EditorPropertyNameProcessor : public Node {
 	GDCLASS(EditorPropertyNameProcessor, Node);

editor/editor_resource_picker.cpp

@@ -36,7 +36,39 @@
 #include "editor_settings.h"
 #include "filesystem_dock.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/dynamic_font.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/dictionary.h"
+#include "core/error_macros.h"
+#include "core/io/resource_loader.h"
+#include "core/map.h"
+#include "core/math/math_defs.h"
+#include "core/math/rect2.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/pair.h"
+#include "core/ref_ptr.h"
+#include "core/script_language.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "editor/editor_data.h"
+#include "editor/editor_file_dialog.h"
+#include "editor/editor_file_system.h"
+#include "editor/plugins/script_editor_plugin.h"
+#include "editor/property_editor.h"
+#include "editor/quick_open.h"
+#include "editor/scene_tree_dock.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/gui/button.h"
+#include "scene/gui/control.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/tab_container.h"
+#include "scene/gui/texture_rect.h"
+#include "scene/main/node.h"
+#include "scene/resources/material.h"
+#include "scene/resources/shader.h"
+#include "scene/resources/style_box.h"
+#include "scene/resources/texture.h"
 
 HashMap<StringName, List<StringName>> EditorResourcePicker::allowed_types_cache;
 

editor/editor_resource_picker.h

@@ -36,6 +36,29 @@
 #include "scene/gui/button.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/texture_rect.h"
+#include "core/hash_map.h"
+#include "core/list.h"
+#include "core/math/vector2.h"
+#include "core/object.h"
+#include "core/object_id.h"
+#include "core/reference.h"
+#include "core/resource.h"
+#include "core/set.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
+
+class Button;
+class Control;
+class Dictionary;
+class EditorFileDialog;
+class EditorQuickOpen;
+class InputEvent;
+class Node;
+class PopupMenu;
+class StringName;
+class Texture;
+class TextureRect;
 
 class EditorResourcePicker : public HBoxContainer {
 	GDCLASS(EditorResourcePicker, HBoxContainer);

editor/editor_resource_preview.cpp

@@ -40,6 +40,16 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "editor_settings.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/image.h"
+
+#include "core/os/memory.h"
+#include "core/os/os.h"
+#include "core/script_language.h"
+#include "core/typedefs.h"
+#include "scene/gui/control.h"
+#include "servers/visual_server.h"
 
 bool EditorResourcePreviewGenerator::handles(const String &p_type) const {
 	if (get_script_instance() && get_script_instance()->has_method("handles")) {

editor/editor_resource_preview.h

@@ -35,6 +35,18 @@
 #include "core/safe_refcount.h"
 #include "scene/main/node.h"
 #include "scene/resources/texture.h"
+#include "core/list.h"
+#include "core/map.h"
+#include "core/math/vector2.h"
+#include "core/object.h"
+#include "core/object_id.h"
+#include "core/os/mutex.h"
+#include "core/reference.h"
+#include "core/resource.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
 
 class EditorResourcePreviewGenerator : public Reference {
 	GDCLASS(EditorResourcePreviewGenerator, Reference);

editor/editor_run.cpp

@@ -30,11 +30,18 @@
 
 #include "editor_run.h"
 
+#include <stdio.h>
+
 #include "plugins/script_editor_plugin.h"
 #include "script_editor_debugger.h"
-
 #include "core/project_settings.h"
 #include "editor_settings.h"
+#include "core/error_macros.h"
+#include "core/math/math_funcs.h"
+#include "core/math/rect2.h"
+#include "core/math/vector2.h"
+#include "core/variant.h"
+#include "core/vector.h"
 
 EditorRun::Status EditorRun::get_status() const {
 	return status;

editor/editor_run.h

@@ -32,6 +32,10 @@
 
 #include "core/os/os.h"
 #include "scene/main/node.h"
+#include "core/error_list.h"
+#include "core/list.h"
+#include "core/ustring.h"
+
 class EditorRun {
 public:
 	enum Status {

editor/editor_run_native.cpp

@@ -33,6 +33,18 @@
 #include "editor_export.h"
 #include "editor_node.h"
 #include "editor_scale.h"
+#include "core/class_db.h"
+#include "core/error_macros.h"
+#include "core/image.h"
+#include "core/os/memory.h"
+#include "core/reference.h"
+#include "core/typedefs.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/main/node.h"
+#include "scene/resources/texture.h"
 
 void EditorRunNative::_notification(int p_what) {
 	if (p_what == NOTIFICATION_ENTER_TREE) {

editor/editor_run_native.h

@@ -32,6 +32,10 @@
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/menu_button.h"
+#include "core/map.h"
+#include "core/object.h"
+
+class MenuButton;
 
 class EditorRunNative : public HBoxContainer {
 	GDCLASS(EditorRunNative, HBoxContainer);

editor/editor_run_script.cpp

@@ -31,6 +31,14 @@
 #include "editor_run_script.h"
 
 #include "editor_node.h"
+#include "core/class_db.h"
+#include "core/error_macros.h"
+#include "core/script_language.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "editor/editor_plugin.h"
+
+class Node;
 
 void EditorScript::add_root_node(Node *p_node) {
 	if (!editor) {

editor/editor_run_script.h

@@ -32,7 +32,12 @@
 
 #include "core/reference.h"
 #include "editor_plugin.h"
+#include "core/object.h"
+
 class EditorNode;
+class EditorInterface;
+class Node;
+
 class EditorScript : public Reference {
 	GDCLASS(EditorScript, Reference);
 

editor/editor_scale.cpp

@@ -30,8 +30,6 @@
 
 #include "editor_scale.h"
 
-#include "core/os/os.h"
-
 static float scale = 1.0;
 
 void editor_set_scale(float p_scale) {

editor/editor_sectioned_inspector.cpp

@@ -32,7 +32,19 @@
 
 #include "editor_property_name_processor.h"
 #include "editor_scale.h"
-#include "scene/gui/shortcut.h"
+#include "core/class_db.h"
+#include "core/list.h"
+#include "core/math/vector2.h"
+#include "core/os/memory.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "core/variant.h"
+#include "core/vector.h"
+#include "editor/editor_inspector.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/control.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/tree.h"
 
 class SectionedInspectorFilter : public Object {
 	GDCLASS(SectionedInspectorFilter, Object);

editor/editor_sectioned_inspector.h

@@ -33,8 +33,16 @@
 #include "editor/editor_inspector.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tree.h"
+#include "core/map.h"
+#include "core/object.h"
+#include "core/object_id.h"
+#include "core/ustring.h"
 
 class SectionedInspectorFilter;
+class EditorInspector;
+class LineEdit;
+class Tree;
+class TreeItem;
 
 class SectionedInspector : public HSplitContainer {
 	GDCLASS(SectionedInspector, HSplitContainer);

editor/editor_settings.cpp

@@ -40,12 +40,27 @@
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/project_settings.h"
-#include "core/version.h"
-#include "editor/editor_node.h"
 #include "editor/editor_translation.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/dictionary.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/io/ip_address.h"
+#include "core/math/math_funcs.h"
+#include "core/math/vector2.h"
+#include "core/os/input_event.h"
+#include "core/os/main_loop.h"
+#include "core/os/memory.h"
+#include "core/print_string.h"
+#include "core/set.h"
+#include "core/translation.h"
+#include "core/typedefs.h"
+#include "core/version_generated.gen.h"
 
 // PRIVATE METHODS
 

editor/editor_settings.h

@@ -31,14 +31,23 @@
 /*************************************************************************/
 
 #include "core/object.h"
-
 #include "core/io/config_file.h"
 #include "core/os/thread_safe.h"
 #include "core/resource.h"
 #include "core/translation.h"
 #include "scene/gui/shortcut.h"
+#include "core/hash_map.h"
+#include "core/list.h"
+#include "core/map.h"
+#include "core/reference.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
 
 class EditorPlugin;
+class Dictionary;
+class InputEvent;
 
 class EditorSettings : public Resource {
 	GDCLASS(EditorSettings, Resource);

editor/editor_spin_slider.cpp

@@ -29,11 +29,33 @@
 /*************************************************************************/
 
 #include "editor_spin_slider.h"
+
 #include "core/math/expression.h"
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
-#include "editor_node.h"
 #include "editor_scale.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/math/math_defs.h"
+#include "core/math/math_funcs.h"
+#include "core/math/rect2.h"
+#include "core/math/transform_2d.h"
+#include "core/os/input_event.h"
+#include "core/os/main_loop.h"
+#include "core/os/memory.h"
+#include "core/typedefs.h"
+#include "core/variant.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/gui/control.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/texture_rect.h"
+#include "scene/main/node.h"
+#include "scene/resources/font.h"
+#include "scene/resources/style_box.h"
+#include "scene/resources/texture.h"
 
 String EditorSpinSlider::get_tooltip(const Point2 &p_pos) const {
 	if (grabber->is_visible()) {

editor/editor_spin_slider.h

@@ -33,6 +33,15 @@
 #include "scene/gui/line_edit.h"
 #include "scene/gui/range.h"
 #include "scene/gui/texture_rect.h"
+#include "core/color.h"
+#include "core/math/vector2.h"
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/ustring.h"
+
+class InputEvent;
+class LineEdit;
+class TextureRect;
 
 class EditorSpinSlider : public Range {
 	GDCLASS(EditorSpinSlider, Range);

editor/editor_sub_scene.cpp

@@ -31,8 +31,22 @@
 #include "editor_sub_scene.h"
 
 #include "editor/editor_node.h"
-#include "scene/gui/margin_container.h"
 #include "scene/resources/packed_scene.h"
+#include "core/class_db.h"
+#include "core/error_macros.h"
+#include "core/io/resource_loader.h"
+#include "core/os/memory.h"
+#include "core/reference.h"
+#include "core/string_name.h"
+#include "core/variant.h"
+#include "editor/editor_file_dialog.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
+#include "scene/gui/control.h"
+#include "scene/gui/line_edit.h"
+#include "scene/gui/tree.h"
+#include "scene/main/node.h"
 
 void EditorSubScene::_path_selected(const String &p_path) {
 	path->set_text(p_path);

editor/editor_sub_scene.h

@@ -33,6 +33,15 @@
 #include "editor/editor_file_dialog.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
+#include "core/list.h"
+#include "core/object.h"
+#include "core/ustring.h"
+
+class EditorFileDialog;
+class LineEdit;
+class Node;
+class Tree;
+class TreeItem;
 
 class EditorSubScene : public ConfirmationDialog {
 	GDCLASS(EditorSubScene, ConfirmationDialog);

editor/editor_themes.cpp

@@ -30,13 +30,30 @@
 
 #include "editor_themes.h"
 
+#include <string.h>
+#include <cmath>
+
 #include "core/io/resource_loader.h"
 #include "editor_fonts.h"
 #include "editor_icons.gen.h"
 #include "editor_scale.h"
 #include "editor_settings.h"
-
 #include "modules/modules_enabled.gen.h" // For svg.
+#include "core/color.h"
+#include "core/dictionary.h"
+#include "core/image.h"
+#include "core/math/math_defs.h"
+#include "core/math/math_funcs.h"
+#include "core/math/vector2.h"
+#include "core/os/memory.h"
+#include "core/set.h"
+#include "core/string_name.h"
+#include "core/typedefs.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "scene/resources/font.h"
+#include "scene/resources/style_box.h"
+#include "scene/resources/texture.h"
 #ifdef MODULE_SVG_ENABLED
 #include "modules/svg/image_loader_svg.h"
 #endif

editor/editor_themes.h

@@ -32,6 +32,9 @@
 
 #include "scene/resources/texture.h"
 #include "scene/resources/theme.h"
+#include "core/reference.h"
+
+class ImageTexture;
 
 Ref<Theme> create_editor_theme(Ref<Theme> p_theme = nullptr);
 

editor/editor_translation.cpp

@@ -35,6 +35,10 @@
 #include "core/io/translation_loader_po.h"
 #include "editor/doc_translations.gen.h"
 #include "editor/editor_translations.gen.h"
+#include "core/error_macros.h"
+#include "core/os/memory.h"
+#include "core/reference.h"
+#include "core/translation.h"
 
 Vector<String> get_editor_locales() {
 	Vector<String> locales;

editor/export_template_manager.cpp

@@ -33,14 +33,41 @@
 #include "core/io/json.h"
 #include "core/io/zip_io.h"
 #include "core/os/dir_access.h"
-#include "core/os/input.h"
-#include "core/os/keyboard.h"
 #include "core/version.h"
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "progress_dialog.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/link_button.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/dictionary.h"
+#include "core/error_macros.h"
+#include "core/io/http_client.h"
+#include "core/math/vector2.h"
+#include "core/os/file_access.h"
+#include "core/os/memory.h"
+#include "core/os/os.h"
+#include "core/pool_vector.h"
+#include "core/set.h"
+#include "core/vector.h"
+#include "core/version_generated.gen.h"
+#include "editor/editor_settings.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/gui/button.h"
+#include "scene/gui/control.h"
+#include "scene/gui/file_dialog.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_menu.h"
+#include "scene/gui/progress_bar.h"
+#include "scene/gui/separator.h"
+#include "scene/gui/tree.h"
+#include "scene/main/http_request.h"
+#include "scene/main/node.h"
+#include "thirdparty/minizip/ioapi.h"
+#include "thirdparty/minizip/unzip.h"
 
 void ExportTemplateManager::_update_template_status() {
 	// Fetch installed templates from the file system.

editor/export_template_manager.h

@@ -37,9 +37,23 @@
 #include "scene/gui/progress_bar.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/main/http_request.h"
+#include "core/error_list.h"
+#include "core/object.h"
+#include "core/ustring.h"
+#include "core/variant.h"
 
 class ExportTemplateVersion;
 class HBoxContainer;
+class Button;
+class FileDialog;
+class HTTPRequest;
+class Label;
+class LineEdit;
+class MenuButton;
+class OptionButton;
+class ProgressBar;
+class Tree;
+class VBoxContainer;
 
 class ExportTemplateManager : public AcceptDialog {
 	GDCLASS(ExportTemplateManager, AcceptDialog);

editor/filesystem_dock.cpp

@@ -44,6 +44,41 @@
 #include "import_dock.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/packed_scene.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/dictionary.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/io/config_file.h"
+#include "core/io/resource_saver.h"
+#include "core/os/input_event.h"
+#include "core/os/memory.h"
+#include "core/print_string.h"
+#include "core/resource.h"
+#include "core/typedefs.h"
+#include "editor/create_dialog.h"
+#include "editor/dependency_editor.h"
+#include "editor/editor_data.h"
+#include "editor/editor_dir_dialog.h"
+#include "editor/editor_file_system.h"
+#include "editor/scene_tree_dock.h"
+#include "editor/script_create_dialog.h"
+#include "scene/gui/button.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/popup_menu.h"
+#include "scene/gui/progress_bar.h"
+#include "scene/gui/scroll_bar.h"
+#include "scene/gui/tool_button.h"
+#include "scene/gui/tree.h"
+#include "scene/main/node.h"
+#include "scene/main/scene_tree.h"
+#include "scene/resources/texture.h"
 
 Ref<Texture> FileSystemDock::_get_tree_item_icon(bool p_is_valid, String p_file_type) {
 	Ref<Texture> file_icon;

editor/filesystem_dock.h

@@ -42,18 +42,45 @@
 #include "scene/gui/tool_button.h"
 #include "scene/gui/tree.h"
 #include "scene/main/timer.h"
-
 #include "core/os/dir_access.h"
 #include "core/os/thread.h"
-
 #include "create_dialog.h"
-
 #include "dependency_editor.h"
 #include "editor_dir_dialog.h"
 #include "editor_file_system.h"
 #include "script_create_dialog.h"
+#include "core/list.h"
+#include "core/map.h"
+#include "core/math/vector2.h"
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/set.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
 
 class EditorNode;
+class Button;
+class ConfirmationDialog;
+class Control;
+class CreateDialog;
+class DependencyEditor;
+class DependencyEditorOwners;
+class DependencyRemoveDialog;
+class EditorDirDialog;
+class EditorFileSystemDirectory;
+class InputEvent;
+class ItemList;
+class LineEdit;
+class MenuButton;
+class PopupMenu;
+class ProgressBar;
+class ScriptCreateDialog;
+class Texture;
+class TextureRect;
+class Tree;
+class TreeItem;
 
 class FileSystemDock : public VBoxContainer {
 	GDCLASS(FileSystemDock, VBoxContainer);

editor/find_in_files.cpp

@@ -44,6 +44,22 @@
 #include "scene/gui/line_edit.h"
 #include "scene/gui/progress_bar.h"
 #include "scene/gui/tree.h"
+#include "core/array.h"
+#include "core/class_db.h"
+#include "core/color.h"
+#include "core/error_list.h"
+#include "core/error_macros.h"
+#include "core/math/math_defs.h"
+#include "core/math/rect2.h"
+#include "core/math/vector2.h"
+#include "core/os/file_access.h"
+#include "core/os/memory.h"
+#include "core/pool_vector.h"
+#include "core/print_string.h"
+#include "core/reference.h"
+#include "core/typedefs.h"
+#include "scene/2d/canvas_item.h"
+#include "scene/resources/font.h"
 
 const char *FindInFiles::SIGNAL_RESULT_FOUND = "result_found";
 const char *FindInFiles::SIGNAL_FINISHED = "finished";

editor/find_in_files.h

@@ -32,6 +32,18 @@
 
 #include "core/hash_map.h"
 #include "scene/gui/dialogs.h"
+#include "core/map.h"
+#include "core/object.h"
+#include "core/set.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
+#include "scene/gui/control.h"
+#include "scene/main/node.h"
+
+class Button;
+class Label;
+struct Rect2;
 
 // Performs the actual search
 class FindInFiles : public Node {