Index: uspace/drv/bus/usb/uhci/uhci.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci.c	(revision 3121b5f30ef34cc426b12f3245f12ebbbe102c32)
+++ uspace/drv/bus/usb/uhci/uhci.c	(revision d8d100c2d26b0dda1225f4f46bf1636bf03a63e8)
@@ -33,7 +33,4 @@
  * @brief UHCI driver
  */
-
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
 
 #include <errno.h>
@@ -134,6 +131,5 @@
 	}
 
-	ddf_fun_t *hc_fun = NULL;
-	ret = hcd_ddf_setup_device(device, &hc_fun, USB_SPEED_FULL,
+	ret = hcd_ddf_setup_device(device, NULL, USB_SPEED_FULL,
 	    BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
 	CHECK_RET_RETURN(ret, "Failed to setup UHCI HCD.\n");
Index: uspace/drv/bus/usb/usbhid/generic/hiddev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/generic/hiddev.c	(revision 3121b5f30ef34cc426b12f3245f12ebbbe102c32)
+++ uspace/drv/bus/usb/usbhid/generic/hiddev.c	(revision d8d100c2d26b0dda1225f4f46bf1636bf03a63e8)
@@ -35,7 +35,4 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <usb/debug.h>
 #include <usb/classes/classes.h>