--- a/persistentstorage/sqlite3api/OsLayer/os_symbian_hrdw.cpp	Tue Aug 31 16:57:14 2010 +0300
+++ b/persistentstorage/sqlite3api/OsLayer/os_symbian_hrdw.cpp	Wed Sep 01 12:39:58 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -20,12 +20,6 @@
  @file
 */
 #include "os_symbian.h"
-#include "SqliteUtil.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "os_symbian_hrdwTraces.h"
-#endif
-#include "SqliteTraceDef.h"
 
 #ifdef SQLITE_OS_SYMBIAN
 
@@ -53,7 +47,7 @@
 	TInt err = Connect();
 	if(err != KErrNone)
 		{
-		SQLITE_TRACE_OS(OstTraceExt2(TRACE_INTERNALS, TSTATICFS_TSTATICFS, "OS;0x%X;TStaticFs::TStaticFs;err=%d", (TUint)this, err));
+		RDebug::Print(_L("===SQLITE OS porting layer, file session creation has failed with err=%d.\r\n"), err);
 		User::Exit(err);	
 		}
 	}
@@ -69,7 +63,7 @@
 */
 RFs& TStaticFs::Fs()
 	{
-	__ASSERT_DEBUG(TheFs.iFs.Handle() != KNullHandle, __SQLITEPANIC2(ESqliteOsPanicInvalidFs));
+	__ASSERT_DEBUG(TheFs.iFs.Handle() != KNullHandle, User::Panic(KPanicCategory, EPanicInvalidFs));
 	return TheFs.iFs;
 	}
 
@@ -97,14 +91,14 @@
 	TInt err = Create();
 	if(err != KErrNone)
 		{
-		SQLITE_TRACE_OS(OstTraceExt2(TRACE_INTERNALS, TSTATICMUTEX_TSTATICMUTEX, "OS;0x%X;TStaticMutex::TStaticMutex;err=%d", (TUint)this, err));
+		RDebug::Print(_L("===SQLITE OS porting layer, static mutex creation has failed with err=%d.\r\n"), err);
 		User::Exit(err);	
 		}
 	}
 
 sqlite3_mutex* StaticMutex(TInt aType)
 	{
-	__ASSERT_ALWAYS((TUint)aType < (sizeof(TheStaticMutex)/sizeof(TheStaticMutex[0])), __SQLITEPANIC2(ESqliteOsPanicInvalidMutexType));
+	__ASSERT_ALWAYS((TUint)aType < (sizeof(TheStaticMutex)/sizeof(TheStaticMutex[0])), User::Panic(KPanicCategory, EPanicInvalidMutexType));
 	return &TheStaticMutex[aType];
 	}