--- a/bthci/bthci2/CommandsEvents/group/bld.inf	Wed Aug 18 10:54:44 2010 +0300
+++ b/bthci/bthci2/CommandsEvents/group/bld.inf	Fri Sep 17 08:36:02 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -16,13 +16,13 @@
 PRJ_EXPORTS
 // Base classes and utilities for commands and events.
 
-../interface/Command.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/command.h)
-../interface/Event.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/event.h)
-../interface/commandcompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/commandcompleteevent.h)
-../interface/VendorDebugCommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/vendordebugcommand.h)
-../interface/VendorDebugEvent.H				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/vendordebugevent.h)
-../interface/VendorDebugCompleteEvent.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/vendordebugcompleteevent.h)
-../interface/completingeventquery.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/completingeventquery.h)
+../interface/Command.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/command.h)
+../interface/Event.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/event.h)
+../interface/commandcompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/commandcompleteevent.h)
+../interface/VendorDebugCommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/vendordebugcommand.h)
+../interface/VendorDebugEvent.H				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/vendordebugevent.h)
+../interface/VendorDebugCompleteEvent.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/vendordebugcompleteevent.h)
+../interface/completingeventquery.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/completingeventquery.h)
 
 // The actual commands and events classes.
 
@@ -31,347 +31,347 @@
 //
 // Link Control Commands
 //
-../interface/inquirycommand.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycommand.h)
-../interface/inquirycancelcommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycancelcommand.h)
-../interface/periodicinquirymodecommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/periodicinquirymodecommand.h)
-../interface/exitperiodicinquirymodecommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitperiodicinquirymodecommand.h)
-../interface/createaclconnectioncommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createaclconnectioncommand.h)
-../interface/disconnectcommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/disconnectcommand.h)
-../interface/createconnectioncancelcommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createconnectioncancelcommand.h)
-../interface/acceptconnectionrequestcommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/acceptconnectionrequestcommand.h)
-../interface/rejectconnectionrequestcommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rejectconnectionrequestcommand.h)
-../interface/linkkeyrequestreplycommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplycommand.h)
-../interface/linkkeyrequestreplynegativecommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplynegativecommand.h)
-../interface/pincoderequestreplycommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplycommand.h)
-../interface/pincoderequestreplynegativecommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplynegativecommand.h)
-../interface/changeconnectionpackettypecommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/changeconnectionpackettypecommand.h)
-../interface/authenticationrequestedcommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/authenticationrequestedcommand.h)
-../interface/setconnectionencryptioncommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setconnectionencryptioncommand.h)
-../interface/changelinkkeycommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/changelinkkeycommand.h)
-../interface/masterlinkkeycommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/masterlinkkeycommand.h)
-../interface/remotenamerequestcommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamerequestcommand.h)
-../interface/remotenamerequestcancelcommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamerequestcancelcommand.h)
-../interface/readremotesupportedfeaturescommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremotesupportedfeaturescommand.h)
-../interface/readremoteextendedfeaturescommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremoteextendedfeaturescommand.h)
-../interface/readremoteversioninfocommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremoteversioninfocommand.h)
-../interface/readclockoffsetcommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockoffsetcommand.h)
-../interface/readlmphandlecommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlmphandlecommand.h)
-../interface/setupsynchronousconnectioncommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setupsynchronousconnectioncommand.h)
-../interface/acceptsynchronousconnectionrequestcommand.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/acceptsynchronousconnectionrequestcommand.h)
-../interface/rejectsynchronousconnectionrequestcommand.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rejectsynchronousconnectionrequestcommand.h)
-../interface/iocapabilityrequestreplycommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestreplycommand.h)
-../interface/userconfirmationrequestreplycommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestreplycommand.h)
-../interface/userconfirmationrequestnegativereplycommand.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestnegativereplycommand.h)
-../interface/userpasskeyrequestreplycommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestreplycommand.h)
-../interface/userpasskeyrequestnegativereplycommand.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestnegativereplycommand.h)
-../interface/remoteoobdatarequestreplycommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestreplycommand.h)
-../interface/remoteoobdatarequestnegativereplycommand.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestnegativereplycommand.h)
-../interface/iocapabilityrequestnegativereplycommand.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestnegativereplycommand.h)
+../interface/inquirycommand.h								OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycommand.h)
+../interface/inquirycancelcommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycancelcommand.h)
+../interface/periodicinquirymodecommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/periodicinquirymodecommand.h)
+../interface/exitperiodicinquirymodecommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitperiodicinquirymodecommand.h)
+../interface/createaclconnectioncommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createaclconnectioncommand.h)
+../interface/disconnectcommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/disconnectcommand.h)
+../interface/createconnectioncancelcommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createconnectioncancelcommand.h)
+../interface/acceptconnectionrequestcommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/acceptconnectionrequestcommand.h)
+../interface/rejectconnectionrequestcommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rejectconnectionrequestcommand.h)
+../interface/linkkeyrequestreplycommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplycommand.h)
+../interface/linkkeyrequestreplynegativecommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplynegativecommand.h)
+../interface/pincoderequestreplycommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplycommand.h)
+../interface/pincoderequestreplynegativecommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplynegativecommand.h)
+../interface/changeconnectionpackettypecommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/changeconnectionpackettypecommand.h)
+../interface/authenticationrequestedcommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/authenticationrequestedcommand.h)
+../interface/setconnectionencryptioncommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setconnectionencryptioncommand.h)
+../interface/changelinkkeycommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/changelinkkeycommand.h)
+../interface/masterlinkkeycommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/masterlinkkeycommand.h)
+../interface/remotenamerequestcommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamerequestcommand.h)
+../interface/remotenamerequestcancelcommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamerequestcancelcommand.h)
+../interface/readremotesupportedfeaturescommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremotesupportedfeaturescommand.h)
+../interface/readremoteextendedfeaturescommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremoteextendedfeaturescommand.h)
+../interface/readremoteversioninfocommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremoteversioninfocommand.h)
+../interface/readclockoffsetcommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockoffsetcommand.h)
+../interface/readlmphandlecommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlmphandlecommand.h)
+../interface/setupsynchronousconnectioncommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setupsynchronousconnectioncommand.h)
+../interface/acceptsynchronousconnectionrequestcommand.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/acceptsynchronousconnectionrequestcommand.h)
+../interface/rejectsynchronousconnectionrequestcommand.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rejectsynchronousconnectionrequestcommand.h)
+../interface/iocapabilityrequestreplycommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestreplycommand.h)
+../interface/userconfirmationrequestreplycommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestreplycommand.h)
+../interface/userconfirmationrequestnegativereplycommand.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestnegativereplycommand.h)
+../interface/userpasskeyrequestreplycommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestreplycommand.h)
+../interface/userpasskeyrequestnegativereplycommand.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestnegativereplycommand.h)
+../interface/remoteoobdatarequestreplycommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestreplycommand.h)
+../interface/remoteoobdatarequestnegativereplycommand.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestnegativereplycommand.h)
+../interface/iocapabilityrequestnegativereplycommand.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestnegativereplycommand.h)
 //
 // Link Policy Commands
 //
