--- a/gst_plugins_good/group/gstavi.mmp	Fri Apr 30 19:11:56 2010 -0500
+++ b/gst_plugins_good/group/gstavi.mmp	Fri May 14 18:43:44 2010 -0500
@@ -50,10 +50,7 @@
 MW_LAYER_SYSTEMINCLUDE
 OS_LAYER_LIBC_SYSTEMINCLUDE
 OS_LAYER_GLIB_SYSTEMINCLUDE
-USERINCLUDE		../../include/gstreamer
-USERINCLUDE		../../include/gstreamer/gst
-USERINCLUDE		../../include/gstreamer/gst/base
-USERINCLUDE		../../include/gstreamer/gst/riff
+MW_LAYER_GSTREAMER_SYSTEMINCLUDE
 
 SOURCEPATH      ../gst/avi
 SOURCE gstavi.c gstavimux.c gstavidemux.c gstavisubtitle.c