--- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/inc/wlanconversionutil.h	Sun Mar 14 13:16:18 2010 +0000
+++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/inc/wlanconversionutil.h	Sun Mar 28 16:41:03 2010 +0100
@@ -232,7 +232,7 @@
         * @param aCorePowerMode (IN)
         * @return TPowerMode
         */        
-        static TPowerMode TWlanConversionUtil::ConvertPowerMode(
+        static TPowerMode ConvertPowerMode(
             const core_power_mode_e& aCorePowerMode );
 
         /**
@@ -243,7 +243,7 @@
         * @param aCoreWakeUpMode (OUT)
         * @param aCoreWakeUpInterval (IN)
         */        
-        static void TWlanConversionUtil::ConvertWakeUpInterval(
+        static void ConvertWakeUpInterval(
             TWlanWakeUpInterval& aAmWakeUpMode,
             TUint8& aAmWakeUpInterval,
             const core_power_save_wakeup_mode_e& aCoreWakeUpMode,

--- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/inc/wlantimerservices.h	Sun Mar 14 13:16:18 2010 +0000
+++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/inc/wlantimerservices.h	Sun Mar 28 16:41:03 2010 +0100
@@ -31,7 +31,7 @@
 class CTimeoutRequestEntry : public CBase
     {
 public:
-    CTimeoutRequestEntry::CTimeoutRequestEntry(
+    CTimeoutRequestEntry(
     	TTime& aAt,
     	MWlanTimerServiceCallback& aCb,
     	TUint aRequestId,

--- a/wlan_bearer/wlanldd/wlan_common/osa_common/inc/osaheap.h	Sun Mar 14 13:16:18 2010 +0000
+++ b/wlan_bearer/wlanldd/wlan_common/osa_common/inc/osaheap.h	Sun Mar 28 16:41:03 2010 +0100
@@ -113,7 +113,7 @@
 
     RWlanHeap(TInt aInitialSize, TInt aAllocationUnit );
     
-    TAny* RWlanHeap::operator new(TUint aSize, TAny* aBase);
+    TAny* operator new(TUint aSize, TAny* aBase);
     
     void Initialise();
     

--- a/wlan_bearer/wlannwif/inc/wlanmcprfactory.h	Sun Mar 14 13:16:18 2010 +0000
+++ b/wlan_bearer/wlannwif/inc/wlanmcprfactory.h	Sun Mar 28 16:41:03 2010 +0100
@@ -33,7 +33,7 @@
 protected:
 	CWlanMetaConnectionProviderFactory(TUid aFactoryId, ESock::CMetaConnectionFactoryContainer& aParentContainer);
 	
-	ESock::ACommsFactoryNodeId* CWlanMetaConnectionProviderFactory::DoCreateObjectL(ESock::TFactoryQueryBase& aQuery);
+	ESock::ACommsFactoryNodeId* DoCreateObjectL(ESock::TFactoryQueryBase& aQuery);
 	};
 
 #endif //__WLANMCPRFACTORY_H__