--- a/uifw/AvKon/akncompamode/group/akncompamode.mmp	Tue Aug 31 15:28:30 2010 +0300
+++ b/uifw/AvKon/akncompamode/group/akncompamode.mmp	Wed Sep 01 12:16:19 2010 +0100
@@ -56,11 +56,6 @@
 SOURCE                  akncompaclearer.cpp
 
 USERINCLUDE             ../inc ../srv/inc ../loc ../../../inc
-
-/* notifier removal workaround */
-USERINCLUDE /sf/mw/classicui/classicui_plat/extended_notifiers_api/inc
-USERINCLUDE /sf/mw/classicui/classicui_plat/notifiers_api/inc
-
 APP_LAYER_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
@@ -74,10 +69,10 @@
 LIBRARY         bafl.lib
 LIBRARY         egul.lib
 LIBRARY         aknskins.lib
-LIBRARY         cdlengine.lib
+LIBRARY         CdlEngine.lib
 LIBRARY         touchfeedback.lib
 LIBRARY         AknLayout2Scalable.lib
 LIBRARY         ecom.lib
 LIBRARY         centralrepository.lib
-LIBRARY         AknLayout2.lib
+LIBRARY         aknlayout2.lib