--- a/gst_plugins_base/group/gstpbutils.mmp	Fri Apr 30 19:11:56 2010 -0500
+++ b/gst_plugins_base/group/gstpbutils.mmp	Fri May 14 18:43:44 2010 -0500
@@ -37,23 +37,17 @@
 EpocAllowDllData
 #endif
 
+MW_LAYER_SYSTEMINCLUDE
+OS_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_GLIB_SYSTEMINCLUDE
+MW_LAYER_GSTREAMER_SYSTEMINCLUDE
+
 USERINCLUDE     ../gst
 USERINCLUDE     ../gst-libs/gst/pbutils
 USERINCLUDE     ../gst-libs
 USERINCLUDE     ../gst-libs/gst
 USERINCLUDE     ..
 
-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/controller
-USERINCLUDE		../../include/gstreamer/gst/dataprotocol
-USERINCLUDE		../../include/gstreamer/gst/net
-
 SOURCEPATH		../gst-libs/gst/pbutils
 
 SOURCE			descriptions.c