--- a/kernel/eka/bld.inf	Mon Feb 01 19:40:00 2010 +0100
+++ b/kernel/eka/bld.inf	Mon Feb 01 19:49:38 2010 +0100
@@ -55,7 +55,7 @@
 include/collate.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(collate.h)
 include/k32keys.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(k32keys.h)
 include/k32keys.inl								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(k32keys.inl)
-include/u32std.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(u32std.h)
+include/u32std.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(u32std.h)
 include/u32hal.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(u32hal.h)
 include/u32property.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(u32property.h)
 include/u32exec.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(u32exec.h)
@@ -201,7 +201,14 @@
 include/drivers/ethernet.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 include/drivers/ethernet.inl					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 include/drivers/dma.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
-include/drivers/dma.inl							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_v1.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_v1.inl						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_v2.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_v2.inl						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dmadefs.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_compat.inl					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_hai.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
+include/drivers/dma_hai.inl						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 include/drivers/iic.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 include/drivers/iic.inl							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
 include/drivers/iic_channel.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(drivers/)
@@ -312,11 +319,12 @@
 include/e32svr.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32svr.h)
 include/e32notif.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32notif.h)
 include/e32ktran.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32ktran.h)
-include/e32debug.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32debug.h)
+include/e32debug.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32debug.h)
 include/e32lmsg.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32lmsg.h)
 include/e32event.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32event.h)
 include/e32event_private.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32event_private.h)
-include/e32ldr.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32ldr.h)
+include/e32ldr.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32ldr.h)
+include/e32ldr_private.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32ldr_private.h)
 include/e32test.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32test.h)
 include/e32uid.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32uid.h)
 include/e32ver.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32ver.h)
@@ -339,6 +347,7 @@
 include/d32soundsc.inl							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(d32soundsc.inl)
 include/e32msgqueue.h							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32msgqueue.h)
 include/e32msgqueue.inl							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32msgqueue.inl)
+include/d32public.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(d32public.h)
 include/d32usbcshared.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(d32usbcshared.h)
 include/d32usbcshared.inl						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(d32usbcshared.inl)
 include/d32usbcsc.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(d32usbcsc.h)