--- a/bthci/bthci2/group/bld.inf	Wed Jul 21 15:42:05 2010 +0300
+++ b/bthci/bthci2/group/bld.inf	Thu Sep 23 17:06:47 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -32,25 +32,25 @@
 hci_framework.iby  /epoc32/rom/include/hci_framework.iby
 
 PRJ_EXPORTS
-../corehci/interface/aclpacketconsts.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/aclpacketconsts.h)
-../corehci/interface/basebandpacketconsts.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/basebandpacketconsts.h)
-../corehci/interface/CoreHCI.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/corehci.h)
-../corehci/interface/corehciplugin.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/corehciplugin.h)
-../corehci/interface/hcibase.hrh					/epoc32/include/bluetooth/hci/hcibase.hrh
-../corehci/interface/hciconsts.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciconsts.h)
-../corehci/interface/HciCommandAllocator.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcicommandallocator.h)
-../corehci/interface/HciDataEventObserver.h 		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcidataeventobserver.h)
-../corehci/interface/HciCommandEventObserver.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hcicommandeventobserver.h)
-../corehci/interface/HciDataFramer.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcidataframer.h)
-../corehci/interface/HciDataObserver.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcidataobserver.h)
-../corehci/interface/hcierrors.h					SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/hci/hcierrors.h)
-../corehci/interface/hcievents.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcievents.h)
-../corehci/interface/hciframe.h 					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciframe.h)
-../corehci/interface/hcitypes.h 					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcitypes.h)
-../corehci/interface/hciclientusage.h 				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciclientusage.h)
+../corehci/interface/aclpacketconsts.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/aclpacketconsts.h)
+../corehci/interface/basebandpacketconsts.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/basebandpacketconsts.h)
+../corehci/interface/CoreHCI.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/corehci.h)
+../corehci/interface/corehciplugin.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/corehciplugin.h)
+../corehci/interface/hcibase.hrh					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcibase.hrh)
+../corehci/interface/hciconsts.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciconsts.h)
+../corehci/interface/HciCommandAllocator.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcicommandallocator.h)
+../corehci/interface/HciDataEventObserver.h 		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcidataeventobserver.h)
+../corehci/interface/HciCommandEventObserver.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hcicommandeventobserver.h)
+../corehci/interface/HciDataFramer.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcidataframer.h)
+../corehci/interface/HciDataObserver.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcidataobserver.h)
+../corehci/interface/hcierrors.h					OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/hci/hcierrors.h)
+../corehci/interface/hcievents.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcievents.h)
+../corehci/interface/hciframe.h 					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciframe.h)
+../corehci/interface/hcitypes.h 					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hcitypes.h)
+../corehci/interface/hciclientusage.h 				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciclientusage.h)
 
-../CommandsEvents/interface/hciopcodes.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciopcodes.h)
+../CommandsEvents/interface/hciopcodes.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciopcodes.h)
 
-../hctl/interface/hctlchannelobserver.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlchannelobserver.h)
+../hctl/interface/hctlchannelobserver.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hctlchannelobserver.h)
 
-../hciserverclient/interface/hciipc.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciipc.h)
+../hciserverclient/interface/hciipc.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hciipc.h)