-../interface/holdmodecommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/holdmodecommand.h)
-../interface/sniffmodecommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffmodecommand.h)
-../interface/exitsniffmodecommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitsniffmodecommand.h)
-../interface/parkmodecommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/parkmodecommand.h)
-../interface/exitparkmodecommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitparkmodecommand.h)
-../interface/qossetupcommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qossetupcommand.h)
-../interface/rolediscoverycommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rolediscoverycommand.h)
-../interface/switchrolecommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/switchrolecommand.h)
-../interface/readlinkpolicysettingscommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkpolicysettingscommand.h)
-../interface/writelinkpolicysettingscommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinkpolicysettingscommand.h)
-../interface/readdefaultlinkpolicysettingscommand.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaultlinkpolicysettingscommand.h)
-../interface/writedefaultlinkpolicysettingscommand.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaultlinkpolicysettingscommand.h)
-../interface/flowspecificationcommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flowspecificationcommand.h)
-../interface/sniffsubratingcommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffsubratingcommand.h)
+../interface/holdmodecommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/holdmodecommand.h)
+../interface/sniffmodecommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffmodecommand.h)
+../interface/exitsniffmodecommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitsniffmodecommand.h)
+../interface/parkmodecommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/parkmodecommand.h)
+../interface/exitparkmodecommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitparkmodecommand.h)
+../interface/qossetupcommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qossetupcommand.h)
+../interface/rolediscoverycommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rolediscoverycommand.h)
+../interface/switchrolecommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/switchrolecommand.h)
+../interface/readlinkpolicysettingscommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkpolicysettingscommand.h)
+../interface/writelinkpolicysettingscommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinkpolicysettingscommand.h)
+../interface/readdefaultlinkpolicysettingscommand.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaultlinkpolicysettingscommand.h)
+../interface/writedefaultlinkpolicysettingscommand.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaultlinkpolicysettingscommand.h)
+../interface/flowspecificationcommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flowspecificationcommand.h)
+../interface/sniffsubratingcommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffsubratingcommand.h)
 //
 // Controller and Baseband Commands
 //
