diff --git a/right/build/armgcc/CMakeLists.txt b/right/build/armgcc/CMakeLists.txt
index 7a740bf..ade9d33 100644
--- a/right/build/armgcc/CMakeLists.txt
+++ b/right/build/armgcc/CMakeLists.txt
@@ -169,6 +169,8 @@ add_executable(dev_composite_hid_mouse_hid_keyboard_bm.elf
 "${SrcDir}/include/usb/usb_device_ch9.h"
 "${SrcDir}/composite.c"
 "${SrcDir}/composite.h"
+"${SrcDir}/hid_generic.c"
+"${SrcDir}/hid_generic.h"
 "${SrcDir}/hid_keyboard.c"
 "${SrcDir}/hid_keyboard.h"
 "${SrcDir}/hid_mouse.c"
@@ -176,6 +178,8 @@ add_executable(dev_composite_hid_mouse_hid_keyboard_bm.elf
 "${SrcDir}/usb_device_descriptor.c"
 "${SrcDir}/usb_device_descriptor.h"
 "${SrcDir}/usb_device_config.h"
+"${SrcDir}/usb_generic_hid_descriptors.c"
+"${SrcDir}/usb_generic_hid_descriptors.h"
 "${SrcDir}/usb_keyboard_descriptors.c"
 "${SrcDir}/usb_keyboard_descriptors.h"
 "${SrcDir}/usb_mouse_descriptors.c"
diff --git a/right/hid_mouse.c b/right/hid_mouse.c
index 8367115..8d99611 100644
--- a/right/hid_mouse.c
+++ b/right/hid_mouse.c
@@ -27,8 +27,7 @@ usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param
 {
     usb_status_t error = kStatus_USB_Error;
 
-    switch (event)
-    {
+    switch (event) {
         case kUSB_DeviceHidEventSendResponse:
             if (UsbCompositeDevice.attach) {
                 return UsbMouseAction();