--- a/smsprotocols/smsstack/smsu/src/smsutimer.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsutimer.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smsutimerTraces.h"
-#endif
-
 #include "SmsuTimer.h"
 
 #include <e32std.h>
@@ -39,7 +33,7 @@
  */
 CSmsuTimeout* CSmsuTimeout::NewL(CSmsuActiveBase& aActive)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUTIMEOUT_NEWL_1, "CSmsuTimeout::NewL()");
+    LOGSMSU1("CSmsuTimeout::NewL()");
     
     CSmsuTimeout* self = new(ELeave) CSmsuTimeout(aActive);
     CleanupStack::PushL(self);
@@ -62,7 +56,7 @@
  */
 void CSmsuTimeout::Start(const TTimeIntervalMicroSeconds32& aTimeIntervalMicroSeconds32)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUTIMEOUT_START_1, "CSmsuTimeout::Start()");
+	LOGSMSU1("CSmsuTimeout::Start()");
 
 	iTimedOut = EFalse;
 	After(aTimeIntervalMicroSeconds32);
@@ -78,7 +72,7 @@
 	iTimedOut(EFalse),
 	iCompleteMyselfRequested(EFalse)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUTIMEOUT_CTOR_1, "CSmsuTimeout::CSmsuTimeout()");
+	LOGSMSU1("CSmsuTimeout::CSmsuTimeout()");
 
 	CActiveScheduler::Add(this);
 	} // CSmsuTimeout::CSmsuTimeout
@@ -89,7 +83,7 @@
  */
 void CSmsuTimeout::RunL()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUTIMEOUT_RUNL_1, "CSmsuTimeout::RunL [iStatus=%d]", iStatus.Int() );
+	LOGSMSU2("CSmsuTimeout::RunL [iStatus=%d]", iStatus.Int() );
 	iTimedOut = ETrue;
 	iActive.Cancel();