-../interface/seteventmaskcommand.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventmaskcommand.h)
-../interface/resetcommand.h										SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetcommand.h)
-../interface/seteventfiltercommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventfiltercommand.h)
-../interface/flushcommand.h										SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flushcommand.h)
-../interface/readpintypecommand.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpintypecommand.h)
-../interface/writepintypecommand.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepintypecommand.h)
-../interface/createnewunitkeycommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createnewunitkeycommand.h)
-../interface/readstoredlinkkeycommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readstoredlinkkeycommand.h)
-../interface/writestoredlinkkeycommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writestoredlinkkeycommand.h)
-../interface/deletestoredlinkkeycommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/deletestoredlinkkeycommand.h)
-../interface/WriteLocalNameCommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelocalnamecommand.h)
-../interface/ReadLocalNameCommand.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalnamecommand.h)
-../interface/readconnectionaccepttimeoutcommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readconnectionaccepttimeoutcommand.h)
-../interface/writeconnectionaccepttimeoutcommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeconnectionaccepttimeoutcommand.h)
-../interface/readpagetimeoutcommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagetimeoutcommand.h)
-../interface/writepagetimeoutcommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagetimeoutcommand.h)
-../interface/readscanenablecommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readscanenablecommand.h)
-../interface/writescanenablecommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writescanenablecommand.h)
-../interface/readpagescanactivitycommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanactivitycommand.h)
-../interface/writepagescanactivitycommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanactivitycommand.h)
-../interface/readinquiryscanactivitycommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscanactivitycommand.h)
-../interface/writeinquiryscanactivitycommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscanactivitycommand.h)
-../interface/readauthenticationenablecommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readauthenticationenablecommand.h)
-../interface/writeauthenticationenablecommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeauthenticationenablecommand.h)
-../interface/readclassofdevicecommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclassofdevicecommand.h)
-../interface/writeclassofdevicecommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeclassofdevicecommand.h)
-../interface/readvoicesettingcommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readvoicesettingcommand.h)
-../interface/writevoicesettingcommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writevoicesettingcommand.h)
-../interface/readautomaticflushtimeoutcommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readautomaticflushtimeoutcommand.h)
-../interface/writeautomaticflushtimeoutcommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeautomaticflushtimeoutcommand.h)
-../interface/readnumbroadcastretransmissionscommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumbroadcastretransmissionscommand.h)
-../interface/writenumbroadcastretransmissionscommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writenumbroadcastretransmissionscommand.h)
-../interface/readholdmodeactivitycommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readholdmodeactivitycommand.h)
-../interface/writeholdmodeactivitycommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeholdmodeactivitycommand.h)
-../interface/readtransmitpowerlevelcommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readtransmitpowerlevelcommand.h)
-../interface/readsynchronousflowcontrolenablecommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsynchronousflowcontrolenablecommand.h)
-../interface/writesynchronousflowcontrolenablecommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesynchronousflowcontrolenablecommand.h)
-../interface/setcontrollertohostflowcontrolcommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setcontrollertohostflowcontrolcommand.h)
-../interface/hostbuffersizecommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostbuffersizecommand.h)
-../interface/hostnumberofcompletedpacketscommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostnumberofcompletedpacketscommand.h)
-../interface/readlinksupervisiontimeoutcommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinksupervisiontimeoutcommand.h)
-../interface/writelinksupervisiontimeoutcommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinksupervisiontimeoutcommand.h)
-../interface/readnumberofsupportediaccommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumberofsupportediaccommand.h)
-../interface/readcurrentiaclapcommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readcurrentiaclapcommand.h)
-../interface/writecurrentiaclapcommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writecurrentiaclapcommand.h)
-../interface/setafhhostchannelclassificationcommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setafhhostchannelclassificationcommand.h)
-../interface/readinquiryscantypecommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscantypecommand.h)
-../interface/writeinquiryscantypecommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscantypecommand.h)
-../interface/readinquirymodecommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquirymodecommand.h)
-../interface/writeinquirymodecommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquirymodecommand.h)
-../interface/readpagescantypecommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescantypecommand.h)
-../interface/writepagescantypecommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescantypecommand.h)
-../interface/readafhchannelassessmentmodecommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelassessmentmodecommand.h)
-../interface/writeafhchannelassessmentmodecommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeafhchannelassessmentmodecommand.h)
-../interface/readextendedinquiryresponsecommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readextendedinquiryresponsecommand.h)
-../interface/writeextendedinquiryresponsecommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeextendedinquiryresponsecommand.h)
-../interface/refreshencryptionkeycommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/refreshencryptionkeycommand.h)
-../interface/readsimplepairingmodecommand.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsimplepairingmodecommand.h)
-../interface/writesimplepairingmodecommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingmodecommand.h)
-../interface/readlocaloobdatacommand.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocaloobdatacommand.h)
-../interface/readinquiryresponsetransmitpowerlevelcommand.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryresponsetransmitpowerlevelcommand.h)
-../interface/writeinquiryresponsetransmitpowerlevelcommand.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryresponsetransmitpowerlevelcommand.h)
-../interface/sendkeypressnotificationcommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sendkeypressnotificationcommand.h)
-../interface/readdefaulterroneousdatareportingcommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaulterroneousdatareportingcommand.h)
-../interface/writedefaulterroneousdatareportingcommand.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaulterroneousdatareportingcommand.h)
-../interface/enhancedflushcommand.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enhancedflushcommand.h)
+../interface/seteventmaskcommand.h								OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventmaskcommand.h)
+../interface/resetcommand.h										OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetcommand.h)
+../interface/seteventfiltercommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventfiltercommand.h)
+../interface/flushcommand.h										OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flushcommand.h)
+../interface/readpintypecommand.h								OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpintypecommand.h)
+../interface/writepintypecommand.h								OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepintypecommand.h)
+../interface/createnewunitkeycommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createnewunitkeycommand.h)
+../interface/readstoredlinkkeycommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readstoredlinkkeycommand.h)
+../interface/writestoredlinkkeycommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writestoredlinkkeycommand.h)
+../interface/deletestoredlinkkeycommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/deletestoredlinkkeycommand.h)
+../interface/WriteLocalNameCommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelocalnamecommand.h)
+../interface/ReadLocalNameCommand.h								OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalnamecommand.h)
+../interface/readconnectionaccepttimeoutcommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readconnectionaccepttimeoutcommand.h)
+../interface/writeconnectionaccepttimeoutcommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeconnectionaccepttimeoutcommand.h)
+../interface/readpagetimeoutcommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagetimeoutcommand.h)
+../interface/writepagetimeoutcommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagetimeoutcommand.h)
+../interface/readscanenablecommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readscanenablecommand.h)
+../interface/writescanenablecommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writescanenablecommand.h)
+../interface/readpagescanactivitycommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanactivitycommand.h)
+../interface/writepagescanactivitycommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanactivitycommand.h)
+../interface/readinquiryscanactivitycommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscanactivitycommand.h)
+../interface/writeinquiryscanactivitycommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscanactivitycommand.h)
+../interface/readauthenticationenablecommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readauthenticationenablecommand.h)
+../interface/writeauthenticationenablecommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeauthenticationenablecommand.h)
+../interface/readclassofdevicecommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclassofdevicecommand.h)
+../interface/writeclassofdevicecommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeclassofdevicecommand.h)
+../interface/readvoicesettingcommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readvoicesettingcommand.h)
+../interface/writevoicesettingcommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writevoicesettingcommand.h)
+../interface/readautomaticflushtimeoutcommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readautomaticflushtimeoutcommand.h)
+../interface/writeautomaticflushtimeoutcommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeautomaticflushtimeoutcommand.h)
+../interface/readnumbroadcastretransmissionscommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumbroadcastretransmissionscommand.h)
+../interface/writenumbroadcastretransmissionscommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writenumbroadcastretransmissionscommand.h)
+../interface/readholdmodeactivitycommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readholdmodeactivitycommand.h)
+../interface/writeholdmodeactivitycommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeholdmodeactivitycommand.h)
+../interface/readtransmitpowerlevelcommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readtransmitpowerlevelcommand.h)
+../interface/readsynchronousflowcontrolenablecommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsynchronousflowcontrolenablecommand.h)
+../interface/writesynchronousflowcontrolenablecommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesynchronousflowcontrolenablecommand.h)
+../interface/setcontrollertohostflowcontrolcommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setcontrollertohostflowcontrolcommand.h)
+../interface/hostbuffersizecommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostbuffersizecommand.h)
+../interface/hostnumberofcompletedpacketscommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostnumberofcompletedpacketscommand.h)
+../interface/readlinksupervisiontimeoutcommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinksupervisiontimeoutcommand.h)
+../interface/writelinksupervisiontimeoutcommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinksupervisiontimeoutcommand.h)
+../interface/readnumberofsupportediaccommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumberofsupportediaccommand.h)
+../interface/readcurrentiaclapcommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readcurrentiaclapcommand.h)
+../interface/writecurrentiaclapcommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writecurrentiaclapcommand.h)
+../interface/setafhhostchannelclassificationcommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setafhhostchannelclassificationcommand.h)
+../interface/readinquiryscantypecommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscantypecommand.h)
+../interface/writeinquiryscantypecommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscantypecommand.h)
+../interface/readinquirymodecommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquirymodecommand.h)
+../interface/writeinquirymodecommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquirymodecommand.h)
+../interface/readpagescantypecommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescantypecommand.h)
+../interface/writepagescantypecommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescantypecommand.h)
+../interface/readafhchannelassessmentmodecommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelassessmentmodecommand.h)
+../interface/writeafhchannelassessmentmodecommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeafhchannelassessmentmodecommand.h)
+../interface/readextendedinquiryresponsecommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readextendedinquiryresponsecommand.h)
+../interface/writeextendedinquiryresponsecommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeextendedinquiryresponsecommand.h)
+../interface/refreshencryptionkeycommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/refreshencryptionkeycommand.h)
+../interface/readsimplepairingmodecommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsimplepairingmodecommand.h)
+../interface/writesimplepairingmodecommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingmodecommand.h)
+../interface/readlocaloobdatacommand.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocaloobdatacommand.h)
+../interface/readinquiryresponsetransmitpowerlevelcommand.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryresponsetransmitpowerlevelcommand.h)
+../interface/writeinquiryresponsetransmitpowerlevelcommand.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryresponsetransmitpowerlevelcommand.h)
+../interface/sendkeypressnotificationcommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sendkeypressnotificationcommand.h)
+../interface/readdefaulterroneousdatareportingcommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaulterroneousdatareportingcommand.h)
+../interface/writedefaulterroneousdatareportingcommand.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaulterroneousdatareportingcommand.h)
+../interface/enhancedflushcommand.h								OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enhancedflushcommand.h)
 //
 // Informational Parameters
 //
