diff -r 3a31ca4b29c4 -r b8fa7dfeeaa1 sbsv2/raptor/lib/config/gccxml.xml
--- a/sbsv2/raptor/lib/config/gccxml.xml	Wed Aug 04 12:07:55 2010 +0100
+++ b/sbsv2/raptor/lib/config/gccxml.xml	Wed Oct 06 15:13:17 2010 +0100
@@ -11,20 +11,26 @@
 		<env name='CPP' default='$(GNUCPP)' type='tool'/>
 		<env name='CREATERFIFILE' default='$(PERL) $(SBS_HOME)/bin/createrfifile.pl ' type='script'/>
 		<env name='GNUAWK' default='$(GNUPREFIX)gawk$(DOTEXE)' type='tool' versionCommand='$(GNUAWK) --version' versionResult='GNU Awk [3-9].*'/>
-		<env name='MAKEDEF' default='$(PERL) $(EPOCROOT)/epoc32/tools/makedef.pl' type='script'/>
-		<env name='PREPDEF' default='$(PERL) $(EPOCROOT)/epoc32/tools/prepdef.pl' type='script'/>
-		<env name='RCOMP' default='$(EPOCROOT)/epoc32/tools/rcomp$(DOTEXE)' type='tool'/>
+		<env name='SBS_MAKEDEF' default='$(PERL) $(EPOCTOOLS)/makedef.pl' type='script'/>
+		<set name='MAKEDEF' value='$(SBS_MAKEDEF)'/>
+		<env name='SBS_PREPDEF' default='$(PERL) $(EPOCTOOLS)/prepdef.pl' type='script'/>
+		<set name='PREPDEF' value='$(SBS_PREPDEF)'/>
+		<env name='SBS_RCOMP' default='$(EPOCTOOLS)/rcomp$(DOTEXE)' type='tool'/>
+		<set name='RCOMP' value='$(SBS_RCOMP)'/>
 		<env name='STRINGTABLE' default='$(PERL) $(EPOCROOT)/epoc32/tools/stringtable.pl' type='script'/>
 
 		<!-- link to bld.inf and mmp platform names -->
 		<set name='TRADITIONAL_PLATFORM' value='GCCXML'/>
 
+		<!-- targettypes -->
+		<set name="TARGET_TYPES" value="ani dll exe exexp implib fsy kdll kext klib ldd lib pdd pdl plugin stddll stdexe stdlib textnotifier2 var var2 none"/>
 		<!-- interfaces -->
+		<append name="INTERFACE_TYPES" value="$(TARGET_TYPES)"/>
+
 		<set name="INTERFACE.ani" value="analysis.ani"/>
 		<set name="INTERFACE.dll" value="analysis.dll"/>
 		<set name="INTERFACE.exe" value="analysis.exe"/>
 		<set name="INTERFACE.exexp" value="analysis.exexp"/>
-		<set name="INTERFACE.extension" value="analysis.extension"/>
 		<set name="INTERFACE.implib" value="analysis.implib"/>
 		<set name="INTERFACE.fsy" value="analysis.fsy"/>
 		<set name="INTERFACE.kdll" value="analysis.kdll"/>
@@ -35,7 +41,6 @@
 		<set name="INTERFACE.pdd" value="analysis.pdd"/>
 		<set name="INTERFACE.pdl" value="analysis.pdl"/>
 		<set name="INTERFACE.plugin" value="analysis.plugin"/>
-		<set name="INTERFACE.resource" value="analysis.resource"/>
 		<set name="INTERFACE.stddll" value="analysis.stddll"/>
 		<set name="INTERFACE.stdexe" value="analysis.stdexe"/>
 		<set name="INTERFACE.stdlib" value="analysis.stdlib"/>
@@ -45,6 +50,10 @@
 		<!-- the following should really be done via the default "Symbian.*" interfaces from standard.xml - but they're currently tied to non-defaulted ARM build specifics -->
 		<set name="INTERFACE.none" value="analysis.none"/>
 
+		<!-- START block interfaces -->
+		<set name="INTERFACE.extension" value="analysis.extension"/>
+		<set name="INTERFACE.resource" value="analysis.resource"/>
+
 		<!-- Java used by Trace Compiler -->
 		<env name='JAVA_HOME' default='' type='path'/>
 		<env name='JAVATC' default='$(JAVA_HOME)/bin/java' type='tool'/>