--- a/msgfw_plat/always_online_plugin_api/inc/AlwaysOnlineEComInterface.h	Sun Mar 14 13:11:44 2010 +0000
+++ b/msgfw_plat/always_online_plugin_api/inc/AlwaysOnlineEComInterface.h	Sun Mar 28 16:37:42 2010 +0100
@@ -57,7 +57,7 @@
 	//The function which instantiates an object of this type 
 	// using the MatchString as the resolver parameters.
 	//(eg NewL for a CBase derived object).
-	static CAlwaysOnlineEComInterface* CAlwaysOnlineEComInterface::NewL(const TDesC8& aMatchString);
+	static CAlwaysOnlineEComInterface* NewL(const TDesC8& aMatchString);
 
 	//Standardised destructor.
 	inline virtual ~CAlwaysOnlineEComInterface();

--- a/msgfw_plat/msg_common_utils_api/inc/contactmatcher.h	Sun Mar 14 13:11:44 2010 +0000
+++ b/msgfw_plat/msg_common_utils_api/inc/contactmatcher.h	Sun Mar 28 16:37:42 2010 +0100
@@ -93,7 +93,7 @@
     *
     * @return CContactMatcher* Pointer to newly created instance.
     */
-    IMPORT_C static CContactMatcher* CContactMatcher::NewLC( RFs* aFsSession );
+    IMPORT_C static CContactMatcher* NewLC( RFs* aFsSession );
 
     /**
     * C++ destructor.
@@ -564,8 +564,8 @@
         const MVPbkFieldType& aFType ) const;
     static CVPbkContactStoreUriArray* GetStoreArrayLC(
         const TDesC& (* const aFuncPtrs[])() );
-    void CContactMatcher::OpenStoreL( const TDesC& (* const aFuncPtrs[])() );
-    void CContactMatcher::OpenStoreL( const TDesC& (* const aFuncPtrs[])(),
+    void OpenStoreL( const TDesC& (* const aFuncPtrs[])() );
+    void OpenStoreL( const TDesC& (* const aFuncPtrs[])(),
         TRequestStatus&  aStatus );
     void FreeOldOperation();
 

--- a/msgfw_plat/msg_common_utils_api/inc/msgtextutils.h	Sun Mar 14 13:11:44 2010 +0000
+++ b/msgfw_plat/msg_common_utils_api/inc/msgtextutils.h	Sun Mar 28 16:37:42 2010 +0100
@@ -231,7 +231,7 @@
         * @param    aFile       IN (Text) file to be recognized
         * @return   CharConv id of the character set
         */
-        IMPORT_C static TUint CMsgTextUtils::RecognizeCharSetL( RFs& aFs, RFile& aFile );
+        IMPORT_C static TUint RecognizeCharSetL( RFs& aFs, RFile& aFile );
 
         /*
         * GetSafeAttachmentNameLC