diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp
index 623662a3a..9c37a9ccf 100644
--- a/editor/doc/doc_data.cpp
+++ b/editor/doc/doc_data.cpp
@@ -40,6 +40,7 @@
 #include "core/translation.h"
 #include "core/version.h"
 #include "scene/resources/theme.h"
+#include "core/io/xml_parser.h"
 
 static String _get_indent(const String &p_text) {
 	String indent;
diff --git a/editor/doc/doc_data.h b/editor/doc/doc_data.h
index 9ac7f88e9..0444842bf 100644
--- a/editor/doc/doc_data.h
+++ b/editor/doc/doc_data.h
@@ -30,9 +30,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/io/xml_parser.h"
 #include "core/map.h"
 #include "core/variant.h"
+#include "core/reference.h"
+
+class XMLParser;
 
 class DocData {
 public:
diff --git a/editor/import/resource_importer_bitmask.cpp b/editor/import/resource_importer_bitmask.cpp
index 0a23f81b4..7ec35f6fd 100644
--- a/editor/import/resource_importer_bitmask.cpp
+++ b/editor/import/resource_importer_bitmask.cpp
@@ -36,6 +36,7 @@
 #include "editor/editor_node.h"
 #include "scene/resources/bit_map.h"
 #include "scene/resources/texture.h"
+#include "core/image.h"
 
 String ResourceImporterBitMap::get_importer_name() const {
 	return "bitmap";
diff --git a/editor/import/resource_importer_bitmask.h b/editor/import/resource_importer_bitmask.h
index dafad7ae5..6057f9d11 100644
--- a/editor/import/resource_importer_bitmask.h
+++ b/editor/import/resource_importer_bitmask.h
@@ -30,7 +30,6 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
 #include "core/io/resource_importer.h"
 
 class StreamBitMap;
diff --git a/editor/import/resource_importer_image.cpp b/editor/import/resource_importer_image.cpp
index cbb78a77e..fdc96ba36 100644
--- a/editor/import/resource_importer_image.cpp
+++ b/editor/import/resource_importer_image.cpp
@@ -34,6 +34,7 @@
 #include "core/io/resource_saver.h"
 #include "core/os/file_access.h"
 #include "scene/resources/texture.h"
+#include "core/image.h"
 
 String ResourceImporterImage::get_importer_name() const {
 	return "image";
diff --git a/editor/import/resource_importer_image.h b/editor/import/resource_importer_image.h
index 46c1f3b99..773e55fa8 100644
--- a/editor/import/resource_importer_image.h
+++ b/editor/import/resource_importer_image.h
@@ -30,7 +30,6 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
 #include "core/io/resource_importer.h"
 
 class ResourceImporterImage : public ResourceImporter {
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp
index eff03bbdd..7a48ce6e5 100644
--- a/editor/import/resource_importer_scene.cpp
+++ b/editor/import/resource_importer_scene.cpp
@@ -47,6 +47,9 @@
 #include "scene/resources/ray_shape.h"
 #include "scene/resources/resource_format_text.h"
 #include "scene/resources/sphere_shape.h"
+#include "scene/resources/animation.h"
+#include "scene/resources/mesh.h"
+#include "scene/resources/shape.h"
 
 uint32_t EditorSceneImporter::get_import_flags() const {
 	if (get_script_instance()) {
diff --git a/editor/import/resource_importer_scene.h b/editor/import/resource_importer_scene.h
index 8a9629205..d092e2925 100644
--- a/editor/import/resource_importer_scene.h
+++ b/editor/import/resource_importer_scene.h
@@ -33,11 +33,14 @@
 #include "core/pair.h"
 
 #include "core/io/resource_importer.h"
-#include "scene/resources/animation.h"
-#include "scene/resources/mesh.h"
-#include "scene/resources/shape.h"
+#include "scene/main/node.h"
 
 class Material;
+class Shape;
+class Animation;
+class Mesh;
+class ArrayMesh;
+
 class EditorSceneImporter : public Reference {
 	GDCLASS(EditorSceneImporter, Reference);
 
diff --git a/editor/import/resource_importer_texture_atlas.h b/editor/import/resource_importer_texture_atlas.h
index 807f64f05..0a3793a24 100644
--- a/editor/import/resource_importer_texture_atlas.h
+++ b/editor/import/resource_importer_texture_atlas.h
@@ -32,6 +32,7 @@
 
 #include "core/image.h"
 #include "core/io/resource_importer.h"
+
 class ResourceImporterTextureAtlas : public ResourceImporter {
 	GDCLASS(ResourceImporterTextureAtlas, ResourceImporter);
 
diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp
index f49cda709..d042ae33c 100644
--- a/editor/plugins/mesh_editor_plugin.cpp
+++ b/editor/plugins/mesh_editor_plugin.cpp
@@ -34,6 +34,7 @@
 #include "scene/gui/texture_button.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/world.h"
+#include "scene/resources/mesh.h"
 
 void MeshEditor::_gui_input(Ref<InputEvent> p_event) {
 	Ref<InputEventMouseMotion> mm = p_event;
diff --git a/editor/plugins/sprite_editor_plugin.cpp b/editor/plugins/sprite_editor_plugin.cpp
index 2c8eeb66c..4341202b0 100644
--- a/editor/plugins/sprite_editor_plugin.cpp
+++ b/editor/plugins/sprite_editor_plugin.cpp
@@ -39,6 +39,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/resources/bit_map.h"
 #include "thirdparty/misc/clipper.hpp"
+#include "scene/resources/mesh.h"
 
 void SpriteEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {