4 files changed, 17 insertions, 7 deletions
diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am
index a410ad32..e7cf3d8c 100644
--- a/gst-libs/gst/colorbalance/Makefile.am
+++ b/gst-libs/gst/colorbalance/Makefile.am
@@ -18,7 +18,9 @@ built_headers =	\
 	colorbalance-marshal.h \
 	colorbalance-enumtypes.h
 
-libgstcolorbalanceinclude_HEADERS = $(colorbalance_headers) \
+libgstcolorbalanceinclude_HEADERS = $(colorbalance_headers)
+
+nodist_libgstcolorbalanceinclude_HEADERS = \
 	colorbalance-enumtypes.h
 
 noinst_LTLIBRARIES = libgstcolorbalance.la
@@ -26,6 +28,7 @@ noinst_LTLIBRARIES = libgstcolorbalance.la
 libgstcolorbalance_la_SOURCES = \
 	colorbalance.c \
 	colorbalancechannel.c
+
 nodist_libgstcolorbalance_la_SOURCES = \
         $(built_sources) \
 	colorbalance-marshal.h
diff --git a/gst-libs/gst/mixer/Makefile.am b/gst-libs/gst/mixer/Makefile.am
index e556ab0e..e5abf687 100644
--- a/gst-libs/gst/mixer/Makefile.am
+++ b/gst-libs/gst/mixer/Makefile.am
@@ -21,8 +21,11 @@ built_headers =	\
 	mixer-enumtypes.h
 
 libgstmixerinclude_HEADERS = \
-	$(mixer_headers) \
-	mixer-enumtypes.h
+	$(mixer_headers) 
+
+# FIXME 0.9: don't include marshal files
+nodist_libgstmixerinclude_HEADERS = \
+	$(built_headers)
 
 noinst_LTLIBRARIES = libgstmixer.la
 
@@ -32,7 +35,6 @@ libgstmixer_la_SOURCES = \
 	mixertrack.c
 
 nodist_libgstmixer_la_SOURCES = \
-	mixer-marshal.h \
 	$(built_sources)
 
 libgstmixer_la_CFLAGS = $(GST_CFLAGS)
diff --git a/gst-libs/gst/play/Makefile.am b/gst-libs/gst/play/Makefile.am
index ad2ca458..ef17d461 100644
--- a/gst-libs/gst/play/Makefile.am
+++ b/gst-libs/gst/play/Makefile.am
@@ -13,10 +13,11 @@ built_headers = \
 
 library_LTLIBRARIES = libgstplay-@GST_MAJORMINOR@.la
 
-libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c play-enumtypes.c
+libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c 
+nodist_libgstplay_@GST_MAJORMINOR@_la_SOURCES = play-enumtypes.c
 
 libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/play
-libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) $(built_headers)
+libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) 
 
 libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS)
 libgstplay_@GST_MAJORMINOR@_la_LIBADD =	\
diff --git a/gst-libs/gst/tuner/Makefile.am b/gst-libs/gst/tuner/Makefile.am
index c5c4e5e4..804e33db 100644
--- a/gst-libs/gst/tuner/Makefile.am
+++ b/gst-libs/gst/tuner/Makefile.am
@@ -20,7 +20,10 @@ built_headers =	\
 	tuner-enumtypes.h
 
 libgsttunerinclude_HEADERS = \
-	$(tuner_headers) \
+	$(tuner_headers)
+
+# FIXME 0.9: don't install
+nodist_libgsttunerinclude_HEADERS = \
 	tuner-enumtypes.h
 
 noinst_LTLIBRARIES = libgsttuner.la
@@ -29,6 +32,7 @@ libgsttuner_la_SOURCES = \
 	tuner.c \
 	tunernorm.c \
 	tunerchannel.c
+
 nodist_libgsttuner_la_SOURCES = \
 	$(built_sources) \
 	tuner-marshal.h