--- a/traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_trace_system_enabled_suite.mmp	Thu Aug 19 11:36:21 2010 +0300
+++ b/traceservices/tracefw/ost_trace_api/unit_test/te_ost/group/te_trace_system_enabled_suite.mmp	Tue Aug 31 16:57:14 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -19,16 +19,16 @@
 
 #undef 				SYMBIAN_TRACE_SYSTEM_INCLUDE
 #define 			SYMBIAN_TRACE_EXECUTABLE_INCLUDE
-#include    			<platform/opensystemtrace.mmh>
+#include    		<platform/opensystemtrace.mmh>
+
 //MACRO 			TE_SYSTEM_SHOULD_BE_ENABLED
 MACRO 				TE_EXECUTABLE_SHOULD_BE_ENABLED
 MACRO				TE_SYSTEM_TRACE_ENABLED
 MACRO 				EXECUTABLE_DEFAULT_MODULEUID=6666
 MACRO	 			TE_MODULE_UID=0x101F6784
 MACRO				EXECUTABLE_DEFAULT_HAS_THREAD_IDENTIFICATION=ENoThreadIdentification
-SYSTEMINCLUDE 		\epoc32\include
-SYSTEMINCLUDE 		\epoc32\include\test
-SYSTEMINCLUDE 		\epoc32\include\platform
+
+OS_LAYER_SYSTEMINCLUDE
 
 USERINCLUDE			..\inc
 USERINCLUDE 		../../devicedriver/inc/
@@ -52,7 +52,6 @@
 #endif
 SOURCE				te_usertimer.cpp
 
-
 LIBRARY		euser.lib
 LIBRARY		testexecuteutils.lib 
 LIBRARY		testexecutelogclient.lib 
@@ -63,7 +62,6 @@
 LIBRARY		te_lauterbach.lib
 LIBRARY		te_ost_lauterbach.lib
 
-
 always_build_as_arm
 OPTION ARMCC --interleave