--- a/commonuis/CommonUi/group/CommonUI.mmp	Thu Aug 19 10:11:06 2010 +0300
+++ b/commonuis/CommonUi/group/CommonUI.mmp	Tue Aug 31 15:28:30 2010 +0300
@@ -82,6 +82,10 @@
 USERINCLUDE   ../../../inc
 USERINCLUDE   . ../inc ../LibLoad/inc
 
+/* notifier removal workaround */
+USERINCLUDE /sf/mw/classicui/classicui_plat/extended_notifiers_api/inc
+USERINCLUDE /sf/mw/classicui/classicui_plat/notifiers_api/inc
+
 SYSTEMINCLUDE   /epoc32/include/ecom //youdk : now leave this line unchange, since it will cause build break. We should remove this line after web fixed the header reloc error.
 
 // This is a SYSTEMINCLUDE macro containing the middleware
@@ -96,31 +100,26 @@
 LIBRARY         eikcoctl.lib
 LIBRARY         avkon.lib
 LIBRARY         eikdlg.lib
-LIBRARY         servicehandler.lib
-LIBRARY         CdlEngine.lib
+LIBRARY         ServiceHandler.lib
+LIBRARY         cdlengine.lib
 LIBRARY         ecom.lib
 LIBRARY         CommonEngine.lib        // For class Stringloader, etc.
 LIBRARY         apgrfx.lib              // For class RApaLsSession, class TApaTask
-LIBRARY         featmgr.lib             // For class FeatureManager
-#ifdef __SERIES60_MMC
-LIBRARY         commondialogs.lib
-#endif
+LIBRARY         FeatMgr.lib             // For class FeatureManager
 
 // FindUI
 LIBRARY         etext.lib               // For class CPlainText, class TCharFormat
 LIBRARY         form.lib                // For class CTextLayout
 LIBRARY         eikctl.lib              // For class CRichText
-LIBRARY         favouritesengine.lib    // For class CFavouritesItem, etc.
-LIBRARY         sendui.lib              // For class CSendUi, class CMessageData
 #ifndef RD_VIRTUAL_PHONEBOOK
-LIBRARY         pbkview.lib             // For class RPbkViewResourceFile, class CPbkDataSaveAppUi
-LIBRARY         pbkeng.lib              // For class CPbkContactEngine, class CPbkFieldInfo
+LIBRARY         PbkView.lib             // For class RPbkViewResourceFile, class CPbkDataSaveAppUi
+LIBRARY         PbkEng.lib              // For class CPbkContactEngine, class CPbkFieldInfo
 #endif // !RD_VIRTUAL_PHONEBOOK
-LIBRARY         centralrepository.lib   // For class CRepository
-LIBRARY         cenrepnotifhandler.lib  // For CRepository things
+LIBRARY         CentralRepository.lib   // For class CRepository
+LIBRARY         CenRepNotifHandler.lib  // For CRepository things
 #ifdef __VOIP
 #ifndef RD_VOIP_REL_2_2
-LIBRARY         rcse.lib
+LIBRARY         RCSE.lib
 #else // RD_VOIP_REL_2_2
 LIBRARY         serviceprovidersettings.lib
 #endif // !RD_VOIP_REL_2_2
@@ -131,14 +130,14 @@
 LIBRARY         efsrv.lib               // For file handling operations
 LIBRARY         apparc.lib              // For Application lauching
 LIBRARY         apmime.lib              // For mime type handling (class TDataType)
-LIBRARY         sysutil.lib             // For checking the filesystem space
+LIBRARY         SysUtil.lib             // For checking the filesystem space
 LIBRARY         estor.lib               // For class RDesReadStream in GameHandler
-LIBRARY         platformenv.lib         // For finding correct paths for files (class PathInfo)
+LIBRARY         PlatformEnv.lib         // For finding correct paths for files (class PathInfo)
 #ifdef RD_CONTENTNOTIFICATION
 LIBRARY         contentnotification.lib // For notifying Media Gallery about new content.
 #endif
-LIBRARY         swinstcli.lib           // For Application installer launching
-LIBRARY         charconv.lib            // For class CCnvCharacterSetConverter
+LIBRARY         SWInstCli.lib           // For Application installer launching
+LIBRARY         CharConv.lib            // For class CCnvCharacterSetConverter
 #ifdef __DRM
 LIBRARY         DRMCommon.lib
 LIBRARY         DcfRep.lib
@@ -150,7 +149,7 @@
 LIBRARY         aknnotify.lib           // For Global note (class CAknGlobalNote)
 LIBRARY         aknskins.lib            // Skins support
 
-LIBRARY         egul.lib
+LIBRARY         EGUL.LIB
 
 #ifdef __KEEP_DRM_CONTENT_ON_PHONE
 LIBRARY         distributablechecker.lib    // generic API for determining if content is protected
@@ -158,11 +157,7 @@
 
 LIBRARY         aiwdialdata.lib
 
-#ifdef RD_MULTIPLE_DRIVE 
-LIBRARY         rsfwmountman.lib
-#endif
 
 LIBRARY         AknLayout2Scalable.lib
-LIBRARY         touchfeedback.lib
 
 // End of file.