--- a/ncdengine/engine/accesspointmanager/inc/catalogsaccesspointmanagerimpl.h	Thu Aug 19 10:02:49 2010 +0300
+++ b/ncdengine/engine/accesspointmanager/inc/catalogsaccesspointmanagerimpl.h	Tue Aug 31 15:21:33 2010 +0300
@@ -20,7 +20,14 @@
 #define C_CATALOGSACCESSPOINTMANAGERIMPL_H
 
 #include <e32def.h>
+#include <e32base.h> // HLa: DLMgr remove
+
+#ifdef _0
 #include <ApAccessPointItem.h>
+#endif
+
+#include <e32cmn.h>
+
 #include "catalogsaccesspointmanager.h"
 #include "catalogsaccesspointobserver.h"
 
@@ -190,10 +197,11 @@
      */
     void RemoveAccessPointsL();
         
-    
+#ifdef _0
     HBufC16* ReadText16L( CApAccessPointItem* aItem, const TApMember& aApMember );
 
     HBufC8* ReadText8L( CApAccessPointItem* aItem, const TApMember& aApMember );
+#endif 
     
     TBool MatchInCommsDbL( const CCatalogsAccessPointSettings& aSettings, TUint32& aId );
 
@@ -206,7 +214,9 @@
     void SaveToStorageL();
     
         
+#ifdef _0
     TBool MatchingSettingsL(const CCatalogsAccessPointSettings& aSettings, CApAccessPointItem& aItem);
+#endif
     
     void SetApDetailL( CCatalogsAccessPoint& aAp, const TDesC& aKey, const TDesC& aValue );