--- a/persistentstorage/sqlite3api/GROUP/sqlite3.mmp	Thu Jul 01 17:02:22 2010 +0100
+++ b/persistentstorage/sqlite3api/GROUP/sqlite3.mmp	Tue Jul 06 11:54:49 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 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"
@@ -19,14 +19,8 @@
  @file
 */
 
-//#define SYMBIAN_INCLUDE_EXECUTABLE_TRACE
-#include <e32utrace.mmh>
 #include "sqlite3_macro.mmh"
 
-#ifdef SYMBIAN_INCLUDE_EXECUTABLE_TRACE
-MACRO			SQLITE_ENABLE_TRACE
-#endif
-
 TARGET		sqlite3.dll
 TARGETTYPE	dll
 
@@ -78,6 +72,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+userinclude		../traces_sqlite3
 userinclude		../SQLite
 userinclude		../OsLayer
 OS_LAYER_LIBC_SYSTEMINCLUDE
@@ -146,14 +141,12 @@
 SOURCEPATH	../OsLayer
 SOURCE		FileBuf64.cpp
 SOURCE		os_symbian_mt.cpp
+SOURCE		SqliteUtil.cpp
 #ifdef WINSCW
 SOURCE		os_symbian_emul.cpp
 #else
 SOURCE		os_symbian_hrdw.cpp
 #endif
-#ifdef SYMBIAN_INCLUDE_EXECUTABLE_TRACE
-SOURCE 		UTraceSqlite.cpp
-#endif
 
 LIBRARY		euser.lib 
 LIBRARY		efsrv.lib