Index: uspace/drv/bus/usb/usbflbk/main.c
===================================================================
--- uspace/drv/bus/usb/usbflbk/main.c	(revision 7c69861bb4a18e9c3cdf796e6cca49187b64245a)
+++ uspace/drv/bus/usb/usbflbk/main.c	(revision b6812a1f9a954398c35656fde6deca4d15049de3)
@@ -48,7 +48,7 @@
 static int usbfallback_device_add(usb_device_t *dev)
 {
-	usb_log_info("Pretending to control %s `%s' (handle %" PRIun ").\n",
+	usb_log_info("Pretending to control %s `%s'.\n",
 	    dev->interface_no < 0 ? "device" : "interface",
-	    usb_device_get_name(dev), ddf_dev_get_handle(dev->ddf_dev));
+	    usb_device_get_name(dev));
 	return EOK;
 }
Index: uspace/drv/bus/usb/usbhid/generic/hiddev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/generic/hiddev.c	(revision 7c69861bb4a18e9c3cdf796e6cca49187b64245a)
+++ uspace/drv/bus/usb/usbhid/generic/hiddev.c	(revision b6812a1f9a954398c35656fde6deca4d15049de3)
@@ -195,6 +195,6 @@
 	/* Create the exposed function. */
 	usb_log_debug("Creating DDF function %s...\n", HID_GENERIC_FUN_NAME);
-	ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
-	    HID_GENERIC_FUN_NAME);
+	ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev,
+	    fun_exposed, HID_GENERIC_FUN_NAME);
 	if (fun == NULL) {
 		usb_log_error("Could not create DDF function node.\n");
Index: uspace/drv/bus/usb/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/kbd/kbddev.c	(revision 7c69861bb4a18e9c3cdf796e6cca49187b64245a)
+++ uspace/drv/bus/usb/usbhid/kbd/kbddev.c	(revision b6812a1f9a954398c35656fde6deca4d15049de3)
@@ -627,5 +627,5 @@
 	/* Create the exposed function. */
 	usb_log_debug("Creating DDF function %s...\n", HID_KBD_FUN_NAME);
-	ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev,
+	ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev,
 	    fun_exposed, HID_KBD_FUN_NAME);
 	if (fun == NULL) {
Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/mouse/mousedev.c	(revision 7c69861bb4a18e9c3cdf796e6cca49187b64245a)
+++ uspace/drv/bus/usb/usbhid/mouse/mousedev.c	(revision b6812a1f9a954398c35656fde6deca4d15049de3)
@@ -332,6 +332,6 @@
 	/* Create the exposed function. */
 	usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
-	ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed,
-	    HID_MOUSE_FUN_NAME);
+	ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev,
+	    fun_exposed, HID_MOUSE_FUN_NAME);
 	if (fun == NULL) {
 		usb_log_error("Could not create DDF function node `%s'.\n",
Index: uspace/drv/bus/usb/usbhid/multimedia/multimedia.c
===================================================================
--- uspace/drv/bus/usb/usbhid/multimedia/multimedia.c	(revision 7c69861bb4a18e9c3cdf796e6cca49187b64245a)
+++ uspace/drv/bus/usb/usbhid/multimedia/multimedia.c	(revision b6812a1f9a954398c35656fde6deca4d15049de3)
@@ -161,6 +161,6 @@
 
 	/* Create the exposed function. */
-	ddf_fun_t *fun = ddf_fun_create(
-	    hid_dev->usb_dev->ddf_dev, fun_exposed, NAME);
+	ddf_fun_t *fun = usb_device_ddf_fun_create(
+	    hid_dev->usb_dev, fun_exposed, NAME);
 	if (fun == NULL) {
 		usb_log_error("Could not create DDF function node.\n");
Index: uspace/drv/bus/usb/usbhub/usbhub.c
===================================================================
--- uspace/drv/bus/usb/usbhub/usbhub.c	(revision 7c69861bb4a18e9c3cdf796e6cca49187b64245a)
+++ uspace/drv/bus/usb/usbhub/usbhub.c	(revision b6812a1f9a954398c35656fde6deca4d15049de3)
@@ -128,5 +128,5 @@
 	/* Create hub control function. */
 	usb_log_debug("Creating DDF function '" HUB_FNC_NAME "'.\n");
-	hub_dev->hub_fun = ddf_fun_create(hub_dev->usb_device->ddf_dev,
+	hub_dev->hub_fun = usb_device_ddf_fun_create(hub_dev->usb_device,
 	    fun_exposed, HUB_FNC_NAME);
 	if (hub_dev->hub_fun == NULL) {
Index: uspace/drv/bus/usb/usbmid/explore.c
===================================================================
--- uspace/drv/bus/usb/usbmid/explore.c	(revision 7c69861bb4a18e9c3cdf796e6cca49187b64245a)
+++ uspace/drv/bus/usb/usbmid/explore.c	(revision b6812a1f9a954398c35656fde6deca4d15049de3)
@@ -180,5 +180,5 @@
 
 	/* Create control function. */
-	usb_mid->ctl_fun = ddf_fun_create(dev->ddf_dev, fun_exposed, "ctl");
+	usb_mid->ctl_fun = usb_device_ddf_fun_create(dev, fun_exposed, "ctl");
 	if (usb_mid->ctl_fun == NULL) {
 		usb_log_error("Failed to create control function.\n");
Index: uspace/drv/bus/usb/usbmid/main.c
===================================================================
--- uspace/drv/bus/usb/usbmid/main.c	(revision 7c69861bb4a18e9c3cdf796e6cca49187b64245a)
+++ uspace/drv/bus/usb/usbmid/main.c	(revision b6812a1f9a954398c35656fde6deca4d15049de3)
@@ -51,5 +51,5 @@
 static int usbmid_device_add(usb_device_t *dev)
 {
-	usb_log_info("Taking care of new MID `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
+	usb_log_info("Taking care of new MID `%s'.\n", usb_device_get_name(dev));
 
 	return usbmid_explore_device(dev);
@@ -116,5 +116,5 @@
 	assert(usb_mid);
 
-	usb_log_info("USB MID gone: `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
+	usb_log_info("USB MID gone: `%s'.\n", usb_device_get_name(dev));
 
 	/* Remove ctl function */
Index: uspace/drv/bus/usb/usbmid/usbmid.c
===================================================================
--- uspace/drv/bus/usb/usbmid/usbmid.c	(revision 7c69861bb4a18e9c3cdf796e6cca49187b64245a)
+++ uspace/drv/bus/usb/usbmid/usbmid.c	(revision b6812a1f9a954398c35656fde6deca4d15049de3)
@@ -112,5 +112,5 @@
 
 	/* Create the device. */
-	child = ddf_fun_create(parent->ddf_dev, fun_inner, child_name);
+	child = usb_device_ddf_fun_create(parent, fun_inner, child_name);
 	free(child_name);
 	if (child == NULL) {