--- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_multiparttrace.mmp	Thu Aug 19 11:36:21 2010 +0300
+++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_multiparttrace.mmp	Tue Aug 31 16:57:14 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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,12 +17,18 @@
 TARGETTYPE 	exe
 UID         0x1000007A 0x10287238
 
-#define SYMBIAN_INCLUDE_EXECUTABLE_TRACE
+#define     SYMBIAN_INCLUDE_EXECUTABLE_TRACE
 #include    <platform/opensystemtrace.mmh>
 
 MACRO TE_MULTIPART_TRACE
 epocprocesspriority high
 
+OS_LAYER_SYSTEMINCLUDE
+
+USERINCLUDE ../inc
+USERINCLUDE ../../lauterbach_perf_tester/inc
+USERINCLUDE ../../devicedriver/inc
+
 SOURCEPATH    	../src
 SOURCE		te_multiparttrace.cpp
 SOURCE		te_suite_step_base.cpp
@@ -41,16 +47,6 @@
 SOURCE		uloggerconfig.cpp
 SOURCE		te_usertimer.cpp
 
-
-USERINCLUDE	../inc
-USERINCLUDE ../../lauterbach_perf_tester/inc
-USERINCLUDE ../../devicedriver/inc
-
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/test
-SYSTEMINCLUDE /epoc32/include/platform
-
-
 LIBRARY		euser.lib
 LIBRARY		testexecuteutils.lib 
 LIBRARY		testexecutelogclient.lib