--- a/accessoryservices/pluggeddisplay/edidparser/inc/cea861edidparser.h	Sun Mar 14 13:15:06 2010 +0000
+++ b/accessoryservices/pluggeddisplay/edidparser/inc/cea861edidparser.h	Sun Mar 28 16:38:55 2010 +0100
@@ -520,7 +520,7 @@
      * @param   aAudioBlock
      * @return  none
      */
-    void CCea861EdidParser::DetermineAudioBlockInformation( TCEA861AudioDataBlock* aAudioBlock );
+    void DetermineAudioBlockInformation( TCEA861AudioDataBlock* aAudioBlock );
     
     /**
      * Check if Latency_Fields_Preset bit is set as specified in HDMISpecification13a.pdf.

--- a/devicesrv_plat/haptics_plugin_api/inc/hwrmhapticspluginservice.h	Sun Mar 14 13:15:06 2010 +0000
+++ b/devicesrv_plat/haptics_plugin_api/inc/hwrmhapticspluginservice.h	Sun Mar 28 16:38:55 2010 +0100
@@ -103,7 +103,7 @@
      * @param aResponseCallback Pointer to plugin callback handler.
      */
     IMPORT_C static 
-    CHWRMHapticsPluginService* CHWRMHapticsPluginService::NewL( 
+    CHWRMHapticsPluginService* NewL( 
             TUid aImplementationUid, 
             MHWRMHapticsPluginCallback* aResponseCallback );
 

--- a/dosservices/dosserver/inc/dosclishareddata.h	Sun Mar 14 13:15:06 2010 +0000
+++ b/dosservices/dosserver/inc/dosclishareddata.h	Sun Mar 28 16:38:55 2010 +0100
@@ -47,7 +47,7 @@
     
 private:    // Data
     const RMessage2* iMessage;  // Kernel owns
-    void RDosSharedData::SetFreeDiskSpaceRequest( const TInt aAmount);
+    void SetFreeDiskSpaceRequest( const TInt aAmount);
 };
 
 

--- a/mediator/inc/Server/MediatorDebug.h	Sun Mar 14 13:15:06 2010 +0000
+++ b/mediator/inc/Server/MediatorDebug.h	Sun Mar 28 16:38:55 2010 +0100
@@ -304,7 +304,7 @@
         * @param None.
         * @return None.
         */
-        void RMediatorDebug::PrintConfigurationL();
+        void PrintConfigurationL();
         
         /**
         * Handles internal error (usually leave due to buffer overflow),
@@ -461,4 +461,4 @@
 
 #endif      // MEDIADOR_DEBUG_H
            
-//  End of File
\ No newline at end of file
+//  End of File

--- a/mediator/inc/Server/MediatorServerObjects.h	Sun Mar 14 13:15:06 2010 +0000
+++ b/mediator/inc/Server/MediatorServerObjects.h	Sun Mar 28 16:38:55 2010 +0100
@@ -992,7 +992,7 @@
         * @param aStatus command status
         * @return TCommandStatus None.
         */      
-        void CCommand::SetStatus( TCommandStatus aStatus );
+        void SetStatus( TCommandStatus aStatus );
         
         /**
         * Getter for command status

--- a/sensorservices/sensorserver/inc/server/senserverchannel.h	Sun Mar 14 13:15:06 2010 +0000
+++ b/sensorservices/sensorserver/inc/server/senserverchannel.h	Sun Mar 28 16:38:55 2010 +0100
@@ -535,14 +535,14 @@
         *
         * @since S60 5.0
         */
-		void CSensrvChannel::SetChannelUnavailable( );
+		void SetChannelUnavailable( );
 
         /**
         * Handles channel availability property change to availabe
         *
         * @since S60 5.0
         */
-		void CSensrvChannel::SetChannelAvailable( );
+		void SetChannelAvailable( );
 
     private: // Member variables