--- a/cbs/CbsServer/ServerInc/CCbsMessage.h	Sun Mar 14 13:11:59 2010 +0000
+++ b/cbs/CbsServer/ServerInc/CCbsMessage.h	Sun Mar 28 16:37:52 2010 +0100
@@ -36,7 +36,7 @@
     const TLitC< 3 > iCode;
     const TCbsDbLanguage iLang;
 
-    TCbsIso639ToLangMapElement::TCbsIso639ToLangMapElement( 
+    TCbsIso639ToLangMapElement( 
         const TLitC< 3 > aCode, 
         TCbsDbLanguage aLang )
         :iCode( aCode ), 

--- a/convergedcallengine/cce/inc/ccceutility.h	Sun Mar 14 13:11:59 2010 +0000
+++ b/convergedcallengine/cce/inc/ccceutility.h	Sun Mar 28 16:37:52 2010 +0100
@@ -58,7 +58,7 @@
      * @since S60 3.2
      * @param aPanic Panic code
      */
-    static void CCCEUtility::Panic( const TCCEPanic aPanic );
+    static void Panic( const TCCEPanic aPanic );
 
     };
 

--- a/convergedcallengine/csplugin/inc/cspaudiohandler.h	Sun Mar 14 13:11:59 2010 +0000
+++ b/convergedcallengine/csplugin/inc/cspaudiohandler.h	Sun Mar 28 16:37:52 2010 +0100
@@ -82,7 +82,7 @@
         * @param aUid uid of setting 
         * @param aVal value
         */
-        virtual void CSPAudioHandler::HandleNotifyCenRepL( 
+        virtual void HandleNotifyCenRepL( 
                 const TUid aUid, 
                 const TUint32 aKey,
                 TInt aVal );

--- a/convergedcallengine/csplugin/inc/cspcall.h	Sun Mar 14 13:11:59 2010 +0000
+++ b/convergedcallengine/csplugin/inc/cspcall.h	Sun Mar 28 16:37:52 2010 +0100
@@ -477,7 +477,7 @@
         * @return corresponding CCP state
         */
         MCCPCallObserver::TCCPCallState 
-            CSPCall::CCPStateFromETelState(
+            CCPStateFromETelState(
                 RMobileCall::TMobileCallStatus aEtelState );
                 
         /**

--- a/convergedcallengine/csplugin/inc/cspetelcallrequester.h	Sun Mar 14 13:11:59 2010 +0000
+++ b/convergedcallengine/csplugin/inc/cspetelcallrequester.h	Sun Mar 28 16:37:52 2010 +0100
@@ -150,7 +150,7 @@
         * Cancel dial (applies both emergency and normal calls)
         * @return result of cancel (system wide error code)
         */
-        TInt CSPEtelCallRequester::DialCancel();
+        TInt DialCancel();
         
     protected: // From CActive
         /**
@@ -199,4 +199,4 @@
 
     };
 
-#endif // CSPETELCALLREQUESTER_H
\ No newline at end of file
+#endif // CSPETELCALLREQUESTER_H

--- a/convergedcallengine/csplugin/inc/cspetelcallwaitingrequester.h	Sun Mar 14 13:11:59 2010 +0000
+++ b/convergedcallengine/csplugin/inc/cspetelcallwaitingrequester.h	Sun Mar 28 16:37:52 2010 +0100
@@ -102,14 +102,14 @@
         * @param aPhone mobile phone reference needed for reading cw setting
         *
         */
-        CSPEtelCallWaitingRequester::CSPEtelCallWaitingRequester(RMobilePhone& aPhone);
+        CSPEtelCallWaitingRequester(RMobilePhone& aPhone);
                               
         /**
         * Constructs the requester.
         *
         * @param aPhone phone reference
         */
-        void CSPEtelCallWaitingRequester::ConstructL();
+        void ConstructL();
         
         /**
         * Starts monitoring call waiting setting.

--- a/phoneclientserver/phoneclient/Inc/UssdWrapper/Ussd_Ext/CPhCltUssdImp.h	Sun Mar 14 13:11:59 2010 +0000
+++ b/phoneclientserver/phoneclient/Inc/UssdWrapper/Ussd_Ext/CPhCltUssdImp.h	Sun Mar 28 16:37:52 2010 +0100
@@ -188,7 +188,7 @@
         void EncodeL( const TDesC& aSrc, TDes8& aDes );
         
         // Finds CR character        
-        void CPhCltUssdImp::FindFirstCarriageReturnL( 
+        void FindFirstCarriageReturnL( 
         const TDesC& aBuffer ,
         TUint& aSkipChars , 
         TUint& aStartBit );

--- a/phonesrv_plat/cenrep_database_api/inc/cenrepdatabaseproperty.h	Sun Mar 14 13:11:59 2010 +0000
+++ b/phonesrv_plat/cenrep_database_api/inc/cenrepdatabaseproperty.h	Sun Mar 28 16:37:52 2010 +0100
@@ -109,8 +109,7 @@
 	     * @param aProperty property to be compared
 	     * @return ETrue if properties have same data
 	     */
-	    IMPORT_C TBool CCenRepDatabaseProperty::operator==( 
-	                const CCenRepDatabaseProperty& aProperty ) const;
+	    IMPORT_C TBool operator==( const CCenRepDatabaseProperty& aProperty ) const;
 
 	private:
 

--- a/satui/satapp/SATUIInc/CSatUiWaitDialog.h	Sun Mar 14 13:11:59 2010 +0000
+++ b/satui/satapp/SATUIInc/CSatUiWaitDialog.h	Sun Mar 28 16:37:52 2010 +0100
@@ -58,7 +58,7 @@
          * @param aButtonId The ID of the button that was activated
          * @return ETrue to validate and exit the dialog
          */
-        TBool CSatUiWaitDialog::OkToExitL( TInt aButtonId );
+        TBool OkToExitL( TInt aButtonId );
         
     private:    // Data