Index: uspace/drv/bus/usb/ehci/main.c
===================================================================
--- uspace/drv/bus/usb/ehci/main.c	(revision 861b5d6f1de4d4c071b00ff016eeb5fdba73d042)
+++ uspace/drv/bus/usb/ehci/main.c	(revision 944f8fdd006b2359954cee16ede3ed01c2d88b24)
@@ -37,5 +37,5 @@
 #include <io/logctl.h>
 #include <usb/host/hcd.h>
-#include <usb/host/ddf_helpers.h>
+#include <usb/host/utility.h>
 
 #include "res.h"
@@ -52,5 +52,5 @@
 	.claim = disable_legacy,
 	.start = hc_start,
-	.setup_root_hub = hcd_setup_virtual_root_hub,
+	.setup_root_hub = hc_setup_virtual_root_hub,
 	.hc_gone = hc_gone,
 };
Index: uspace/drv/bus/usb/ohci/main.c
===================================================================
--- uspace/drv/bus/usb/ohci/main.c	(revision 861b5d6f1de4d4c071b00ff016eeb5fdba73d042)
+++ uspace/drv/bus/usb/ohci/main.c	(revision 944f8fdd006b2359954cee16ede3ed01c2d88b24)
@@ -43,5 +43,5 @@
 
 #include <usb/debug.h>
-#include <usb/host/ddf_helpers.h>
+#include <usb/host/utility.h>
 
 #include "hc.h"
@@ -58,5 +58,5 @@
 	.claim = hc_gain_control,
 	.start = hc_start,
-	.setup_root_hub = hcd_setup_virtual_root_hub,
+	.setup_root_hub = hc_setup_virtual_root_hub,
 	.hc_gone = hc_gone,
 };
Index: uspace/drv/bus/usb/uhci/main.c
===================================================================
--- uspace/drv/bus/usb/uhci/main.c	(revision 861b5d6f1de4d4c071b00ff016eeb5fdba73d042)
+++ uspace/drv/bus/usb/uhci/main.c	(revision 944f8fdd006b2359954cee16ede3ed01c2d88b24)
@@ -43,5 +43,5 @@
 #include <str_error.h>
 #include <usb/debug.h>
-#include <usb/host/ddf_helpers.h>
+#include <usb/host/utility.h>
 
 #include "hc.h"
@@ -58,5 +58,5 @@
 	.hc_add = hc_add,
 	.start = hc_start,
-	.setup_root_hub = hcd_setup_virtual_root_hub,
+	.setup_root_hub = hc_setup_virtual_root_hub,
 	.hc_gone = hc_gone,
 };
Index: uspace/drv/bus/usb/vhc/main.c
===================================================================
--- uspace/drv/bus/usb/vhc/main.c	(revision 861b5d6f1de4d4c071b00ff016eeb5fdba73d042)
+++ uspace/drv/bus/usb/vhc/main.c	(revision 944f8fdd006b2359954cee16ede3ed01c2d88b24)
@@ -40,4 +40,5 @@
 
 #include <usb/host/ddf_helpers.h>
+#include <usb/host/utility.h>
 
 #include <usb/debug.h>
@@ -106,5 +107,5 @@
 	 * needs to be ready at this time.
 	 */
-	ret = hcd_setup_virtual_root_hub(&vhc->base);
+	ret = hc_setup_virtual_root_hub(&vhc->base);
 	if (ret != EOK) {
 		usb_log_error("Failed to init VHC root hub: %s",
Index: uspace/drv/bus/usb/xhci/bus.c
===================================================================
--- uspace/drv/bus/usb/xhci/bus.c	(revision 861b5d6f1de4d4c071b00ff016eeb5fdba73d042)
+++ uspace/drv/bus/usb/xhci/bus.c	(revision 944f8fdd006b2359954cee16ede3ed01c2d88b24)
@@ -36,4 +36,5 @@
 #include <usb/host/endpoint.h>
 #include <usb/host/hcd.h>
+#include <usb/host/utility.h>
 #include <usb/descriptor.h>
 #include <usb/debug.h>
@@ -113,5 +114,5 @@
 
 	uint16_t max_packet_size;
-	if ((err = hcd_get_ep0_max_packet_size(&max_packet_size, (bus_t *) &hc->bus, &dev->base)))
+	if ((err = hc_get_ep0_max_packet_size(&max_packet_size, (bus_t *) &hc->bus, &dev->base)))
 		return err;
 
@@ -184,5 +185,5 @@
 
 	/* Read the device descriptor, derive the match ids */
-	if ((err = hcd_device_explore(dev))) {
+	if ((err = hc_device_explore(dev))) {
 		usb_log_error("Device(%d): Failed to explore device: %s", dev->address, str_error(err));
 		goto err_address;