--- a/mmserv/tms/tmscallserver/group/tmscallserver.mmp	Fri Apr 30 19:18:45 2010 -0500
+++ b/mmserv/tms/tmscallserver/group/tmscallserver.mmp	Fri May 14 18:19:45 2010 -0500
@@ -60,9 +60,6 @@
 
 USERINCLUDE     ../inc
 USERINCLUDE     ../../inc
-#ifdef __USE_GSTREAMER__
-USERINCLUDE     /sf/mw/gstreamer/gst_plugins_symbian/gst/devsound
-#endif //__USE_GSTREAMER__
 
 MW_LAYER_SYSTEMINCLUDE
 OS_LAYER_LIBC_SYSTEMINCLUDE
@@ -74,10 +71,7 @@
 
 #ifdef __USE_GSTREAMER__
 MW_LAYER_GSTREAMER_SYSTEMINCLUDE
-//SYSTEMINCLUDE   /sf/mw/gstreamer/include/gstreamer
-//SYSTEMINCLUDE   /sf/mw/gstreamer/include/gstreamer/gst
-//SYSTEMINCLUDE   /sf/mw/gstreamer/include/gstreamer/gst/app
-//SYSTEMINCLUDE   /epoc32/include/stdapis/glib-2.0/gobject
+MW_LAYER_GSTREAMER_SYSTEMINCLUDE(gst_plugins_symbian/gst/devsound)
 
 LIBRARY         libgobject.lib
 LIBRARY         libgstreamer.lib