Index: uspace/drv/uhci-hcd/iface.c
===================================================================
--- uspace/drv/uhci-hcd/iface.c	(revision 62ed5bc1bda7bdd1be1c735c399c3b3be035c1b1)
+++ uspace/drv/uhci-hcd/iface.c	(revision 1c6a45f787bcff8490498e6a9e7b6db8600e85b4)
@@ -33,9 +33,7 @@
  */
 #include <ddf/driver.h>
-#include <remote_usbhc.h>
+#include <errno.h>
 
 #include <usb/debug.h>
-
-#include <errno.h>
 
 #include "iface.h"
@@ -48,5 +46,4 @@
  * @return Error code.
  */
-/*----------------------------------------------------------------------------*/
 static int reserve_default_address(ddf_fun_t *fun, usb_speed_t speed)
 {
@@ -93,5 +90,5 @@
 	usb_log_debug("Address request with result: %d.\n", *address);
 	if (*address <= 0)
-	  return *address;
+		return *address;
 	return EOK;
 }
@@ -192,5 +189,5 @@
 	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
 	    max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
-			&hc->manager);
+	    &hc->manager);
 	if (!batch)
 		return ENOMEM;
@@ -369,9 +366,9 @@
 	.interrupt_in = interrupt_in,
 
+	.bulk_out = bulk_out,
 	.bulk_in = bulk_in,
-	.bulk_out = bulk_out,
-
+
+	.control_write = control_write,
 	.control_read = control_read,
-	.control_write = control_write,
 };
 /**