Index: uspace/drv/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/usbhid/kbd/kbddev.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
+++ uspace/drv/usbhid/kbd/kbddev.c	(revision 2586860589ca84a0d0a8cf23c0f02e2967ea7b3d)
@@ -48,13 +48,13 @@
 #include <usb/dev/dp.h>
 #include <usb/dev/request.h>
-#include <usb/classes/hid.h>
+#include <usb/hid/hid.h>
 #include <usb/dev/pipes.h>
 #include <usb/debug.h>
-#include <usb/classes/hidparser.h>
+#include <usb/hid/hidparser.h>
 #include <usb/classes/classes.h>
-#include <usb/classes/hidut.h>
-#include <usb/classes/hidreq.h>
-#include <usb/classes/hidreport.h>
-#include <usb/classes/hid/utled.h>
+#include <usb/hid/usages/core.h>
+#include <usb/hid/request.h>
+#include <usb/hid/hidreport.h>
+#include <usb/hid/usages/led.h>
 
 #include <usb/dev/driver.h>
Index: uspace/drv/usbhid/kbd/kbddev.h
===================================================================
--- uspace/drv/usbhid/kbd/kbddev.h	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
+++ uspace/drv/usbhid/kbd/kbddev.h	(revision 2586860589ca84a0d0a8cf23c0f02e2967ea7b3d)
@@ -41,6 +41,6 @@
 #include <fibril_synch.h>
 
-#include <usb/classes/hid.h>
-#include <usb/classes/hidparser.h>
+#include <usb/hid/hid.h>
+#include <usb/hid/hidparser.h>
 #include <ddf/driver.h>
 #include <usb/dev/pipes.h>
Index: uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c
===================================================================
--- uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
+++ uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c	(revision 2586860589ca84a0d0a8cf23c0f02e2967ea7b3d)
@@ -40,7 +40,7 @@
 #include "keymap.h"
 
-#include <usb/classes/hidparser.h>
+#include <usb/hid/hidparser.h>
 #include <usb/debug.h>
-#include <usb/classes/hidut.h>
+#include <usb/hid/usages/core.h>
 
 #include <errno.h>
Index: uspace/drv/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/usbhid/mouse/mousedev.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
+++ uspace/drv/usbhid/mouse/mousedev.c	(revision 2586860589ca84a0d0a8cf23c0f02e2967ea7b3d)
@@ -37,7 +37,7 @@
 #include <usb/debug.h>
 #include <usb/classes/classes.h>
-#include <usb/classes/hid.h>
-#include <usb/classes/hidreq.h>
-#include <usb/classes/hidut.h>
+#include <usb/hid/hid.h>
+#include <usb/hid/request.h>
+#include <usb/hid/usages/core.h>
 #include <errno.h>
 #include <str_error.h>
Index: uspace/drv/usbhid/subdrivers.c
===================================================================
--- uspace/drv/usbhid/subdrivers.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
+++ uspace/drv/usbhid/subdrivers.c	(revision 2586860589ca84a0d0a8cf23c0f02e2967ea7b3d)
@@ -35,6 +35,6 @@
 
 #include "subdrivers.h"
-#include "usb/classes/hidut.h"
-#include "usb/classes/hidpath.h"
+#include <usb/hid/usages/core.h>
+#include <usb/hid/hidpath.h>
 
 #include "lgtch-ultrax/lgtch-ultrax.h"
Index: uspace/drv/usbhid/usbhid.c
===================================================================
--- uspace/drv/usbhid/usbhid.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
+++ uspace/drv/usbhid/usbhid.c	(revision 2586860589ca84a0d0a8cf23c0f02e2967ea7b3d)
@@ -37,8 +37,8 @@
 #include <usb/debug.h>
 #include <usb/classes/classes.h>
-#include <usb/classes/hid.h>
-#include <usb/classes/hidparser.h>
-#include <usb/classes/hidreport.h>
-#include <usb/classes/hidreq.h>
+#include <usb/hid/hid.h>
+#include <usb/hid/hidparser.h>
+#include <usb/hid/hidreport.h>
+#include <usb/hid/request.h>
 #include <errno.h>
 #include <str_error.h>
Index: uspace/drv/usbhid/usbhid.h
===================================================================
--- uspace/drv/usbhid/usbhid.h	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
+++ uspace/drv/usbhid/usbhid.h	(revision 2586860589ca84a0d0a8cf23c0f02e2967ea7b3d)
@@ -39,9 +39,9 @@
 #include <stdint.h>
 
-#include <usb/classes/hidparser.h>
+#include <usb/hid/hidparser.h>
 #include <ddf/driver.h>
 #include <usb/dev/pipes.h>
 #include <usb/dev/driver.h>
-#include <usb/classes/hid.h>
+#include <usb/hid/hid.h>
 #include <bool.h>
 
Index: uspace/drv/usbkbd/kbddev.c
===================================================================
--- uspace/drv/usbkbd/kbddev.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
+++ uspace/drv/usbkbd/kbddev.c	(revision 2586860589ca84a0d0a8cf23c0f02e2967ea7b3d)
@@ -48,13 +48,13 @@
 #include <usb/dev/dp.h>
 #include <usb/dev/request.h>
-#include <usb/classes/hid.h>
+#include <usb/hid/hid.h>
 #include <usb/dev/pipes.h>
 #include <usb/debug.h>
-#include <usb/classes/hidparser.h>
+#include <usb/hid/hidparser.h>
 #include <usb/classes/classes.h>
-#include <usb/classes/hidut.h>
-#include <usb/classes/hidreq.h>
-#include <usb/classes/hidreport.h>
-#include <usb/classes/hid/utled.h>
+#include <usb/hid/usages/core.h>
+#include <usb/hid/request.h>
+#include <usb/hid/hidreport.h>
+#include <usb/hid/usages/led.h>
 
 #include <usb/dev/driver.h>
Index: uspace/drv/usbkbd/kbddev.h
===================================================================
--- uspace/drv/usbkbd/kbddev.h	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
+++ uspace/drv/usbkbd/kbddev.h	(revision 2586860589ca84a0d0a8cf23c0f02e2967ea7b3d)
@@ -41,6 +41,6 @@
 #include <fibril_synch.h>
 
-#include <usb/classes/hid.h>
-#include <usb/classes/hidparser.h>
+#include <usb/hid/hid.h>
+#include <usb/hid/hidparser.h>
 #include <ddf/driver.h>
 #include <usb/dev/pipes.h>
Index: uspace/drv/usbmouse/init.c
===================================================================
--- uspace/drv/usbmouse/init.c	(revision 9f2de9253acdd441e502bbbb86a6091c8d9d30a2)
+++ uspace/drv/usbmouse/init.c	(revision 2586860589ca84a0d0a8cf23c0f02e2967ea7b3d)
@@ -37,5 +37,5 @@
 #include <usb/debug.h>
 #include <usb/classes/classes.h>
-#include <usb/classes/hid.h>
+#include <usb/hid/hid.h>
 #include <usb/dev/request.h>
 #include <errno.h>