--- a/installationservices/swi/source/sisregistry/server/scrhelperutil.cpp	Tue Aug 31 15:21:33 2010 +0300
+++ b/installationservices/swi/source/sisregistry/server/scrhelperutil.cpp	Wed Sep 01 12:22:02 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -42,9 +42,11 @@
 #include <usif/usifcommon.h>
 #include <swi/sisregistrylog.h>
 #include <scs/streamingarray.h>
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include "screntries_internal.h"
 #endif //SYMBIAN_ENABLE_SPLIT_HEADERS
+#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 
 using namespace Swi;
 
@@ -117,21 +119,6 @@
 	ExternalizeChainIndexArrayL(aScrSession, aCompId, aObject.InstallChainIndicies());
 	}
 
-void ScrHelperUtil::AddApplicationEntryL(Usif::RSoftwareComponentRegistry& aScrSession, Usif::TComponentId& aCompId, const Usif::CApplicationRegistrationData& aApplicationRegistrationData)
-    {
-    aScrSession.AddApplicationEntryL(aCompId, aApplicationRegistrationData);
-    }
-
-void ScrHelperUtil::DeleteApplicationEntriesL(Usif::RSoftwareComponentRegistry& aScrSession, Usif::TComponentId& aCompId)
-    {
-    aScrSession.DeleteApplicationEntriesL(aCompId);
-    }
-
-void ScrHelperUtil::DeleteApplicationEntryL(Usif::RSoftwareComponentRegistry& aScrSession, const TUid& aAppUId)
-    {
-    aScrSession.DeleteApplicationEntryL(aAppUId);
-    }
-
 void ScrHelperUtil::WriteToScrL(Usif::RSoftwareComponentRegistry& aScrSession, Usif::TComponentId& aCompId, CSisRegistryObject& aObject, Usif::TScrComponentOperationType aOpType)
 	{
 	
@@ -423,7 +410,7 @@
 		TPtrC fileTargetPtr(fileTarget);
 		if (filenamesArray.SpecificFindInOrder(fileTargetPtr, descriptorsComparator, EArrayFindMode_First) != KErrNotFound)
 			continue; // Skip duplicates
-		filenamesArray.InsertInOrderL(fileTargetPtr, descriptorsComparator);
+		filenamesArray.InsertInOrder(fileTargetPtr, descriptorsComparator);
 		
 		if (IsWildcardFile(fileTarget))
 			{