--- a/phonebookengines/contactsmodel/src/CNTITEM.CPP	Tue Feb 02 10:12:17 2010 +0200
+++ b/phonebookengines/contactsmodel/src/CNTITEM.CPP	Fri Mar 19 09:27:18 2010 +0200
@@ -1,17 +1,20 @@
-// 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:
-//
+/*
+* 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: 
+*
+*/
+
 
 #include <s32std.h>
 #include <f32file.h>
@@ -22,11 +25,8 @@
 #include <cntfldst.h>
 #include <cntdb.h>
 
-#include "CNTSTD.H"
-#include "CNTPROF.H"
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include "cntfieldheader.h"
-#endif
+#include "cntstd.h"
+#include "cntprof.h"
 
 
 EXPORT_C CContactItemFieldSet* CContactItemFieldSet::NewL()