diff -r 95847726fe57 -r 5e441a173c63 kernel/eka/bld.inf
--- a/kernel/eka/bld.inf	Mon May 24 18:38:55 2010 +0100
+++ b/kernel/eka/bld.inf	Mon May 24 18:45:46 2010 +0100
@@ -262,6 +262,8 @@
 include/drivers/resourcecontrol_trace.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 include/drivers/resource_category.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 include/drivers/resource_extend.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/resourcecontrol_settings.h		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/resourcecontrol_clientsettings.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 
 // Power Resource Manager User-Side API
 include/drivers/resmanus_trace.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
@@ -379,6 +381,8 @@
 include/d32resmanus.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(d32resmanus.h)
 include/d32resmanus.inl							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(d32resmanus.inl)
 
+include/heap_hybrid.h							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(kernel/)
+
 //Unified Trace Framework API
 include/e32utf.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32utf.h)
 include/e32utrace.inl							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32utrace.inl)
@@ -386,20 +390,20 @@
 include/e32utrace.mmh							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32utrace.mmh)
 
 //Open System Trace API
-include/opensystemtrace.h					/epoc32/include/platform/
-include/opensystemtrace.inl					/epoc32/include/platform/
-include/opensystemtrace_types.h					/epoc32/include/platform/
-include/opensystemtrace.mmh					/epoc32/include/platform/
+include/opensystemtrace.h                       SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(opensystemtrace.h)
+include/opensystemtrace.inl                     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(opensystemtrace.inl)
+include/opensystemtrace_types.h                 SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(opensystemtrace_types.h)
+include/opensystemtrace.mmh                     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(opensystemtrace.mmh)
 
 // ROM building scripts
-rombuild/base.iby								/epoc32/rom/include/			//
-rombuild/PlatSecEnforcement.oby					/epoc32/rom/include/			//
-rombuild/PlatSecDiagnostics.oby					/epoc32/rom/include/			//
-rombuild/btrace.iby								/epoc32/rom/include/			//
+rombuild/base.iby								/epoc32/rom/include/
+rombuild/PlatSecEnforcement.oby					/epoc32/rom/include/
+rombuild/PlatSecDiagnostics.oby					/epoc32/rom/include/
+rombuild/btrace.iby								/epoc32/rom/include/
 rombuild/kernel.hby								/epoc32/rom/include/
 rombuild/rm_debug_svr.iby						/epoc32/rom/include/			// Run mode debug driver
-rombuild/utrace.iby								/epoc32/rom/include/			//utrace
-rombuild/ost.iby								/epoc32/rom/include/			//ost
+rombuild/utrace.iby								/epoc32/rom/include/
+rombuild/ost.iby								/epoc32/rom/include/
 
 // Byte pair compressor
 include/byte_pair_compress.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(byte_pair_compress.h)