--- a/phonebookengines/contactsmodel/cntmodel/src/ccontactdatabase.cpp	Tue Feb 02 10:12:17 2010 +0200
+++ b/phonebookengines/contactsmodel/cntmodel/src/ccontactdatabase.cpp	Fri Mar 19 09:27:18 2010 +0200
@@ -1,17 +1,20 @@
-// Copyright (c) 2005-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) 2005-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 <cntitem.h>
 #include <f32file.h>
@@ -19,21 +22,11 @@
 #include <phbksync.h>
 #include <cntdb.h>
 
-#include "CNTSTD.H"
+#include "cntstd.h"
 #include "rcntmodel.h"
 #include "ccontactprivate.h"
 
 #include "clplproxyfactory.h"
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include "cntdb_internal.h"
-#include "cntsyncecom.h"
-
-const TInt KMajorVersion=1;
-
-const TInt KMinorVersion=0;
-
-const TInt KBuildNumber=40;
-#endif
 
 CContactDatabase::CContactDatabase():
 		iDbConnectionState(EDbConnectionNotReady),
@@ -4161,18 +4154,17 @@
 	}
 
 
-void CContactDatabase::AddObserverL(MContactDbObserver& aChangeNotifier)
+EXPORT_C void CContactDatabase::AddObserverL(MContactDbObserver& aChangeNotifier)
 	{
 	iCntSvr->AddObserverL(aChangeNotifier);
 	}
 
 
-void CContactDatabase::RemoveObserver(const MContactDbObserver& aChangeNotifier)
+EXPORT_C void CContactDatabase::RemoveObserver(const MContactDbObserver& aChangeNotifier)
 	{
 	iCntSvr->RemoveObserver(aChangeNotifier);
 	}
 	
-
 void CContactDatabase::CancelNotifyRequestL()
 	{
 	}
@@ -5199,3 +5191,4 @@
 	//remove it from iGroupIds	
 	RemoveFromGroupIds(aContactId);
 	}
+