diff --git a/scene/3d/collision_polygon.cpp b/scene/3d/collision_polygon.cpp
index 6e7be3445..16cdd2255 100644
--- a/scene/3d/collision_polygon.cpp
+++ b/scene/3d/collision_polygon.cpp
@@ -33,6 +33,7 @@
 #include "collision_object.h"
 #include "scene/resources/concave_polygon_shape.h"
 #include "scene/resources/convex_polygon_shape.h"
+#include "scene/resources/shape.h"
 
 void CollisionPolygon::_build_polygon() {
 	if (!parent) {
diff --git a/scene/3d/collision_polygon.h b/scene/3d/collision_polygon.h
index 9138b5da5..a7871b38e 100644
--- a/scene/3d/collision_polygon.h
+++ b/scene/3d/collision_polygon.h
@@ -32,9 +32,11 @@
 #define COLLISION_POLYGON_H
 
 #include "scene/3d/spatial.h"
-#include "scene/resources/shape.h"
+#include "core/reference.h"
 
 class CollisionObject;
+class Shape;
+
 class CollisionPolygon : public Spatial {
 	GDCLASS(CollisionPolygon, Spatial);
 	real_t margin = 0.04;
diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp
index e5fd57060..44bf19fe8 100644
--- a/scene/3d/collision_shape.cpp
+++ b/scene/3d/collision_shape.cpp
@@ -41,6 +41,7 @@
 #include "scene/resources/ray_shape.h"
 #include "scene/resources/sphere_shape.h"
 #include "servers/visual_server.h"
+#include "scene/resources/shape.h"
 
 void CollisionShape::make_convex_from_brothers() {
 	Node *p = get_parent();
diff --git a/scene/3d/collision_shape.h b/scene/3d/collision_shape.h
index 375f10e38..e177428e6 100644
--- a/scene/3d/collision_shape.h
+++ b/scene/3d/collision_shape.h
@@ -32,8 +32,11 @@
 #define COLLISION_SHAPE_H
 
 #include "scene/3d/spatial.h"
-#include "scene/resources/shape.h"
+#include "core/reference.h"
+
 class CollisionObject;
+class shape;
+
 class CollisionShape : public Spatial {
 	GDCLASS(CollisionShape, Spatial);
 	OBJ_CATEGORY("3D Physics Nodes");
diff --git a/scene/3d/immediate_geometry.h b/scene/3d/immediate_geometry.h
index a921d8394..1ea3b3dd1 100644
--- a/scene/3d/immediate_geometry.h
+++ b/scene/3d/immediate_geometry.h
@@ -32,8 +32,11 @@
 #define IMMEDIATE_GEOMETRY_H
 
 #include "scene/3d/visual_instance.h"
+
 #include "scene/resources/mesh.h"
 
+class Texture;
+
 class ImmediateGeometry : public GeometryInstance {
 	GDCLASS(ImmediateGeometry, GeometryInstance);
 
diff --git a/scene/3d/light.h b/scene/3d/light.h
index 5b82ec368..c90986564 100644
--- a/scene/3d/light.h
+++ b/scene/3d/light.h
@@ -32,7 +32,6 @@
 #define LIGHT_H
 
 #include "scene/3d/visual_instance.h"
-#include "scene/resources/texture.h"
 #include "servers/visual_server.h"
 
 class Light : public VisualInstance {