diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/apmstd.h
--- a/epoc32/include/apmstd.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/apmstd.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 1997-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.
@@ -46,6 +46,7 @@
 @released */
 const TInt32 KDataTypePriorityUserSpecified=KMaxTInt16;
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 /** This is a special priority that overrides any user settings. Applications must
 have EWriteDeviceData to use this priority. If they have not then they will be
 downgraded to KDataTypePriorityNormal.
@@ -55,6 +56,8 @@
 @see TDataTypeWithPriority */
 const TInt32 KDataTypePrioritySystem = 0xFFF9;
 
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
+
 /** Trusted applications may use this priority value to ensure 
     their MIME type associations cannot be overridden by 
     self signed (untrusted) applications.
@@ -149,7 +152,7 @@
 	TBuf8<KMaxDataTypeLength> iDataType;
 	TUid iUid;
 	};
-
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 /**
 @internalComponent
 */
@@ -160,7 +163,7 @@
 */
 _LIT8(KEpocUrlDataTypeHeader, "X-Epoc-Url/");
 
-
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 class TDataTypeWithPriority
 /** A data (MIME) type and a priority value for that data type.