diff -r 709f89d8c047 -r e35735ece90c mmserv/tms/tmscallserver/group/tmscallserver.mmp
--- a/mmserv/tms/tmscallserver/group/tmscallserver.mmp	Fri Mar 12 15:45:41 2010 +0200
+++ b/mmserv/tms/tmscallserver/group/tmscallserver.mmp	Mon Mar 15 12:42:35 2010 +0200
@@ -62,17 +62,17 @@
 MW_LAYER_SYSTEMINCLUDE
 OS_LAYER_LIBC_SYSTEMINCLUDE
 OS_LAYER_GLIB_SYSTEMINCLUDE
-
+OS_LAYER_STDCPP_SYSTEMINCLUDE
 SYSTEMINCLUDE   /epoc32/include/mmf/server
 SYSTEMINCLUDE   /epoc32/include/mda/common
 SYSTEMINCLUDE   /epoc32/include/mmf/common
-SYSTEMINCLUDE   /epoc32/include/stdapis/stlport
 
 #ifdef __USE_GSTREAMER__
-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
+//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
 
 LIBRARY         libgobject.lib
 LIBRARY         libgstreamer.lib