-../interface/readlocalversioninfocommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalversioninfocommand.h)
-../interface/readlocalsupportedcommandscommand.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedcommandscommand.h)
-../interface/readlocalsupportedfeaturescommand.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedfeaturescommand.h)
-../interface/readlocalextendedfeaturescommand.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalextendedfeaturescommand.h)
-../interface/readbuffersizecommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbuffersizecommand.h)
-../interface/readbdaddrcommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbdaddrcommand.h)
+../interface/readlocalversioninfocommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalversioninfocommand.h)
+../interface/readlocalsupportedcommandscommand.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedcommandscommand.h)
+../interface/readlocalsupportedfeaturescommand.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedfeaturescommand.h)
+../interface/readlocalextendedfeaturescommand.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalextendedfeaturescommand.h)
+../interface/readbuffersizecommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbuffersizecommand.h)
+../interface/readbdaddrcommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbdaddrcommand.h)
 //
 // Status Parameters
 //
-../interface/readfailedcontactcountercommand.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readfailedcontactcountercommand.h)
-../interface/resetfailedcontactcountercommand.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetfailedcontactcountercommand.h)
-../interface/readlinkqualitycommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkqualitycommand.h)
-../interface/readrssicommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readrssicommand.h)
-../interface/readafhchannelmapcommand.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelmapcommand.h)
-../interface/readclockcommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockcommand.h)
+../interface/readfailedcontactcountercommand.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readfailedcontactcountercommand.h)
+../interface/resetfailedcontactcountercommand.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetfailedcontactcountercommand.h)
+../interface/readlinkqualitycommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkqualitycommand.h)
+../interface/readrssicommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readrssicommand.h)
+../interface/readafhchannelmapcommand.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelmapcommand.h)
+../interface/readclockcommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockcommand.h)
 //
 // Testing Commands
 //
-../interface/readloopbackmodecommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readloopbackmodecommand.h)
-../interface/writeloopbackmodecommand.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeloopbackmodecommand.h)
-../interface/enabledeviceundertestmodecommand.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enabledeviceundertestmodecommand.h)
-../interface/writesimplepairingdebugmodecommand.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingdebugmodecommand.h)
+../interface/readloopbackmodecommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readloopbackmodecommand.h)
+../interface/writeloopbackmodecommand.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeloopbackmodecommand.h)
+../interface/enabledeviceundertestmodecommand.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enabledeviceundertestmodecommand.h)
+../interface/writesimplepairingdebugmodecommand.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingdebugmodecommand.h)
 
 // Command Complete Events
 // Nop
-../interface/nopcompleteevent.h										SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/nopcompleteevent.h)
+../interface/nopcompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/nopcompleteevent.h)
 //
 // Link Control Commands
 //
-../interface/inquirycancelcompleteevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycancelcompleteevent.h)
-../interface/periodicinquirymodecompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/periodicinquirymodecompleteevent.h)
-../interface/exitperiodicinquirymodecompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitperiodicinquirymodecompleteevent.h)
-../interface/createconnectioncancelcompleteevent.h 					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createconnectioncancelcompleteevent.h)
-../interface/linkkeyrequestreplycompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplycompleteevent.h)
-../interface/linkkeyrequestreplynegativecompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplynegativecompleteevent.h)
-../interface/pincoderequestreplycompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplycompleteevent.h)
-../interface/pincoderequestreplynegativecompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplynegativecompleteevent.h)
-../interface/remotenamerequestcancelcompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamerequestcancelcompleteevent.h)
-../interface/readlmphandlecompleteevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlmphandlecompleteevent.h)
-../interface/iocapabilityrequestreplycompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestreplycompleteevent.h)
-../interface/userconfirmationrequestreplycompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestreplycompleteevent.h)
-../interface/userconfirmationrequestnegativereplycompleteevent.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestnegativereplycompleteevent.h)
-../interface/userpasskeyrequestreplycompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestreplycompleteevent.h)
-../interface/userpasskeyrequestnegativereplycompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestnegativereplycompleteevent.h)
-../interface/remoteoobdatarequestreplycompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestreplycompleteevent.h)
-../interface/remoteoobdatarequestnegativereplycompleteevent.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestnegativereplycompleteevent.h)
-../interface/iocapabilityrequestnegativereplycompleteevent.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestnegativereplycompleteevent.h)
+../interface/inquirycancelcompleteevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycancelcompleteevent.h)
+../interface/periodicinquirymodecompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/periodicinquirymodecompleteevent.h)
+../interface/exitperiodicinquirymodecompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/exitperiodicinquirymodecompleteevent.h)
+../interface/createconnectioncancelcompleteevent.h 					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createconnectioncancelcompleteevent.h)
+../interface/linkkeyrequestreplycompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplycompleteevent.h)
+../interface/linkkeyrequestreplynegativecompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestreplynegativecompleteevent.h)
+../interface/pincoderequestreplycompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplycompleteevent.h)
+../interface/pincoderequestreplynegativecompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestreplynegativecompleteevent.h)
+../interface/remotenamerequestcancelcompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamerequestcancelcompleteevent.h)
+../interface/readlmphandlecompleteevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlmphandlecompleteevent.h)
+../interface/iocapabilityrequestreplycompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestreplycompleteevent.h)
+../interface/userconfirmationrequestreplycompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestreplycompleteevent.h)
+../interface/userconfirmationrequestnegativereplycompleteevent.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestnegativereplycompleteevent.h)
+../interface/userpasskeyrequestreplycompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestreplycompleteevent.h)
+../interface/userpasskeyrequestnegativereplycompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestnegativereplycompleteevent.h)
+../interface/remoteoobdatarequestreplycompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestreplycompleteevent.h)
+../interface/remoteoobdatarequestnegativereplycompleteevent.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestnegativereplycompleteevent.h)
+../interface/iocapabilityrequestnegativereplycompleteevent.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestnegativereplycompleteevent.h)
 //
 // Link Policy Commands
 //
