--- a/csxhelp/AiwHelpProvider/group/AiwHelpProvider.mmp	Wed Sep 15 11:59:08 2010 +0300
+++ b/csxhelp/AiwHelpProvider/group/AiwHelpProvider.mmp	Wed Oct 13 14:17:45 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY         bafl.lib
 LIBRARY         cone.lib
 LIBRARY         estlib.lib
-LIBRARY         servicehandler.lib
+LIBRARY         ServiceHandler.lib
 LIBRARY         eikcore.lib
 LIBRARY			hlplch.lib
 LIBRARY     	ws32.lib

--- a/csxhelp/HelpEngine/src/CSXHRuntimeIndexing.cpp	Wed Sep 15 11:59:08 2010 +0300
+++ b/csxhelp/HelpEngine/src/CSXHRuntimeIndexing.cpp	Wed Oct 13 14:17:45 2010 +0300
@@ -132,12 +132,7 @@
     // rename to index.xml. otherwise, the old index file still exists.
     //
     des.Append( KMasterMetaTmpFile );
-    TInt err = KErrNone;
-    err = iFile.Replace( fileSession, des, EFileWrite );
-    if ( KErrNone != err || 0 == iFile.SubSessionHandle() )
-        {
-        return;
-        }
+    iFile.Replace( fileSession, des, EFileWrite );
     
     HBufC8* driveInfo = HBufC8::NewLC( KMaxDriveInfo );
     TPtr8 ptr = driveInfo->Des();
@@ -151,10 +146,6 @@
     
 void CCSXHRuntimeIndexing::FinishAndCloseIndexFileL()
     {
-    if ( 0 == iFile.SubSessionHandle() )
-        {
-        return;
-        }
     RFs& fileSession = iCoeEnv->FsSession();
     iFile.Write( KIndexCollectEnd );
     iFile.Close();  
@@ -195,10 +186,6 @@
       
 void CCSXHRuntimeIndexing::RuntimeGenerateIndexL( const CCSXHHtmlTOC1& aToc1, const TDesC& aFeature )
     {
-    if ( 0 == iFile.SubSessionHandle() )
-        {
-        return;
-        }
     // Form into an entry, like
     // <collection FeatureID="-1" id="0x10005951" navtitle="Bluetooth"></collection>
     HBufC8* appName = CnvUtfConverter::ConvertFromUnicodeToUtf8L( aToc1.GetName() );

--- a/csxhelp/group/HelpEngine.mmp	Wed Sep 15 11:59:08 2010 +0300
+++ b/csxhelp/group/HelpEngine.mmp	Wed Oct 13 14:17:45 2010 +0300
@@ -56,8 +56,8 @@
 
 LIBRARY	cone.lib	euser.lib	bafl.lib
 LIBRARY efsrv.lib charconv.lib   eikctl.lib       
-LIBRARY	senxml.lib xmlframework.lib	ezip.lib
-LIBRARY hlpmodel.lib platformenv.lib
+LIBRARY	SenXml.lib XMLFRAMEWORK.lib	ezip.lib 
+LIBRARY HLPMODEL.LIB PlatformEnv.lib
 LIBRARY featmgr.lib 
 LIBRARY ptiengine.lib //Input Language variation changes
 

--- a/csxhelp/group/cshelp.mmp	Wed Sep 15 11:59:08 2010 +0300
+++ b/csxhelp/group/cshelp.mmp	Wed Oct 13 14:17:45 2010 +0300
@@ -106,13 +106,13 @@
 LIBRARY euser.lib apparc.lib cone.lib eikcore.lib
 LIBRARY apgrfx.lib charconv.lib 
 LIBRARY eikcoctl.lib eikctl.lib avkon.lib
-LIBRARY aknnotify.lib etext.lib
-LIBRARY aknskins.lib
+LIBRARY AknNotify.lib etext.lib
+LIBRARY AknSkins.lib
 LIBRARY ws32.lib 
 LIBRARY CdlEngine.lib   //dynamic ui 
 LIBRARY AknLayout2Scalable.lib
 LIBRARY gdi.lib HelpEngine.lib apmime.lib featmgr.lib
-LIBRARY servicehandler.lib // For the AiwServiceHandler
+LIBRARY ServiceHandler.lib // For the AiwServiceHandler
 LIBRARY efsrv.lib
 
 #ifdef FF_HELP_TUTORIAL_MERGE