Index: contrib/arch/uspace/lib/libc/requires
===================================================================
--- contrib/arch/uspace/lib/libc/requires	(revision e8e2ae1410b2c4feac7d059af6a832c7c068e182)
+++ contrib/arch/uspace/lib/libc/requires	(revision e8e2ae1410b2c4feac7d059af6a832c7c068e182)
@@ -0,0 +1,2 @@
+/* Interfaces required by libc */
+naming_service ns;
Index: contrib/arch/uspace/lib/libc/requires.iface
===================================================================
--- contrib/arch/uspace/lib/libc/requires.iface	(revision 07fdf2039be8c557cff859a000458feabc41d241)
+++ 	(revision )
@@ -1,2 +1,0 @@
-/* Interfaces required by libc */
-naming_service ns;
Index: contrib/arch/uspace/lib/libc/requires.iface.kernel
===================================================================
--- contrib/arch/uspace/lib/libc/requires.iface.kernel	(revision 07fdf2039be8c557cff859a000458feabc41d241)
+++ 	(revision )
@@ -1,14 +1,0 @@
-/* Kernel interfaces required by libc */
-kernel_klog kernel_klog;
-kernel_console kernel_console;
-kernel_tls kernel_tls;
-kernel_thread kernel_thread;
-kernel_task kernel_task;
-kernel_program kernel_program;
-kernel_as kernel_as;
-kernel_ipc kernel_sys;
-kernel_event kernel_event;
-kernel_cap kernel_cap;
-kernel_ddi kernel_ddi;
-kernel_sysinfo kernel_sysinfo;
-kernel_debug kernel_debug;
Index: contrib/arch/uspace/lib/libc/requires.kernel
===================================================================
--- contrib/arch/uspace/lib/libc/requires.kernel	(revision e8e2ae1410b2c4feac7d059af6a832c7c068e182)
+++ contrib/arch/uspace/lib/libc/requires.kernel	(revision e8e2ae1410b2c4feac7d059af6a832c7c068e182)
@@ -0,0 +1,14 @@
+/* Kernel interfaces required by libc */
+kernel_klog kernel_klog;
+kernel_console kernel_console;
+kernel_tls kernel_tls;
+kernel_thread kernel_thread;
+kernel_task kernel_task;
+kernel_program kernel_program;
+kernel_as kernel_as;
+kernel_ipc kernel_sys;
+kernel_event kernel_event;
+kernel_cap kernel_cap;
+kernel_ddi kernel_ddi;
+kernel_sysinfo kernel_sysinfo;
+kernel_debug kernel_debug;
Index: contrib/arch/uspace/srv/bd/rd/rd.adl
===================================================================
--- contrib/arch/uspace/srv/bd/rd/rd.adl	(revision 07fdf2039be8c557cff859a000458feabc41d241)
+++ contrib/arch/uspace/srv/bd/rd/rd.adl	(revision e8e2ae1410b2c4feac7d059af6a832c7c068e182)
@@ -3,7 +3,10 @@
 		block_device bd;
 	requires:
-		[/lib/libc/iface.requires]
+		[/uspace/lib/libc/requires]
+		[/uspace/lib/libc/requires.kernel]
 		device_mapper_driver dm_driver;
 	protocol:
+		[/uspace/lib/libc/protocol] +
+		[/uspace/lib/libc/protocol.kernel] +
 		[rd.bp]
 };
Index: contrib/arch/uspace/srv/bd/rd/rd.bp
===================================================================
--- contrib/arch/uspace/srv/bd/rd/rd.bp	(revision 07fdf2039be8c557cff859a000458feabc41d241)
+++ contrib/arch/uspace/srv/bd/rd/rd.bp	(revision e8e2ae1410b2c4feac7d059af6a832c7c068e182)
@@ -1,2 +1,2 @@
-[/lib/libc/devmap_driver_register] ;
-[/lib/libc/devmap_device_register]
+[/lib/libc/fnc.devmap_driver_register] ;
+[/lib/libc/fnc.devmap_device_register]
Index: contrib/arch/uspace/srv/ns/ns.adl
===================================================================
--- contrib/arch/uspace/srv/ns/ns.adl	(revision 07fdf2039be8c557cff859a000458feabc41d241)
+++ contrib/arch/uspace/srv/ns/ns.adl	(revision e8e2ae1410b2c4feac7d059af6a832c7c068e182)
@@ -31,5 +31,5 @@
 		naming_service ns;
 	requires:
-		[/uspace/lib/libc/requires.iface.kernel]
+		[/uspace/lib/libc/requires.kernel]
 	protocol:
 		[/uspace/lib/libc/protocol.kernel]