-../interface/rolediscoverycompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rolediscoverycompleteevent.h)
-../interface/readlinkpolicysettingscompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkpolicysettingscompleteevent.h)
-../interface/writelinkpolicysettingscompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinkpolicysettingscompleteevent.h)
-../interface/readdefaultlinkpolicysettingscompleteevent.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaultlinkpolicysettingscompleteevent.h)
-../interface/writedefaultlinkpolicysettingscompleteevent.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaultlinkpolicysettingscompleteevent.h)
-../interface/sniffsubratingcompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffsubratingcompleteevent.h)
+../interface/rolediscoverycompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rolediscoverycompleteevent.h)
+../interface/readlinkpolicysettingscompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkpolicysettingscompleteevent.h)
+../interface/writelinkpolicysettingscompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinkpolicysettingscompleteevent.h)
+../interface/readdefaultlinkpolicysettingscompleteevent.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaultlinkpolicysettingscompleteevent.h)
+../interface/writedefaultlinkpolicysettingscompleteevent.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaultlinkpolicysettingscompleteevent.h)
+../interface/sniffsubratingcompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffsubratingcompleteevent.h)
 //
 // Controller and Baseband Commands
 //
-../interface/seteventmaskcompleteevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventmaskcompleteevent.h)
-../interface/resetcompleteevent.h									SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetcompleteevent.h)
-../interface/seteventfiltercompleteevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventfiltercompleteevent.h)
-../interface/flushcompleteevent.h									SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flushcompleteevent.h)
-../interface/readpintypecompleteevent.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpintypecompleteevent.h)
-../interface/writepintypecompleteevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepintypecompleteevent.h)
-../interface/createnewunitkeycompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createnewunitkeycompleteevent.h)
-../interface/readstoredlinkkeycompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readstoredlinkkeycompleteevent.h)
-../interface/writestoredlinkkeycompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writestoredlinkkeycompleteevent.h)
-../interface/deletestoredlinkkeycompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/deletestoredlinkkeycompleteevent.h)
-../interface/writelocalnamecompleteevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelocalnamecompleteevent.h)
-../interface/ReadLocalNameCompleteEvent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalnamecompleteevent.h)
-../interface/readconnectionaccepttimeoutcompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readconnectionaccepttimeoutcompleteevent.h)
-../interface/writeconnectionaccepttimeoutcompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeconnectionaccepttimeoutcompleteevent.h)
-../interface/readpagetimeoutcompleteevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagetimeoutcompleteevent.h)
-../interface/writepagetimeoutcompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagetimeoutcompleteevent.h)
-../interface/readscanenablecompleteevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readscanenablecompleteevent.h)
-../interface/writescanenablecompleteevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writescanenablecompleteevent.h)
-../interface/readpagescanactivitycompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanactivitycompleteevent.h)
-../interface/writepagescanactivitycompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanactivitycompleteevent.h)
-../interface/readinquiryscanactivitycompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscanactivitycompleteevent.h)
-../interface/writeinquiryscanactivitycompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscanactivitycompleteevent.h)
-../interface/readauthenticationenablecompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readauthenticationenablecompleteevent.h)
-../interface/writeauthenticationenablecompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeauthenticationenablecompleteevent.h)
-../interface/readclassofdevicecompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclassofdevicecompleteevent.h)
-../interface/writeclassofdevicecompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeclassofdevicecompleteevent.h)
-../interface/readvoicesettingcompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readvoicesettingcompleteevent.h)
-../interface/writevoicesettingcompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writevoicesettingcompleteevent.h)
-../interface/readautomaticflushtimeoutcompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readautomaticflushtimeoutcompleteevent.h)
-../interface/writeautomaticflushtimeoutcompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeautomaticflushtimeoutcompleteevent.h)
-../interface/readnumbroadcastretransmissionscompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumbroadcastretransmissionscompleteevent.h)
-../interface/writenumbroadcastretransmissionscompleteevent.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writenumbroadcastretransmissionscompleteevent.h)
-../interface/readholdmodeactivitycompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readholdmodeactivitycompleteevent.h)
-../interface/writeholdmodeactivitycompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeholdmodeactivitycompleteevent.h)
-../interface/readtransmitpowerlevelcompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readtransmitpowerlevelcompleteevent.h)
-../interface/readsynchronousflowcontrolenablecompleteevent.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsynchronousflowcontrolenablecompleteevent.h)
-../interface/writesynchronousflowcontrolenablecompleteevent.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesynchronousflowcontrolenablecompleteevent.h)
-../interface/setcontrollertohostflowcontrolcompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setcontrollertohostflowcontrolcompleteevent.h)
-../interface/hostbuffersizecompleteevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostbuffersizecompleteevent.h)
-../interface/hostnumberofcompletedpacketscompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostnumberofcompletedpacketscompleteevent.h)
-../interface/readlinksupervisiontimeoutcompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinksupervisiontimeoutcompleteevent.h)
-../interface/writelinksupervisiontimeoutcompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinksupervisiontimeoutcompleteevent.h)
-../interface/readnumberofsupportediaccompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumberofsupportediaccompleteevent.h)
-../interface/readcurrentiaclapcompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readcurrentiaclapcompleteevent.h)
-../interface/writecurrentiaclapcompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writecurrentiaclapcompleteevent.h)
-../interface/setafhhostchannelclassificationcompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setafhhostchannelclassificationcompleteevent.h)
-../interface/readinquiryscantypecompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscantypecompleteevent.h)
-../interface/writeinquiryscantypecompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscantypecompleteevent.h)
-../interface/readinquirymodecompleteevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquirymodecompleteevent.h)
-../interface/writeinquirymodecompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquirymodecompleteevent.h)
-../interface/readpagescantypecompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescantypecompleteevent.h)
-../interface/writepagescantypecompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescantypecompleteevent.h)
-../interface/readafhchannelassessmentmodecompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelassessmentmodecompleteevent.h)
-../interface/writeafhchannelassessmentmodecompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeafhchannelassessmentmodecompleteevent.h)
-../interface/readextendedinquiryresponsecompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readextendedinquiryresponsecompleteevent.h)
-../interface/writeextendedinquiryresponsecompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeextendedinquiryresponsecompleteevent.h)
-../interface/readsimplepairingmodecompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsimplepairingmodecompleteevent.h)
-../interface/writesimplepairingmodecompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingmodecompleteevent.h)
-../interface/readlocaloobdatacompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocaloobdatacompleteevent.h)
-../interface/readinquiryresponsetransmitpowerlevelcompleteevent.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryresponsetransmitpowerlevelcompleteevent.h)
-../interface/writeinquiryresponsetransmitpowerlevelcompleteevent.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryresponsetransmitpowerlevelcompleteevent.h)
-../interface/sendkeypressnotificationcompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sendkeypressnotificationcompleteevent.h)
-../interface/readdefaulterroneousdatareportingcompleteevent.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaulterroneousdatareportingcompleteevent.h)
-../interface/writedefaulterroneousdatareportingcompleteevent.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaulterroneousdatareportingcompleteevent.h)
+../interface/seteventmaskcompleteevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventmaskcompleteevent.h)
+../interface/resetcompleteevent.h									OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetcompleteevent.h)
+../interface/seteventfiltercompleteevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/seteventfiltercompleteevent.h)
+../interface/flushcompleteevent.h									OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flushcompleteevent.h)
+../interface/readpintypecompleteevent.h								OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpintypecompleteevent.h)
+../interface/writepintypecompleteevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepintypecompleteevent.h)
+../interface/createnewunitkeycompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/createnewunitkeycompleteevent.h)
+../interface/readstoredlinkkeycompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readstoredlinkkeycompleteevent.h)
+../interface/writestoredlinkkeycompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writestoredlinkkeycompleteevent.h)
+../interface/deletestoredlinkkeycompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/deletestoredlinkkeycompleteevent.h)
+../interface/writelocalnamecompleteevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelocalnamecompleteevent.h)
+../interface/ReadLocalNameCompleteEvent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalnamecompleteevent.h)
+../interface/readconnectionaccepttimeoutcompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readconnectionaccepttimeoutcompleteevent.h)
+../interface/writeconnectionaccepttimeoutcompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeconnectionaccepttimeoutcompleteevent.h)
+../interface/readpagetimeoutcompleteevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagetimeoutcompleteevent.h)
+../interface/writepagetimeoutcompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagetimeoutcompleteevent.h)
+../interface/readscanenablecompleteevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readscanenablecompleteevent.h)
+../interface/writescanenablecompleteevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writescanenablecompleteevent.h)
+../interface/readpagescanactivitycompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanactivitycompleteevent.h)
+../interface/writepagescanactivitycompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanactivitycompleteevent.h)
+../interface/readinquiryscanactivitycompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscanactivitycompleteevent.h)
+../interface/writeinquiryscanactivitycompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscanactivitycompleteevent.h)
+../interface/readauthenticationenablecompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readauthenticationenablecompleteevent.h)
+../interface/writeauthenticationenablecompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeauthenticationenablecompleteevent.h)
+../interface/readclassofdevicecompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclassofdevicecompleteevent.h)
+../interface/writeclassofdevicecompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeclassofdevicecompleteevent.h)
+../interface/readvoicesettingcompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readvoicesettingcompleteevent.h)
+../interface/writevoicesettingcompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writevoicesettingcompleteevent.h)
+../interface/readautomaticflushtimeoutcompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readautomaticflushtimeoutcompleteevent.h)
+../interface/writeautomaticflushtimeoutcompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeautomaticflushtimeoutcompleteevent.h)
+../interface/readnumbroadcastretransmissionscompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumbroadcastretransmissionscompleteevent.h)
+../interface/writenumbroadcastretransmissionscompleteevent.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writenumbroadcastretransmissionscompleteevent.h)
+../interface/readholdmodeactivitycompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readholdmodeactivitycompleteevent.h)
+../interface/writeholdmodeactivitycompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeholdmodeactivitycompleteevent.h)
+../interface/readtransmitpowerlevelcompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readtransmitpowerlevelcompleteevent.h)
+../interface/readsynchronousflowcontrolenablecompleteevent.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsynchronousflowcontrolenablecompleteevent.h)
+../interface/writesynchronousflowcontrolenablecompleteevent.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesynchronousflowcontrolenablecompleteevent.h)
+../interface/setcontrollertohostflowcontrolcompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setcontrollertohostflowcontrolcompleteevent.h)
+../interface/hostbuffersizecompleteevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostbuffersizecompleteevent.h)
+../interface/hostnumberofcompletedpacketscompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hostnumberofcompletedpacketscompleteevent.h)
+../interface/readlinksupervisiontimeoutcompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinksupervisiontimeoutcompleteevent.h)
+../interface/writelinksupervisiontimeoutcompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writelinksupervisiontimeoutcompleteevent.h)
+../interface/readnumberofsupportediaccompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readnumberofsupportediaccompleteevent.h)
+../interface/readcurrentiaclapcompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readcurrentiaclapcompleteevent.h)
+../interface/writecurrentiaclapcompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writecurrentiaclapcompleteevent.h)
+../interface/setafhhostchannelclassificationcompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/setafhhostchannelclassificationcompleteevent.h)
+../interface/readinquiryscantypecompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryscantypecompleteevent.h)
+../interface/writeinquiryscantypecompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryscantypecompleteevent.h)
+../interface/readinquirymodecompleteevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquirymodecompleteevent.h)
+../interface/writeinquirymodecompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquirymodecompleteevent.h)
+../interface/readpagescantypecompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescantypecompleteevent.h)
+../interface/writepagescantypecompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescantypecompleteevent.h)
+../interface/readafhchannelassessmentmodecompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelassessmentmodecompleteevent.h)
+../interface/writeafhchannelassessmentmodecompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeafhchannelassessmentmodecompleteevent.h)
+../interface/readextendedinquiryresponsecompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readextendedinquiryresponsecompleteevent.h)
+../interface/writeextendedinquiryresponsecompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeextendedinquiryresponsecompleteevent.h)
+../interface/readsimplepairingmodecompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readsimplepairingmodecompleteevent.h)
+../interface/writesimplepairingmodecompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingmodecompleteevent.h)
+../interface/readlocaloobdatacompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocaloobdatacompleteevent.h)
+../interface/readinquiryresponsetransmitpowerlevelcompleteevent.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readinquiryresponsetransmitpowerlevelcompleteevent.h)
+../interface/writeinquiryresponsetransmitpowerlevelcompleteevent.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeinquiryresponsetransmitpowerlevelcompleteevent.h)
+../interface/sendkeypressnotificationcompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sendkeypressnotificationcompleteevent.h)
+../interface/readdefaulterroneousdatareportingcompleteevent.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readdefaulterroneousdatareportingcompleteevent.h)
+../interface/writedefaulterroneousdatareportingcompleteevent.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writedefaulterroneousdatareportingcompleteevent.h)
 //
 // Informational Parameters
 //
