--- a/vpnengine/vpnmanager/inc/pkiutil.h	Sun Mar 14 13:13:45 2010 +0000
+++ b/vpnengine/vpnmanager/inc/pkiutil.h	Sun Mar 28 16:38:24 2010 +0100
@@ -123,8 +123,8 @@
 
     static CX509Certificate* ReadCertificateLC(RPKIServiceAPI& aPkiService,
                                                const TPKIKeyIdentifier& aKeyId);
-    static HBufC8* PkiUtil::To8BitL(const TDesC16& aDes);
+    static HBufC8* To8BitL(const TDesC16& aDes);
 
     };
 
-#endif // __PKIUTIL_H__
\ No newline at end of file
+#endif // __PKIUTIL_H__

--- a/vpnengine/vpnmanager/inc/policyimporter.h	Sun Mar 14 13:13:45 2010 +0000
+++ b/vpnengine/vpnmanager/inc/policyimporter.h	Sun Mar 28 16:38:24 2010 +0100
@@ -151,8 +151,8 @@
     /**
      * Returns Issuer name of certificate
      */
-    HBufC8* CPolicyImporter::CertIssuerL(const TFileName& aCertFile);
-    TFileName CPolicyImporter::GetCAFromFileListL(const TDesC8& aCertSubjectName, CArrayFixFlat<TFileName>* aCertFileArray);
+    HBufC8* CertIssuerL(const TFileName& aCertFile);
+    TFileName GetCAFromFileListL(const TDesC8& aCertSubjectName, CArrayFixFlat<TFileName>* aCertFileArray);
 
 private:
     RMessage2 iMessage;

--- a/vpnui/vpnmanagementui/inc/vpnmanagementuilogcontainer.h	Sun Mar 14 13:13:45 2010 +0000
+++ b/vpnui/vpnmanagementui/inc/vpnmanagementuilogcontainer.h	Sun Mar 28 16:38:24 2010 +0100
@@ -216,7 +216,7 @@
         * @return The full name and path of the MIF file
         * containing icons for VPN Log view
         */
-        TFileName CVpnManagementUiLogContainer::GetIconFilenameL();
+        TFileName GetIconFilenameL();