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 8d2e251742ab219acbc8a6a85a15783e6290cab5)
@@ -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 8d2e251742ab219acbc8a6a85a15783e6290cab5)
@@ -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 8d2e251742ab219acbc8a6a85a15783e6290cab5)
@@ -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 8d2e251742ab219acbc8a6a85a15783e6290cab5)
@@ -36,5 +36,4 @@
 
 #include <devman.h>
-#include <usb/usb.h>
 
 int usb_resolve_device_handle(const char *, devman_handle_t *);
Index: uspace/lib/usb/src/class.c
===================================================================
--- uspace/lib/usb/src/class.c	(revision 026271d5b6f0c2f02cd1ddb46545d5290a89565e)
+++ uspace/lib/usb/src/class.c	(revision 8d2e251742ab219acbc8a6a85a15783e6290cab5)
@@ -34,5 +34,4 @@
  */
 #include <usb/classes/classes.h>
-#include <errno.h>
 
 /** Tell string representation of USB class.
Index: uspace/lib/usb/src/debug.c
===================================================================
--- uspace/lib/usb/src/debug.c	(revision 026271d5b6f0c2f02cd1ddb46545d5290a89565e)
+++ uspace/lib/usb/src/debug.c	(revision 8d2e251742ab219acbc8a6a85a15783e6290cab5)
@@ -33,9 +33,5 @@
  * Debugging and logging support.
  */
-#include <adt/list.h>
 #include <fibril_synch.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <ddf/log.h>
 #include <usb/debug.h>
Index: uspace/lib/usb/src/dump.c
===================================================================
--- uspace/lib/usb/src/dump.c	(revision 026271d5b6f0c2f02cd1ddb46545d5290a89565e)
+++ uspace/lib/usb/src/dump.c	(revision 8d2e251742ab219acbc8a6a85a15783e6290cab5)
@@ -33,7 +33,4 @@
  * Descriptor dumping.
  */
-#include <adt/list.h>
-#include <fibril_synch.h>
-#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -42,4 +39,5 @@
 #include <usb/classes/classes.h>
 #include <usb/classes/hub.h>
+#include <usb/usb.h>
 
 /** Mapping between descriptor id and dumping function. */
Index: uspace/lib/usb/src/usb.c
===================================================================
--- uspace/lib/usb/src/usb.c	(revision 026271d5b6f0c2f02cd1ddb46545d5290a89565e)
+++ uspace/lib/usb/src/usb.c	(revision 8d2e251742ab219acbc8a6a85a15783e6290cab5)
@@ -36,6 +36,6 @@
 #include <usb/request.h>
 
-#include <errno.h>
 #include <assert.h>
+#include <byteorder.h>
 #include <macros.h>