Index: uspace/drv/usbhid/generic/hiddev.h
===================================================================
--- uspace/drv/usbhid/generic/hiddev.h	(revision 60c0573469b97a8a312f0304101cbd58ad38e764)
+++ uspace/drv/usbhid/generic/hiddev.h	(revision ba358ed1a4aba4117ec596f5a482ee72d3380d6f)
@@ -34,6 +34,6 @@
  */
 
-#ifndef USB_HIDDDEV_H_
-#define USB_HIDDDEV_H_
+#ifndef USB_HID_HIDDDEV_H_
+#define USB_HID_HIDDDEV_H_
 
 #include <usb/devdrv.h>
@@ -49,5 +49,5 @@
     uint8_t *buffer, size_t buffer_size);
 
-#endif // USB_HIDDDEV_H_
+#endif // USB_HID_HIDDDEV_H_
 
 /**
Index: uspace/drv/usbhid/kbd/conv.h
===================================================================
--- uspace/drv/usbhid/kbd/conv.h	(revision 60c0573469b97a8a312f0304101cbd58ad38e764)
+++ uspace/drv/usbhid/kbd/conv.h	(revision ba358ed1a4aba4117ec596f5a482ee72d3380d6f)
@@ -34,10 +34,10 @@
  */
 
-#ifndef USB_KBD_CONV_H_
-#define USB_KBD_CONV_H_
+#ifndef USB_HID_CONV_H_
+#define USB_HID_CONV_H_
 
 unsigned int usbhid_parse_scancode(int scancode);
 
-#endif /* USB_KBD_CONV_H_ */
+#endif /* USB_HID_CONV_H_ */
 
 /**
Index: uspace/drv/usbhid/kbd/kbddev.h
===================================================================
--- uspace/drv/usbhid/kbd/kbddev.h	(revision 60c0573469b97a8a312f0304101cbd58ad38e764)
+++ uspace/drv/usbhid/kbd/kbddev.h	(revision ba358ed1a4aba4117ec596f5a482ee72d3380d6f)
@@ -34,6 +34,6 @@
  */
 
-#ifndef USB_KBDDEV_H_
-#define USB_KBDDEV_H_
+#ifndef USB_HID_KBDDEV_H_
+#define USB_HID_KBDDEV_H_
 
 #include <stdint.h>
@@ -133,5 +133,5 @@
 int usb_kbd_set_boot_protocol(struct usb_hid_dev *hid_dev);
 
-#endif /* USB_KBDDEV_H_ */
+#endif /* USB_HID_KBDDEV_H_ */
 
 /**
Index: uspace/drv/usbhid/kbd/kbdrepeat.h
===================================================================
--- uspace/drv/usbhid/kbd/kbdrepeat.h	(revision 60c0573469b97a8a312f0304101cbd58ad38e764)
+++ uspace/drv/usbhid/kbd/kbdrepeat.h	(revision ba358ed1a4aba4117ec596f5a482ee72d3380d6f)
@@ -34,6 +34,6 @@
  */
 
-#ifndef USB_KBDREPEAT_H_
-#define USB_KBDREPEAT_H_
+#ifndef USB_HID_KBDREPEAT_H_
+#define USB_HID_KBDREPEAT_H_
 
 struct usb_kbd_t;
@@ -62,5 +62,5 @@
 void usb_kbd_repeat_stop(struct usb_kbd_t *kbd, unsigned int key);
 
-#endif /* USB_KBDREPEAT_H_ */
+#endif /* USB_HID_KBDREPEAT_H_ */
 
 /**
Index: uspace/drv/usbhid/layout.h
===================================================================
--- uspace/drv/usbhid/layout.h	(revision 60c0573469b97a8a312f0304101cbd58ad38e764)
+++ uspace/drv/usbhid/layout.h	(revision ba358ed1a4aba4117ec596f5a482ee72d3380d6f)
@@ -36,6 +36,6 @@
  */
 
-#ifndef USB_KBD_LAYOUT_H_
-#define USB_KBD_LAYOUT_H_
+#ifndef USB_HID_LAYOUT_H_
+#define USB_HID_LAYOUT_H_
 
 #include <sys/types.h>
Index: uspace/drv/usbhid/mouse/mousedev.h
===================================================================
--- uspace/drv/usbhid/mouse/mousedev.h	(revision 60c0573469b97a8a312f0304101cbd58ad38e764)
+++ uspace/drv/usbhid/mouse/mousedev.h	(revision ba358ed1a4aba4117ec596f5a482ee72d3380d6f)
@@ -34,6 +34,6 @@
  */
 
-#ifndef USB_MOUSEDEV_H_
-#define USB_MOUSEDEV_H_
+#ifndef USB_HID_MOUSEDEV_H_
+#define USB_HID_MOUSEDEV_H_
 
 #include <usb/devdrv.h>
@@ -71,5 +71,5 @@
 /*----------------------------------------------------------------------------*/
 
-#endif // USB_MOUSEDEV_H_
+#endif // USB_HID_MOUSEDEV_H_
 
 /**
Index: uspace/drv/usbhid/usbhid.c
===================================================================
--- uspace/drv/usbhid/usbhid.c	(revision 60c0573469b97a8a312f0304101cbd58ad38e764)
+++ uspace/drv/usbhid/usbhid.c	(revision ba358ed1a4aba4117ec596f5a482ee72d3380d6f)
@@ -51,12 +51,4 @@
 /*----------------------------------------------------------------------------*/
 
-typedef struct usb_hid_callback_mapping {
-	usb_hid_report_path_t *path;
-	char *vendor_id;
-	char *product_id;
-} usb_hid_callback_mapping;
-
-/*----------------------------------------------------------------------------*/
-
 /* Array of endpoints expected on the device, NULL terminated. */
 usb_endpoint_description_t *usb_hid_endpoints[USB_HID_POLL_EP_COUNT + 1] = {
Index: uspace/drv/usbhid/usbhid.h
===================================================================
--- uspace/drv/usbhid/usbhid.h	(revision 60c0573469b97a8a312f0304101cbd58ad38e764)
+++ uspace/drv/usbhid/usbhid.h	(revision ba358ed1a4aba4117ec596f5a482ee72d3380d6f)
@@ -34,6 +34,6 @@
  */
 
-#ifndef USB_USBHID_H_
-#define USB_USBHID_H_
+#ifndef USB_HID_USBHID_H_
+#define USB_HID_USBHID_H_
 
 #include <stdint.h>
@@ -63,4 +63,12 @@
 	usb_hid_driver_poll_ended poll_end;
 } usb_hid_subdriver_t;
+
+/*----------------------------------------------------------------------------*/
+
+typedef struct usb_hid_callback_mapping {
+	usb_hid_report_path_t *path;
+	char *vendor_id;
+	char *product_id;
+} usb_hid_callback_mapping_t;
 
 /*----------------------------------------------------------------------------*/
@@ -126,5 +134,5 @@
 void usb_hid_free(usb_hid_dev_t **hid_dev);
 
-#endif /* USB_USBHID_H_ */
+#endif /* USB_HID_USBHID_H_ */
 
 /**