diff -r cce6680bbf1c -r ba1c4f4a893f persistentstorage/sql/GROUP/sqlite.mmp
--- a/persistentstorage/sql/GROUP/sqlite.mmp	Thu Jul 01 17:02:22 2010 +0100
+++ b/persistentstorage/sql/GROUP/sqlite.mmp	Tue Jul 06 11:54:49 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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,13 +19,8 @@
  @file
 */
 
-//#define SYMBIAN_INCLUDE_EXECUTABLE_TRACE
 #include "sqlite_macro.mmh"
 
-#ifdef SYMBIAN_INCLUDE_EXECUTABLE_TRACE
-MACRO			SQLITELIB_ENABLE_TRACE
-#endif
-
 TARGET		sqlite.lib
 TARGETTYPE	lib
 
@@ -68,9 +63,9 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-USERINCLUDE		../SRC/Common/Trace
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 OS_LAYER_ESTLIB_SYSTEMINCLUDE
+USERINCLUDE		../traces_sqlite
 USERINCLUDE		../OsLayer
 
 #ifdef SYMBIAN_USE_SQLITE_VERSION_3_6_4
@@ -195,8 +190,4 @@
 SOURCEPATH	../OsLayer
 SOURCE		FileBuf64.cpp
 SOURCE		os_symbian.cpp
-
-#ifdef SYMBIAN_INCLUDE_EXECUTABLE_TRACE
-SOURCEPATH 	../SRC/Common/Trace
-SOURCE 		UTraceSql.cpp
-#endif
+SOURCE		SqliteUtil.cpp