--- a/telephonyprotocols/rawipnif/rawipnif2/src/IPTagHeader.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/IPTagHeader.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -21,19 +21,14 @@
 
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "IPTagHeaderTraces.h"
-#endif
-
 #include "IPTagHeader.h"
 #include "Constants.h"
 
 /**
 Default constructor. 
 */
-CIPTagHeader::CIPTagHeader()
+CIPTagHeader::CIPTagHeader(CBttLogger* aTheLogger)
+	: iTheLogger(aTheLogger)
 	{
 	iHeaderByte.SetMax();
 	iHeaderByte.FillZ();
@@ -53,7 +48,7 @@
 */
 void CIPTagHeader::SetType(TUint16 aType)
  	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_SETTYPE_1, "CIPTagHeader::SetType");
+ 	_LOG_L1C1(_L8("CIPTagHeader::SetType"));
  	
  	iHeaderByte[0] = (TUint8)(aType>>8); 
  	iHeaderByte[1] = (TUint8)(aType&0xff);	
@@ -68,7 +63,7 @@
 */
 void CIPTagHeader::AddHeader(RCommsBufChain& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_ADDHEADER_1, "CIPTagHeader::AddHeader");
+	_LOG_L1C1(_L8("CIPTagHeader::AddHeader"));
 
 	// Add the protocol code as a header to the buffer
 	aPdu.Write(iHeaderByte,0);	
@@ -84,7 +79,7 @@
 */
 TUint16 CIPTagHeader::RemoveHeader(RCommsBufChain& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_REMOVEHEADER_1, "CIPTagHeader::RemoveHeader");
+	_LOG_L1C1(_L8("CIPTagHeader::RemoveHeader"));
 
 	if (aPdu.Length() > KIPTagHeaderLength)
 		{