Index: uspace/lib/usbhid/include/usb/classes/hidreport.h
===================================================================
--- uspace/lib/usbhid/include/usb/classes/hidreport.h	(revision 3e4f2e0be68fb7237dac816aa68461e328a38b03)
+++ 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 3e4f2e0be68fb7237dac816aa68461e328a38b03)
+++ 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>
 
 /*----------------------------------------------------------------------------*/