diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index b1107d6b3..1eef4019b 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -249,11 +249,6 @@ endif
 # subdir Makefile.am, so just extract them from cogl.h instead. The doc
 # comments for COGL are in the headers, so we don't need the source files.
 Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la
-	headers=`sed -n "s/#include <cogl\/\([^>]*\)>/\1/p" < $(top_srcdir)/clutter/cogl/cogl.h` ; \
-	cogl_headers="" ; \
-	for header in $$headers; do \
-		cogl_headers="$$cogl_headers $(top_srcdir)/clutter/cogl/$$header " ; \
-	done ; \
 	$(INTROSPECTION_SCANNER) -v --namespace Clutter --nsversion=@CLUTTER_API_VERSION@ \
 	     $(INCLUDES) \
 	     $(json_gir_include_path) \
@@ -261,6 +256,7 @@ Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_
              --include=GObject-2.0 \
              --include=Pango-1.0 \
              --include=PangoCairo-1.0 \
+	     --include=Cogl-@CLUTTER_API_VERSION@ \
              --include=ClutterJson-@CLUTTER_API_VERSION@ \
 	     --library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \
 	     --libtool="$(top_builddir)/doltlibtool" \
@@ -269,8 +265,6 @@ Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_
              --pkg pangocairo \
              --output $@ \
 	     $(clutter_HEADERS) \
-	     $$cogl_headers \
-	     $(top_builddir)/clutter/cogl/cogl-defines-$(CLUTTER_COGL).h \
 	     $(source_c)
 
 BUILT_GIRSOURCES += Clutter-@CLUTTER_API_VERSION@.gir