--- a/pkiutilities/DeviceToken/Inc/DevTokenServer.h	Sun Mar 14 13:12:09 2010 +0000
+++ b/pkiutilities/DeviceToken/Inc/DevTokenServer.h	Sun Mar 28 16:37:59 2010 +0100
@@ -93,7 +93,7 @@
          * @param 
          * @return server object of Truste sites
          */
-        CTrustedSitesServer& CDevTokenServer::TrustedSitesL() const;
+        CTrustedSitesServer& TrustedSitesL() const;
         
     // For CServer2
     private:

--- a/pkiutilities/PKCS12/CrPkcs12/Inc/crpkcs12.h	Sun Mar 14 13:12:09 2010 +0000
+++ b/pkiutilities/PKCS12/CrPkcs12/Inc/crpkcs12.h	Sun Mar 28 16:37:59 2010 +0100
@@ -237,7 +237,7 @@
 
 
         // Extracts contents of keybag, used in DecodeSafeBags function.
-		void CCrPKCS12::ExtractKeybagL( CCrData& aSafeBag );
+		void ExtractKeybagL( CCrData& aSafeBag );
 
         // Decrypts pkcs8-shroudedkeybag, used in DecodeSafeBags function.
         void DecryptShroudedKeybagL( CCrData& aSafeBag );
@@ -323,4 +323,4 @@
         TFileName iFileName;
 	};
 
-#endif
\ No newline at end of file
+#endif

--- a/secsrv_plat/devenccommonutils_api/inc/DevEncKeyUtils.h	Sun Mar 14 13:12:09 2010 +0000
+++ b/secsrv_plat/devenccommonutils_api/inc/DevEncKeyUtils.h	Sun Mar 28 16:37:59 2010 +0100
@@ -49,10 +49,10 @@
         virtual ~CDevEncKeyUtils();
 
         // To connect the engine 
-        IMPORT_C TInt CDevEncKeyUtils::Connect();
+        IMPORT_C TInt Connect();
 
         // To close the connection with the engine
-        IMPORT_C void CDevEncKeyUtils::Close();
+        IMPORT_C void Close();
 
         /**
         * Creates a PKCS#5 key and takes it into use by loading it

--- a/securitydialogs/lockapp/inc/lockappdevicelockcontainer.h	Sun Mar 14 13:12:09 2010 +0000
+++ b/securitydialogs/lockapp/inc/lockappdevicelockcontainer.h	Sun Mar 28 16:37:59 2010 +0100
@@ -45,7 +45,7 @@
 		/**
 		 * Two-phased constructor.
 		 */
-		static CLockAppDevicelockContainer* CLockAppDevicelockContainer::NewL( RWindowGroup& aWg );
+		static CLockAppDevicelockContainer* NewL( RWindowGroup& aWg );
 
 		/**
 		 * Destructor.

--- a/securitydialogs/lockapp/inc/lockappdevicelockcontrol.h	Sun Mar 14 13:12:09 2010 +0000
+++ b/securitydialogs/lockapp/inc/lockappdevicelockcontrol.h	Sun Mar 28 16:37:59 2010 +0100
@@ -68,7 +68,7 @@
 		/**
 		 * Finalize the construction by connecting to Phone side.
 		 */
-		void CLockAppDevicelockControl::ConnectToPhoneL( RWindowGroup& aWg );
+		void ConnectToPhoneL( RWindowGroup& aWg );
 
 		/**
 		 * Is it allowed to activate control.

--- a/wim/Scard/inc/ScardServer.h	Sun Mar 14 13:12:09 2010 +0000
+++ b/wim/Scard/inc/ScardServer.h	Sun Mar 28 16:37:59 2010 +0100
@@ -79,7 +79,7 @@
         * @param aVersion Version of the server
         * @return Pointer to created session
         */
-        virtual CSession2* CScardServer::NewSessionL( 
+        virtual CSession2* NewSessionL( 
             const TVersion& aVersion,
             const RMessage2& aMessage ) const;
     

--- a/wim/WimServer/inc/WimCallbackImpl.h	Sun Mar 14 13:12:09 2010 +0000
+++ b/wim/WimServer/inc/WimCallbackImpl.h	Sun Mar 28 16:37:59 2010 +0100
@@ -267,7 +267,7 @@
         * This function is called by CWimServer destructor,
         * to delete the gApdu object.
         */
-        static void CWimCallBack::DeletegApdu();
+        static void DeletegApdu();
                              
     private: