diff --git a/src/Makefile.am b/src/Makefile.am
index bd17b0701..5e7e8a3db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -266,8 +266,8 @@ libmutter_la_SOURCES +=				\
 	wayland/meta-wayland-versions.h		\
 	wayland/meta-wayland-outputs.c		\
 	wayland/meta-wayland-outputs.h		\
-	wayland/window-wayland.c		\
-	wayland/window-wayland.h		\
+	wayland/meta-window-wayland.c		\
+	wayland/meta-window-wayland.h		\
 	$(NULL)
 endif
 
diff --git a/src/core/window.c b/src/core/window.c
index ec155f85a..ef85aab39 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -57,7 +57,7 @@
 #include "x11/xprops.h"
 
 #ifdef HAVE_WAYLAND
-#include "wayland/window-wayland.h"
+#include "wayland/meta-window-wayland.h"
 #include "wayland/meta-wayland-private.h"
 #endif
 
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 43c6a7a50..be6c6f461 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -46,7 +46,7 @@
 #include "meta-cursor-tracker-private.h"
 #include "display-private.h"
 #include "window-private.h"
-#include "window-wayland.h"
+#include "meta-window-wayland.h"
 
 #include "compositor/region-utils.h"
 
diff --git a/src/wayland/window-wayland.c b/src/wayland/meta-window-wayland.c
similarity index 99%
rename from src/wayland/window-wayland.c
rename to src/wayland/meta-window-wayland.c
index 8900c359d..8c6ca581f 100644
--- a/src/wayland/window-wayland.c
+++ b/src/wayland/meta-window-wayland.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "window-wayland.h"
+#include "meta-window-wayland.h"
 
 #include <meta/errors.h>
 #include "window-private.h"
diff --git a/src/wayland/window-wayland.h b/src/wayland/meta-window-wayland.h
similarity index 100%
rename from src/wayland/window-wayland.h
rename to src/wayland/meta-window-wayland.h