Index: uspace/drv/bus/usb/uhci/hc.c
===================================================================
--- uspace/drv/bus/usb/uhci/hc.c	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/hc.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -32,14 +32,24 @@
  * @brief UHCI Host controller driver routines
  */
+
+#include <adt/list.h>
+#include <assert.h>
+#include <async.h>
+#include <ddi.h>
+#include <device/hw_res_parsed.h>
+#include <fibril.h>
 #include <errno.h>
+#include <macros.h>
+#include <mem.h>
+#include <stdlib.h>
 #include <str_error.h>
-#include <adt/list.h>
-#include <ddi.h>
+#include <sys/types.h>
 
 #include <usb/debug.h>
 #include <usb/usb.h>
 
+#include "uhci_batch.h"
+#include "utils/malloc32.h"
 #include "hc.h"
-#include "uhci_batch.h"
 
 #define UHCI_INTR_ALLOW_INTERRUPTS \
Index: uspace/drv/bus/usb/uhci/hc.h
===================================================================
--- uspace/drv/bus/usb/uhci/hc.h	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/hc.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -36,12 +36,15 @@
 #define DRV_UHCI_HC_H
 
-#include <ddf/interrupt.h>
 #include <device/hw_res_parsed.h>
 #include <fibril.h>
 #include <macros.h>
+#include <stdbool.h>
+#include <sys/types.h>
 #include <usb/host/hcd.h>
+#include <usb/host/usb_transfer_batch.h>
+
 #include "uhci_rh.h"
-
 #include "transfer_list.h"
+#include "hw_struct/link_pointer.h"
 
 /** UHCI I/O registers layout */
Index: uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -35,4 +35,6 @@
 #define DRV_UHCI_HW_STRUCT_LINK_POINTER_H
 
+#include <sys/types.h>
+
 /** UHCI link pointer, used by many data structures */
 typedef uint32_t link_pointer_t;
Index: uspace/drv/bus/usb/uhci/hw_struct/queue_head.h
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/queue_head.h	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/hw_struct/queue_head.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -34,5 +34,7 @@
 #ifndef DRV_UHCI_HW_STRUCT_QH_H
 #define DRV_UHCI_HW_STRUCT_QH_H
+
 #include <assert.h>
+#include <sys/types.h>
 
 #include "link_pointer.h"
Index: uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -32,7 +32,12 @@
  * @brief UHCI driver
  */
+
+#include <assert.h>
 #include <errno.h>
+
 #include <usb/debug.h>
+#include <usb/usb.h>
 
+#include "link_pointer.h"
 #include "transfer_descriptor.h"
 #include "../utils/malloc32.h"
Index: uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h
===================================================================
--- uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -36,6 +36,7 @@
 
 #include <assert.h>
-#include <mem.h>
 #include <usb/usb.h>
+#include <stdbool.h>
+#include <sys/types.h>
 
 #include "link_pointer.h"
Index: uspace/drv/bus/usb/uhci/main.c
===================================================================
--- uspace/drv/bus/usb/uhci/main.c	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/main.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -32,8 +32,11 @@
  * @brief UHCI driver initialization
  */
+
+#include <assert.h>
 #include <ddf/driver.h>
 #include <errno.h>
+#include <io/log.h>
+#include <stdio.h>
 #include <str_error.h>
-
 #include <usb/debug.h>
 
Index: uspace/drv/bus/usb/uhci/res.c
===================================================================
--- uspace/drv/bus/usb/uhci/res.c	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/res.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -35,9 +35,9 @@
  */
 
+#include <assert.h>
+#include <ddf/driver.h>
+#include <device/pci.h>
+#include <devman.h>
 #include <errno.h>
-#include <assert.h>
-#include <devman.h>
-#include <device/hw_res_parsed.h>
-#include <device/pci.h>
 
 #include "res.h"
Index: uspace/drv/bus/usb/uhci/res.h
===================================================================
--- uspace/drv/bus/usb/uhci/res.h	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/res.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -37,5 +37,4 @@
 
 #include <ddf/driver.h>
-#include <device/hw_res_parsed.h>
 
 int disable_legacy(ddf_dev_t *);
Index: uspace/drv/bus/usb/uhci/transfer_list.c
===================================================================
--- uspace/drv/bus/usb/uhci/transfer_list.c	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/transfer_list.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -34,8 +34,13 @@
  */
 
+#include <assert.h>
 #include <errno.h>
+#include <libarch/barrier.h>
+#include <sys/types.h>
 #include <usb/debug.h>
-#include <libarch/barrier.h>
-
+#include <usb/host/usb_transfer_batch.h>
+
+#include "utils/malloc32.h"
+#include "hw_struct/link_pointer.h"
 #include "transfer_list.h"
 
Index: uspace/drv/bus/usb/uhci/transfer_list.h
===================================================================
--- uspace/drv/bus/usb/uhci/transfer_list.h	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/transfer_list.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -35,4 +35,5 @@
 #define DRV_UHCI_TRANSFER_LIST_H
 
