diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/mw/msvruids.h
--- a/epoc32/include/mw/msvruids.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/mw/msvruids.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
@@ -11,10 +11,9 @@
 // Contributors:
 //
 // Description:
+// MSVRUIDS.H
 //
 
-
-
 /**
  @file
  @publishedAll
@@ -26,16 +25,10 @@
 #include <e32base.h>
 #include <msvstd.hrh>
 
-/**
-* @internalAll
-* @released
-*/
-const TInt KMsvNumMtmDllTypes=4;
-/**
-* @internalAll
-* @released
-*/
-const TUid KUidMsvDataComponent     ={0x10003C69};
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS  
+#include "msvconsts.h"
+#endif
+
 // Server-side MTM 
 /**
 * @publishedAll
@@ -48,52 +41,5 @@
 * @released
 */
 const TUid KUidMtmClientComponent	={KUidMtmClientComponentVal};
-// User Interface MTM
-/**
-* @internalAll
-* @released
-*/
-const TUid KUidMtmUiComponent		={KUidMtmUiComponentVal};
-// UI Data MTM 
-/**
-* @internalAll
-* @released
-*/
-const TUid KUidMtmUiDataComponent	={KUidMtmUiDataComponentVal};
-/**
-* @internalTechnology
-* @released
-*/
-const TUid KMsvDllType1Uid={0x10003C62}; 
-/**
-* @internalTechnology
-* @released
-*/
-const TUid KMsvDllType2Uid={0x10003C63};
-/**
-* @internalTechnology
-* @released
-*/
-const TUid KMsvDllType3Uid={0x10003C64};
-/**
-* @internalTechnology
-* @released
-*/
-const TUid KMsvDllType4Uid={0x10003C65};
-/**
-* @internalTechnology
-* @released
-*/
-const TUid KMsvDllType5Uid={0x10003C66};
-/**
-* @internalTechnology
-* @released
-*/
-const TUid KMsvDllType6Uid={0x10003C67};
-/**
-* @internalComponent
-* @released
-*/
-const TUid KUidMtmMultipleComponent	={0x10004845}; 
 
 #endif