--- a/commondrm/drmutility/inc/DrmUiHandlingImpl.h	Sun Mar 14 13:10:51 2010 +0000
+++ b/commondrm/drmutility/inc/DrmUiHandlingImpl.h	Sun Mar 28 16:37:09 2010 +0100
@@ -817,7 +817,7 @@
     * CallSilentAvailble after right
     * @return Etrue, if silent RO rerieval led to usable content
     */
-    TBool CDrmUiHandlingImpl::GetSilentAndCallL(
+    TBool GetSilentAndCallL(
         MDrmHandleErrorObserver* aObserver,
         TInt aOperationId,
         const ContentAccess::TIntent aIntent,
@@ -830,7 +830,7 @@
     * checks status if launched embedded.
     * CallRightsAvailable, if launched embedded or righsUrl not present
     */
-    void CDrmUiHandlingImpl::GetRightsAndCallL(
+    void GetRightsAndCallL(
         MDrmHandleErrorObserver* aObserver,
         TInt aOperationId,
         const ContentAccess::TIntent aIntent,

--- a/omadrm/drmengine/ro/inc/DRMProtectedRoParser.h	Sun Mar 14 13:10:51 2010 +0000
+++ b/omadrm/drmengine/ro/inc/DRMProtectedRoParser.h	Sun Mar 28 16:37:09 2010 +0100
@@ -279,8 +279,7 @@
         * @param aProtectedRo protected RO element
         * @return protected RO element, if namespace was not added NULL
         */    
-        HBufC8* CDrmProtectedRoParser::AddRoapNamespaceL(
-            TDesC8& aProtectedRo ) const;
+        HBufC8* AddRoapNamespaceL( TDesC8& aProtectedRo ) const;
 
     private:
 

--- a/omadrm/drmengine/roapstorage/inc/RoapStorageSession.h	Sun Mar 14 13:10:51 2010 +0000
+++ b/omadrm/drmengine/roapstorage/inc/RoapStorageSession.h	Sun Mar 28 16:37:09 2010 +0100
@@ -157,8 +157,7 @@
 
     void UpdateDrmTimeL( const RMessage2& aMessage );
 
-    void
-        CRoapStorageSession::VerifyOcspResponsesL( const RMessage2& aMessage );
+    void VerifyOcspResponsesL( const RMessage2& aMessage );
 
     void GetOcspResponderIdL( const RMessage2& aMessage );
 

--- a/wmdrm/wmdrmengine/wmdrmserver/server/inc/clock.h	Sun Mar 14 13:10:51 2010 +0000
+++ b/wmdrm/wmdrmengine/wmdrmserver/server/inc/clock.h	Sun Mar 28 16:37:09 2010 +0100
@@ -35,7 +35,7 @@
 public:
 	static const TInt KClockInterval = 15 * 60 * 1000000;
 
-    static CClock* CClock::NewL( CWmDrmServer* aServer );
+    static CClock* NewL( CWmDrmServer* aServer );
 	~CClock();
 	CClock( CWmDrmServer* aServer );