--- a/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp	Fri Aug 06 17:25:01 2010 +0800
+++ b/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp	Tue Aug 17 18:16:43 2010 +0800
@@ -114,10 +114,6 @@
 LIBRARY         aknlistloadertfx.lib
 #endif // RD_UI_TRANSITION_EFFECTS_LIST
 
-#ifdef SYMBIAN_BUILD_GCE
-LIBRARY         alfclient.lib
-#endif // SYMBIAN_BUILD_GCE
-
 // #define WCPLOG WCPLOG
 #ifdef WCPLOG
 LIBRARY         flogger.lib

--- a/uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp	Fri Aug 06 17:25:01 2010 +0800
+++ b/uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp	Tue Aug 17 18:16:43 2010 +0800
@@ -73,10 +73,6 @@
     #include <akntranseffect.h> // for Transition effect enumerations
 #endif
 
-#ifdef SYMBIAN_BUILD_GCE
-    #include <alf/alfclientbase.h>
-#endif    
-
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 #include <AvkonInternalCRKeys.h>
 
@@ -228,11 +224,7 @@
 
     me->iEikSrv.AllowNotifierAppServersToLoad();
     me->iEikSrv.Close(); // currently there is no use to keep this session alive.
-    
-#ifdef SYMBIAN_BUILD_GCE
-    TRAP(err, CAlfAsynchStartup::StartL());
-#endif     
-    
+
     return err;
     }
 

Binary file uifw/AvKon/conf/s60/avkon.confml has changed

--- a/uiutils/hlplch/group/hlplch.mmp	Fri Aug 06 17:25:01 2010 +0800
+++ b/uiutils/hlplch/group/hlplch.mmp	Tue Aug 17 18:16:43 2010 +0800
@@ -31,6 +31,7 @@
 
 START RESOURCE	../data/lch.rss
 TARGETPATH		resource/apps
+HEADER
 END
 
 LIBRARY			euser.lib	apgrfx.lib	eikcore.lib	apparc.lib bafl.lib efsrv.lib