Index: uspace/lib/usbdev/src/pipes.c
===================================================================
--- uspace/lib/usbdev/src/pipes.c	(revision d46ceb2b135bb1118b9cac35e2589807c28d3c97)
+++ uspace/lib/usbdev/src/pipes.c	(revision ff14aede529e82477b19f7e9c2e101612709dd67)
@@ -36,5 +36,5 @@
 #include <usb/dev/request.h>
 #include <usb/usb.h>
-#include <usb_iface.h>
+#include <usbhc_iface.h>
 
 #include <assert.h>
@@ -98,5 +98,5 @@
 	async_exch_t *exch = async_exchange_begin(pipe->bus_session);
 	size_t act_size = 0;
-	const int rc = usb_read(exch, pipe->desc.endpoint_no, setup_packet, buffer,
+	const int rc = usbhc_read(exch, pipe->desc.endpoint_no, setup_packet, buffer,
 	    buffer_size, &act_size);
 	async_exchange_end(exch);
@@ -151,5 +151,5 @@
 
 	async_exch_t *exch = async_exchange_begin(pipe->bus_session);
-	const int rc = usb_write(exch,
+	const int rc = usbhc_write(exch,
 	    pipe->desc.endpoint_no, setup_packet, buffer, buffer_size);
 	async_exchange_end(exch);
@@ -199,5 +199,5 @@
 	size_t act_size = 0;
 	const int rc =
-	    usb_read(exch, pipe->desc.endpoint_no, 0, buffer, size, &act_size);
+	    usbhc_read(exch, pipe->desc.endpoint_no, 0, buffer, size, &act_size);
 	async_exchange_end(exch);
 
@@ -238,5 +238,5 @@
 
 	async_exch_t *exch = async_exchange_begin(pipe->bus_session);
-	const int rc = usb_write(exch, pipe->desc.endpoint_no, 0, buffer, size);
+	const int rc = usbhc_write(exch, pipe->desc.endpoint_no, 0, buffer, size);
 	async_exchange_end(exch);
 	return rc;
@@ -307,5 +307,5 @@
 		return ENOMEM;
 
-	const int ret = usb_register_endpoint(exch, &pipe->desc);
+	const int ret = usbhc_register_endpoint(exch, &pipe->desc);
 
 	async_exchange_end(exch);
@@ -326,5 +326,5 @@
 		return ENOMEM;
 
-	const int ret = usb_unregister_endpoint(exch, &pipe->desc);
+	const int ret = usbhc_unregister_endpoint(exch, &pipe->desc);
 
 	async_exchange_end(exch);