--- a/epoc32/include/bt_subscribe.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/bt_subscribe.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
@@ -18,18 +18,16 @@
 //
 
 
-
-
 #ifndef BT_SUBSCRIBE_H
 #define BT_SUBSCRIBE_H
 
-#include <e32property.h>
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <bt_subscribe_partner.h>
+#endif
 
-/**
-@publishedAll
-@released
-*/
-const TInt KUidBluetoothPubSubKeyBase = 0x10203637;	//	Range of 32 values registered
+#include <bt_subscribe_keybase.h>
+
+#include <e32property.h>
 
 // P&S Categories
  
@@ -266,36 +264,6 @@
 //-------------
 
 /**
-KPropertyKeyBluetoothSetAFHChannelAssessmentMode
-The key to send the Bluetooth AFH Channel Assessment Mode to the local Bluetooth hardware.
-If AFH Channel Assessment Mode is on, then the local hardware will keep checking what 
-channels are busy and so should be avoided in a connection using AFH.
-The P&S value will contain a boolean: ETrue if AFH Channel Assessment Mode is required, 
-EFalse if not.
-The hardware is likely to support this either never, in master role only, 
-or in both master and slave roles.
-The default setting of AFH Channel Assessment Mode in the hardware is 'on' 
-whenever the hardware can support it.
-@publishedPartner
-@released
-@capability LocalServices	Needed for both read and write access to this property
-@capability NetworkControl	Needed for both read and write access to this property
-*/
-const TUint KPropertyKeyBluetoothSetAFHChannelAssessmentMode = (KUidBluetoothPubSubKeyBase + 10);
-
-/**
-KPropertyKeyBluetoothAFHChannelAssessmentMode
-This is a deprecated constant, maintained for source compatibility with non-secured 
-Symbian OS platforms.
-
-@publishedPartner
-@deprecated
-*/
-const TUint KPropertyKeyBluetoothAFHChannelAssessmentMode = KPropertyKeyBluetoothSetAFHChannelAssessmentMode;
-
-//-------------
-
-/**
 KPropertyKeyBluetoothGetRegistryTableChange
 The key to observe changes in the Bluetooth Registry
 The P&S value will contain an integer describing which of the tables in the Bluetooth Registry changed
@@ -451,21 +419,6 @@
 */
 const TUint KPropertyKeyBluetoothHostResolverActive = (KUidBluetoothPubSubKeyBase + 20); 
 
-/**
-KPropertyKeyBluetoothSetSimplePairingDebugMode
-The key is intended to be used by a platform to set the stack into simple pairing debug mode.
-Once enabled (by setting to ETrue) then it cannot be disabled, the mode will remain set until
-the Bluetooth stack has been restarted.
-When the Symbian simple pairing debug mode is enabled then the stack will instruct the hardware
-to generate debug link keys for use with air traffic capture.
-When the Symbian simple pairing debug mode is disabled a remote device attempting to make a 
-connection with a debug link key will be rejected for secure reasons. 
-@publishedPartner
-@released
-@capability LocalServices	Needed for both read and write access to this property
-@capability CommDD			Needed for write access to this property
-*/
-const TUint KPropertyKeyBluetoothSetSimplePairingDebugMode = (KUidBluetoothPubSubKeyBase + 21);
 
 /**
 KPropertyKeyBluetoothGetSimplePairingDebugMode