--- a/userlibandfileserver/fileserver/group/bld.inf	Wed May 12 10:34:10 2010 +0100
+++ b/userlibandfileserver/fileserver/group/bld.inf	Mon May 24 18:38:55 2010 +0100
@@ -46,17 +46,13 @@
 ../inc/F32plugin.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(f32plugin.h)
 ../inc/f32plugin.inl							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(f32plugin.inl)
 
-../inc/f32tracedef.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(f32tracedef.h)
-../inc/utraceefsrv.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(utraceefsrv.h)
-../inc/utraceefile.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(utraceefile.h)
 ../rom/f32.iby	 		/epoc32/rom/f32/f32.iby
 
 PRJ_MMPFILES
 
 #if !defined(SMP)
-efsrv
-efile
+../sfsrv/efsrv
+../sfile/efile
 runtests
 #endif
 
-ftrace