Index: contrib/arch/uspace/srv/bd/rd/rd.adl
===================================================================
--- contrib/arch/uspace/srv/bd/rd/rd.adl	(revision e8e2ae1410b2c4feac7d059af6a832c7c068e182)
+++ contrib/arch/uspace/srv/bd/rd/rd.adl	(revision 2ac62cfc62bfa68275cbc24fdfd44b1195dc5dc5)
@@ -3,10 +3,9 @@
 		block_device bd;
 	requires:
+		naming_service ns;
+		device_mapper_driver dm_driver;
 		[/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/ns/ns.adl
===================================================================
--- contrib/arch/uspace/srv/ns/ns.adl	(revision e8e2ae1410b2c4feac7d059af6a832c7c068e182)
+++ contrib/arch/uspace/srv/ns/ns.adl	(revision 2ac62cfc62bfa68275cbc24fdfd44b1195dc5dc5)
@@ -31,6 +31,6 @@
 		naming_service ns;
 	requires:
-		[/uspace/lib/libc/requires.kernel]
+		[/uspace/lib/libc/requires]
 	protocol:
-		[/uspace/lib/libc/protocol.kernel]
+		[/uspace/lib/libc/protocol]
 };