--- a/Msrp/MsrpServer/group/msrpserver.mmp	Sat Jun 12 14:30:11 2010 +0530
+++ b/Msrp/MsrpServer/group/msrpserver.mmp	Thu Nov 25 13:59:42 2010 +0200
@@ -14,6 +14,8 @@
 *
 */
 
+#include <platform_paths.hrh>
+
 // Capability assignment.
 CAPABILITY ProtServ NetworkControl NetworkServices Location \
 ReadDeviceData WriteDeviceData
@@ -33,7 +35,6 @@
 USERINCLUDE     ../../inc
 USERINCLUDE     ../../msrpheader/inc
 
-OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE
 
 SOURCEPATH      ../src
@@ -55,7 +56,6 @@
 SOURCE 			CMSRPMsgParser.cpp 
 SOURCE			TStateFactory.cpp 
 SOURCE			TStates.cpp 
-SOURCE          CMSRPMessageChunkState.cpp
 
 
 
@@ -67,6 +67,7 @@
 LIBRARY         bafl.lib
 LIBRARY         random.lib
 DEBUGLIBRARY    flogger.lib
+#undef __SERIES60_
 #if defined(__SERIES60_)
 LIBRARY		  	extendedconnpref.lib
 LIBRARY 	  	netmeta.lib