diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index b52a85bcd..586bdc148 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -82,7 +82,9 @@
 
 #include "backends/x11/meta-backend-x11.h"
 
+#ifdef HAVE_WAYLAND
 #include "wayland/meta-wayland-private.h"
+#endif
 
 static gboolean
 is_modal (MetaDisplay *display)
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 4347a057f..1885d87ab 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -35,9 +35,8 @@
 
 #ifdef HAVE_WAYLAND
 #include "meta-surface-actor-wayland.h"
-#endif
-
 #include "wayland/meta-wayland-surface.h"
+#endif
 
 typedef enum {
   INITIALLY_FROZEN,