diff --git a/Makefile.am b/Makefile.am
index 9bb6b772c..7cf4aac17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = common $(CLUTTER_COGL)
 
-EXTRA_DIST = cogl.h
+EXTRA_DIST = cogl.h.in
 
-DIST_SUBDIRS = gl gles
+DIST_SUBDIRS = common gl gles
diff --git a/gl/Makefile.am b/gl/Makefile.am
index 17e5ed465..be2e20606 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -20,8 +20,7 @@ noinst_LTLIBRARIES = libclutter-cogl.la
 
 libclutter_cogl_la_SOURCES = \
 	$(top_builddir)/clutter/cogl/cogl.h \
-	$(top_builddir)/clutter/cogl/gl/cogl-defines.h \
-        cogl-defines.h \
+	$(top_builddir)/clutter/cogl/cogl-defines-gl.h \
 	cogl-internal.h \
 	cogl-primitives.h \
 	cogl-texture.h \
@@ -33,4 +32,6 @@ libclutter_cogl_la_SOURCES = \
 	cogl-fbo.c \
 	cogl-context.c
 
+EXTRA_DIST = cogl-defines.h.in
+
 libclutter_cogl_la_LIBADD =  $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la
diff --git a/gles/Makefile.am b/gles/Makefile.am
index c629e1ee5..fb663d660 100644
--- a/gles/Makefile.am
+++ b/gles/Makefile.am
@@ -20,8 +20,7 @@ noinst_LTLIBRARIES = libclutter-cogl.la
 
 libclutter_cogl_la_SOURCES = \
 	$(top_builddir)/clutter/cogl/cogl.h \
-	$(top_builddir)/clutter/cogl/gles/cogl-defines.h \
-        cogl-defines.h \
+	$(top_builddir)/clutter/cogl/cogl-defines-gles.h \
 	cogl-internal.h \
 	cogl-primitives.h \
 	cogl-texture.h \
@@ -33,4 +32,6 @@ libclutter_cogl_la_SOURCES = \
 	cogl-fbo.c \
 	cogl-context.c
 
+EXTRA_DIST = cogl-defines.h.in
+
 libclutter_cogl_la_LIBADD =  $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la