diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/app/cntfield.h
--- a/epoc32/include/app/cntfield.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/app/cntfield.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.
@@ -24,41 +24,74 @@
 
 
 
+/** Null field ID.
+@publishedAll
+@released
+*/
 const TInt KNullFieldId=-1;
 
-//const TInt KIntContactFieldHint???=0x01;
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+/** @internalComponent */
 const TInt KIntContactHintIsPhone=0x02;
+/** @internalComponent */
 const TInt KIntContactHintIsMsg=0x04;
+/** @internalComponent */
 const TInt KIntContactHintIsCompanyName=0x08;
+/** @internalComponent */
 const TInt KIntContactHintIsFamilyName=0x10;
+/** @internalComponent */
 const TInt KIntContactHintIsGivenName=0x20;
+/** @internalComponent */
 const TInt KIntContactHintIsAddress=0x40;
+/** @internalComponent */
 const TInt KIntContactHintIsAdditionalName=0x80;
+/** @internalComponent */
 const TInt KIntContactHintIsSuffixName=0x100;
+/** @internalComponent */
 const TInt KIntContactHintIsPrefixName=0x200;
+/** @internalComponent */
 const TInt KIntContactHintStorageInline=0x400;
+/** @internalComponent */
 const TInt KIntContactHintIsEmail=0x4000;
+/** @internalComponent */
 const TInt KIntContactHintIsPronunciation=0x800;
+/** @internalComponent */
 const TInt KIntContactHintIsCompanyNamePronunciation=KIntContactHintIsPronunciation|KIntContactHintIsCompanyName;
+/** @internalComponent */
 const TInt KIntContactHintIsGivenNamePronunciation=KIntContactHintIsPronunciation|KIntContactHintIsGivenName;
+/** @internalComponent */
 const TInt KIntContactHintIsFamilyNamePronunciation=KIntContactHintIsPronunciation|KIntContactHintIsFamilyName;
 
+/** @internalComponent */
 const TInt KHintTypeMask = 0x1FFFFF;
 
 #ifdef __SYMBIAN_CNTMODEL_USE_SQLITE__
-const TInt KHintAdditionalMask    = 0x7F000000; //Number of additional type ids.
-const TInt KHintVCardMappingMask  = 0x80000000; //bit flag to show if there is a vCard mapping uid.
-const TInt KHintTemplateFieldMask = 0x7FFFFFFF; //Template field mask in low hint value.
 
+/** Number of additional type ids.
+@internalComponent 
+*/
+const TInt KHintAdditionalMask    = 0x7F000000;
+/** Bit flag to show if there is a vCard mapping uid.
+@internalComponent 
+*/
+const TInt KHintVCardMappingMask  = 0x80000000;
+/** Template field mask in low hint value.
+@internalComponent 
+*/
+const TInt KHintTemplateFieldMask = 0x7FFFFFFF;
+
+/** @internalComponent */
 const TInt KHintAdditionalMaskShift = 24;
 
 #else //_SYMBIAN_USE_SQLITE__
 
+/** @internalComponent */
 const TInt KHintAdditionalMask = 0x200000;
+/** @internalComponent */
 const TInt KHintIdMask = 0xFFC00000;
 
 #endif //_SYMBIAN_USE_SQLITE__
-
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
 class RWriteStream;
 class RReadStream;
@@ -173,6 +206,9 @@
 	friend class CContactTables;
 	friend class RPplContactTable;
 	friend class CPackagerTests;
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+    class THint;
+#else
 	class THint
 	/**
 	@internalComponent
@@ -239,6 +275,7 @@
 		TInt iHintValue;
 
 		};
+#endif
 		
 public:
 	IMPORT_C static CContactItemField* NewLC();
@@ -401,7 +438,7 @@
 	/** Constructs the CContactItemFieldDef object, with an array granularity of 8. */
 		{};
 	};
-
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 class TContactFieldAtts
 /**
 @internalComponent
@@ -479,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.
@@ -527,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()
@@ -592,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.