--- a/uiaccelerator_plat/alf_tracing_api/group/bld.inf	Tue Sep 28 14:40:28 2010 +0300
+++ b/uiaccelerator_plat/alf_tracing_api/group/bld.inf	Thu Oct 14 18:35:08 2010 +0300
@@ -17,16 +17,39 @@
 */
 
 
+// The new Symbian Build System (SBS, Raptor) gives warnings from ##
+// concatenation. Use __GNUC__ >= 3 to check the SBS version!
+#ifndef __SERIES60_30__
+#include <platform_paths.hrh>
+#if __GNUC__ >= 3
+#define CORETOOLKIT_EXPORT_FOLDER(P) ../P
+#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S
 
-#include <platform_paths.hrh>
+#else
+#define CORETOOLKIT_EXPORT_FOLDER(P) ../##P
+#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/##S
+
+#endif
+#else
+#if __GNUC__ >= 3
+#define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/S
+#define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/P
+#define INTERNAL_UIACCEL_EXPORT_PATH(S) |../../../inc/S
+#else
+#define MW_LAYER_PLATFORM_EXPORT_PATH(S) /epoc32/include/oem/##S
+#define CORETOOLKIT_EXPORT_FOLDER(P) ../alf_core_toolkit_api/##P
+#define INTERNAL_UIACCEL_EXPORT_PATH(S)	|../../../inc/##S
+
+#endif
+#endif
 
 PRJ_PLATFORMS
 DEFAULT
 
 PRJ_EXPORTS
 
-../inc/uiacceltk/HuiProbe.h     MW_LAYER_PLATFORM_EXPORT_PATH(uiacceltk/HuiProbe.h)
-../inc/alf/alfmetricsinterface.h     MW_LAYER_PLATFORM_EXPORT_PATH(alf/alfmetricsinterface.h)
-../inc/alf/alflayoutmetrics.h     MW_LAYER_PLATFORM_EXPORT_PATH(alf/alflayoutmetrics.h)
-../inc/alf/alftraceextclient.h     MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftraceextclient.h)
-../inc/alf/alftraceinterface.h     MW_LAYER_PLATFORM_EXPORT_PATH(alf/alftraceinterface.h)
+../inc/uiacceltk/HuiProbe.h     INTERNAL_UIACCEL_EXPORT_PATH(uiacceltk/HuiProbe.h)
+../inc/alf/alfmetricsinterface.h     INTERNAL_UIACCEL_EXPORT_PATH(alf/alfmetricsinterface.h)
+../inc/alf/alflayoutmetrics.h     INTERNAL_UIACCEL_EXPORT_PATH(alf/alflayoutmetrics.h)
+../inc/alf/alftraceextclient.h     INTERNAL_UIACCEL_EXPORT_PATH(alf/alftraceextclient.h)
+../inc/alf/alftraceinterface.h     INTERNAL_UIACCEL_EXPORT_PATH(alf/alftraceinterface.h)