--- a/bluetoothengine/bteng/inc/btengserver.h	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/bteng/inc/btengserver.h	Wed Sep 01 12:20:04 2010 +0100
@@ -32,6 +32,7 @@
 class CBTEngSrvBBConnMgr;
 class CBTEngSrvKeyWatcher;
 class CBTEngSdpDbHandler;
+class CBTEngPairMan;
 class CPolicyServer;
 class TEComResolverParams;
 class CImplementationInformation;
@@ -149,6 +150,14 @@
     inline CBTEngSrvBBConnMgr* BasebandConnectionManager() const
             { return iBBConnMgr; }
 
+    /**
+     * Getter for pairing manager. Ownership is not transferred.
+     *
+     * @since Symbian^3
+     * @return Pointer to instance of baseband connection manager.
+     */
+    inline CBTEngPairMan* PairManager() const
+            { return iPairMan; }
 
     /**
      * Getter for socket server session.
@@ -161,6 +170,16 @@
             { return  iSocketServ; }
 
     /**
+     * Getter for registry server session.
+     * This handle can be used for creating subsessions.
+     *
+     * @since Symbian^3
+     * @return Reference to session with the registry server.
+     */
+    inline RBTRegServ& RegistrServer()
+            { return iBTRegServ; }
+
+    /**
      * Set Bluetooth on or off
      *
      * @since S60 v3.2
@@ -386,6 +405,11 @@
      * Callback for expiry of Simple Pairing debug mode.
      */
     TDeltaTimerEntry iDebugModeCallBack;
+
+    /**
+     * Pairing manager.
+     */
+    CBTEngPairMan* iPairMan;
     
     /**
     * Socket Server instance for this and other classes to access Bluetooth socket APIs.
@@ -393,6 +417,11 @@
     RSocketServ iSocketServ;
 
     /**
+    * Registry Server instance for bteng to access Bluetooth registry APIs.
+    */      
+    RBTRegServ iBTRegServ;
+
+    /**
      * Our state machine for handling power on/off.
      * Own.
      */