diff --git a/.gitignore b/.gitignore
index 6b0931f43..fe8848221 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,10 +57,8 @@ testgradient
 m4/*
 INSTALL
 mkinstalldirs
-src/mutter-enum-types.[ch]
-src/stamp-mutter-enum-types.h
-src/mutter-marshal.[ch]
-src/stamp-mutter-marshal.h
+meta-enum-types.[ch]
+src/stamp-meta-enum-types.h
 src/meta-dbus-display-config.[ch]
 src/meta-dbus-idle-monitor.[ch]
 src/meta-dbus-login1.[ch]
diff --git a/src/Makefile.am b/src/Makefile.am
index be444f4de..af8ae87a9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,8 +39,8 @@ mutter_built_sources = \
 	$(dbus_idle_built_sources)		\
 	$(dbus_display_config_built_sources)	\
 	$(dbus_login1_built_sources)		\
-	mutter-enum-types.h 			\
-	mutter-enum-types.c			\
+	meta/meta-enum-types.h			\
+	meta-enum-types.c			\
 	$(NULL)
 
 if HAVE_WAYLAND
@@ -334,7 +334,9 @@ libmutterinclude_headers =			\
 	$(NULL)
 
 libmutterinclude_built_headers =		\
-	meta/meta-version.h
+	meta/meta-version.h			\
+	meta/meta-enum-types.h			\
+	$(NULL)
 
 libmutterinclude_base_headers =			\
 	$(libmutterinclude_headers)		\
@@ -386,7 +388,6 @@ Meta-$(api_version).gir: libmutter.la
 @META_GIR@_CFLAGS = $(AM_CPPFLAGS)
 @META_GIR@_LIBS = libmutter.la
 @META_GIR@_FILES =				\
-	mutter-enum-types.h			\
 	$(libmutterinclude_base_headers)	\
 	$(filter %.c,$(libmutter_la_SOURCES) $(nodist_libmutter_la_SOURCES))
 @META_GIR@_SCANNERFLAGS = --warn-all --warn-error
@@ -409,8 +410,8 @@ pkgconfig_DATA = libmutter.pc
 EXTRA_DIST +=					\
 	$(wayland_protocols)			\
 	libmutter.pc.in				\
-	mutter-enum-types.h.in			\
-	mutter-enum-types.c.in			\
+	meta-enum-types.h.in			\
+	meta-enum-types.c.in			\
 	org.freedesktop.login1.xml		\
 	org.gnome.Mutter.DisplayConfig.xml	\
 	org.gnome.Mutter.IdleMonitor.xml	\
@@ -420,26 +421,26 @@ BUILT_SOURCES =					\
 	$(mutter_built_sources)			\
 	$(libmutterinclude_built_headers)
 
-MUTTER_STAMP_FILES = stamp-mutter-enum-types.h
+MUTTER_STAMP_FILES = stamp-meta-enum-types.h
 CLEANFILES += $(MUTTER_STAMP_FILES)
 
-mutter-enum-types.h: stamp-mutter-enum-types.h Makefile
+meta/meta-enum-types.h: stamp-meta-enum-types.h Makefile
 	@true
-stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.in
+stamp-meta-enum-types.h: $(libmutterinclude_headers) meta-enum-types.h.in
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template mutter-enum-types.h.in \
+	    --template meta-enum-types.h.in \
 	  $(libmutterinclude_base_headers) ) >> xgen-teth && \
-	(cmp -s xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \
+	(cmp -s xgen-teth meta/meta-enum-types.h || cp xgen-teth meta/meta-enum-types.h) && \
 	rm -f xgen-teth && \
 	echo timestamp > $(@F)
 
-mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
+meta-enum-types.c: stamp-meta-enum-types.h meta-enum-types.c.in
 	  $(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template mutter-enum-types.c.in \
+	    --template meta-enum-types.c.in \
 	  $(libmutterinclude_base_headers) ) >> xgen-tetc && \
-	cp xgen-tetc mutter-enum-types.c && \
+	cp xgen-tetc meta-enum-types.c && \
 	rm -f xgen-tetc
 
 dbus_display_config_built_sources = meta-dbus-display-config.c meta-dbus-display-config.h
diff --git a/src/backends/meta-barrier.c b/src/backends/meta-barrier.c
index 20bc4eff3..f5422ee1b 100644
--- a/src/backends/meta-barrier.c
+++ b/src/backends/meta-barrier.c
@@ -16,7 +16,7 @@
 #include "backends/native/meta-barrier-native.h"
 #include "backends/x11/meta-backend-x11.h"
 #include "backends/x11/meta-barrier-x11.h"
-#include "mutter-enum-types.h"
+#include <meta/meta-enum-types.h>
 
 G_DEFINE_TYPE (MetaBarrier, meta_barrier, G_TYPE_OBJECT)
 G_DEFINE_TYPE (MetaBarrierImpl, meta_barrier_impl, G_TYPE_OBJECT)
diff --git a/src/core/display.c b/src/core/display.c
index 130981cb8..b5174c4de 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -46,7 +46,7 @@
 #include <meta/compositor.h>
 #include <meta/compositor-mutter.h>
 #include <X11/Xatom.h>
-#include "mutter-enum-types.h"
+#include <meta/meta-enum-types.h>
 #include "meta-idle-monitor-dbus.h"
 #include "meta-cursor-tracker-private.h"
 #include <meta/meta-backend.h>
diff --git a/src/core/screen.c b/src/core/screen.c
index b3b9b9df6..bef429b9a 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -40,7 +40,7 @@
 #include "keybindings-private.h"
 #include "stack.h"
 #include <meta/compositor.h>
-#include "mutter-enum-types.h"
+#include <meta/meta-enum-types.h>
 #include "core.h"
 #include "meta-cursor-tracker-private.h"
 
diff --git a/src/core/window.c b/src/core/window.c
index 0341d03bf..812a4b847 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -41,7 +41,7 @@
 #include <meta/prefs.h>
 #include <meta/group.h>
 #include "constraints.h"
-#include "mutter-enum-types.h"
+#include <meta/meta-enum-types.h>
 #include "core.h"
 
 #include <X11/Xatom.h>
diff --git a/src/mutter-enum-types.c.in b/src/meta-enum-types.c.in
similarity index 96%
rename from src/mutter-enum-types.c.in
rename to src/meta-enum-types.c.in
index 8bbc82154..0480ffdca 100644
--- a/src/mutter-enum-types.c.in
+++ b/src/meta-enum-types.c.in
@@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#include "mutter-enum-types.h"
+#include <meta/meta-enum-types.h>
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
diff --git a/src/mutter-enum-types.h.in b/src/meta-enum-types.h.in
similarity index 87%
rename from src/mutter-enum-types.h.in
rename to src/meta-enum-types.h.in
index 5be906662..d03277762 100644
--- a/src/mutter-enum-types.h.in
+++ b/src/meta-enum-types.h.in
@@ -1,6 +1,6 @@
 /*** BEGIN file-header ***/
-#ifndef __MUTTER_ENUM_TYPES_H__
-#define __MUTTER_ENUM_TYPES_H__
+#ifndef __META_ENUM_TYPES_H__
+#define __META_ENUM_TYPES_H__
 
 #include <glib-object.h>
 
diff --git a/src/stamp-mutter-enum-types.h b/src/stamp-mutter-enum-types.h
new file mode 100644
index 000000000..9788f7023
--- /dev/null
+++ b/src/stamp-mutter-enum-types.h
@@ -0,0 +1 @@
+timestamp