diff --git a/.gitignore b/.gitignore
index 83d8e5981..2c2298771 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,8 +19,11 @@ clutter/stamp-*
 /clutter/clutter-json.h
 /clutter/cogl/cogl-defines-gl.h
 /clutter/cogl/cogl-defines-gles.h
+/clutter/cogl/cogl-enum-types.h
 /clutter/cogl/cogl.h
 /clutter/cogl/*.pc
+/clutter/cogl/common/cogl-enum-types.[ch]
+/clutter/cogl/common/stamp-cogl-enum-types.h
 /clutter/cogl/gles/cogl-fixed-vertex-shader.[ch]
 /clutter/cogl/gles/cogl-fixed-fragment-shader.[ch]
 *.gir
diff --git a/clutter/cogl/Makefile.am b/clutter/cogl/Makefile.am
index 225b66100..1490ec68a 100644
--- a/clutter/cogl/Makefile.am
+++ b/clutter/cogl/Makefile.am
@@ -1,3 +1,9 @@
+NULL =
+
+V         = @
+Q         = $(V:1=)
+QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
+
 SUBDIRS = common $(CLUTTER_COGL)
 
 BUILT_SOURCES = cogl.h
@@ -23,19 +29,24 @@ CLEANFILES = $(pc_files)
 
 AM_CPPFLAGS = $(CLUTTER_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
 
+# COGL installed headers
 cogl_headers = \
-	$(top_srcdir)/clutter/cogl/cogl-bitmap.h	\
-	$(top_srcdir)/clutter/cogl/cogl-color.h		\
-	$(top_srcdir)/clutter/cogl/cogl-debug.h		\
-	$(top_srcdir)/clutter/cogl/cogl-fixed.h		\
-	$(top_srcdir)/clutter/cogl/cogl-material.h	\
-	$(top_srcdir)/clutter/cogl/cogl-matrix.h	\
-	$(top_srcdir)/clutter/cogl/cogl-offscreen.h	\
-	$(top_srcdir)/clutter/cogl/cogl-path.h		\
-	$(top_srcdir)/clutter/cogl/cogl-shader.h	\
-	$(top_srcdir)/clutter/cogl/cogl-texture.h	\
-	$(top_srcdir)/clutter/cogl/cogl-types.h		\
-	$(top_srcdir)/clutter/cogl/cogl-vertex-buffer.h
+	$(top_srcdir)/clutter/cogl/cogl-bitmap.h			\
+	$(top_srcdir)/clutter/cogl/cogl-color.h				\
+	$(top_srcdir)/clutter/cogl/cogl-debug.h				\
+	$(top_srcdir)/clutter/cogl/cogl-fixed.h				\
+	$(top_srcdir)/clutter/cogl/cogl-material.h			\
+	$(top_srcdir)/clutter/cogl/cogl-matrix.h			\
+	$(top_srcdir)/clutter/cogl/cogl-offscreen.h			\
+	$(top_srcdir)/clutter/cogl/cogl-path.h				\
+	$(top_srcdir)/clutter/cogl/cogl-shader.h			\
+	$(top_srcdir)/clutter/cogl/cogl-texture.h			\
+	$(top_srcdir)/clutter/cogl/cogl-types.h				\
+	$(top_srcdir)/clutter/cogl/cogl-vertex-buffer.h			\
+	$(top_builddir)/clutter/cogl/cogl-defines-@CLUTTER_COGL@.h 	\
+	$(top_builddir)/clutter/cogl/cogl-enum-types.h			\
+	$(top_builddir)/clutter/cogl/cogl.h				\
+	$(NULL)
 
 # HACK - gobject-introspection can't scan a library in another directory
 # so we create a libclutter-cogl.la that's just identical to the one
@@ -44,6 +55,9 @@ noinst_LTLIBRARIES = libclutter-cogl.la
 libclutter_cogl_la_LIBADD = $(CLUTTER_COGL)/libclutter-cogl.la
 libclutter_cogl_la_SOURCES = $(cogl_headers)
 
+coglincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl
+coglinclude_HEADERS = $(cogl_headers)
+
 if HAVE_INTROSPECTION
 Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) $(CLUTTER_COGL)/libclutter-cogl.la
 	$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
@@ -59,8 +73,6 @@ Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) $(CLUTTER_COGL)/libclut
 		--libtool="$(top_builddir)/doltlibtool" \
 		--pkg gobject-2.0 \
 		--output $@ \
-		$(top_builddir)/clutter/cogl/cogl-defines-@CLUTTER_COGL@.h \
-		$(top_builddir)/clutter/cogl/cogl.h \
 		$(cogl_headers)
 
 BUILT_GIRSOURCES = Cogl-@CLUTTER_API_VERSION@.gir
diff --git a/clutter/cogl/cogl-shader.h b/clutter/cogl/cogl-shader.h
index f5280722f..d0b0ce13e 100644
--- a/clutter/cogl/cogl-shader.h
+++ b/clutter/cogl/cogl-shader.h
@@ -51,8 +51,7 @@ G_BEGIN_DECLS
  *
  * Since: 1.0
  */
