diff -r 2a11b5b00470 -r fd64c38c277d phonebookengines/contactsmodel/inc/CNTITEM.H
--- a/phonebookengines/contactsmodel/inc/CNTITEM.H	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/inc/CNTITEM.H	Thu May 27 12:45:19 2010 +0300
@@ -1,21 +1,19 @@
-/*
-* 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 "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Persistence layer exports
-*
-*/
-
+// 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 "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Persistence layer exports
+// 
+//
 
 #if !defined(__CNTITEM_H__)
 #define __CNTITEM_H__
@@ -46,10 +44,12 @@
 */
 #define KUidStringSeparator '-'
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 /** Constant used by vCard import/export.
 @internalComponent
 */
 #define KContactMaxFieldNumber 32
+#endif
 
 class CContactItemField;
 class CContactItemViewDef;