--- a/satengine/satserver/Engine/src/CSatApnHandler.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/satengine/satserver/Engine/src/CSatApnHandler.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -17,9 +17,7 @@
 
 // INCLUDE FILES
 #include <cmmanager.h>
-#include <cmmanagerext.h>
 #include <cmconnectionmethod.h>
-#include <cmconnectionmethodext.h>
 #include <cmconnectionmethoddef.h>
 #include <cmpluginpacketdatadef.h>
 #include <cmdestination.h>
@@ -209,11 +207,11 @@
     if ( aApnId )
         { 
         // Create CMManager Session
-        RCmManagerExt cmManager;
+        RCmManager cmManager;
         cmManager.OpenLC();
         
         // Get the connection method
-        RCmConnectionMethodExt cm;
+        RCmConnectionMethod cm;
         cm = cmManager.ConnectionMethodL( aApnId );
         CleanupClosePushL( cm );
 
@@ -247,12 +245,12 @@
         &aReqApn )
     
     // Create CMManager Session
-    RCmManagerExt cmManager;
+    RCmManager cmManager;
     cmManager.OpenLC();
 
     // Create a connection method without destination. So when we can find 
     // the connection method by going through the connection method list.
-    RCmConnectionMethodExt cm;
+    RCmConnectionMethod cm;
     cm = cmManager.CreateConnectionMethodL( KUidPacketDataBearerType );
     CleanupClosePushL( cm );