Index: uspace/lib/usbdev/include/usb/dev/alternate_ifaces.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/alternate_ifaces.h	(revision d93f5afb66a052121af391b708957e081d9184d7)
+++ uspace/lib/usbdev/include/usb/dev/alternate_ifaces.h	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -39,4 +39,5 @@
 
 #include <usb/descriptor.h>
+#include <sys/types.h>
 
 /** Wrapper for data related to alternate interface setting.
Index: uspace/lib/usbdev/include/usb/dev/device.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/device.h	(revision d93f5afb66a052121af391b708957e081d9184d7)
+++ uspace/lib/usbdev/include/usb/dev/device.h	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -38,6 +38,11 @@
 
 #include <ddf/driver.h>
+#include <usb/usb.h>
+#include <usb/descriptor.h>
 #include <usb/dev/alternate_ifaces.h>
 #include <usb/dev/pipes.h>
+
+#include <assert.h>
+#include <async.h>
 
 /** Some useful descriptors for USB device. */
Index: uspace/lib/usbdev/include/usb/dev/dp.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/dp.h	(revision d93f5afb66a052121af391b708957e081d9184d7)
+++ uspace/lib/usbdev/include/usb/dev/dp.h	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -37,6 +37,4 @@
 
 #include <sys/types.h>
-#include <usb/usb.h>
-#include <usb/descriptor.h>
 
 /** USB descriptors nesting.
Index: uspace/lib/usbdev/include/usb/dev/pipes.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/pipes.h	(revision d93f5afb66a052121af391b708957e081d9184d7)
+++ uspace/lib/usbdev/include/usb/dev/pipes.h	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -35,11 +35,10 @@
 #define LIBUSBDEV_PIPES_H_
 
-#include <sys/types.h>
-#include <ipc/devman.h>
-#include <ddf/driver.h>
-#include <fibril_synch.h>
 #include <usb/usb.h>
 #include <usb/descriptor.h>
 #include <usb_iface.h>
+
+#include <stdbool.h>
+#include <sys/types.h>
 
 #define CTRL_PIPE_MIN_PACKET_SIZE 8
Index: uspace/lib/usbdev/include/usb/dev/poll.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/poll.h	(revision d93f5afb66a052121af391b708957e081d9184d7)
+++ uspace/lib/usbdev/include/usb/dev/poll.h	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -36,6 +36,10 @@
 #define LIBUSBDEV_POLL_H_
 
-#include <usb/dev/driver.h>
-#include <time.h>
+#include <usb/usb.h>
+#include <usb/dev/device.h>
+#include <usb/dev/pipes.h>
+
+#include <stdbool.h>
+#include <sys/types.h>
 
 /** Parameters and callbacks for automated polling. */
Index: uspace/lib/usbdev/include/usb/dev/recognise.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/recognise.h	(revision d93f5afb66a052121af391b708957e081d9184d7)
+++ uspace/lib/usbdev/include/usb/dev/recognise.h	(revision 2acae4dabcbecdc5d84a73b37c0c708d82b75b0f)
@@ -37,6 +37,8 @@
 #define LIBUSBDEV_RECOGNISE_H_
 
-#include <usb/usb.h>
+#include <usb/descriptor.h>
 #include <usb/dev/pipes.h>
+
+#include <devman.h>
 
 extern int usb_device_create_match_ids_from_device_descriptor(