--- a/classicui_plat/extended_sounds_api/group/bld.inf	Wed Jun 23 18:29:30 2010 +0300
+++ b/classicui_plat/extended_sounds_api/group/bld.inf	Tue Jul 06 14:33:00 2010 +0300
@@ -33,7 +33,7 @@
 // TEMP
 // Temp solution to remove original version exported from audiothemes
 // To be removed after one release cycle to platform
-../inc/ataudioeventapi.h                  MW_LAYER_PLATFORM_EXPORT_PATH(../../ataudioeventapi.h)
-../inc/mateventcompleteobserver.h  MW_LAYER_PLATFORM_EXPORT_PATH(../../mateventcompleteobserver.h)
+//../inc/ataudioeventapi.h                  MW_LAYER_PLATFORM_EXPORT_PATH(../../ataudioeventapi.h)
+//../inc/mateventcompleteobserver.h  MW_LAYER_PLATFORM_EXPORT_PATH(../../mateventcompleteobserver.h)
 // TEMP
 // TEMP

--- a/uifw/EikStd/srvuisrc/EIKSRVUI.CPP	Wed Jun 23 18:29:30 2010 +0300
+++ b/uifw/EikStd/srvuisrc/EIKSRVUI.CPP	Tue Jul 06 14:33:00 2010 +0300
@@ -1070,7 +1070,11 @@
     _LIT(KTimeout, "timeout");
     _LIT(KTitle,   "title");
 
-    CHbDeviceDialogSymbian* dlg = CHbDeviceDialogSymbian::NewL();
+    //@TODO replace the hardcoded parameter after enum EASyncServerStartup
+    // is defined(after MCL wk26).
+    //CHbDeviceDialogSymbian* dlg = CHbDeviceDialogSymbian::NewL(
+    //                    CHbDeviceDialogSymbian::EASyncServerStartup);
+    CHbDeviceDialogSymbian* dlg = CHbDeviceDialogSymbian::NewL(2);
     CleanupStack::PushL(dlg);
 
     TInt  timeout = 0;