diff -r 924385140d98 -r c2c61fdca848 commonappservices/coreappstest/Group/BLD.INF
--- a/commonappservices/coreappstest/Group/BLD.INF	Tue Aug 31 15:24:25 2010 +0300
+++ b/commonappservices/coreappstest/Group/BLD.INF	Wed Sep 01 12:24:48 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -25,11 +25,7 @@
 
 PRJ_TESTEXPORTS
 CoreAppsTestTest.iby	/epoc32/rom/include/coreappstesttest.iby
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../Inc/TestServer.h	/epoc32/include/coreappstest/testserver.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../Inc/utilities.h	/epoc32/include/coreappstest/utilities.h
-#endif
+../Inc/testserver.h	SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(coreappstest/testserver.h)
+../Inc/utilities.h	SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(coreappstest/utilities.h)
 CoreAppsTest.iby	/epoc32/rom/include/coreappstest.iby
 runeshell.iby	/epoc32/rom/include/runeshell.iby