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