-typedef enum _CoglShaderType
-{
+typedef enum {
   COGL_SHADER_TYPE_VERTEX,
   COGL_SHADER_TYPE_FRAGMENT
 } CoglShaderType;
@@ -115,7 +114,7 @@ void            cogl_shader_source            (CoglHandle         shader,
  * Compiles the shader, no return value, but the shader is now ready for
  * linking into a program.
  */
-void            cogl_shader_compile           (CoglHandle        handle);
+void            cogl_shader_compile           (CoglHandle         handle);
 
 /**
  * cogl_shader_get_info_log:
diff --git a/clutter/cogl/cogl-types.h b/clutter/cogl/cogl-types.h
index 719ecd087..3aa6f5c3c 100644
--- a/clutter/cogl/cogl-types.h
+++ b/clutter/cogl/cogl-types.h
@@ -123,8 +123,7 @@ typedef struct _CoglTextureVertex       CoglTextureVertex;
  *
  * Since: 0.8
  */
-typedef enum
-{
+typedef enum { /*< prefix=COGL_PIXEL_FORMAT >*/
   COGL_PIXEL_FORMAT_ANY           = 0,
   COGL_PIXEL_FORMAT_A_8           = 1 | COGL_A_BIT,
 
@@ -135,60 +134,21 @@ typedef enum
   COGL_PIXEL_FORMAT_G_8           = 8,
 
   COGL_PIXEL_FORMAT_RGB_888       =  COGL_PIXEL_FORMAT_24,
+  COGL_PIXEL_FORMAT_BGR_888       = (COGL_PIXEL_FORMAT_24 | COGL_BGR_BIT),
 
-  COGL_PIXEL_FORMAT_BGR_888       = (COGL_PIXEL_FORMAT_24 |
-                                     COGL_BGR_BIT),
-
-  COGL_PIXEL_FORMAT_RGBA_8888     =  COGL_PIXEL_FORMAT_32 |
-                                     COGL_A_BIT,
-
-  COGL_PIXEL_FORMAT_BGRA_8888     = (COGL_PIXEL_FORMAT_32 |
-                                     COGL_A_BIT           |
-                                     COGL_BGR_BIT),
-
-  COGL_PIXEL_FORMAT_ARGB_8888     = (COGL_PIXEL_FORMAT_32 |
-                                     COGL_A_BIT           |
-                                     COGL_AFIRST_BIT),
-
-  COGL_PIXEL_FORMAT_ABGR_8888     = (COGL_PIXEL_FORMAT_32 |
-                                     COGL_A_BIT           |
-                                     COGL_BGR_BIT         |
-                                     COGL_AFIRST_BIT),
-
-  COGL_PIXEL_FORMAT_RGBA_8888_PRE = (COGL_PIXEL_FORMAT_32 |
-                                     COGL_A_BIT           |
-                                     COGL_PREMULT_BIT),
-
-  COGL_PIXEL_FORMAT_BGRA_8888_PRE = (COGL_PIXEL_FORMAT_32 |
-                                     COGL_A_BIT           |
-                                     COGL_PREMULT_BIT     |
-                                     COGL_BGR_BIT),
-
-  COGL_PIXEL_FORMAT_ARGB_8888_PRE = (COGL_PIXEL_FORMAT_32 |
-                                     COGL_A_BIT           |
-                                     COGL_PREMULT_BIT     |
-                                     COGL_AFIRST_BIT),
-
-  COGL_PIXEL_FORMAT_ABGR_8888_PRE = (COGL_PIXEL_FORMAT_32 |
-                                     COGL_A_BIT           |
-                                     COGL_PREMULT_BIT     |
-                                     COGL_BGR_BIT         |
-                                     COGL_AFIRST_BIT),
-
-  COGL_PIXEL_FORMAT_RGBA_4444_PRE = (COGL_PIXEL_FORMAT_RGBA_4444 |
-                                     COGL_A_BIT                  |
-                                     COGL_PREMULT_BIT),
-
-  COGL_PIXEL_FORMAT_RGBA_5551_PRE = (COGL_PIXEL_FORMAT_RGBA_5551 |
-                                     COGL_A_BIT                  |
-                                     COGL_PREMULT_BIT),
-
+  COGL_PIXEL_FORMAT_RGBA_8888     = (COGL_PIXEL_FORMAT_32 | COGL_A_BIT),
+  COGL_PIXEL_FORMAT_BGRA_8888     = (COGL_PIXEL_FORMAT_32 | COGL_A_BIT | COGL_BGR_BIT),
+  COGL_PIXEL_FORMAT_ARGB_8888     = (COGL_PIXEL_FORMAT_32 | COGL_A_BIT | COGL_AFIRST_BIT),
+  COGL_PIXEL_FORMAT_ABGR_8888     = (COGL_PIXEL_FORMAT_32 | COGL_A_BIT | COGL_BGR_BIT | COGL_AFIRST_BIT),
 
+  COGL_PIXEL_FORMAT_RGBA_8888_PRE = (COGL_PIXEL_FORMAT_32 | COGL_A_BIT | COGL_PREMULT_BIT),
+  COGL_PIXEL_FORMAT_BGRA_8888_PRE = (COGL_PIXEL_FORMAT_32 | COGL_A_BIT | COGL_PREMULT_BIT | COGL_BGR_BIT),
+  COGL_PIXEL_FORMAT_ARGB_8888_PRE = (COGL_PIXEL_FORMAT_32 | COGL_A_BIT | COGL_PREMULT_BIT | COGL_AFIRST_BIT),
+  COGL_PIXEL_FORMAT_ABGR_8888_PRE = (COGL_PIXEL_FORMAT_32 | COGL_A_BIT | COGL_PREMULT_BIT | COGL_BGR_BIT | COGL_AFIRST_BIT),
+  COGL_PIXEL_FORMAT_RGBA_4444_PRE = (COGL_PIXEL_FORMAT_RGBA_4444 | COGL_A_BIT | COGL_PREMULT_BIT),
+  COGL_PIXEL_FORMAT_RGBA_5551_PRE = (COGL_PIXEL_FORMAT_RGBA_5551 | COGL_A_BIT | COGL_PREMULT_BIT),
 } CoglPixelFormat;
 
-#define COGL_TYPE_PIXEL_FORMAT          (cogl_pixel_format_get_type ())
-GType cogl_pixel_format_get_type (void) G_GNUC_CONST;
-
 /**
  * CoglFeatureFlags:
  * @COGL_FEATURE_TEXTURE_RECTANGLE: ARB_texture_rectangle support
@@ -222,9 +182,6 @@ typedef enum
   COGL_FEATURE_VBOS		      = (1 << 11)
 } CoglFeatureFlags;
 
-#define COGL_TYPE_FEATURE_FLAGS         (cogl_feature_flags_get_type ())
-GType cogl_feature_flags_get_type (void) G_GNUC_CONST;
-
 /**
  * CoglBufferTarget:
  * @COGL_WINDOW_BUFFER: FIXME
@@ -240,9 +197,6 @@ typedef enum
   COGL_OFFSCREEN_BUFFER   = (1 << 2)
 } CoglBufferTarget;
 
-#define COGL_TYPE_BUFFER_TARGET         (cogl_buffer_target_get_type ())
-GType cogl_buffer_target_get_type (void) G_GNUC_CONST;
-
 /**
  * CoglColor:
  *
@@ -304,9 +258,6 @@ typedef enum {
   COGL_TEXTURE_NO_SLICING  = 1 << 1
 } CoglTextureFlags;
 
-#define COGL_TYPE_TEXTURE_FLAGS         (cogl_texture_flags_get_type ())
-GType cogl_texture_flags_get_type (void) G_GNUC_CONST;
-
 /**
  * CoglFogMode:
  * @COGL_FOG_MODE_LINEAR: Calculates the fog blend factor as:
@@ -335,16 +286,12 @@ GType cogl_texture_flags_get_type (void) G_GNUC_CONST;
  *
  * Since: 1.0
  */
-typedef enum _CoglFogMode
-{
+typedef enum {
   COGL_FOG_MODE_LINEAR,
   COGL_FOG_MODE_EXPONENTIAL,
   COGL_FOG_MODE_EXPONENTIAL_SQUARED
 } CoglFogMode;
 
-#define COGL_TYPE_FOG_MODE              (cogl_fog_mode_get_type ())
-GType cogl_fog_mode_get_type (void) G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif /* __COGL_TYPES_H__ */
diff --git a/clutter/cogl/cogl.h.in b/clutter/cogl/cogl.h.in
index 611d358ba..a468cf717 100644
--- a/clutter/cogl/cogl.h.in
+++ b/clutter/cogl/cogl.h.in
@@ -45,6 +45,7 @@
 #include <cogl/cogl-types.h>
 #include <cogl/cogl-debug.h>
 #include <cogl/cogl-deprecated.h>
+#include <cogl/cogl-enum-types.h>
 
 G_BEGIN_DECLS
 
@@ -417,8 +418,7 @@ void            cogl_disable_fog              (void);
  *
  * Since: 1.0
  */
-typedef enum _CoglBufferBit
-{
+typedef enum {
   COGL_BUFFER_BIT_COLOR   = 1L<<0,
   COGL_BUFFER_BIT_DEPTH   = 1L<<1,
   COGL_BUFFER_BIT_STENCIL = 1L<<2
@@ -427,13 +427,14 @@ typedef enum _CoglBufferBit
 /**
  * cogl_clear:
  * @color: Background color to clear to
- * @buffers: A mask of @CoglBufferBit<!-- -->'s identifying which auxiliary
- *           buffers to clear
+ * @buffers: A mask of #CoglBufferBit<!-- -->'s identifying which auxiliary
+ *   buffers to clear
  *
  * Clears all the auxiliary buffers identified in the @buffers mask, and if
  * that includes the color buffer then the specified @color is used.
  */
-void            cogl_clear                    (const CoglColor *color, gulong buffers);
+void            cogl_clear                    (const CoglColor *color,
+                                               gulong           buffers);
 
 /**
  * cogl_set_source:
diff --git a/clutter/cogl/common/Makefile.am b/clutter/cogl/common/Makefile.am
index c4e6eb2f7..df50a1d16 100644
--- a/clutter/cogl/common/Makefile.am
+++ b/clutter/cogl/common/Makefile.am
@@ -1,3 +1,10 @@
+NULL =
+
+V         = @
+Q         = $(V:1=)
+QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
+QUIET_CP  = $(Q:@=@echo '  CP    '$@;)
+
 INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/clutter \
@@ -9,12 +16,49 @@ INCLUDES = \
         -DG_LOG_DOMAIN=\"Cogl-Common\" \
         -DCLUTTER_COMPILATION
 
+cogl_public_h = \
+	$(top_srcdir)/clutter/cogl/cogl-bitmap.h	\
+	$(top_srcdir)/clutter/cogl/cogl-color.h		\
+	$(top_srcdir)/clutter/cogl/cogl-debug.h		\
+	$(top_srcdir)/clutter/cogl/cogl-fixed.h		\
+	$(top_srcdir)/clutter/cogl/cogl-material.h	\
+	$(top_srcdir)/clutter/cogl/cogl-matrix.h	\
+	$(top_srcdir)/clutter/cogl/cogl-offscreen.h	\
+	$(top_srcdir)/clutter/cogl/cogl-path.h		\
+	$(top_srcdir)/clutter/cogl/cogl-shader.h	\
+	$(top_srcdir)/clutter/cogl/cogl-texture.h	\
+	$(top_srcdir)/clutter/cogl/cogl-types.h		\
+	$(top_srcdir)/clutter/cogl/cogl-vertex-buffer.h	\
+	$(top_builddir)/clutter/cogl/cogl.h		\
+	$(NULL)
+
 noinst_LTLIBRARIES = libclutter-cogl-common.la
-EXTRA_DIST = stb_image.c
+
+cogl-enum-types.h: stamp-cogl-enum-types.h
+	$(QUIET_CP)cp -f $(@F) $(top_builddir)/clutter/cogl/cogl-enum-types.h
+
+stamp-cogl-enum-types.h: $(cogl_public_h) Makefile
+	$(QUIET_GEN)( $(GLIB_MKENUMS) \
+		--template $(srcdir)/cogl-enum-types.h.in \
+	$(cogl_public_h) ) > xgen-ceth \
+	&& (cmp -s xgen-ceth cogl-enum-types.h || cp -f xgen-ceth cogl-enum-types.h) \
+	&& rm -f xgen-ceth \
+	&& echo timestamp > $(@F)
+
+cogl-enum-types.c: cogl-enum-types.h
+	$(QUIET_GEN)( $(GLIB_MKENUMS) \
+		--template $(srcdir)/cogl-enum-types.c.in \
+	$(cogl_public_h) ) > xgen-cetc \
+	&& cp -f xgen-cetc cogl-enum-types.c \
+	&& rm -f xgen-cetc
+
+BUILT_SOURCES = cogl-enum-types.h cogl-enum-types.c
 
 libclutter_cogl_common_la_CPPFLAGS = $(CLUTTER_CFLAGS) $(COGL_DEBUG_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
 libclutter_cogl_common_la_LIBADD = -lm $(CLUTTER_LIBS)
 libclutter_cogl_common_la_SOURCES = 	\
+	$(top_builddir)/clutter/cogl/common/cogl-enum-types.h	\
+	$(top_builddir)/clutter/cogl/common/cogl-enum-types.c	\
 	cogl-handle.h 			\
 	cogl-internal.h			\
 	cogl.c				\
@@ -41,4 +85,9 @@ libclutter_cogl_common_la_SOURCES = 	\
 	cogl-material-private.h		\
 	cogl-blend-string.c		\
 	cogl-blend-string.h		\
-	cogl-debug.c
+	cogl-debug.c			\
+	$(NULL)
+
+EXTRA_DIST = stb_image.c cogl-enum-types.h.in cogl-enum-types.h.in
+CLEANFILES = stamp-cogl-enum-types.h
+DISTCLEANFILES = cogl-enum-types.h cogl-enum-types.c
diff --git a/clutter/cogl/common/cogl-enum-types.c.in b/clutter/cogl/common/cogl-enum-types.c.in
new file mode 100644
index 000000000..f2c01c78c
--- /dev/null
+++ b/clutter/cogl/common/cogl-enum-types.c.in
@@ -0,0 +1,33 @@
+/*** BEGIN file-header ***/
+#include "cogl-enum-types.h"
+#include "cogl.h"
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+#include "@filename@"
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType
+@enum_name@_get_type(void) {
+  static GType etype = 0;
+
+  if (G_UNLIKELY (!etype))
+    {
+      static const G@Type@Value values[] = {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+        { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+        { 0, NULL, NULL }
+      };
+      etype = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
+    }
+
+  return etype;
+}
+/*** END value-tail ***/
diff --git a/clutter/cogl/common/cogl-enum-types.h.in b/clutter/cogl/common/cogl-enum-types.h.in
new file mode 100644
index 000000000..23d705dee
--- /dev/null
+++ b/clutter/cogl/common/cogl-enum-types.h.in
@@ -0,0 +1,25 @@
+/*** BEGIN file-header ***/
+#ifndef __COGL_ENUM_TYPES_H__
+#define __COGL_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif /* !__CLUTTER_ENUM_TYPES_H__ */
+/*** END file-tail ***/
+
+/*** BEGIN value-header ***/
+GType @enum_name@_get_type (void) G_GNUC_CONST;
+#define COGL_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
+
+/*** END value-header ***/
diff --git a/clutter/cogl/common/cogl-util.c b/clutter/cogl/common/cogl-util.c
index 2b9ccba27..2d86f73f3 100644
--- a/clutter/cogl/common/cogl-util.c
+++ b/clutter/cogl/common/cogl-util.c
@@ -103,160 +103,6 @@ cogl_handle_get_type (void)
   return our_type;
 }
 
-GType
-cogl_pixel_format_get_type (void)
-{
-  static GType gtype = 0;
-
-  if (G_UNLIKELY (gtype == 0))
-    {
-      static const GEnumValue values[] = {
-        { COGL_PIXEL_FORMAT_ANY, "COGL_PIXEL_FORMAT_ANY", "any" },
-        { COGL_PIXEL_FORMAT_A_8, "COGL_PIXEL_FORMAT_A_8", "a-8" },
-        { COGL_PIXEL_FORMAT_RGB_565, "COGL_PIXEL_FORMAT_RGB_565", "rgb-565" },
-        { COGL_PIXEL_FORMAT_RGBA_4444, "COGL_PIXEL_FORMAT_RGBA_4444", "rgba-4444" },
-        { COGL_PIXEL_FORMAT_RGBA_5551, "COGL_PIXEL_FORMAT_RGBA_5551", "rgba-5551" },
-        { COGL_PIXEL_FORMAT_YUV, "COGL_PIXEL_FORMAT_YUV", "yuv" },
-        { COGL_PIXEL_FORMAT_G_8, "COGL_PIXEL_FORMAT_G_8", "g-8" },
-        { COGL_PIXEL_FORMAT_RGB_888, "COGL_PIXEL_FORMAT_RGB_888", "rgb-888" },
-        { COGL_PIXEL_FORMAT_BGR_888, "COGL_PIXEL_FORMAT_BGR_888", "bgr-888" },
-        { COGL_PIXEL_FORMAT_RGBA_8888, "COGL_PIXEL_FORMAT_RGBA_8888", "rgba-8888" },
-        { COGL_PIXEL_FORMAT_BGRA_8888, "COGL_PIXEL_FORMAT_BGRA_8888", "bgra-8888" },
-        { COGL_PIXEL_FORMAT_ARGB_8888, "COGL_PIXEL_FORMAT_ARGB_8888", "argb-8888" },
-        { COGL_PIXEL_FORMAT_ABGR_8888, "COGL_PIXEL_FORMAT_ABGR_8888", "abgr-8888" },
-        { COGL_PIXEL_FORMAT_RGBA_8888_PRE, "COGL_PIXEL_FORMAT_RGBA_8888_PRE", "rgba-8888-pre" },
-        { COGL_PIXEL_FORMAT_BGRA_8888_PRE, "COGL_PIXEL_FORMAT_BGRA_8888_PRE", "bgra-8888-pre" },
-        { COGL_PIXEL_FORMAT_ARGB_8888_PRE, "COGL_PIXEL_FORMAT_ARGB_8888_PRE", "argb-8888-pre" },
-        { COGL_PIXEL_FORMAT_ABGR_8888_PRE, "COGL_PIXEL_FORMAT_ABGR_8888_PRE", "abgr-8888-pre" },
-        { COGL_PIXEL_FORMAT_RGBA_4444_PRE, "COGL_PIXEL_FORMAT_RGBA_4444_PRE", "rgba-4444-pre" },
-        { COGL_PIXEL_FORMAT_RGBA_5551_PRE, "COGL_PIXEL_FORMAT_RGBA_5551_PRE", "rgba-5551-pre" },
-        { 0, NULL, NULL }
-      };
-
-      gtype =
-        g_enum_register_static (g_intern_static_string ("CoglPixelFormat"),
-                                values);
-    }
-
-  return gtype;
-}
-
-GType
-cogl_feature_flags_get_type (void)
-{
-  static GType gtype = 0;
-
-  if (G_UNLIKELY (gtype == 0))
-    {
-      static const GFlagsValue values[] = {
-        { COGL_FEATURE_TEXTURE_RECTANGLE, "COGL_FEATURE_TEXTURE_RECTANGLE", "texture-rectangle" },
-        { COGL_FEATURE_TEXTURE_NPOT, "COGL_FEATURE_TEXTURE_NPOT", "texture-npot" },
-        { COGL_FEATURE_TEXTURE_YUV, "COGL_FEATURE_TEXTURE_YUV", "yuv" },
-        { COGL_FEATURE_TEXTURE_READ_PIXELS, "COGL_FEATURE_TEXTURE_READ_PIXELS", "read-pixels" },
-        { COGL_FEATURE_SHADERS_GLSL, "COGL_FEATURE_SHADERS_GLSL", "shaders-glsl" },
-        { COGL_FEATURE_OFFSCREEN, "COGL_FEATURE_OFFSCREEN", "offscreen" },
-        { COGL_FEATURE_OFFSCREEN_MULTISAMPLE, "COGL_FEATURE_OFFSCREEN_MULTISAMPLE", "offscreen-multisample" },
-        { COGL_FEATURE_OFFSCREEN_BLIT, "COGL_FEATURE_OFFSCREEN_BLIT", "offscreen-blit" },
-        { COGL_FEATURE_FOUR_CLIP_PLANES, "COGL_FEATURE_FOUR_CLIP_PLANES", "four-clip-planes" },
-        { COGL_FEATURE_STENCIL_BUFFER, "COGL_FEATURE_STENCIL_BUFFER", "stencil-buffer" },
-        { 0, NULL, NULL }
-      };
-
-      gtype =
-        g_flags_register_static (g_intern_static_string ("CoglFeatureFlags"),
-                                 values);
-    }
-
-  return gtype;
-}
-
-GType
-cogl_buffer_target_get_type (void)
-{
-  static GType gtype = 0;
-
-  if (G_UNLIKELY (gtype == 0))
-    {
-      static const GFlagsValue values[] = {
-        { COGL_WINDOW_BUFFER, "COGL_WINDOW_BUFFER", "window-buffer" },
-        { COGL_OFFSCREEN_BUFFER, "COGL_OFFSCREEN_BUFFER", "offscreen-buffer" },
-        { 0, NULL, NULL }
-      };
-
-      gtype =
-        g_flags_register_static (g_intern_static_string ("CoglBufferTarget"),
-                                 values);
-    }
-
-  return gtype;
-}
-
-GType
-cogl_matrix_mode_get_type (void)
-{
-  static GType gtype = 0;
-
-  if (G_UNLIKELY (gtype == 0))
-    {
-      static const GEnumValue values[] = {
-        { COGL_MATRIX_MODELVIEW, "COGL_MATRIX_MODELVIEW", "modelview" },
-        { COGL_MATRIX_PROJECTION, "COGL_MATRIX_PROJECTION", "projection" },
-        { COGL_MATRIX_TEXTURE, "COGL_MATRIX_TEXTURE", "texture" },
-        { 0, NULL, NULL }
-      };
-
-      gtype =
-        g_enum_register_static (g_intern_static_string ("CoglMatrixMode"),
-                                values);
-    }
-
-  return gtype;
-}
-
-GType
-cogl_texture_flags_get_type (void)
-{
-  static GType gtype = 0;
-
-  if (G_UNLIKELY (gtype == 0))
-    {
-      static const GFlagsValue values[] = {
-        { COGL_TEXTURE_NONE, "COGL_TEXTURE_NONE", "none" },
-        { COGL_TEXTURE_AUTO_MIPMAP, "COGL_TEXTURE_AUTO_MIPMAP", "auto-mipmap" },
-        { COGL_TEXTURE_NO_SLICING, "COGL_TEXTURE_NO_SLICING", "no-slicing" },
-        { 0, NULL, NULL }
-      };
-
-      gtype =
-        g_flags_register_static (g_intern_static_string ("CoglTextureFlags"),
-                                 values);
-    }
-
-  return gtype;
-}
-
-GType
-cogl_fog_mode_get_type (void)
-{
-  static GType gtype = 0;
-
-  if (G_UNLIKELY (gtype == 0))
-    {
-      static const GEnumValue values[] = {
-        { COGL_FOG_MODE_LINEAR, "COGL_FOG_MODE_LINEAR", "linear" },
-        { COGL_FOG_MODE_EXPONENTIAL, "COGL_FOG_MODE_EXPONENTIAL", "exponential" },
-        { COGL_FOG_MODE_EXPONENTIAL_SQUARED, "COGL_FOG_MODE_EXPONENTIAL_SQUARED", "exponential-squared" },
-        { 0, NULL, NULL }
-      };
-
-      gtype =
-        g_enum_register_static (g_intern_static_string ("CoglFogMode"),
-                                values);
-    }
-
-  return gtype;
-}
-
 /*
  * CoglFixed
  */
diff --git a/clutter/cogl/gl/Makefile.am b/clutter/cogl/gl/Makefile.am
index 367f674f2..dc33e0bb1 100644
--- a/clutter/cogl/gl/Makefile.am
+++ b/clutter/cogl/gl/Makefile.am
@@ -35,11 +35,6 @@ cogl_sources = \
 	cogl-context.c		\
 	$(NULL)
 
-coglincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl
-coglinclude_HEADERS = \
-	$(cogl_headers) \
-	$(top_builddir)/clutter/cogl/cogl.h
-
 INCLUDES = \
 	-I$(top_srcdir)/clutter/cogl \
 	-I$(top_srcdir)/clutter/cogl/common \