-../interface/readlocalversioninfocompleteevent.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalversioninfocompleteevent.h)
-../interface/readlocalsupportedcommandscompleteevent.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedcommandscompleteevent.h)
-../interface/readlocalsupportedfeaturescompleteevent.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedfeaturescompleteevent.h)
-../interface/readlocalextendedfeaturescompleteevent.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalextendedfeaturescompleteevent.h)
-../interface/readbuffersizecompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbuffersizecompleteevent.h)
-../interface/readbdaddrcompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbdaddrcompleteevent.h)
+../interface/readlocalversioninfocompleteevent.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalversioninfocompleteevent.h)
+../interface/readlocalsupportedcommandscompleteevent.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedcommandscompleteevent.h)
+../interface/readlocalsupportedfeaturescompleteevent.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalsupportedfeaturescompleteevent.h)
+../interface/readlocalextendedfeaturescompleteevent.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlocalextendedfeaturescompleteevent.h)
+../interface/readbuffersizecompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbuffersizecompleteevent.h)
+../interface/readbdaddrcompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readbdaddrcompleteevent.h)
 //
 // Status Parameters
 //
-../interface/readfailedcontactcountercompleteevent.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readfailedcontactcountercompleteevent.h)
-../interface/resetfailedcontactcountercompleteevent.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetfailedcontactcountercompleteevent.h)
-../interface/readlinkqualitycompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkqualitycompleteevent.h)
-../interface/readrssicompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readrssicompleteevent.h)
-../interface/readafhchannelmapcompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelmapcompleteevent.h)
-../interface/readclockcompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockcompleteevent.h)
+../interface/readfailedcontactcountercompleteevent.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readfailedcontactcountercompleteevent.h)
+../interface/resetfailedcontactcountercompleteevent.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/resetfailedcontactcountercompleteevent.h)
+../interface/readlinkqualitycompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readlinkqualitycompleteevent.h)
+../interface/readrssicompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readrssicompleteevent.h)
+../interface/readafhchannelmapcompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readafhchannelmapcompleteevent.h)
+../interface/readclockcompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockcompleteevent.h)
 //
 // Testing Commands
 //
