diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index c2e2e1923..d4b6d14c3 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -595,9 +595,14 @@ meta_compositor_add_window (MetaCompositor    *compositor,
       window_actor_type = META_TYPE_WINDOW_ACTOR_X11;
       break;
 
+#ifdef HAVE_WAYLAND
     case META_WINDOW_CLIENT_TYPE_WAYLAND:
       window_actor_type = META_TYPE_WINDOW_ACTOR_WAYLAND;
       break;
+#endif
+
+    default:
+      g_return_if_reached ();
     }
 
   window_actor = g_object_new (window_actor_type,
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 0f80cfaf4..db9ccec62 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -29,6 +29,7 @@
 #include "core/frame.h"
 #include "compositor/compositor-private.h"
 #include "compositor/meta-cullable.h"
+#include "compositor/meta-shaped-texture-private.h"
 #include "compositor/meta-surface-actor-x11.h"
 #include "compositor/meta-surface-actor.h"
 #include "compositor/meta-window-actor-private.h"
diff --git a/src/meson.build b/src/meson.build
index 182f7f5f5..90d80734f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -317,8 +317,6 @@ mutter_sources = [
   'compositor/meta-texture-tower.h',
   'compositor/meta-window-actor.c',
   'compositor/meta-window-actor-private.h',
-  'compositor/meta-window-actor-wayland.c',
-  'compositor/meta-window-actor-wayland.h',
   'compositor/meta-window-actor-x11.c',
   'compositor/meta-window-actor-x11.h',
   'compositor/meta-window-group.c',
@@ -475,6 +473,8 @@ if have_wayland
   mutter_sources += [
     'compositor/meta-surface-actor-wayland.c',
     'compositor/meta-surface-actor-wayland.h',
+    'compositor/meta-window-actor-wayland.c',
+    'compositor/meta-window-actor-wayland.h',
     'compositor/meta-compositor-server.c',
     'compositor/meta-compositor-server.h',
     'wayland/meta-cursor-sprite-wayland.c',