+#include <adt/list.h>
 #include <fibril_synch.h>
 
Index: uspace/drv/bus/usb/uhci/uhci.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci.c	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/uhci.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -34,10 +34,19 @@
  */
 
+#include <assert.h>
+#include <ddf/driver.h>
+#include <ddf/interrupt.h>
+#include <device/hw_res_parsed.h>
 #include <errno.h>
+#include <stdbool.h>
+#include <stdlib.h>
 #include <str_error.h>
-#include <ddf/interrupt.h>
+#include <sys/types.h>
+
 #include <usb/debug.h>
+#include <usb/usb.h>
+#include <usb/host/ddf_helpers.h>
 #include <usb/host/hcd.h>
-#include <usb/host/ddf_helpers.h>
+#include <usb/host/usb_bus.h>
 
 #include "uhci.h"
Index: uspace/drv/bus/usb/uhci/uhci_batch.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_batch.c	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/uhci_batch.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -32,13 +32,16 @@
  * @brief UHCI driver USB transfer structure
  */
+
+#include <assert.h>
 #include <errno.h>
-#include <str_error.h>
 #include <macros.h>
+#include <mem.h>
+#include <stdlib.h>
 
 #include <usb/usb.h>
 #include <usb/debug.h>
+#include <usb/host/endpoint.h>
 
 #include "uhci_batch.h"
-#include "transfer_list.h"
 #include "hw_struct/transfer_descriptor.h"
 #include "utils/malloc32.h"
Index: uspace/drv/bus/usb/uhci/uhci_batch.h
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_batch.h	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/uhci_batch.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -35,6 +35,10 @@
 #define DRV_UHCI_BATCH_H
 
+#include <adt/list.h>
+#include <assert.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <sys/types.h>
 #include <usb/host/usb_transfer_batch.h>
-#include <adt/list.h>
 
 #include "hw_struct/queue_head.h"
Index: uspace/drv/bus/usb/uhci/uhci_rh.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_rh.c	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/uhci_rh.c	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -28,8 +28,16 @@
 
 #include <assert.h>
+#include <async.h>
+#include <ddi.h>
+#include <errno.h>
 #include <macros.h>
+#include <mem.h>
+#include <sys/time.h>
+
 #include <usb/debug.h>
+#include <usb/descriptor.h>
 #include <usb/classes/hub.h>
-#include <ddi.h>
+#include <usb/request.h>
+#include <usb/usb.h>
 
 #include "uhci_rh.h"
Index: uspace/drv/bus/usb/uhci/uhci_rh.h
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_rh.h	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/uhci_rh.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -38,4 +38,8 @@
 #include <usbvirt/virthub_base.h>
 #include <usb/host/usb_transfer_batch.h>
+#include <usb/usb.h>
+
+#include <stdbool.h>
+#include <sys/types.h>
 
 /** Endpoint number for status change pipe. */
@@ -63,5 +67,4 @@
 static inline usb_address_t uhci_rh_get_address(uhci_rh_t *instance)
 {
-	assert(instance);
 	return virthub_base_get_address(&instance->base);
 }
Index: uspace/drv/bus/usb/uhci/utils/malloc32.h
===================================================================
--- uspace/drv/bus/usb/uhci/utils/malloc32.h	(revision 8f1dd3bc30f0bed67c0cd24128345f052a31dcfd)
+++ uspace/drv/bus/usb/uhci/utils/malloc32.h	(revision 8064c2f637436703e1f0f2ff9ea48c89db58dac2)
@@ -36,12 +36,10 @@
 
 #include <as.h>
-#include <assert.h>
 #include <ddi.h>
 #include <errno.h>
 #include <malloc.h>
-#include <mem.h>
-#include <unistd.h>
+#include <sys/types.h>
 
-#define UHCI_STRCUTURES_ALIGNMENT 16
+#define UHCI_STRUCTURES_ALIGNMENT 16
 #define UHCI_REQUIRED_PAGE_SIZE 4096
 
@@ -56,10 +54,10 @@
 	if (addr == NULL)
 		return 0;
-	
+
 	uintptr_t result;
 	const int ret = as_get_physical_mapping(addr, &result);
 	if (ret != EOK)
 		return 0;
-	
+
 	return result;
 }
@@ -81,5 +79,5 @@
 	/* Calculate alignment to make sure the block won't cross page
 	 * boundary */
-	size_t alignment = UHCI_STRCUTURES_ALIGNMENT;
+	size_t alignment = UHCI_STRUCTURES_ALIGNMENT;
 	while (alignment < size)
 		alignment *= 2;
@@ -104,9 +102,9 @@
 	uintptr_t phys;
 	void *address;
-	
+
 	const int ret = dmamem_map_anonymous(UHCI_REQUIRED_PAGE_SIZE,
 	    DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
 	    &address);
-	
+
 	return ((ret == EOK) ? address : NULL);
 }