--- a/remotemgmt_plat/oma_ds_extensions_api/tsrc/group/ClientAPIAdvanced.mmp	Thu Aug 19 10:44:50 2010 +0300
+++ b/remotemgmt_plat/oma_ds_extensions_api/tsrc/group/ClientAPIAdvanced.mmp	Tue Aug 31 16:04:06 2010 +0300
@@ -40,15 +40,8 @@
 USERINCLUDE     ../inc 
 USERINCLUDE     ../../../../inc 
 
-SYSTEMINCLUDE     /epoc32/include/app
-#if defined(__S60_)
-//    OS_LAYER_SYSTEMINCLUDE
-    MW_LAYER_SYSTEMINCLUDE
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-//    SYSTEMINCLUDE   /epoc32/include/internal
-//    SYSTEMINCLUDE     /epoc32/include/applications    
-#endif
+APP_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
 LIBRARY         stiftestinterface.lib
@@ -67,8 +60,7 @@
 LIBRARY apparc.lib
 LIBRARY cone.lib 
 LIBRARY eikcore.lib  
-LIBRARY avkon.lib 
-LIBRARY aknnotify.lib
+
 
 LANG            SC
 SMPSAFE