--- a/ncdengine/engine/group/ncddevicemgmt.mmp	Thu Aug 19 10:02:49 2010 +0300
+++ b/ncdengine/engine/group/ncddevicemgmt.mmp	Tue Aug 31 15:21:33 2010 +0300
@@ -60,12 +60,7 @@
 USERINCLUDE   ../../provider/deviceinteraction/inc
 
 // System include paths
-#ifndef __SERIES60_30__
-APP_LAYER_SYSTEMINCLUDE
-#else
-SYSTEMINCLUDE /Epoc32/include
-#endif
-
+MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY euser.lib estor.lib 
 LIBRARY bafl.lib charconv.lib efsrv.lib  // needed for ARMV5 building
@@ -91,14 +86,10 @@
 LIBRARY         avkon.lib
 LIBRARY         etel3rdparty.lib 
 LIBRARY         apgrfx.lib
-LIBRARY         swinstcli.lib           // Silent install
-LIBRARY         widgetregistryclient.lib // Widget Registry
 
-#if defined( __SERIES60_30__ ) || defined( __SERIES60_31__ ) || defined( __S60_32__ )
-LIBRARY         javaregistry.lib        // Java Registry
-#else
-LIBRARY         javaregistryclient.lib
-#endif
+LIBRARY         sif.lib // SIF installer
+LIBRARY         scrclient.lib  //Registry client
+
 
 #ifndef __SERIES60_31__
 LIBRARY         sysversioninfo.lib      // SysVersionInfo