Index: uspace/drv/uhci/callback.c
===================================================================
--- uspace/drv/uhci/callback.c	(revision 5286a2cd2af7c94b67b6ff752686d58fa1d5d720)
+++ uspace/drv/uhci/callback.c	(revision 67a1b787725524897a37f6bd386e04069e316cce)
@@ -49,5 +49,5 @@
 		  instance->callback_in, outcome, act_size);
 		instance->callback_in(
-		  instance->dev, act_size, outcome, instance->arg);
+		  instance->dev, outcome, act_size, instance->arg);
 	} else {
 		assert(instance->callback_out);
Index: uspace/drv/uhci/iface.c
===================================================================
--- uspace/drv/uhci/iface.c	(revision 5286a2cd2af7c94b67b6ff752686d58fa1d5d720)
+++ uspace/drv/uhci/iface.c	(revision 67a1b787725524897a37f6bd386e04069e316cce)
@@ -26,5 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <usb/hcdhubd.h>
+#include <driver.h>
+#include <remote_usbhc.h>
 #include <errno.h>
 
Index: uspace/drv/uhci/main.c
===================================================================
--- uspace/drv/uhci/main.c	(revision 5286a2cd2af7c94b67b6ff752686d58fa1d5d720)
+++ uspace/drv/uhci/main.c	(revision 67a1b787725524897a37f6bd386e04069e316cce)
@@ -26,5 +26,4 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <usb/hcdhubd.h>
 #include <usb_iface.h>
 #include <errno.h>
Index: uspace/drv/uhci/uhci.h
===================================================================
--- uspace/drv/uhci/uhci.h	(revision 5286a2cd2af7c94b67b6ff752686d58fa1d5d720)
+++ uspace/drv/uhci/uhci.h	(revision 67a1b787725524897a37f6bd386e04069e316cce)
@@ -38,5 +38,4 @@
 
 #include <usb/addrkeep.h>
-#include <usb/hcdhubd.h>
 #include <usbhc_iface.h>