-../interface/readloopbackmodecompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readloopbackmodecompleteevent.h)
-../interface/writeloopbackmodecompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeloopbackmodecompleteevent.h)
-../interface/enabledeviceundertestmodecompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enabledeviceundertestmodecompleteevent.h)
-../interface/writesimplepairingdebugmodecompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingdebugmodecompleteevent.h)
+../interface/readloopbackmodecompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readloopbackmodecompleteevent.h)
+../interface/writeloopbackmodecompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeloopbackmodecompleteevent.h)
+../interface/enabledeviceundertestmodecompleteevent.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enabledeviceundertestmodecompleteevent.h)
+../interface/writesimplepairingdebugmodecompleteevent.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writesimplepairingdebugmodecompleteevent.h)
 
 // Events
-../interface/inquirycompleteevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycompleteevent.h)
-../interface/inquiryresultevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquiryresultevent.h)
-../interface/connectioncompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/connectioncompleteevent.h)
-../interface/connectionrequestevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/connectionrequestevent.h)
-../interface/disconnectioncompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/disconnectioncompleteevent.h)
-../interface/authenticationcompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/authenticationcompleteevent.h)
-../interface/remotenamereqcompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamereqcompleteevent.h)
-../interface/encryptionchangeevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/encryptionchangeevent.h)
-../interface/changelinkkeyevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/changelinkkeyevent.h)
-../interface/masterlinkkeyevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/masterlinkkeyevent.h)
-../interface/readremsuppfeatcompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremsuppfeatcompleteevent.h)
-../interface/readremverinfocompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremverinfocompleteevent.h)
-../interface/qossetupcompleteevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qossetupcompleteevent.h)
-../interface/commandstatusevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/commandstatusevent.h)
-../interface/hardwareerrorevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hardwareerrorevent.h)
-../interface/flushoccurredevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flushoccurredevent.h)
-../interface/rolechangeevent.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rolechangeevent.h)
-../interface/numberofcompletedpacketsevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/numberofcompletedpacketsevent.h)
-../interface/modechangeevent.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/modechangeevent.h)
-../interface/returnlinkkeysevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/returnlinkkeysevent.h)
-../interface/pincoderequestevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestevent.h)
-../interface/linkkeyrequestevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestevent.h)
-../interface/linkkeynotificationevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeynotificationevent.h)
-../interface/loopbackcommandevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/loopbackcommandevent.h)
-../interface/databufferoverflowevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/databufferoverflowevent.h)
-../interface/maxslotschangeevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/maxslotschangeevent.h)
-../interface/readclockoffsetevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockoffsetevent.h)
-../interface/connectionpackettypechangedevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/connectionpackettypechangedevent.h)
-../interface/qosviolationevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qosviolationevent.h)
-../interface/pagescanrepetitionmodechangeevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pagescanrepetitionmodechangeevent.h)
-../interface/flowspecificationcompleteevent.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flowspecificationcompleteevent.h)
-../interface/inquiryresultwithrssievent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquiryresultwithrssievent.h)
-../interface/readremoteextendedfeaturescompleteevent.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremoteextendedfeaturescompleteevent.h)
-../interface/synchronousconnectioncompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/synchronousconnectioncompleteevent.h)
-../interface/synchronousconnectionchangedevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/synchronousconnectionchangedevent.h)
-../interface/sniffsubratingevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffsubratingevent.h)
-../interface/extendedinquiryresultevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/extendedinquiryresultevent.h)
-../interface/encryptionkeyrefreshcompleteevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/encryptionkeyrefreshcompleteevent.h)
-../interface/iocapabilityrequestevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestevent.h)
-../interface/iocapabilityresponseevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityresponseevent.h)
-../interface/userconfirmationrequestevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestevent.h)
-../interface/userpasskeyrequestevent.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestevent.h)
-../interface/remoteoobdatarequestevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestevent.h)
-../interface/simplepairingcompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/simplepairingcompleteevent.h)
-../interface/linksupervisiontimeoutchangedevent.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linksupervisiontimeoutchangedevent.h)
-../interface/enhancedflushcompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enhancedflushcompleteevent.h)
-../interface/userpasskeynotificationevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeynotificationevent.h)
-../interface/keypressnotificationevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/keypressnotificationevent.h)
-../interface/remotehostsupportedfeaturesnotificationevent.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotehostsupportedfeaturesnotificationevent.h)
+../interface/inquirycompleteevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquirycompleteevent.h)
+../interface/inquiryresultevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquiryresultevent.h)
+../interface/connectioncompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/connectioncompleteevent.h)
+../interface/connectionrequestevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/connectionrequestevent.h)
+../interface/disconnectioncompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/disconnectioncompleteevent.h)
+../interface/authenticationcompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/authenticationcompleteevent.h)
+../interface/remotenamereqcompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotenamereqcompleteevent.h)
+../interface/encryptionchangeevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/encryptionchangeevent.h)
+../interface/changelinkkeyevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/changelinkkeyevent.h)
+../interface/masterlinkkeyevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/masterlinkkeyevent.h)
+../interface/readremsuppfeatcompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremsuppfeatcompleteevent.h)
+../interface/readremverinfocompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremverinfocompleteevent.h)
+../interface/qossetupcompleteevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qossetupcompleteevent.h)
+../interface/commandstatusevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/commandstatusevent.h)
+../interface/hardwareerrorevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/hardwareerrorevent.h)
+../interface/flushoccurredevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flushoccurredevent.h)
+../interface/rolechangeevent.h								OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/rolechangeevent.h)
+../interface/numberofcompletedpacketsevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/numberofcompletedpacketsevent.h)
+../interface/modechangeevent.h								OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/modechangeevent.h)
+../interface/returnlinkkeysevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/returnlinkkeysevent.h)
+../interface/pincoderequestevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pincoderequestevent.h)
+../interface/linkkeyrequestevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeyrequestevent.h)
+../interface/linkkeynotificationevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linkkeynotificationevent.h)
+../interface/loopbackcommandevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/loopbackcommandevent.h)
+../interface/databufferoverflowevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/databufferoverflowevent.h)
+../interface/maxslotschangeevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/maxslotschangeevent.h)
+../interface/readclockoffsetevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readclockoffsetevent.h)
+../interface/connectionpackettypechangedevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/connectionpackettypechangedevent.h)
+../interface/qosviolationevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/qosviolationevent.h)
+../interface/pagescanrepetitionmodechangeevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pagescanrepetitionmodechangeevent.h)
+../interface/flowspecificationcompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/flowspecificationcompleteevent.h)
+../interface/inquiryresultwithrssievent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/inquiryresultwithrssievent.h)
+../interface/readremoteextendedfeaturescompleteevent.h		OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readremoteextendedfeaturescompleteevent.h)
+../interface/synchronousconnectioncompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/synchronousconnectioncompleteevent.h)
+../interface/synchronousconnectionchangedevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/synchronousconnectionchangedevent.h)
+../interface/sniffsubratingevent.h							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/sniffsubratingevent.h)
+../interface/extendedinquiryresultevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/extendedinquiryresultevent.h)
+../interface/encryptionkeyrefreshcompleteevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/encryptionkeyrefreshcompleteevent.h)
+../interface/iocapabilityrequestevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityrequestevent.h)
+../interface/iocapabilityresponseevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/iocapabilityresponseevent.h)
+../interface/userconfirmationrequestevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userconfirmationrequestevent.h)
+../interface/userpasskeyrequestevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeyrequestevent.h)
+../interface/remoteoobdatarequestevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remoteoobdatarequestevent.h)
+../interface/simplepairingcompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/simplepairingcompleteevent.h)
+../interface/linksupervisiontimeoutchangedevent.h			OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/linksupervisiontimeoutchangedevent.h)
+../interface/enhancedflushcompleteevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/enhancedflushcompleteevent.h)
+../interface/userpasskeynotificationevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/userpasskeynotificationevent.h)
+../interface/keypressnotificationevent.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/keypressnotificationevent.h)
+../interface/remotehostsupportedfeaturesnotificationevent.h	OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/remotehostsupportedfeaturesnotificationevent.h)
 
 // Deprecated Commands and Events
