diff --git a/include/wlr/types/wlr_scene.h b/include/wlr/types/wlr_scene.h
index 2a2d08da..19924090 100644
--- a/include/wlr/types/wlr_scene.h
+++ b/include/wlr/types/wlr_scene.h
@@ -20,19 +20,25 @@
  */
 
 #include <pixman.h>
+#include <time.h>
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_damage_ring.h>
+#include <wlr/types/wlr_linux_dmabuf_v1.h>
+#include <wlr/util/addon.h>
+#include <wlr/util/box.h>
 
 struct wlr_output;
 struct wlr_output_layout;
 struct wlr_xdg_surface;
 struct wlr_layer_surface_v1;
 struct wlr_drag_icon;
+struct wlr_surface;
 
 struct wlr_scene_node;
 struct wlr_scene_buffer;
 
+struct wlr_presentation;
+
 typedef bool (*wlr_scene_buffer_point_accepts_input_func_t)(
 	struct wlr_scene_buffer *buffer, int sx, int sy);
 
@@ -271,6 +277,7 @@ struct wlr_scene_node *wlr_scene_node_at(struct wlr_scene_node *node,
  * Create a new scene-graph.
  */
 struct wlr_scene *wlr_scene_create(void);
+
 /**
  * Handle presentation feedback for all surfaces in the scene, assuming that
  * scene outputs and the scene rendering functions are used.
diff --git a/types/scene/drag_icon.c b/types/scene/drag_icon.c
index 15b6b45b..220d2c80 100644
--- a/types/scene/drag_icon.c
+++ b/types/scene/drag_icon.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include "wlr/types/wlr_compositor.h"
 #include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_data_device.h>
 
diff --git a/types/scene/subsurface_tree.c b/types/scene/subsurface_tree.c
index 35420abe..87cbfb5f 100644
--- a/types/scene/subsurface_tree.c
+++ b/types/scene/subsurface_tree.c
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include <stdlib.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_subcompositor.h>
 #include <wlr/util/addon.h>
diff --git a/types/scene/surface.c b/types/scene/surface.c
index 3881fed3..c58bcd94 100644
--- a/types/scene/surface.c
+++ b/types/scene/surface.c
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include <stdlib.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_presentation_time.h>