--- a/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp	Tue Feb 02 01:39:10 2010 +0200
+++ b/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp	Fri Apr 16 16:08:15 2010 +0300
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2009 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 component           boardsupport_metadata
 source   \sf\os\boardsupport\boardsupport_info\boardsupport_metadata 
 source   \sf\os\boardsupport\package_definition.xml

--- a/emulator/emulatorbsp/bld.inf	Tue Feb 02 01:39:10 2010 +0200
+++ b/emulator/emulatorbsp/bld.inf	Fri Apr 16 16:08:15 2010 +0300
@@ -22,7 +22,6 @@
 
 documentation/wins_ether_drv_howto.txt	/epoc32/engdoc/ethernet/	//
 
-
 inc/variantmediadef.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(wins/variantmediadef.h)		
 variant.mmh						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(wins/variant.mmh)
 specific/winscomm.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(wins/winscomm.h)
@@ -76,9 +75,9 @@
 start		extension		base/nand_fbr_offset
 
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-option INC_PATH   /epoc32/include
+option INC_PATH   $(EPOCROOT)epoc32/include
 #else
-option INC_PATH  /epoc32/include/platform
+option INC_PATH  $(EPOCROOT)epoc32/include/platform
 #endif
 
 option		SRCDIR			$(EXTENSION_ROOT)/inc