--- a/xml/legacyminidomparser/XMLDom/INC/GMXMLDocument.h	Sun Mar 14 13:16:21 2010 +0000
+++ b/xml/legacyminidomparser/XMLDom/INC/GMXMLDocument.h	Sun Mar 28 16:41:06 2010 +0100
@@ -186,7 +186,7 @@
 	/** Gets a reference to the MXMLDtd object to use for DTD validation checking.
 	
 	@return DTD */
-	const MXMLDtd& CMDXMLDocument::DtdRepresentation() const;
+	const MXMLDtd& DtdRepresentation() const;
 
 
 private:  

--- a/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiancertchain.h	Sun Mar 14 13:16:21 2010 +0000
+++ b/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiancertchain.h	Sun Mar 28 16:41:06 2010 +0100
@@ -47,15 +47,15 @@
      * @param aEncodedCertsLen Length of the DER encoded X.509 certificates
      * @param aRootCerts An array of certificates which the chain will treat as candidate root certificates
      */        
-    IMPORT_C void CSymbianCertChain::InitializeL(TUint8 *aEncodedCerts, 
-                                            TUint aEncodedCertsLen, 
-                                            const RPointerArray< CX509Certificate > &aRootCerts);
+    IMPORT_C void InitializeL(TUint8 *aEncodedCerts, 
+                              TUint aEncodedCertsLen, 
+                              const RPointerArray< CX509Certificate > &aRootCerts);
  
     /**
      * Call ValidateL() of the iCertChain
      * @since S60 v3.2 
      */         
-    IMPORT_C void CSymbianCertChain::ValidateL();
+    IMPORT_C void ValidateL();
  		
     /**
      * Get the validation result
@@ -65,7 +65,7 @@
      * @return -1 if no result can be fetched
      * @return enum TValidationError if validation fails
      */     		
-    IMPORT_C TInt CSymbianCertChain::GetValidateResult();
+    IMPORT_C TInt GetValidateResult();
     
     /**
      * Get the error flag
@@ -73,7 +73,7 @@
      * @since S60 v3.2
      * @return error code
      */    		
-    IMPORT_C TInt CSymbianCertChain::GetError();
+    IMPORT_C TInt GetError();
         
 protected:
     /**

--- a/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiancertstore.h	Sun Mar 14 13:16:21 2010 +0000
+++ b/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiancertstore.h	Sun Mar 28 16:41:06 2010 +0100
@@ -87,7 +87,7 @@
      * @return KErrNone if the cert is found
      * @return KErrNotFound if the cert is not found
      */     
-    IMPORT_C TInt CSymbianCertStore::hasCert();
+    IMPORT_C TInt hasCert();
          
     /**
      * Sets iCert
@@ -149,7 +149,7 @@
      * @since S60 v3.2
      * @return error code
      */           
-    IMPORT_C TInt CSymbianCertStore::GetError();
+    IMPORT_C TInt GetError();
 
 protected:
     /**

--- a/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiankeystore.h	Sun Mar 14 13:16:21 2010 +0000
+++ b/xmlsecurityengine/xmlseccertman/inc/xmlsecmsymbiankeystore.h	Sun Mar 28 16:41:06 2010 +0100
@@ -171,7 +171,7 @@
      * @since S60 v3.2
      * @return error code
      */         
-    IMPORT_C TInt CSymbianKeyStore::GetError();
+    IMPORT_C TInt GetError();
     
     /**
      * Perform RSA sign operation

--- a/xmlsrv_plat/xml_signature_api/inc/xmlsecwsign.h	Sun Mar 14 13:16:21 2010 +0000
+++ b/xmlsrv_plat/xml_signature_api/inc/xmlsecwsign.h	Sun Mar 28 16:41:06 2010 +0100
@@ -572,7 +572,7 @@
      *            If sets to FALSE then key manager will be used.
      * @return TElement with signed node.
      */
-    TXmlEngElement CXmlSecSign::SignXmlNodeL(TXmlEngElement aNode, TBool aUseCurrentKey);
+    TXmlEngElement SignXmlNodeL(TXmlEngElement aNode, TBool aUseCurrentKey);
 
 private:   
     /**