Index: uspace/lib/usbdev/src/altiface.c
===================================================================
--- uspace/lib/usbdev/src/altiface.c	(revision 3121b5f30ef34cc426b12f3245f12ebbbe102c32)
+++ uspace/lib/usbdev/src/altiface.c	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -36,7 +36,7 @@
 #include <usb/dev/alternate_ifaces.h>
 #include <usb/dev/dp.h>
-#include <malloc.h>
+#include <assert.h>
 #include <errno.h>
-#include <assert.h>
+#include <stdlib.h>
 
 /** Count number of alternate settings of a interface.
@@ -103,5 +103,5 @@
 	}
 
-	const size_t alt_count =usb_interface_count_alternates(config_descr,
+	const size_t alt_count = usb_interface_count_alternates(config_descr,
 	    config_descr_size, interface_number);
 
Index: uspace/lib/usbdev/src/devdrv.c
===================================================================
--- uspace/lib/usbdev/src/devdrv.c	(revision 3121b5f30ef34cc426b12f3245f12ebbbe102c32)
+++ uspace/lib/usbdev/src/devdrv.c	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -35,11 +35,19 @@
 
 #include <usb_iface.h>
+#include <usb/dev/alternate_ifaces.h>
 #include <usb/dev/device.h>
+#include <usb/dev/pipes.h>
 #include <usb/dev/request.h>
 #include <usb/debug.h>
-#include <usb/dev.h>
+#include <usb/descriptor.h>
+#include <usb/usb.h>
+
+#include <assert.h>
+#include <async.h>
+#include <devman.h>
 #include <errno.h>
-#include <str_error.h>
-#include <assert.h>
+#include <stdlib.h>
+
+#include <ddf/driver.h>
 
 /** USB device structure. */
Index: uspace/lib/usbdev/src/devpoll.c
===================================================================
--- uspace/lib/usbdev/src/devpoll.c	(revision 3121b5f30ef34cc426b12f3245f12ebbbe102c32)
+++ uspace/lib/usbdev/src/devpoll.c	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -33,11 +33,21 @@
  * USB device driver framework - automatic interrupt polling.
  */
+#include <usb/dev/device.h>
+#include <usb/dev/pipes.h>
 #include <usb/dev/poll.h>
 #include <usb/dev/request.h>
+#include <usb/classes/classes.h>
 #include <usb/debug.h>
-#include <usb/classes/classes.h>
+#include <usb/descriptor.h>
+#include <usb/usb.h>
+
+#include <assert.h>
+#include <async.h>
 #include <errno.h>
+#include <fibril.h>
+#include <stdbool.h>
+#include <stdlib.h>
 #include <str_error.h>
-#include <assert.h>
+#include <sys/types.h>
 
 /** Maximum number of failed consecutive requests before announcing failure. */
Index: uspace/lib/usbdev/src/dp.c
===================================================================
--- uspace/lib/usbdev/src/dp.c	(revision 3121b5f30ef34cc426b12f3245f12ebbbe102c32)
+++ uspace/lib/usbdev/src/dp.c	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -41,11 +41,12 @@
  * sibling.
  */
-#include <stdio.h>
-#include <str_error.h>
-#include <errno.h>
-#include <assert.h>
-#include <stdbool.h>
 #include <usb/dev/dp.h>
 #include <usb/descriptor.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <sys/types.h>
 
 #define NESTING(parentname, childname) \
Index: uspace/lib/usbdev/src/driver.c
===================================================================
--- uspace/lib/usbdev/src/driver.c	(revision 3121b5f30ef34cc426b12f3245f12ebbbe102c32)
+++ uspace/lib/usbdev/src/driver.c	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -35,7 +35,11 @@
 
 #include <usb/dev/driver.h>
+#include <usb/dev/device.h>
+#include <usb/debug.h>
+
+#include <assert.h>
 #include <errno.h>
 #include <str_error.h>
-#include <usb/debug.h>
+#include <ddf/driver.h>
 
 static const usb_driver_t *driver = NULL;
Index: uspace/lib/usbdev/src/pipes.c
===================================================================
--- uspace/lib/usbdev/src/pipes.c	(revision 3121b5f30ef34cc426b12f3245f12ebbbe102c32)
+++ uspace/lib/usbdev/src/pipes.c	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -35,6 +35,11 @@
 #include <usb/dev/pipes.h>
 #include <usb/dev/request.h>
+#include <usb/usb.h>
+#include <usb_iface.h>
+
+#include <assert.h>
+#include <async.h>
 #include <errno.h>
-#include <assert.h>
+#include <mem.h>
 
 /** Try to clear endpoint halt of default control pipe.
Index: uspace/lib/usbdev/src/pipesinit.c
===================================================================
--- uspace/lib/usbdev/src/pipesinit.c	(revision 3121b5f30ef34cc426b12f3245f12ebbbe102c32)
+++ uspace/lib/usbdev/src/pipesinit.c	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -34,10 +34,12 @@
  *
  */
-#include <usb/usb.h>
 #include <usb/dev/pipes.h>
 #include <usb/dev/dp.h>
 #include <usb/dev/request.h>
+#include <usb/usb.h>
+#include <usb/descriptor.h>
+
+#include <assert.h>
 #include <errno.h>
-#include <assert.h>
 
 #define DEV_DESCR_MAX_PACKET_SIZE_OFFSET 7
Index: uspace/lib/usbdev/src/recognise.c
===================================================================
--- uspace/lib/usbdev/src/recognise.c	(revision 3121b5f30ef34cc426b12f3245f12ebbbe102c32)
+++ uspace/lib/usbdev/src/recognise.c	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -34,14 +34,13 @@
  */
 
-#include <sys/types.h>
-#include <fibril_synch.h>
-#include <usb/debug.h>
 #include <usb/dev/pipes.h>
 #include <usb/dev/recognise.h>
 #include <usb/dev/request.h>
 #include <usb/classes/classes.h>
+
+#include <assert.h>
+#include <errno.h>
 #include <stdio.h>
-#include <errno.h>
-#include <assert.h>
+#include <sys/types.h>
 
 /** Get integer part from BCD coded number. */
@@ -235,5 +234,5 @@
 		    (int) device_descriptor->product_id,
 		    BCD_ARGS(device_descriptor->device_version));
-		
+
 		/* Next, without release number. */
 		ADD_MATCHID_OR_RETURN(matches, 90,
@@ -241,10 +240,10 @@
 		    (int) device_descriptor->vendor_id,
 		    (int) device_descriptor->product_id);
-	}	
+	}
 
 	/* Class match id */
 	ADD_MATCHID_OR_RETURN(matches, 50, "usb&class=%s",
 	    usb_str_class(device_descriptor->device_class));
-	
+
 	/* As a last resort, try fallback driver. */
 	ADD_MATCHID_OR_RETURN(matches, 10, "usb&fallback");
Index: uspace/lib/usbdev/src/request.c
===================================================================
--- uspace/lib/usbdev/src/request.c	(revision 3121b5f30ef34cc426b12f3245f12ebbbe102c32)
+++ uspace/lib/usbdev/src/request.c	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -34,7 +34,11 @@
  */
 #include <usb/dev/request.h>
+#include <usb/request.h>
+#include <usb/usb.h>
+
 #include <errno.h>
-#include <assert.h>
-#include <usb/debug.h>
+#include <mem.h>
+#include <stdlib.h>
+#include <str.h>
 
 #define MAX_DATA_LENGTH ((size_t)(0xFFFF))