--- a/traceservices/tracefw/ulogger/unit_test/group/te_server.mmp	Thu Aug 19 11:36:21 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_server.mmp	Tue Aug 31 16:57:14 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -17,13 +17,18 @@
 
 TARGET      te_uloggerservertestsuite.exe
 TARGETTYPE  exe
-UID             0x1000007A 0x10273881
-//0x101F7784
-CAPABILITY CommDD NetworkControl LocalServices ProtServ
+UID         0x1000007A 0x10273881
+CAPABILITY  CommDD NetworkControl LocalServices ProtServ
 
 MACRO __ULOGGER_SERVER_UNIT_TEST
 
-//Please add any change under here
+OS_LAYER_SYSTEMINCLUDE
+
+USERINCLUDE   ../te-server
+USERINCLUDE   ../../inc
+USERINCLUDE  ../../src/pluginframework
+USERINCLUDE   ../../src/uloggerserver
+
 SOURCEPATH  ../te-server
 SOURCE	       te_uloggerservertestsuiteserver.cpp
 SOURCE	       te_uloggerservertestsuitestepbase.cpp
@@ -40,9 +45,6 @@
 SOURCE			uloggersrvsession.cpp
 SOURCE			uloggerserver.cpp
 
-SMPSAFE
-
-
 SOURCEPATH	../../src/pluginframework
 SOURCE			pluginallocator.cpp
 SOURCE			inputframework.cpp
@@ -52,19 +54,14 @@
 SOURCEPATH  ../../src/command
 SOURCE			uloggercommands.cpp
 
-USERINCLUDE   ../te-server
-USERINCLUDE   ../../inc
-USERINCLUDE  ../../src/pluginframework
-USERINCLUDE   ../../src/uloggerserver
-
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/test
-SYSTEMINCLUDE /epoc32/include/ecom
-
-
-
-LIBRARY		euser.lib estor.lib bafl.lib hal.lib efsrv.lib btracec.lib uloggersysconfig.lib
+LIBRARY		euser.lib 
+LIBRARY     estor.lib 
+LIBRARY     bafl.lib 
+LIBRARY     hal.lib 
+LIBRARY     efsrv.lib 
+LIBRARY     btracec.lib 
+LIBRARY     uloggersysconfig.lib
 LIBRARY		testexecuteutils.lib 
 LIBRARY		testexecutelogclient.lib ecom.lib
 
-
+SMPSAFE