diff --git a/gst/Makefile.am b/gst/Makefile.am
index ce409a78de..c8dbd4a6ae 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -34,7 +34,8 @@ DIST_SUBDIRS = parse
 # distinction clear
 
 built_header_configure = gstconfig.h gstversion.h
-built_header_make = gstenumtypes.h gstmarshal.h
+built_header_make = gstenumtypes.h
+built_header_make_noinst = gstmarshal.h
 built_source_make = gstenumtypes.c gstmarshal.c
 
 EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
@@ -110,9 +111,10 @@ nodist_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = $(built_source_make)
 BUILT_SOURCES = \
         $(built_header_configure)	\
         $(built_header_make)		\
+        $(built_header_make_noinst)	\
         $(built_source_make)
 # CLEANFILES is for files generated by make
-CLEANFILES = $(built_header_make) $(built_source_make) $(as_dll_cleanfiles) *.gcno *.gcda *.gcov *.gcov.out
+CLEANFILES = $(built_header_make) $(built_header_make_noinst) $(built_source_make) $(as_dll_cleanfiles) *.gcno *.gcda *.gcov *.gcov.out
 # DISTCLEANFILES is for files generated by configure
 DISTCLEANFILES = $(built_header_configure)
 
@@ -209,7 +211,8 @@ noinst_HEADERS = 		\
 	gstregistrybinary.h     \
 	gstregistrychunks.h     \
 	gsttrace.h		\
-	gst_private.h
+	gst_private.h           \
+	$(built_header_make_noinst)
 
 gstmarshal.h: gstmarshal.list
 	$(AM_V_GEN)glib-genmarshal --header --prefix=gst_marshal $(srcdir)/gstmarshal.list > gstmarshal.h.tmp && \