diff --git a/gst/wavenc/Makefile.am b/gst/wavenc/Makefile.am
index a7afdd42cd..d1e9148aae 100644
--- a/gst/wavenc/Makefile.am
+++ b/gst/wavenc/Makefile.am
@@ -6,4 +6,4 @@ libgstwavenc_la_CFLAGS = $(GST_CFLAGS)
 libgstwavenc_la_LIBADD =
 libgstwavenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-noinst_HEADERS = gstwavenc.h
+noinst_HEADERS = gstwavenc.h riff.h
diff --git a/gst/wavparse/Makefile.am b/gst/wavparse/Makefile.am
index 0f7df636db..ff55675ede 100644
--- a/gst/wavparse/Makefile.am
+++ b/gst/wavparse/Makefile.am
@@ -6,4 +6,4 @@ libgstwavparse_la_CFLAGS = $(GST_CFLAGS)
 libgstwavparse_la_LIBADD =
 libgstwavparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-noinst_HEADERS = gstwavparse.h
+noinst_HEADERS = gstwavparse.h riff.h
diff --git a/sys/Makefile.am b/sys/Makefile.am
index e47dc0e3ff..dad4940ad2 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -34,11 +34,14 @@ else
 VCD_DIR=
 endif
 
-if USE_XFREE
-XVIDEO_DIR=xvideo ximage
-else
-XVIDEO_DIR=
-endif
+# doesn't work 
+#if USE_XFREE
+#XVIDEO_DIR=xvideo
+#XIMAGE_DIR=ximage
+#else
+#XVIDEO_DIR=
+#XIMAGE_DIR=
+#endif
 
 if USE_CDROM
 CDROM_DIR=cdrom
@@ -47,6 +50,6 @@ CDROM_DIR=
 endif
 
 SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(V4L2_DIR) \
-	$(VCD_DIR) $(XVIDEO_DIR) $(CDROM_DIR)
+	$(VCD_DIR) $(CDROM_DIR)
 
-DIST_SUBDIRS=dxr3 oss qcam v4l v4l2 vcd xvideo cdrom
+DIST_SUBDIRS=dxr3 oss qcam v4l v4l2 vcd xvideo ximage glsink cdrom