diff -r aa99f2208aad -r b8d18c84f71c localisation/apparchitecture/tef/TIconLoaderAndIconArrayForLeaks.mmp
--- a/localisation/apparchitecture/tef/TIconLoaderAndIconArrayForLeaks.mmp	Wed Jul 28 16:03:37 2010 +0100
+++ b/localisation/apparchitecture/tef/TIconLoaderAndIconArrayForLeaks.mmp	Tue Aug 03 10:20:34 2010 +0100
@@ -1,7 +1,7 @@
 // Copyright (c) 2007-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"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
@@ -13,8 +13,6 @@
 // Description:
 //
 
-
-
 /**
  @file
  @test
@@ -22,7 +20,7 @@
 */
 
 
-target		TIconLoaderAndIconArrayForLeaks.dll
+target		ticonloaderandiconarrayforleaks.dll
 TARGETTYPE 	DLL
 UID         0x1000008D 0x102833D0 	
 VENDORID 	0x70000001
@@ -32,39 +30,36 @@
 SOURCEPATH    	.
 SOURCE		TIconLoaderAndIconArrayForLeaks.cpp
 
-SOURCEPATH	 ../apserv
+SOURCEPATH	../aplist
 SOURCE		 apsiconcaptionoverride.cpp
-
+source      aplapplist.cpp aplapplistitem.cpp aplappinforeader.cpp
 SOURCEPATH  ../apgrfx
-#if defined SYMBIAN_APPARC_APPINFO_CACHE
-	source          	APGAPLSTV2.CPP
-#else
-	source          	APGAPLST.CPP
-#endif
-source      APGCTL.CPP APGDOOR.CPP APGICNFL.CPP APGSTD.CPP APGTASK.CPP
-source		APGWGNAM.CPP APGCLI.CPP APGPRIV.CPP
-source		apgnotif.cpp APGAIR.CPP APGAIRV2.CPP APSCLI.CPP apgconstdata.cpp
+source      APGCTL.CPP apgdoor.cpp APGICNFL.CPP APGTASK.CPP
+source		APGWGNAM.CPP apgcli.cpp APGPRIV.CPP apgstart.cpp apgrecog.cpp
+source		apgnotif.cpp APSCLI.CPP apgconstdata.cpp
 source		apsecutils.cpp
-
+SOURCEPATH	../apparc
+source 		apaid.cpp apastd.cpp
 
 USERINCLUDE   	.
 USERINCLUDE		../apgrfx
 USERINCLUDE 	../apserv
 USERINCLUDE		../inc
-SYSTEMINCLUDE 	/epoc32/include
-SYSTEMINCLUDE 	/epoc32/include/techview
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE 	/epoc32/include/techview
  
 library         euser.lib apparc.lib apmime.lib gdi.lib estor.lib efsrv.lib fbscli.lib
 library         bitgdi.lib ws32.lib bafl.lib
-library         apserv.lib apfile.lib centralrepository.lib
+library		centralrepository.lib
+library         apserv.lib apfile.lib aplist.lib
 #ifdef SYMBIAN_BAFL_SYSUTIL
 library sysutil.lib
 #endif
 
 macro 			UI_FRAMEWORKS_V1_REMNANT_FOR_JAVA_MIDLET_INSTALLER
 
-#if defined SYMBIAN_APPARC_APPINFO_CACHE
-	deffile		TICONFORLEAKS.DEF
-#else
-	deffile		TICONFORLEAKSV2.DEF
-#endif
+deffile		TICONFORLEAKS.DEF
+
+SMPSAFE
+