Index: uspace/lib/usbhost/include/usb/host/bus.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/bus.h	(revision ee794529392e0d007ecfbb2eb6d719532ea0aba0)
+++ uspace/lib/usbhost/include/usb/host/bus.h	(revision ec700c75765e920cd0cb4090eb421a98256eb4b3)
@@ -85,5 +85,5 @@
 	int (*register_endpoint)(bus_t *, endpoint_t *);
 	int (*unregister_endpoint)(bus_t *, endpoint_t *);
-	endpoint_t *(*find_endpoint)(bus_t *, usb_target_t, usb_direction_t);
+	endpoint_t *(*find_endpoint)(bus_t *, device_t*, usb_target_t, usb_direction_t);
 	void (*destroy_endpoint)(endpoint_t *);			/**< Optional */
 	bool (*endpoint_get_toggle)(endpoint_t *);		/**< Optional */
@@ -120,5 +120,5 @@
     usb_direction_t dir, usb_transfer_type_t type, size_t max_packet_size,
     unsigned packets, size_t size);
-extern int bus_remove_ep(bus_t *bus, usb_target_t target, usb_direction_t dir);
+extern int bus_remove_ep(bus_t *, device_t *, usb_target_t, usb_direction_t);
 
 int device_set_default_name(device_t *);
@@ -130,5 +130,5 @@
 int bus_register_endpoint(bus_t *, endpoint_t *);
 int bus_unregister_endpoint(bus_t *, endpoint_t *);
-endpoint_t *bus_find_endpoint(bus_t *, usb_target_t, usb_direction_t);
+endpoint_t *bus_find_endpoint(bus_t *, device_t *, usb_target_t, usb_direction_t);
 
 size_t bus_count_bw(endpoint_t *, size_t);
Index: uspace/lib/usbhost/include/usb/host/hcd.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/hcd.h	(revision ee794529392e0d007ecfbb2eb6d719532ea0aba0)
+++ uspace/lib/usbhost/include/usb/host/hcd.h	(revision ec700c75765e920cd0cb4090eb421a98256eb4b3)
@@ -108,10 +108,11 @@
 extern int hcd_remove_ep(hcd_t *, usb_target_t, usb_direction_t);
 
-extern int hcd_send_batch(hcd_t *, usb_target_t, usb_direction_t, void *,
-    size_t, uint64_t, usbhc_iface_transfer_in_callback_t,
-    usbhc_iface_transfer_out_callback_t, void *, const char *);
+extern int hcd_send_batch(hcd_t *, device_t *, usb_target_t,
+    usb_direction_t direction, char *, size_t, uint64_t,
+    usb_transfer_batch_callback_t, void *, const char *);
 
-extern ssize_t hcd_send_batch_sync(hcd_t *, usb_target_t, usb_direction_t,
-    void *, size_t, uint64_t, const char *);
+extern ssize_t hcd_send_batch_sync(hcd_t *, device_t *, usb_target_t,
+    usb_direction_t direction, char *, size_t, uint64_t,
+    const char *);
 
 #endif
Index: uspace/lib/usbhost/include/usb/host/usb2_bus.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/usb2_bus.h	(revision ee794529392e0d007ecfbb2eb6d719532ea0aba0)
+++ uspace/lib/usbhost/include/usb/host/usb2_bus.h	(revision ec700c75765e920cd0cb4090eb421a98256eb4b3)
@@ -56,4 +56,5 @@
 		usb_speed_t speed;      /**< Device speed */
 		bool occupied;          /**< The address is in use. */
+		// TODO: This can be stored in usb2_bus-specific device_t
 		list_t endpoint_list;   /**< Store endpoint_t instances */
 	} devices[USB_ADDRESS_COUNT];
Index: uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision ee794529392e0d007ecfbb2eb6d719532ea0aba0)
+++ uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h	(revision ec700c75765e920cd0cb4090eb421a98256eb4b3)
@@ -108,10 +108,4 @@
 void usb_transfer_batch_destroy(usb_transfer_batch_t *);
 
-/** Provided to ease the transition. Wraps old-style handlers into a new one.
- */
-extern void usb_transfer_batch_set_old_handlers(usb_transfer_batch_t *,
-	usbhc_iface_transfer_in_callback_t,
-	usbhc_iface_transfer_out_callback_t, void *);
-
 #endif