Index: uspace/lib/usb/include/usb/classes/massstor.h
===================================================================
--- uspace/lib/usb/include/usb/classes/massstor.h	(revision 026271d5b6f0c2f02cd1ddb46545d5290a89565e)
+++ uspace/lib/usb/include/usb/classes/massstor.h	(revision c01987c628cf7402a7cb7a0193f89707a0bb2a15)
@@ -36,6 +36,4 @@
 #define LIBUSB_CLASS_MASSSTOR_H_
 
-#include <sys/types.h>
-
 /** USB mass storage subclasses. */
 typedef enum {
Index: uspace/lib/usb/include/usb/debug.h
===================================================================
--- uspace/lib/usb/include/usb/debug.h	(revision 026271d5b6f0c2f02cd1ddb46545d5290a89565e)
+++ uspace/lib/usb/include/usb/debug.h	(revision c01987c628cf7402a7cb7a0193f89707a0bb2a15)
@@ -36,8 +36,7 @@
 #define LIBUSB_DEBUG_H_
 #include <stdio.h>
-#include <inttypes.h>
-#include <usb/usb.h>
+#include <sys/types.h>
 #include <io/log.h>
-#include <assert.h>
+
 
 void usb_dump_standard_descriptor(FILE *, const char *, const char *,
Index: uspace/lib/usb/include/usb/descriptor.h
===================================================================
--- uspace/lib/usb/include/usb/descriptor.h	(revision 026271d5b6f0c2f02cd1ddb46545d5290a89565e)
+++ uspace/lib/usb/include/usb/descriptor.h	(revision c01987c628cf7402a7cb7a0193f89707a0bb2a15)
@@ -36,5 +36,5 @@
 #define LIBUSB_DESCRIPTOR_H_
 
-#include <async.h>
+#include <sys/types.h>
 
 /** Descriptor type. */
Index: uspace/lib/usb/include/usb/dev.h
===================================================================
--- uspace/lib/usb/include/usb/dev.h	(revision 026271d5b6f0c2f02cd1ddb46545d5290a89565e)
+++ uspace/lib/usb/include/usb/dev.h	(revision c01987c628cf7402a7cb7a0193f89707a0bb2a15)
@@ -36,5 +36,4 @@
 
 #include <devman.h>
-#include <usb/usb.h>
 
 int usb_resolve_device_handle(const char *, devman_handle_t *);