--- a/uifw/AvKon/group/avkon.mmp	Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/AvKon/group/avkon.mmp	Tue Aug 31 15:28:30 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002 - 2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002 - 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -61,6 +61,10 @@
 USERINCLUDE   ../../EikStd/coctlinc
 USERINCLUDE   . ../inc ../animdllinc ../akncompamode/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
 // and applications layer specific include directories
 APP_LAYER_SYSTEMINCLUDE
@@ -280,16 +284,14 @@
 SOURCE          akndiscreetpopupdata.cpp
 SOURCE          akndiscreetpopupserverhandler.cpp
 
-SOURCE          AknSmileyUtils.cpp
 SOURCE          AknSmileyModel.cpp
 SOURCE          AknSmileyImage.cpp
-SOURCE          akncombinedpane.cpp
 
 LIBRARY         FontProvider.lib
-LIBRARY         fontutils.lib
+LIBRARY         FontUtils.lib
 
-LIBRARY         euser.lib
-LIBRARY         eikcore.lib
+LIBRARY         EUSER.LIB
+LIBRARY         EIKCORE.LIB
 LIBRARY         cone.lib
 LIBRARY         eikcoctl.lib
 LIBRARY         eikctl.lib
@@ -297,12 +299,12 @@
 LIBRARY         bafl.lib
 LIBRARY         gdi.lib
 LIBRARY         fbscli.lib
-LIBRARY         apgrfx.lib
+LIBRARY         APGRFX.LIB
 LIBRARY         ws32.lib
 LIBRARY         eikdlg.lib
 LIBRARY         bitgdi.lib
 LIBRARY         etext.lib
-LIBRARY         bmpanim.lib
+LIBRARY         BMPANIM.LIB
 LIBRARY         fepbase.lib
 LIBRARY         form.lib
 LIBRARY         estor.lib
@@ -310,28 +312,28 @@
 LIBRARY         phoneclient.lib
 LIBRARY         apparc.lib
 LIBRARY         aknnotify.lib // Global Note
-LIBRARY         insock.lib // For IP address copying in CAknIpFieldSettingPage
+LIBRARY         INSOCK.LIB // For IP address copying in CAknIpFieldSettingPage
 LIBRARY         efsrv.lib
 LIBRARY         eiksrvc.lib
-LIBRARY         aknskins.lib // Skins support
+LIBRARY         AknSkins.lib // Skins support
 LIBRARY         linebreak.lib
-LIBRARY         featmgr.lib
-LIBRARY         numberconversion.lib
-LIBRARY         FindUtil.lib
+LIBRARY         FeatMgr.lib
+LIBRARY         NumberConversion.lib
+LIBRARY         findutil.lib
 LIBRARY         aknpictograph.lib
 LIBRARY         CdlEngine.lib
-LIBRARY         aknicon.lib
-LIBRARY         ecom.lib
+LIBRARY         AknIcon.lib
+LIBRARY         ECom.lib
 LIBRARY         oommonitor.lib
 LIBRARY         akncapserverclient.lib
-LIBRARY         apmime.lib
+LIBRARY         Apmime.lib
 LIBRARY         servicehandler.lib
 LIBRARY         numbergrouping.lib
-LIBRARY         aknlayout2.lib
+LIBRARY         AknLayout2.lib
 LIBRARY         AknLayout2Scalable.lib
 LIBRARY         centralrepository.lib
 LIBRARY         cenrepnotifhandler.lib
-LIBRARY         ptiengine.lib
+LIBRARY         PtiEngine.lib
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 LIBRARY         aknlistloadertfx.lib
 #endif //RD_UI_TRANSITION_EFFECTS_LIST
@@ -344,8 +346,8 @@
 LIBRARY         tacticon.lib
 LIBRARY         viewcli.lib
 LIBRARY         aknphysics.lib
-LIBRARY         hwrmlightclient.lib
-LIBRARY         aiwdialdata.lib
+LIBRARY         HWRMLightClient.lib
+LIBRARY         lockclient.lib
 
 DEFFILE AVKON.def