diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 6cd256566..c514406ff 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -136,7 +136,6 @@ source_h =					\
 	$(srcdir)/clutter-types.h		\
 	$(srcdir)/clutter-units.h 		\
 	$(srcdir)/clutter-util.h 		\
-	$(top_builddir)/clutter/clutter-version.h \
 	$(NULL)
 
 # glib-genmarshal rules
@@ -288,7 +287,8 @@ clutter_HEADERS = \
 	$(top_builddir)/clutter/clutter-enum-types.h 	\
 	$(top_srcdir)/clutter/clutter.h
 nodist_clutter_HEADERS = \
-	$(top_builddir)/clutter/clutter-json.h
+	$(top_builddir)/clutter/clutter-json.h \
+	$(top_builddir)/clutter/clutter-version.h
 
 
 DISTCLEANFILES += clutter-version.h
@@ -343,6 +343,7 @@ Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_
 	        --pkg pangocairo \
 	        --output $@ \
 		$(clutter_HEADERS) \
+		$(nodist_clutter_HEADERS) \
 		$(source_c)
 
 BUILT_GIRSOURCES += Clutter-@CLUTTER_API_VERSION@.gir
diff --git a/clutter/cogl/cogl/Makefile.am b/clutter/cogl/cogl/Makefile.am
index f1247b0f2..59cff8fac 100644
--- a/clutter/cogl/cogl/Makefile.am
+++ b/clutter/cogl/cogl/Makefile.am
@@ -190,12 +190,12 @@ EXTRA_DIST += stb_image.c
 cogl_headers = \
 	$(cogl_public_h) \
 	$(srcdir)/cogl-deprecated.h \
-	cogl-defines.h \
 	cogl-enum-types.h \
 	$(NULL)
 
 coglincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl
 coglinclude_HEADERS = $(cogl_headers)
+nodist_coglinclude_HEADERS = cogl-defines.h
 
 if HAVE_INTROSPECTION
 Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la