--- a/uifw/uiklaf/Group/UIKLAF.MMP	Tue Aug 31 15:28:30 2010 +0300
+++ b/uifw/uiklaf/Group/UIKLAF.MMP	Wed Sep 01 12:16:19 2010 +0100
@@ -48,10 +48,6 @@
 USERINCLUDE     ../../inc
 USERINCLUDE     ../../../inc
 
-/* notifier removal workaround */
-USERINCLUDE /sf/mw/classicui/classicui_plat/extended_notifiers_api/inc
-USERINCLUDE /sf/mw/classicui/classicui_plat/notifiers_api/inc
-
 // This is a SYSTEMINCLUDE macro containing the middleware
 // layer specific include directories
 MW_LAYER_SYSTEMINCLUDE
@@ -85,16 +81,16 @@
 LIBRARY         avkon.lib
 LIBRARY         apgrfx.lib
 LIBRARY         aknnotify.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         eikcore.lib
 LIBRARY         aknskins.lib
-LIBRARY         cdlengine.lib
-LIBRARY	        ESTOR.LIB 
+LIBRARY         CdlEngine.lib
+LIBRARY	        estor.lib
 LIBRARY         EikCoCtlLaf.lib
-LIBRARY         FontUtils.lib
+LIBRARY         fontutils.lib
 LIBRARY         AknLayout2Scalable.lib
 LIBRARY         FontProvider.lib
-LIBRARY         AknCapServerClient.lib
+LIBRARY         akncapserverclient.lib
 
 #if defined(ARMCC)
 DEFFILE         /epoc32/include/uiklaf/private/eabi/uiklaf.def