Index: uspace/lib/usbdev/src/altiface.c
===================================================================
--- uspace/lib/usbdev/src/altiface.c	(revision 19387b618c86f0b622dacb13c8ab5cfa361464a0)
+++ uspace/lib/usbdev/src/altiface.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -33,8 +33,8 @@
  * Handling alternate interface settings.
  */
-#include <usb/devdrv.h>
-#include <usb/request.h>
+#include <usb/dev/driver.h>
+#include <usb/dev/request.h>
 #include <usb/debug.h>
-#include <usb/dp.h>
+#include <usb/dev/dp.h>
 #include <errno.h>
 #include <str_error.h>
Index: uspace/lib/usbdev/src/devdrv.c
===================================================================
--- uspace/lib/usbdev/src/devdrv.c	(revision 19387b618c86f0b622dacb13c8ab5cfa361464a0)
+++ uspace/lib/usbdev/src/devdrv.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -33,8 +33,8 @@
  * USB device driver framework.
  */
-#include <usb/devdrv.h>
-#include <usb/request.h>
+#include <usb/dev/driver.h>
+#include <usb/dev/request.h>
 #include <usb/debug.h>
-#include <usb/dp.h>
+#include <usb/dev/dp.h>
 #include <errno.h>
 #include <str_error.h>
Index: uspace/lib/usbdev/src/devpoll.c
===================================================================
--- uspace/lib/usbdev/src/devpoll.c	(revision 19387b618c86f0b622dacb13c8ab5cfa361464a0)
+++ uspace/lib/usbdev/src/devpoll.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -33,6 +33,6 @@
  * USB device driver framework - automatic interrupt polling.
  */
-#include <usb/devpoll.h>
-#include <usb/request.h>
+#include <usb/dev/poll.h>
+#include <usb/dev/request.h>
 #include <usb/debug.h>
 #include <usb/classes/classes.h>
Index: uspace/lib/usbdev/src/dp.c
===================================================================
--- uspace/lib/usbdev/src/dp.c	(revision 19387b618c86f0b622dacb13c8ab5cfa361464a0)
+++ uspace/lib/usbdev/src/dp.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -46,5 +46,5 @@
 #include <assert.h>
 #include <bool.h>
-#include <usb/dp.h>
+#include <usb/dev/dp.h>
 #include <usb/descriptor.h>
 
Index: uspace/lib/usbdev/src/hub.c
===================================================================
--- uspace/lib/usbdev/src/hub.c	(revision 19387b618c86f0b622dacb13c8ab5cfa361464a0)
+++ uspace/lib/usbdev/src/hub.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -33,8 +33,8 @@
  * Functions needed by hub drivers.
  */
-#include <usb/hub.h>
-#include <usb/pipes.h>
-#include <usb/request.h>
-#include <usb/recognise.h>
+#include <usb/dev/hub.h>
+#include <usb/dev/pipes.h>
+#include <usb/dev/request.h>
+#include <usb/dev/recognise.h>
 #include <usbhc_iface.h>
 #include <errno.h>
Index: uspace/lib/usbdev/src/pipepriv.h
===================================================================
--- uspace/lib/usbdev/src/pipepriv.h	(revision 19387b618c86f0b622dacb13c8ab5cfa361464a0)
+++ uspace/lib/usbdev/src/pipepriv.h	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -36,5 +36,5 @@
 #define LIBUSB_PIPEPRIV_H_
 
-#include <usb/pipes.h>
+#include <usb/dev/pipes.h>
 #include <bool.h>
 
Index: uspace/lib/usbdev/src/pipes.c
===================================================================
--- uspace/lib/usbdev/src/pipes.c	(revision 19387b618c86f0b622dacb13c8ab5cfa361464a0)
+++ uspace/lib/usbdev/src/pipes.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -34,5 +34,5 @@
  */
 #include <usb/usb.h>
-#include <usb/pipes.h>
+#include <usb/dev/pipes.h>
 #include <usb/debug.h>
 #include <usb/driver.h>
Index: uspace/lib/usbdev/src/pipesinit.c
===================================================================
--- uspace/lib/usbdev/src/pipesinit.c	(revision 19387b618c86f0b622dacb13c8ab5cfa361464a0)
+++ uspace/lib/usbdev/src/pipesinit.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -35,7 +35,7 @@
  */
 #include <usb/usb.h>
-#include <usb/pipes.h>
-#include <usb/dp.h>
-#include <usb/request.h>
+#include <usb/dev/pipes.h>
+#include <usb/dev/dp.h>
+#include <usb/dev/request.h>
 #include <usbhc_iface.h>
 #include <errno.h>
Index: uspace/lib/usbdev/src/pipesio.c
===================================================================
--- uspace/lib/usbdev/src/pipesio.c	(revision 19387b618c86f0b622dacb13c8ab5cfa361464a0)
+++ uspace/lib/usbdev/src/pipesio.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -45,9 +45,9 @@
  */
 #include <usb/usb.h>
-#include <usb/pipes.h>
+#include <usb/dev/pipes.h>
 #include <errno.h>
 #include <assert.h>
 #include <usbhc_iface.h>
-#include <usb/request.h>
+#include <usb/dev/request.h>
 #include "pipepriv.h"
 
Index: uspace/lib/usbdev/src/recognise.c
===================================================================
--- uspace/lib/usbdev/src/recognise.c	(revision 19387b618c86f0b622dacb13c8ab5cfa361464a0)
+++ uspace/lib/usbdev/src/recognise.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -35,8 +35,8 @@
 #include <sys/types.h>
 #include <fibril_synch.h>
-#include <usb/pipes.h>
-#include <usb/recognise.h>
+#include <usb/dev/pipes.h>
+#include <usb/dev/recognise.h>
 #include <usb/ddfiface.h>
-#include <usb/request.h>
+#include <usb/dev/request.h>
 #include <usb/classes/classes.h>
 #include <stdio.h>
Index: uspace/lib/usbdev/src/request.c
===================================================================
--- uspace/lib/usbdev/src/request.c	(revision 19387b618c86f0b622dacb13c8ab5cfa361464a0)
+++ uspace/lib/usbdev/src/request.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -33,5 +33,5 @@
  * Standard USB requests (implementation).
  */
-#include <usb/request.h>
+#include <usb/dev/request.h>
 #include <errno.h>
 #include <assert.h>
Index: uspace/lib/usbdev/src/usbdevice.c
===================================================================
--- uspace/lib/usbdev/src/usbdevice.c	(revision 19387b618c86f0b622dacb13c8ab5cfa361464a0)
+++ uspace/lib/usbdev/src/usbdevice.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -36,5 +36,5 @@
 #include <async.h>
 #include <usb_iface.h>
-#include <usb/usbdevice.h>
+#include <usb/dev/hc.h>
 #include <usb/driver.h>
 #include <usb/debug.h>