diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index a5c19666a..2736bdede 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -161,6 +161,7 @@
 #include "editor/settings_config_dialog.h"
 #include "scene/resources/environment.h"
 #include "scene/resources/world.h"
+#include "scene/main/viewport.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h
index 33b5eb863..492138a6c 100644
--- a/editor/plugins/script_text_editor.h
+++ b/editor/plugins/script_text_editor.h
@@ -30,12 +30,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#include "scene/gui/dialogs.h"
+#include "script_editor_plugin.h"
+
 #include "core/reference.h"
 #include "core/vector.h"
-#include "scene/gui/color_picker.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
-#include "script_editor_plugin.h"
+
 #include "core/color.h"
 #include "core/list.h"
 #include "core/map.h"
diff --git a/editor/plugins/shader_editor_plugin.h b/editor/plugins/shader_editor_plugin.h
index 1967926b3..ecd761273 100644
--- a/editor/plugins/shader_editor_plugin.h
+++ b/editor/plugins/shader_editor_plugin.h
@@ -32,13 +32,10 @@
 
 #include "editor/code_editor.h"
 #include "editor/editor_plugin.h"
-#include "scene/gui/menu_button.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/tab_container.h"
-#include "scene/gui/text_edit.h"
-#include "scene/main/timer.h"
+
 #include "scene/resources/shader.h"
-#include "servers/visual/shader_language.h"
+
 #include "core/list.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
diff --git a/editor/plugins/skeleton_2d_editor_plugin.h b/editor/plugins/skeleton_2d_editor_plugin.h
index c6be34e25..9b74f3791 100644
--- a/editor/plugins/skeleton_2d_editor_plugin.h
+++ b/editor/plugins/skeleton_2d_editor_plugin.h
@@ -30,13 +30,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
-#include "scene/2d/skeleton_2d.h"
-#include "scene/gui/spin_box.h"
+#include "scene/gui/control.h"
+
 #include "core/object.h"
 #include "core/ustring.h"
-#include "scene/gui/control.h"
 
 class AcceptDialog;
 class EditorNode;
diff --git a/editor/plugins/skeleton_ik_editor_plugin.h b/editor/plugins/skeleton_ik_editor_plugin.h
index f88ca36a0..1269ac9d6 100644
--- a/editor/plugins/skeleton_ik_editor_plugin.h
+++ b/editor/plugins/skeleton_ik_editor_plugin.h
@@ -30,8 +30,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
+
 #include "core/object.h"
 #include "core/ustring.h"
 
diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h
index f26d2328b..30ac7053f 100644
--- a/editor/plugins/spatial_editor_plugin.h
+++ b/editor/plugins/spatial_editor_plugin.h
@@ -30,15 +30,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/reference.h"
-#include "editor/editor_node.h"
+#include "scene/gui/control.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/container.h"
+#include "scene/3d/spatial.h"
 #include "editor/editor_plugin.h"
-#include "editor/editor_scale.h"
-#include "scene/3d/immediate_geometry.h"
-#include "scene/3d/light.h"
+
 #include "scene/3d/skeleton.h"
-#include "scene/3d/visual_instance.h"
-#include "scene/gui/panel_container.h"
+#include "scene/gui/spin_box.h"
+
+#include "core/reference.h"
 #include "core/color.h"
 #include "core/dictionary.h"
 #include "core/error_macros.h"
@@ -57,17 +58,11 @@
 #include "core/ustring.h"
 #include "core/variant.h"
 #include "core/vector.h"
-#include "scene/3d/spatial.h"
-#include "scene/gui/box_container.h"
-#include "scene/gui/button.h"
-#include "scene/gui/container.h"
-#include "scene/gui/control.h"
-#include "scene/gui/spin_box.h"
-#include "scene/main/node.h"
+#include "editor/editor_scale.h"
+
 #include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/texture.h"
-#include "servers/visual_server.h"
 
 class Camera;
 class SpatialEditor;
@@ -99,6 +94,7 @@ class TriangleMesh;
 class UndoRedo;
 class VSplitContainer;
 class Viewport;
