diff --git a/right/src/usb_device_config.h b/right/src/usb_device_config.h
index de013da..1aa0013 100644
--- a/right/src/usb_device_config.h
+++ b/right/src/usb_device_config.h
@@ -4,22 +4,22 @@
 // KHCI instance count
 #define USB_DEVICE_CONFIG_KHCI 1
 
+#include "usb_interfaces/usb_interface_generic_hid.h"
 #include "usb_interfaces/usb_interface_basic_keyboard.h"
 #include "usb_interfaces/usb_interface_media_keyboard.h"
 #include "usb_interfaces/usb_interface_system_keyboard.h"
 #include "usb_interfaces/usb_interface_mouse.h"
-#include "usb_interfaces/usb_interface_generic_hid.h"
 
 // Device instance count, the sum of KHCI and EHCI instance counts
 #define USB_DEVICE_CONFIG_NUM 1
 
 // HID instance count
 #define USB_DEVICE_CONFIG_HID ( \
+    USB_GENERIC_HID_INTERFACE_COUNT +\
     USB_BASIC_KEYBOARD_INTERFACE_COUNT + \
     USB_MEDIA_KEYBOARD_INTERFACE_COUNT + \
     USB_SYSTEM_KEYBOARD_INTERFACE_COUNT + \
-    USB_MOUSE_INTERFACE_COUNT + \
-    USB_GENERIC_HID_INTERFACE_COUNT \
+    USB_MOUSE_INTERFACE_COUNT \
 )
 
 // Whether the device is self-powered: 1 supported, 0 not supported
@@ -34,11 +34,11 @@
 // How many endpoints are supported in the stack
 #define USB_DEVICE_CONFIG_ENDPOINTS ( \
     USB_CONTROL_ENDPOINT_COUNT + \
+    USB_GENERIC_HID_ENDPOINT_COUNT + \
     USB_BASIC_KEYBOARD_ENDPOINT_COUNT + \
     USB_MEDIA_KEYBOARD_ENDPOINT_COUNT + \
     USB_SYSTEM_KEYBOARD_ENDPOINT_COUNT + \
-    USB_MOUSE_ENDPOINT_COUNT + \
-    USB_GENERIC_HID_ENDPOINT_COUNT \
+    USB_MOUSE_ENDPOINT_COUNT \
 )
 
 // The maximum buffer length for the KHCI DMA workaround