--- a/phonebookengines/contactsmodel/inc/CNTFIELD.H	Fri May 14 15:42:23 2010 +0300
+++ b/phonebookengines/contactsmodel/inc/CNTFIELD.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
+// 
+//
 
 
 
@@ -25,12 +23,14 @@
 #include <cntdef.h>
 
 
+
 /** Null field ID.
 @publishedAll
 @released
 */
 const TInt KNullFieldId=-1;
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 /** @internalComponent */
 const TInt KIntContactHintIsPhone=0x02;
 /** @internalComponent */
@@ -91,7 +91,7 @@
 const TInt KHintIdMask = 0xFFC00000;
 
 #endif //_SYMBIAN_USE_SQLITE__
-
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 class RWriteStream;
 class RReadStream;
@@ -206,6 +206,9 @@
 	friend class CContactTables;
 	friend class RPplContactTable;
 	friend class CPackagerTests;
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+    class THint;
+#else
 	class THint
 	/**
 	@internalComponent
@@ -272,6 +275,7 @@
 		TInt iHintValue;
 
 		};
+#endif
 		
 public:
 	IMPORT_C static CContactItemField* NewLC();
@@ -434,7 +438,7 @@
 	/** Constructs the CContactItemFieldDef object, with an array granularity of 8. */
 		{};
 	};
-
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 class TContactFieldAtts
 /**
 @internalComponent
@@ -512,6 +516,7 @@
 inline TFieldHeader::TFieldHeader(TStreamId aId,TContactFieldAtts aAtts)
 	{ iStreamId=aId; iAtts=aAtts; }
 #endif //__SYMBIAN_CNTMODEL_USE_SQLITE__
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 inline TBool CContactItemField::IsHidden() const
 /** Gets the value of the field's hidden attribute.
@@ -560,7 +565,7 @@
 
 @return ETrue if the field is deleted, otherwise EFalse.                            */
 	{ return iAttributes&EDeleted; }
-
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 inline void CContactItemField::THint::SetIsPhone()
 	{iHintValue|=KIntContactHintIsPhone;}
 inline void CContactItemField::THint::SetIsMsg()
@@ -625,7 +630,7 @@
 #endif //__SYMBIAN_CNTMODEL_USE_SQLITE__ 
 inline TBool CContactItemField::THint::Contains(const THint& aHint) const
 	{return (iHintValue&aHint.iHintValue);}
-
+#endif
 inline TBool CContactItemField::OverRidesLabel() const
 /** Tests whether the field's label (as set by SetLabel()) overrides the label 
 specified in the field's template.