diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index 509f42300..0bfe4e349 100644
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@ -81,7 +81,9 @@
 #endif
 
 #ifdef HAVE_CLUTTER_WAYLAND_COMPOSITOR
+#include <cogl/cogl-wayland-server.h>
 #include <wayland-server.h>
+#include "wayland/clutter-wayland-compositor.h"
 #endif
 
 G_DEFINE_ABSTRACT_TYPE (ClutterBackend, clutter_backend, G_TYPE_OBJECT);
diff --git a/clutter/wayland/clutter-backend-wayland.c b/clutter/wayland/clutter-backend-wayland.c
index db5613c68..6db22c901 100644
--- a/clutter/wayland/clutter-backend-wayland.c
+++ b/clutter/wayland/clutter-backend-wayland.c
@@ -51,6 +51,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <cogl/cogl.h>
+#include <cogl/cogl-wayland-client.h>
 
 #define clutter_backend_wayland_get_type     _clutter_backend_wayland_get_type
 
diff --git a/clutter/wayland/clutter-stage-wayland.c b/clutter/wayland/clutter-stage-wayland.c
index f5cb4f825..9cd83d61e 100644
--- a/clutter/wayland/clutter-stage-wayland.c
+++ b/clutter/wayland/clutter-stage-wayland.c
@@ -30,12 +30,14 @@
 
 #include <glib.h>
 
+#include "clutter-wayland.h"
 #include "clutter-stage-wayland.h"
 #include "clutter-backend-wayland.h"
 #include "clutter-stage-window.h"
 #include "clutter-stage-private.h"
 #include "clutter-event-private.h"
 #include <cogl/cogl.h>
+#include <cogl/cogl-wayland-client.h>
 
 static ClutterStageWindowIface *clutter_stage_window_parent_iface = NULL;
 
diff --git a/clutter/wayland/clutter-wayland-surface.c b/clutter/wayland/clutter-wayland-surface.c
index a86f04e32..b128782f1 100644
--- a/clutter/wayland/clutter-wayland-surface.c
+++ b/clutter/wayland/clutter-wayland-surface.c
@@ -48,8 +48,7 @@
 #include "clutter-backend.h"
 
 #include <cogl/cogl.h>
-
-#include <wayland-server.h>
+#include <cogl/cogl-wayland-server.h>
 
 enum
 {