Index: uspace/lib/usbhost/include/usb/host/hcd.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/hcd.h	(revision 3f03199e0835b11c26a46cd190aeef79835d08f4)
+++ uspace/lib/usbhost/include/usb/host/hcd.h	(revision 93488625b5baeeeee9e1065454fa8734da4f68d8)
@@ -50,11 +50,7 @@
 typedef void (*ep_remove_hook_t)(hcd_t *, endpoint_t *);
 
-/** Generic host controller driver structure. */
-struct hcd {
-	/** Endpoint manager. */
-	usb_endpoint_manager_t ep_manager;
-
+typedef struct {
 	/** Device specific driver data. */
-	void *private_data;
+	void *data;
 	/** Transfer scheduling, implement in device driver. */
 	schedule_hook_t schedule;
@@ -63,4 +59,13 @@
 	/** Hook called upon removing of an endpoint. */
 	ep_remove_hook_t ep_remove_hook;
+} hc_driver_t;
+
+/** Generic host controller driver structure. */
+struct hcd {
+	/** Endpoint manager. */
+	usb_endpoint_manager_t ep_manager;
+
+	/** Driver implementation */
+	hc_driver_t driver;
 };
 
@@ -72,8 +77,8 @@
 {
 	assert(hcd);
-	hcd->private_data = data;
-	hcd->schedule = schedule;
-	hcd->ep_add_hook = add_hook;
-	hcd->ep_remove_hook = rem_hook;
+	hcd->driver.data = data;
+	hcd->driver.schedule = schedule;
+	hcd->driver.ep_add_hook = add_hook;
+	hcd->driver.ep_remove_hook = rem_hook;
 }
 
Index: uspace/lib/usbhost/src/hcd.c
===================================================================
--- uspace/lib/usbhost/src/hcd.c	(revision 3f03199e0835b11c26a46cd190aeef79835d08f4)
+++ uspace/lib/usbhost/src/hcd.c	(revision 93488625b5baeeeee9e1065454fa8734da4f68d8)
@@ -52,6 +52,6 @@
 	assert(ep);
 	assert(hcd);
-	if (hcd->ep_add_hook)
-		return hcd->ep_add_hook(hcd, ep);
+	if (hcd->driver.ep_add_hook)
+		return hcd->driver.ep_add_hook(hcd, ep);
 	return EOK;
 }
@@ -66,6 +66,6 @@
 	assert(ep);
 	assert(hcd);
-	if (hcd->ep_remove_hook)
-		hcd->ep_remove_hook(hcd, ep);
+	if (hcd->driver.ep_remove_hook)
+		hcd->driver.ep_remove_hook(hcd, ep);
 }
 
@@ -97,8 +97,8 @@
 	usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count, max_speed);
 
-	hcd->private_data = NULL;
-	hcd->schedule = NULL;
-	hcd->ep_add_hook = NULL;
-	hcd->ep_remove_hook = NULL;
+	hcd->driver.data = NULL;
+	hcd->driver.schedule = NULL;
+	hcd->driver.ep_add_hook = NULL;
+	hcd->driver.ep_remove_hook = NULL;
 }
 
@@ -207,5 +207,5 @@
 		return ENOSPC;
 	}
-	if (!hcd->schedule) {
+	if (!hcd->driver.schedule) {
 		usb_log_error("HCD does not implement scheduler.\n");
 		return ENOTSUP;
@@ -239,5 +239,5 @@
 	}
 
-	const int ret = hcd->schedule(hcd, batch);
+	const int ret = hcd->driver.schedule(hcd, batch);
 	if (ret != EOK)
 		usb_transfer_batch_destroy(batch);