+class SpinBox;
 
 class EditorSpatialGizmo : public SpatialGizmo {
 	GDCLASS(EditorSpatialGizmo, SpatialGizmo);
diff --git a/editor/plugins/sprite_editor_plugin.h b/editor/plugins/sprite_editor_plugin.h
index 444c07c4b..baad261dc 100644
--- a/editor/plugins/sprite_editor_plugin.h
+++ b/editor/plugins/sprite_editor_plugin.h
@@ -30,15 +30,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "editor/editor_node.h"
+#include "scene/gui/control.h"
 #include "editor/editor_plugin.h"
-#include "scene/2d/sprite.h"
-#include "scene/gui/spin_box.h"
+
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/ustring.h"
 #include "core/vector.h"
-#include "scene/gui/control.h"
+
 
 class AcceptDialog;
 class Button;
diff --git a/editor/plugins/sprite_frames_editor_plugin.h b/editor/plugins/sprite_frames_editor_plugin.h
index d71e573ec..2989624d4 100644
--- a/editor/plugins/sprite_frames_editor_plugin.h
+++ b/editor/plugins/sprite_frames_editor_plugin.h
@@ -30,14 +30,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "editor/editor_node.h"
-#include "editor/editor_plugin.h"
-#include "scene/2d/animated_sprite.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/file_dialog.h"
 #include "scene/gui/split_container.h"
-#include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
+#include "editor/editor_plugin.h"
+
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/reference.h"
diff --git a/editor/plugins/style_box_editor_plugin.h b/editor/plugins/style_box_editor_plugin.h
index 9fd0c9220..cb66d0957 100644
--- a/editor/plugins/style_box_editor_plugin.h
+++ b/editor/plugins/style_box_editor_plugin.h
@@ -30,17 +30,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#include "scene/gui/box_container.h"
+#include "editor/editor_plugin.h"
 #include "editor/editor_inspector.h"
-#include "editor/editor_node.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/texture_rect.h"
-#include "scene/resources/style_box.h"
+
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "editor/editor_plugin.h"
-#include "scene/gui/box_container.h"
 
 class Control;
 class EditorNode;
diff --git a/editor/plugins/text_editor.h b/editor/plugins/text_editor.h
index 4ed7ec6d7..bfc90d20e 100644
--- a/editor/plugins/text_editor.h
+++ b/editor/plugins/text_editor.h
@@ -31,6 +31,7 @@
 /*************************************************************************/
 
 #include "script_editor_plugin.h"
+
 #include "core/color.h"
 #include "core/list.h"
 #include "core/map.h"
diff --git a/editor/plugins/texture_editor_plugin.h b/editor/plugins/texture_editor_plugin.h
index fd63ab089..44703cb53 100644
--- a/editor/plugins/texture_editor_plugin.h
+++ b/editor/plugins/texture_editor_plugin.h
@@ -30,14 +30,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "editor/editor_node.h"
+#include "scene/gui/margin_container.h"
+#include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
+
 #include "scene/resources/texture.h"
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "editor/editor_inspector.h"
-#include "scene/gui/margin_container.h"
 
 class EditorNode;
 class Label;
diff --git a/editor/plugins/texture_region_editor_plugin.h b/editor/plugins/texture_region_editor_plugin.h
index a06378408..88fb08c71 100644
--- a/editor/plugins/texture_region_editor_plugin.h
+++ b/editor/plugins/texture_region_editor_plugin.h
@@ -30,14 +30,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "canvas_item_editor_plugin.h"
-#include "editor/editor_node.h"
+#include "scene/gui/box_container.h"
 #include "editor/editor_plugin.h"
-#include "scene/2d/sprite.h"
-#include "scene/3d/sprite_3d.h"
-#include "scene/gui/nine_patch_rect.h"
+
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
+
 #include "core/dictionary.h"
 #include "core/list.h"
 #include "core/map.h"
@@ -47,7 +45,7 @@
 #include "core/reference.h"
 #include "core/rid.h"
 #include "core/ustring.h"
-#include "scene/gui/box_container.h"
+
 
 class Button;
 class EditorNode;
diff --git a/editor/plugins/theme_editor_plugin.h b/editor/plugins/theme_editor_plugin.h
index 914c50b56..b284ab61c 100644
--- a/editor/plugins/theme_editor_plugin.h
+++ b/editor/plugins/theme_editor_plugin.h
@@ -30,15 +30,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#include "scene/gui/box_container.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/margin_container.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/scroll_container.h"
-#include "scene/gui/tabs.h"
-#include "scene/gui/texture_rect.h"
+#include "editor/editor_plugin.h"
+
 #include "scene/resources/theme.h"
-#include "theme_editor_preview.h"
-#include "editor/editor_node.h"
+#include "scene/resources/style_box.h"
+
 #include "core/list.h"
 #include "core/map.h"
 #include "core/object.h"
@@ -48,9 +47,6 @@
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/vector.h"
-#include "editor/editor_plugin.h"
-#include "scene/gui/box_container.h"
-#include "scene/resources/style_box.h"
 
 class Button;
 class CheckButton;
diff --git a/editor/plugins/theme_editor_preview.h b/editor/plugins/theme_editor_preview.h
index 097a2f53a..0708f28b3 100644
--- a/editor/plugins/theme_editor_preview.h
+++ b/editor/plugins/theme_editor_preview.h
@@ -31,28 +31,13 @@
 /*************************************************************************/
 
 #include "scene/gui/box_container.h"
-#include "scene/gui/check_box.h"
-#include "scene/gui/check_button.h"
-#include "scene/gui/color_picker.h"
-#include "scene/gui/color_rect.h"
-#include "scene/gui/label.h"
-#include "scene/gui/margin_container.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/panel.h"
-#include "scene/gui/progress_bar.h"
-#include "scene/gui/scroll_container.h"
-#include "scene/gui/separator.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/tab_container.h"
-#include "scene/gui/text_edit.h"
-#include "scene/gui/tree.h"
-#include "scene/resources/theme.h"
-#include "editor/editor_node.h"
+
 #include "core/color.h"
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
+
+#include "scene/resources/theme.h"
 #include "scene/resources/font.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/style_box.h"
diff --git a/editor/plugins/viewport_preview_editor_plugin.h b/editor/plugins/viewport_preview_editor_plugin.h
index 025a84b39..3986f7164 100644
--- a/editor/plugins/viewport_preview_editor_plugin.h
+++ b/editor/plugins/viewport_preview_editor_plugin.h
@@ -30,10 +30,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
 #include "editor/plugins/texture_editor_plugin.h"
-#include "scene/main/viewport.h"
+
 #include "core/object.h"
 #include "core/ustring.h"
 
diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp
index 22c7c0e56..9bb496942 100644
--- a/editor/spatial_editor_gizmos.cpp
+++ b/editor/spatial_editor_gizmos.cpp
@@ -72,6 +72,7 @@
 #include "scene/resources/surface_tool.h"
 #include "scene/resources/world.h"
 #include "servers/physics_server.h"
+#include "editor/editor_node.h"
 
 #define HANDLE_HALF_SIZE 9.5