diff --git a/src/Makefile.am b/src/Makefile.am
index 0bc63b718..972fb27ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,11 +29,7 @@ INCLUDES=								\
 	-DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION)	\
 	-DMUTTER_PKGLIBDIR=\"$(pkglibdir)\"				\
 	-DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"			\
-	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
-
-INCLUDES += \
-	-I$(srcdir)/wayland						\
-	-I$(builddir)/wayland						\
+	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"			\
 	-DXWAYLAND_PATH='"@XWAYLAND_PATH@"'
 
 mutter_built_sources = \
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index fa723fa46..6a4904323 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -76,12 +76,11 @@
 #include "display-private.h" /* for meta_display_lookup_x_window() */
 #include "util-private.h"
 #include "frame.h"
-#include "meta-wayland-private.h"
-#include "meta-wayland-pointer.h"
-#include "meta-wayland-keyboard.h"
 #include <X11/extensions/shape.h>
 #include <X11/extensions/Xcomposite.h>
 
+#include "wayland/meta-wayland-private.h"
+
 static gboolean
 is_modal (MetaDisplay *display)
 {
diff --git a/src/compositor/meta-surface-actor-wayland.c b/src/compositor/meta-surface-actor-wayland.c
index 56dd8bd13..bdd8df05c 100644
--- a/src/compositor/meta-surface-actor-wayland.c
+++ b/src/compositor/meta-surface-actor-wayland.c
@@ -28,7 +28,8 @@
 
 #include <cogl/cogl-wayland-server.h>
 #include "meta-shaped-texture-private.h"
-#include "meta-wayland-private.h"
+
+#include "wayland/meta-wayland-private.h"
 
 struct _MetaSurfaceActorWaylandPrivate
 {
diff --git a/src/compositor/meta-surface-actor-wayland.h b/src/compositor/meta-surface-actor-wayland.h
index fbca3ff4d..35058ccf2 100644
--- a/src/compositor/meta-surface-actor-wayland.h
+++ b/src/compositor/meta-surface-actor-wayland.h
@@ -29,7 +29,7 @@
 
 #include "meta-surface-actor.h"
 
-#include "meta-wayland.h"
+#include "wayland/meta-wayland.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index a626328e0..7356d7da8 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -29,11 +29,12 @@
 #include "region-utils.h"
 #include "monitor-private.h"
 #include "meta-cullable.h"
-#include "meta-wayland-private.h"
 
 #include "meta-surface-actor.h"
 #include "meta-surface-actor-x11.h"
 
+#include "wayland/meta-wayland-surface.h"
+
 struct _MetaWindowActorPrivate
 {
   MetaWindow       *window;
diff --git a/src/core/delete.c b/src/core/delete.c
index b86dcf304..136e564ea 100644
--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "meta-wayland-surface.h"
+#include "wayland/meta-wayland-surface.h"
 
 static void meta_window_present_delete_dialog (MetaWindow *window,
                                                guint32     timestamp);
diff --git a/src/core/display.c b/src/core/display.c
index 1bd451a89..e43cd2772 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -73,7 +73,7 @@
 #include "x11/group-props.h"
 #include "x11/xprops.h"
 
-#include "meta-xwayland-private.h"
+#include "wayland/meta-xwayland-private.h"
 #include "meta-surface-actor-wayland.h"
 
 /*
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 415ccf851..c47178773 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -41,7 +41,6 @@
 #include "screen-private.h"
 #include <meta/prefs.h>
 #include "util-private.h"
-#include "meta-wayland.h"
 
 #include <X11/keysym.h>
 #include <string.h>
@@ -52,6 +51,8 @@
 #include <X11/XKBlib.h>
 #endif
 
+#include "wayland/meta-wayland.h"
+
 #define SCHEMA_COMMON_KEYBINDINGS "org.gnome.desktop.wm.keybindings"
 #define SCHEMA_MUTTER_KEYBINDINGS "org.gnome.mutter.keybindings"
 #define SCHEMA_MUTTER_WAYLAND_KEYBINDINGS "org.gnome.mutter.wayland.keybindings"
diff --git a/src/core/main.c b/src/core/main.c
index 84d808751..df87ea213 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -53,7 +53,6 @@
 #include "session.h"
 #include <meta/prefs.h>
 #include <meta/compositor.h>
-#include "meta-wayland.h"
 
 #include <glib-object.h>
 #include <glib-unix.h>
@@ -79,6 +78,8 @@
 #include <girepository.h>
 #endif
 
+#include "wayland/meta-wayland.h"
+
 /*
  * The exit code we'll return to our parent process when we eventually die.
  */
diff --git a/src/core/meta-cursor-tracker.c b/src/core/meta-cursor-tracker.c
index e98f2e72a..37dd9faac 100644
--- a/src/core/meta-cursor-tracker.c
+++ b/src/core/meta-cursor-tracker.c
@@ -47,9 +47,10 @@
 
 #include "meta-cursor-tracker-private.h"
 #include "screen-private.h"
-#include "meta-wayland-private.h"
 #include "monitor-private.h"
 
+#include "wayland/meta-wayland-private.h"
+
 #define META_WAYLAND_DEFAULT_CURSOR_HOTSPOT_X 7
 #define META_WAYLAND_DEFAULT_CURSOR_HOTSPOT_Y 4
 
diff --git a/src/core/screen.c b/src/core/screen.c
index 8e0398917..bac8dcaf0 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -42,7 +42,6 @@
 #include <meta/compositor.h>
 #include "mutter-enum-types.h"
 #include "core.h"
-#include "meta-wayland.h"
 #include "meta-cursor-tracker-private.h"
 
 #include <X11/extensions/Xinerama.h>
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 6b774cb85..2470b8127 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -42,11 +42,12 @@
 #include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <clutter/clutter.h>
-#include "meta-wayland-types.h"
 
 #include "x11/iconcache.h"
 #include "x11/group.h"
 
+#include "wayland/meta-wayland-types.h"
+
 typedef struct _MetaWindowQueue MetaWindowQueue;
 
 typedef enum {
diff --git a/src/core/window.c b/src/core/window.c
index d21c704f8..36a585738 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -54,7 +54,6 @@
 #include <X11/extensions/shape.h>
 #endif
 
-#include "meta-wayland-private.h"
 #include "meta/compositor-mutter.h"
 
 #include "x11/window-x11.h"
@@ -62,6 +61,8 @@
 #include "x11/xprops.h"
 #include "x11/group.h"
 
+#include "wayland/meta-wayland-private.h"
+
 /* Windows that unmaximize to a size bigger than that fraction of the workarea
  * will be scaled down to that size (while maintaining aspect ratio).
  * Windows that cover an area greater then this size are automaximized on map.