-../interface/readpagescanperiodcommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanperiodcommand.h)
-../interface/readpagescanperiodcompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanperiodcompleteevent.h)
-../interface/writepagescanperiodcommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanperiodcommand.h)
-../interface/writepagescanperiodcompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanperiodcompleteevent.h)
-../interface/addscoconnectioncommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/addscoconnectioncommand.h)
-../interface/pagescanmodechangeevent.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pagescanmodechangeevent.h)
-../interface/readencryptionmodecommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readencryptionmodecommand.h)
-../interface/readencryptionmodecompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readencryptionmodecompleteevent.h)
-../interface/writeencryptionmodecommand.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeencryptionmodecommand.h)
-../interface/writeencryptionmodecompleteevent.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeencryptionmodecompleteevent.h)
+../interface/readpagescanperiodcommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanperiodcommand.h)
+../interface/readpagescanperiodcompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readpagescanperiodcompleteevent.h)
+../interface/writepagescanperiodcommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanperiodcommand.h)
+../interface/writepagescanperiodcompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writepagescanperiodcompleteevent.h)
+../interface/addscoconnectioncommand.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/addscoconnectioncommand.h)
+../interface/pagescanmodechangeevent.h						OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/pagescanmodechangeevent.h)
+../interface/readencryptionmodecommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readencryptionmodecommand.h)
+../interface/readencryptionmodecompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/readencryptionmodecompleteevent.h)
+../interface/writeencryptionmodecommand.h					OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeencryptionmodecommand.h)
+../interface/writeencryptionmodecompleteevent.h				OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/writeencryptionmodecompleteevent.h)
 
 
 // DEF files for the implementation to use.
-../BWINS/commandseventsU.def							/epoc32/include/bluetooth/hci/bwins/commandseventsu.def
-../EABI/commandseventsU.def							/epoc32/include/bluetooth/hci/eabi/commandseventsu.def
+../BWINS/commandseventsU.def							OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/bwins/commandseventsu.def)
+../EABI/commandseventsU.def								OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/hci/eabi/commandseventsu.def)
 
 PRJ_MMPFILES
 commandsevents_base.mmp