Index: uspace/lib/usbdev/include/usb/dev/usb_device_connection.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/usb_device_connection.h	(revision 03ffb69c5d89c7672380f99657aed17df553b22b)
+++ uspace/lib/usbdev/include/usb/dev/usb_device_connection.h	(revision 1561e8bc19cde4c7bdc0823ac01bdadb1fe7b52a)
@@ -105,5 +105,5 @@
 {
 	assert(conn);
-	return usb_hc_control_read(conn->hc_connection,
+	return usb_hc_read(conn->hc_connection,
 	    conn->address, ep, setup, data, size, rsize);
 }
@@ -113,5 +113,5 @@
 {
 	assert(conn);
-	return usb_hc_control_write(conn->hc_connection,
+	return usb_hc_write(conn->hc_connection,
 	    conn->address, ep, setup, data, size);
 }
Index: uspace/lib/usbdev/src/pipes.c
===================================================================
--- uspace/lib/usbdev/src/pipes.c	(revision 03ffb69c5d89c7672380f99657aed17df553b22b)
+++ uspace/lib/usbdev/src/pipes.c	(revision 1561e8bc19cde4c7bdc0823ac01bdadb1fe7b52a)
@@ -87,7 +87,6 @@
 	    return ENOTSUP;
 
-	return usb_hc_control_read(pipe->wire->hc_connection,
-	    pipe->wire->address, pipe->endpoint_no, setup, buffer, size,
-	    size_transfered);
+	return usb_device_control_read(pipe->wire,
+	    pipe->endpoint_no, setup, buffer, size, size_transfered);
 }
 /*----------------------------------------------------------------------------*/
@@ -108,6 +107,6 @@
 	    return ENOTSUP;
 
-	return usb_hc_control_write(pipe->wire->hc_connection,
-	    pipe->wire->address, pipe->endpoint_no, setup, buffer, size);
+	return usb_device_control_write(pipe->wire,
+	    pipe->endpoint_no, setup, buffer, size);
 }
 /*----------------------------------------------------------------------------*/
Index: uspace/lib/usbdev/src/pipesinit.c
===================================================================
--- uspace/lib/usbdev/src/pipesinit.c	(revision 03ffb69c5d89c7672380f99657aed17df553b22b)
+++ uspace/lib/usbdev/src/pipesinit.c	(revision 1561e8bc19cde4c7bdc0823ac01bdadb1fe7b52a)
@@ -38,5 +38,4 @@
 #include <usb/dev/dp.h>
 #include <usb/dev/request.h>
-#include <usbhc_iface.h>
 #include <errno.h>
 #include <assert.h>
@@ -357,5 +356,4 @@
 	return EOK;
 }
-
 
 /** Initialize USB endpoint pipe as the default zero control pipe.
@@ -434,5 +432,4 @@
  * @param pipe Pipe to be registered.
  * @param interval Polling interval.
- * @param hc_connection Connection to the host controller (must be opened).
  * @return Error code.
  */
@@ -441,8 +438,7 @@
 	assert(pipe);
 	assert(pipe->wire);
-	assert(pipe->wire->hc_connection);
-
-	return usb_hc_register_endpoint(pipe->wire->hc_connection,
-	   pipe->wire->address, pipe->endpoint_no, pipe->transfer_type,
+
+	return usb_device_register_endpoint(pipe->wire,
+	   pipe->endpoint_no, pipe->transfer_type,
 	   pipe->direction, pipe->max_packet_size, interval);
 }
@@ -451,5 +447,4 @@
  *
  * @param pipe Pipe to be unregistered.
- * @param hc_connection Connection to the host controller (must be opened).
  * @return Error code.
  */
@@ -458,8 +453,7 @@
 	assert(pipe);
 	assert(pipe->wire);
-	assert(pipe->wire->hc_connection);
-
-	return usb_hc_unregister_endpoint(pipe->wire->hc_connection,
-	    pipe->wire->address, pipe->endpoint_no, pipe->direction);
+
+	return usb_device_unregister_endpoint(pipe->wire,
+	    pipe->endpoint_no, pipe->direction);
 }