--- a/epoc32/include/mw/msvids.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/mw/msvids.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.
@@ -13,8 +13,6 @@
 // Description:
 //
 
-
-
 /**
  @file
  @publishedAll
@@ -30,6 +28,10 @@
 #include <msvstd.h>
 #endif
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS  
+#include "msvconsts.h"
+#endif
+
 // Predefined entry ids - values #defined in MSVSTD.HRH
 
 /**
@@ -44,14 +46,7 @@
 */
 const TMsvId KMsvNullIndexEntryId=KMsvNullIndexEntryIdValue;//0
 
-/**
-Temporary ID used for testing purpose
-@internalAll
-@released
-@see TMsvId
-@see KMsvTempIndexEntryIdValue
-*/
-const TMsvId KMsvTempIndexEntryId=KMsvTempIndexEntryIdValue;//1
+
 
 /**
 ID of root entry of entire index
@@ -126,13 +121,6 @@
 const TMsvId KMsvUnknownServiceIndexEntryId=KMsvUnkownServiceIndexEntryIdValue; //0x1007
 
 /**
-@internalAll
-@released
-@see TMsvId
-*/
-const TMsvId KFirstFreeEntryId=0x100000;
-
-/**
 Uid for POPService
 @publishedAll
 @released