Index: uspace/lib/usbhid/include/usb/classes/hidreport.h
===================================================================
--- uspace/lib/usbhid/include/usb/classes/hidreport.h	(revision 3375bd4db69b0aa8eb7d3766620c112904c2dab3)
+++ uspace/lib/usbhid/include/usb/classes/hidreport.h	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -37,5 +37,5 @@
 #define LIBUSB_HIDREPORT_H_
 
-#include <usb/devdrv.h>
+#include <usb/dev/driver.h>
 #include <usb/classes/hidparser.h>
 
Index: uspace/lib/usbhid/include/usb/classes/hidreq.h
===================================================================
--- uspace/lib/usbhid/include/usb/classes/hidreq.h	(revision 3375bd4db69b0aa8eb7d3766620c112904c2dab3)
+++ uspace/lib/usbhid/include/usb/classes/hidreq.h	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -40,5 +40,5 @@
 
 #include <usb/classes/hid.h>
-#include <usb/pipes.h>
+#include <usb/dev/pipes.h>
 
 /*----------------------------------------------------------------------------*/
Index: uspace/lib/usbhid/src/hidreport.c
===================================================================
--- uspace/lib/usbhid/src/hidreport.c	(revision 3375bd4db69b0aa8eb7d3766620c112904c2dab3)
+++ uspace/lib/usbhid/src/hidreport.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -41,10 +41,10 @@
 #include <usb/debug.h>
 #include <usb/classes/hidparser.h>
-#include <usb/dp.h>
-#include <usb/devdrv.h>
-#include <usb/pipes.h>
+#include <usb/dev/dp.h>
+#include <usb/dev/driver.h>
+#include <usb/dev/pipes.h>
 #include <usb/classes/hid.h>
 #include <usb/descriptor.h>
-#include <usb/request.h>
+#include <usb/dev/request.h>
 
 #include <usb/classes/hidreport.h>
Index: uspace/lib/usbhid/src/hidreq.c
===================================================================
--- uspace/lib/usbhid/src/hidreq.c	(revision 3375bd4db69b0aa8eb7d3766620c112904c2dab3)
+++ uspace/lib/usbhid/src/hidreq.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
@@ -40,6 +40,6 @@
 #include <usb/classes/hid.h>
 #include <usb/debug.h>
-#include <usb/request.h>
-#include <usb/pipes.h>
+#include <usb/dev/request.h>
+#include <usb/dev/pipes.h>
 
 #include <usb/classes/hidreq.h>