--- a/commondrm/drmrightsmanagerui/src/DRMRightsMgrDetailsView.cpp	Tue Feb 02 00:21:44 2010 +0200
+++ b/commondrm/drmrightsmanagerui/src/DRMRightsMgrDetailsView.cpp	Fri Apr 16 15:14:55 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,16 +21,16 @@
 #include <avkon.rsg>
 #include <akntitle.h>
 #include <aknview.h>
-#include <aknviewappui.h>
-#include <stringloader.h>
+#include <aknViewAppUi.h>
+#include <StringLoader.h>
 #include <eikbtgpc.h>
 
-#include <drmrightsmanager.rsg>
+#include <DRMRightsManager.rsg>
 
-#include "drmrightsmgrdetailsview.h"
-#include "drmcommonutilities.h"
-#include "drmrightsmgrappui.h"
-#include "drmrightsmanager.hrh"
+#include "DRMRightsMgrDetailsView.h"
+#include "DRMCommonUtilities.h"
+#include "DRMRightsMgrAppUi.h"
+#include "DRMRightsManager.hrh"
 #include "drmutilitywmdrmutilities.h"
 #include "drmutilityinternaltypes.h"
 
@@ -336,12 +336,8 @@
                 break;
             }
 
-#ifdef RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM
-
         DrmUtilityWmDrmUtilities::ParseWmDrmStringL( *aRights[0],
             rights.iPlayConstraint );
-#endif
-
         }
     else
         {