--- a/sbsv2/raptor/RELEASE-NOTES.html	Wed May 05 18:53:43 2010 +0100
+++ b/sbsv2/raptor/RELEASE-NOTES.html	Thu May 06 14:06:40 2010 +0100
@@ -10,7 +10,6 @@
 
 <h3>New Features</h3>
 <ul>
-<li>                                           Turn OST_TRACE_COMPILER_IN_USE macro on automatically so that the TCom doesn't need to.  </a></li>
 <li><a href="notes/tcomsupport.txt">           Support new Trace Compiler commandline interface, autogen header location   </a></li>
 </ul
 	

--- a/sbsv2/raptor/lib/flm/e32abiv2.flm	Wed May 05 18:53:43 2010 +0100
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm	Thu May 06 14:06:40 2010 +0100
@@ -717,9 +717,6 @@
   # TARGETEXT is already set
   include $(FLMHOME)/tracecompiler.mk
   WHATRELEASE:=$(WHATRELEASE) $(TRACE_DICTIONARY) $(AUTOGEN_HEADER)
-  ifneq ($(TRACE_PATH),)
-      CDEFS:=$(CDEFS) OST_TRACE_COMPILER_IN_USE
-  endif
 endif
 
 CC_CPPONLY_ARGS:=$(SYMBIAN_CCFLAGS) $(if $(DEBUG_INFO),-g) $(DEBUG_FORMAT) \

--- a/sbsv2/raptor/lib/flm/win32.flm	Wed May 05 18:53:43 2010 +0100
+++ b/sbsv2/raptor/lib/flm/win32.flm	Thu May 06 14:06:40 2010 +0100
@@ -222,9 +222,6 @@
   # TARGETEXT must be set before here
   include $(FLMHOME)/tracecompiler.mk
   TC_RELEASABLES:=$(TRACE_DICTIONARY) $(AUTOGEN_HEADER)
-  ifneq ($(TRACE_PATH),)
-      CDEFS:=$(CDEFS) OST_TRACE_COMPILER_IN_USE
-  endif
 endif
 
 

--- a/sbsv2/raptor/notes/tcomsupport.txt	Wed May 05 18:53:43 2010 +0100
+++ b/sbsv2/raptor/notes/tcomsupport.txt	Thu May 06 14:06:40 2010 +0100
@@ -32,15 +32,6 @@
 directory in bot SYSTEMINCLUDES and USERINCLUDES.
 
 
-Automatic Macro definition - OST_TRACE_COMPILER_IN_USE
---------------------------------------------------------
-
-When Raptor notices that the trace compiler is required for an MMP (by
-looking for the traces/targetname_ext directory in the SYSTEMINCLUDES
-or USERINCLUDES) it causes the application to build with the
-OST_TRACE_COMPILER_IN_USE defined automatically
-
-
 Create Trace Directories During Makefile Parse
 -----------------------------------------------