diff -r 14e279d2bbb7 -r 22de2e391156 bluetoothmgmt/bluetoothclientlib/bld.inf
--- a/bluetoothmgmt/bluetoothclientlib/bld.inf	Wed Jul 21 15:42:05 2010 +0300
+++ b/bluetoothmgmt/bluetoothclientlib/bld.inf	Thu Sep 23 17:06:47 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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,40 +16,36 @@
 
 PRJ_EXPORTS
 //
-inc/bttypes.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bttypes.h)
-inc/bt_sock.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bt_sock.h)
-inc/btsocketoptionlevels.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btsocketoptionlevels.h)
-inc/btsockaddr.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btsockaddr.h)
-inc/btsecurity.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btsecurity.h)
-inc/btbasebandpolicy.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btbasebandpolicy.h)
-inc/btsyncbandwidth.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(btsyncbandwidth.h)
-inc/bt_subscribe_sec.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bt_subscribe.h)
-inc/bt_subscribe_keybase.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bt_subscribe_keybase.h)
-inc/btbaseband.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/btbaseband.h)
-inc/btscoparams.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/btscoparams.h)
-inc/lmoptions.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/lmoptions.h)
+inc/bttypes.h OS_LAYER_PUBLIC_EXPORT_PATH(bttypes.h)
+inc/bt_sock.h OS_LAYER_PUBLIC_EXPORT_PATH(bt_sock.h)
+inc/btsocketoptionlevels.h OS_LAYER_PUBLIC_EXPORT_PATH(btsocketoptionlevels.h)
+inc/btsockaddr.h OS_LAYER_PUBLIC_EXPORT_PATH(btsockaddr.h)
+inc/btsecurity.h OS_LAYER_PUBLIC_EXPORT_PATH(btsecurity.h)
+inc/btbasebandpolicy.h OS_LAYER_PUBLIC_EXPORT_PATH(btbasebandpolicy.h)
+inc/btsyncbandwidth.h OS_LAYER_PUBLIC_EXPORT_PATH(btsyncbandwidth.h)
+inc/bt_subscribe_sec.h OS_LAYER_PUBLIC_EXPORT_PATH(bt_subscribe.h)
+inc/bt_subscribe_keybase.h OS_LAYER_PUBLIC_EXPORT_PATH(bt_subscribe_keybase.h)
+inc/btbaseband.h OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/btbaseband.h)
+inc/btscoparams.h OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/btscoparams.h)
+inc/lmoptions.h OS_LAYER_PUBLIC_EXPORT_PATH(bluetooth/lmoptions.h)
 
-inc/bttypespartner.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bttypespartner.h)
-inc/bthci.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bthci.h)
-inc/bluetoothAV.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetoothav.h)
-inc/avctptypes.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/avctptypes.h)
-inc/avctpservices.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(avctpservices.h)
-inc/bt_subscribe_partner.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bt_subscribe_partner.h)
-inc/pairing.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/pairing.h)
-inc/eirpublisherbase.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirpublisherbase.h)
-inc/eirpublishermanufacturerspecificdata.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirpublishermanufacturerspecificdata.h)
-inc/aclsockaddr.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/aclsockaddr.h)
+inc/bttypespartner.h OS_LAYER_PLATFORM_EXPORT_PATH(bttypespartner.h)
+inc/bthci.h OS_LAYER_PLATFORM_EXPORT_PATH(bthci.h)
+inc/bluetoothAV.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetoothav.h)
+inc/avctptypes.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/avctptypes.h)
+inc/avctpservices.h OS_LAYER_PLATFORM_EXPORT_PATH(avctpservices.h)
+inc/bt_subscribe_partner.h OS_LAYER_PLATFORM_EXPORT_PATH(bt_subscribe_partner.h)
+inc/pairing.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/pairing.h)
+inc/eirpublisherbase.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirpublisherbase.h)
+inc/eirpublishermanufacturerspecificdata.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/eirpublishermanufacturerspecificdata.h)
+inc/aclsockaddr.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/aclsockaddr.h)
+inc/a2dpoptimisation.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/a2dpoptimisation.h)
+inc/a2dpoptimisationparams.h OS_LAYER_PLATFORM_EXPORT_PATH(bluetooth/a2dpoptimisationparams.h)
 
 
-
-inc/a2dpoptimisation.h						/epoc32/include/bluetooth/a2dpoptimisation.h
-inc/a2dpoptimisationparams.h				/epoc32/include/bluetooth/a2dpoptimisationparams.h
 PRJ_MMPFILES
 //
 btlib/bluetooth.mmp
 avlib/bluetoothAV.mmp
 avctpservices/avctpservices.mmp
 a2dpoptimisation/a2dpoptimisation.mmp
-
-PRJ_TESTMMPFILES
-//