diff --git a/editor/plugins/light_occluder_2d_editor_plugin.h b/editor/plugins/light_occluder_2d_editor_plugin.h
index aebd0087f..07b91930c 100644
--- a/editor/plugins/light_occluder_2d_editor_plugin.h
+++ b/editor/plugins/light_occluder_2d_editor_plugin.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "editor/plugins/abstract_polygon_2d_editor.h"
-#include "scene/2d/light_occluder_2d.h"
+
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/variant.h"
diff --git a/editor/plugins/line_2d_editor_plugin.h b/editor/plugins/line_2d_editor_plugin.h
index 2d563b7e9..867087e11 100644
--- a/editor/plugins/line_2d_editor_plugin.h
+++ b/editor/plugins/line_2d_editor_plugin.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "editor/plugins/abstract_polygon_2d_editor.h"
-#include "scene/2d/line_2d.h"
+
 #include "core/object.h"
 #include "core/variant.h"
 
diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp
index 89fa9dc72..f60a34765 100644
--- a/editor/plugins/material_editor_plugin.cpp
+++ b/editor/plugins/material_editor_plugin.cpp
@@ -230,6 +230,10 @@ MaterialEditor::MaterialEditor() {
 	}
 }
 
+MaterialEditor::~MaterialEditor() {
+
+}
+
 ///////////////////////
 
 bool EditorInspectorPluginMaterial::can_handle(Object *p_object) {
diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h
index 3542206bf..1f745b8dd 100644
--- a/editor/plugins/material_editor_plugin.h
+++ b/editor/plugins/material_editor_plugin.h
@@ -30,19 +30,17 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#include "editor/editor_inspector.h"
+#include "scene/gui/control.h"
 #include "editor/property_editor.h"
+
 #include "scene/resources/primitive_meshes.h"
-#include "editor/editor_node.h"
-#include "editor/editor_plugin.h"
-#include "scene/3d/camera.h"
-#include "scene/3d/light.h"
-#include "scene/3d/mesh_instance.h"
+
 #include "scene/resources/material.h"
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "editor/editor_inspector.h"
-#include "scene/gui/control.h"
+
 #include "scene/resources/environment.h"
 
 class ViewportContainer;
@@ -88,6 +86,7 @@ protected:
 public:
 	void edit(Ref<Material> p_material, const Ref<Environment> &p_env);
 	MaterialEditor();
+	~MaterialEditor();
 };
 
 class EditorInspectorPluginMaterial : public EditorInspectorPlugin {
diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h
index 69a60e44c..0778259f9 100644
--- a/editor/plugins/mesh_editor_plugin.h
+++ b/editor/plugins/mesh_editor_plugin.h
@@ -30,17 +30,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
-#include "scene/3d/camera.h"
-#include "scene/3d/light.h"
-#include "scene/3d/mesh_instance.h"
 #include "scene/gui/viewport_container.h"
-#include "scene/resources/material.h"
+
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "editor/editor_inspector.h"
+
+#include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
 
 class Camera;
diff --git a/editor/plugins/mesh_instance_editor_plugin.h b/editor/plugins/mesh_instance_editor_plugin.h
index b28dc58d2..d9c291fc0 100644
--- a/editor/plugins/mesh_instance_editor_plugin.h
+++ b/editor/plugins/mesh_instance_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/3d/mesh_instance.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 ConfirmationDialog;
diff --git a/editor/plugins/multimesh_editor_plugin.h b/editor/plugins/multimesh_editor_plugin.h
index ee16a03b0..5953d4b0a 100644
--- a/editor/plugins/multimesh_editor_plugin.h
+++ b/editor/plugins/multimesh_editor_plugin.h
@@ -30,14 +30,12 @@
 /* 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/3d/multimesh_instance.h"
-#include "scene/gui/spin_box.h"
+
 #include "core/node_path.h"
 #include "core/object.h"
 #include "core/ustring.h"
-#include "scene/gui/control.h"
 
 class AcceptDialog;
 class ConfirmationDialog;
diff --git a/editor/plugins/navigation_polygon_editor_plugin.h b/editor/plugins/navigation_polygon_editor_plugin.h
index 4cefdc276..60c841787 100644
--- a/editor/plugins/navigation_polygon_editor_plugin.h
+++ b/editor/plugins/navigation_polygon_editor_plugin.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "editor/plugins/abstract_polygon_2d_editor.h"
-#include "scene/2d/navigation_polygon.h"
+
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/variant.h"
diff --git a/editor/plugins/particles_editor_plugin.h b/editor/plugins/particles_editor_plugin.h
index dfc6b1173..cf24cd041 100644
--- a/editor/plugins/particles_editor_plugin.h
+++ b/editor/plugins/particles_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/control.h"
 #include "editor/editor_plugin.h"
-#include "scene/gui/spin_box.h"
+
 #include "core/math/face3.h"
 #include "core/node_path.h"
 #include "core/object.h"
 #include "core/pool_vector.h"
-#include "scene/gui/control.h"
+
 
 class ConfirmationDialog;
 class EditorFileDialog;
diff --git a/editor/plugins/path_2d_editor_plugin.h b/editor/plugins/path_2d_editor_plugin.h
index e8d1b6951..ac187e4da 100644
--- a/editor/plugins/path_2d_editor_plugin.h
+++ b/editor/plugins/path_2d_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/box_container.h"
 #include "editor/editor_plugin.h"
-#include "scene/2d/path_2d.h"
-#include "scene/gui/tool_button.h"
+
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "scene/gui/box_container.h"
+
 
 class CanvasItemEditor;
 class Control;
diff --git a/editor/plugins/path_editor_plugin.h b/editor/plugins/path_editor_plugin.h
index fa92a9f8c..5764fd579 100644
--- a/editor/plugins/path_editor_plugin.h
+++ b/editor/plugins/path_editor_plugin.h
@@ -31,15 +31,15 @@
 /*************************************************************************/
 
 #include "editor/spatial_editor_gizmos.h"
-#include "scene/3d/path.h"
+#include "editor/plugins/spatial_editor_plugin.h"
+#include "editor/editor_plugin.h"
+
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "editor/editor_plugin.h"
-#include "editor/plugins/spatial_editor_plugin.h"
 
 class Camera;
 class EditorNode;
diff --git a/editor/plugins/physical_bone_plugin.h b/editor/plugins/physical_bone_plugin.h
index 29d9dde50..60424aacc 100644
--- a/editor/plugins/physical_bone_plugin.h
+++ b/editor/plugins/physical_bone_plugin.h
@@ -30,7 +30,6 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "editor/editor_node.h"
 #include "core/object.h"
 #include "core/ustring.h"
 #include "editor/editor_plugin.h"
diff --git a/editor/plugins/polygon_2d_editor_plugin.h b/editor/plugins/polygon_2d_editor_plugin.h
index d71444641..658c6aad2 100644
--- a/editor/plugins/polygon_2d_editor_plugin.h
+++ b/editor/plugins/polygon_2d_editor_plugin.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "editor/plugins/abstract_polygon_2d_editor.h"
-#include "scene/gui/scroll_container.h"
+
 #include "core/array.h"
 #include "core/color.h"
 #include "core/math/vector2.h"
@@ -39,7 +39,6 @@
 #include "core/pool_vector.h"
 #include "core/reference.h"
 #include "core/vector.h"
-#include "scene/gui/base_button.h"
 
 class AcceptDialog;
 class Button;
diff --git a/editor/plugins/resource_preloader_editor_plugin.h b/editor/plugins/resource_preloader_editor_plugin.h
index ebdb8928c..4d21344d3 100644
--- a/editor/plugins/resource_preloader_editor_plugin.h
+++ b/editor/plugins/resource_preloader_editor_plugin.h
@@ -30,18 +30,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "editor/editor_node.h"
+#include "scene/gui/panel_container.h"
 #include "editor/editor_plugin.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/tree.h"
+
 #include "scene/main/resource_preloader.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "scene/gui/panel_container.h"
+
 
 class AcceptDialog;
 class Button;
diff --git a/editor/plugins/room_manager_editor_plugin.h b/editor/plugins/room_manager_editor_plugin.h
index 7d0c8e36d..acbd1cb6c 100644
--- a/editor/plugins/room_manager_editor_plugin.h
+++ b/editor/plugins/room_manager_editor_plugin.h
@@ -30,12 +30,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
-#include "scene/3d/occluder.h"
-#include "scene/3d/portal.h"
-#include "scene/3d/room.h"
-#include "scene/3d/room_manager.h"
+
 #include "scene/resources/material.h"
 #include "core/object.h"
 #include "core/ustring.h"
diff --git a/editor/plugins/root_motion_editor_plugin.h b/editor/plugins/root_motion_editor_plugin.h
index 830907ac4..db1c4b3da 100644
--- a/editor/plugins/root_motion_editor_plugin.h
+++ b/editor/plugins/root_motion_editor_plugin.h
@@ -31,9 +31,7 @@
 /*************************************************************************/
 
 #include "editor/editor_inspector.h"
-#include "editor/editor_spin_slider.h"
-#include "editor/property_selector.h"
-#include "scene/animation/animation_tree.h"
+
 #include "core/node_path.h"
 #include "core/object.h"
 #include "core/ustring.h"
diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h
index 52bb9c704..795b7125c 100644
--- a/editor/plugins/script_editor_plugin.h
+++ b/editor/plugins/script_editor_plugin.h
@@ -30,22 +30,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/script_language.h"
-#include "editor/code_editor.h"
-#include "editor/editor_help.h"
-#include "editor/editor_help_search.h"
 #include "editor/editor_plugin.h"
-#include "editor/script_create_dialog.h"
-#include "scene/gui/item_list.h"
-#include "scene/gui/line_edit.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/tab_container.h"
-#include "scene/gui/text_edit.h"
-#include "scene/gui/tool_button.h"
-#include "scene/gui/tree.h"
-#include "scene/main/timer.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/panel_container.h"
+
 #include "scene/resources/text_file.h"
+
+#include "core/script_language.h"
 #include "core/array.h"
 #include "core/error_list.h"
 #include "core/list.h"
@@ -58,9 +50,6 @@
 #include "core/ustring.h"
 #include "core/variant.h"
 #include "core/vector.h"
-#include "scene/gui/box_container.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/panel_container.h"
 
 class Button;
 class ConfigFile;
diff --git a/editor/rename_dialog.cpp b/editor/rename_dialog.cpp
index 1a24a2a32..b1ba5ac04 100644
--- a/editor/rename_dialog.cpp
+++ b/editor/rename_dialog.cpp
@@ -43,6 +43,7 @@
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/tab_container.h"
+#include "scene/gui/check_button.h"
 
 RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor, UndoRedo *p_undo_redo) {
 	scene_tree_editor = p_scene_tree_editor;
diff --git a/editor/rename_dialog.h b/editor/rename_dialog.h
index 5a293a118..116e36546 100644
--- a/editor/rename_dialog.h
+++ b/editor/rename_dialog.h
@@ -41,6 +41,8 @@
 #include "core/undo_redo.h"
 #include "editor/scene_tree_editor.h"
 
+class CheckButton;
+
 /**
 @author Blazej Floch
 */
diff --git a/editor/script_editor_debugger.h b/editor/script_editor_debugger.h
index f95dfcfaf..55bbad119 100644
--- a/editor/script_editor_debugger.h
+++ b/editor/script_editor_debugger.h
@@ -36,6 +36,7 @@
 #include "editor/property_editor.h"
 #include "scene/3d/camera.h"
 #include "scene/gui/box_container.h"
+#include "scene/gui/margin_container.h"
 #include "scene/gui/button.h"
 
 class Tree;