--- a/hti/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommServer/inc/HtiBtCommInterface.h	Sun Mar 14 13:16:23 2010 +0000
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/HtiBtCommServer/inc/HtiBtCommInterface.h	Sun Mar 28 16:41:07 2010 +0100
@@ -139,8 +139,8 @@
         * During Connect(), connect the server
         * to remote BT host service.
         */
-        TInt RHtiBtCommInterface::ConnectBt( TDesC8& aDeviceNameOrAddress,
-                                             TInt aPort );
+        TInt ConnectBt( TDesC8& aDeviceNameOrAddress,
+                        TInt aPort );
 
 };
 

--- a/stif/TestCombiner/inc/TestCombiner.h	Sun Mar 14 13:16:23 2010 +0000
+++ b/stif/TestCombiner/inc/TestCombiner.h	Sun Mar 28 16:41:07 2010 +0100
@@ -233,8 +233,8 @@
         /**
         * Get running slave.
         */
-        CSlaveInfo* CTestCombiner::GetSlave( TUint32 aSlaveId );
-        CSlaveInfo* CTestCombiner::GetSlave( TDesC& aSlaveName );
+        CSlaveInfo* GetSlave( TUint32 aSlaveId );
+        CSlaveInfo* GetSlave( TDesC& aSlaveName );
 
         /**
         * Check requested events and send unset to first requested.

--- a/stif/TestEngine/inc/SettingServer.h	Sun Mar 14 13:16:23 2010 +0000
+++ b/stif/TestEngine/inc/SettingServer.h	Sun Mar 28 16:41:07 2010 +0100
@@ -91,7 +91,7 @@
         /**
         * Return pointer to the Logger(iSettingServerLogger)
         */
-        CStifLogger* CSettingServer::Logger();
+        CStifLogger* Logger();
 
     public: // Functions from base classes
 

--- a/stif/stif_plat/inc/UIStore.h	Sun Mar 14 13:16:23 2010 +0000
+++ b/stif/stif_plat/inc/UIStore.h	Sun Mar 28 16:41:07 2010 +0100
@@ -259,7 +259,7 @@
         *
         * Returns Symbian OS error code.
         */
-        IMPORT_C TInt CUIStore::SaveTestSet2( TDes& aSetName );
+        IMPORT_C TInt SaveTestSet2( TDes& aSetName );
         /**
         * Load test set.
         *