diff -r 19fb38abab1d -r bf47f3b79154 omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPItemBAse.h
--- a/omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPItemBAse.h	Fri Apr 16 15:52:47 2010 +0300
+++ b/omaprovisioning/provisioning/WAPAdapter/Inc/CWPWAPItemBAse.h	Mon May 03 13:19:46 2010 +0300
@@ -24,11 +24,12 @@
 #include <e32base.h>
 #include <MWPVisitor.h>
 #include "MWPWAPItemBase.h"
+#include <cmmanagerext.h>
+#include <cmconnectionmethodext.h>
 
 // FORWARD DECLARATIONS
 class CCommsDatabase;
-class CApDataHandler;
-class CApAccessPointItem;
+
 
 // CLASS DECLARATION
 
@@ -73,7 +74,7 @@
             const TDesC& aDefaultName, 
             CWPCharacteristic& aCharacteristic, 
             CCommsDatabase*& aCommsDb, 
-            CApDataHandler*& aAPHandler );
+            RCmManagerExt*& aCmManager);
 
         /**
         * 2nd phase base constructor. Derived classes must call this.
@@ -96,7 +97,7 @@
         * has a home page, create a new one.
         * @param aItem Access point to access
         */
-        void WriteHomePageL( CApAccessPointItem& aItem );
+        void WriteHomePageL( RCmConnectionMethodExt& aCmItem );
 
         /**
         * Create a valid name for the access point.
@@ -133,8 +134,9 @@
         // Comms db. Refs.
         CCommsDatabase*& iCommsDb;
 
-        // APEngine. Refs.
-        CApDataHandler*& iAPHandler;
+                // @var Pointer to Connection Method Manager that is required to access
+        // Access Point data
+        RCmManagerExt*&   iCmManager;
     };
 
 #endif  // CWPWAPITEMBASE_H