diff --git a/right/build/armgcc/CMakeLists.txt b/right/build/armgcc/CMakeLists.txt
index d37aceb..07313fb 100644
--- a/right/build/armgcc/CMakeLists.txt
+++ b/right/build/armgcc/CMakeLists.txt
@@ -153,19 +153,36 @@ include_directories(${IncludeDir})
 
 add_executable(dev_composite_hid_mouse_hid_keyboard_bm.elf
 "${KsdkDir}/devices/MK22F51212/gcc/startup_MK22F51212.S"
-"${KsdkDir}/middleware/usb_1.0.0/device/usb_device_khci.c"
-"${KsdkDir}/middleware/usb_1.0.0/device/usb_device_khci.h"
+
+"${KsdkDir}/devices/MK22F51212/system_MK22F51212.c"
+"${KsdkDir}/devices/MK22F51212/system_MK22F51212.h"
+
+"${KsdkDir}/devices/MK22F51212/drivers/fsl_clock.h"
+"${KsdkDir}/devices/MK22F51212/drivers/fsl_clock.c"
+"${KsdkDir}/devices/MK22F51212/drivers/fsl_gpio.h"
+"${KsdkDir}/devices/MK22F51212/drivers/fsl_gpio.c"
 "${KsdkDir}/devices/MK22F51212/drivers/fsl_i2c.h"
 "${KsdkDir}/devices/MK22F51212/drivers/fsl_i2c.c"
+"${KsdkDir}/devices/MK22F51212/drivers/fsl_smc.h"
+"${KsdkDir}/devices/MK22F51212/drivers/fsl_smc.c"
+
+"${KsdkDir}/middleware/usb_1.0.0/device/usb_device_khci.c"
+"${KsdkDir}/middleware/usb_1.0.0/device/usb_device_khci.h"
+"${KsdkDir}/middleware/usb_1.0.0/device/usb_device.h"
+"${KsdkDir}/middleware/usb_1.0.0/device/usb_device_dci.c"
+"${KsdkDir}/middleware/usb_1.0.0/device/usb_device_dci.h"
 "${KsdkDir}/middleware/usb_1.0.0/osa/usb_osa.h"
 "${KsdkDir}/middleware/usb_1.0.0/osa/usb_osa_bm.h"
 "${KsdkDir}/middleware/usb_1.0.0/osa/usb_osa_bm.c"
+"${KsdkDir}/middleware/usb_1.0.0/include/usb.h"
+
 "${SrcDir}/include/usb/usb_device_class.c"
 "${SrcDir}/include/usb/usb_device_class.h"
 "${SrcDir}/include/usb/usb_device_hid.c"
 "${SrcDir}/include/usb/usb_device_hid.h"
 "${SrcDir}/include/usb/usb_device_ch9.c"
 "${SrcDir}/include/usb/usb_device_ch9.h"
+
 "${SrcDir}/main.c"
 "${SrcDir}/usb_composite_device.c"
 "${SrcDir}/usb_composite_device.h"
@@ -190,25 +207,12 @@ add_executable(dev_composite_hid_mouse_hid_keyboard_bm.elf
 "${SrcDir}/usb_interface_keyboard.h"
 "${SrcDir}/usb_interface_mouse.c"
 "${SrcDir}/usb_interface_mouse.h"
-"${KsdkDir}/devices/MK22F51212/system_MK22F51212.c"
-"${KsdkDir}/devices/MK22F51212/system_MK22F51212.h"
-"${KsdkDir}/middleware/usb_1.0.0/include/usb.h"
-"${KsdkDir}/middleware/usb_1.0.0/device/usb_device.h"
-"${KsdkDir}/middleware/usb_1.0.0/device/usb_device_dci.c"
-"${KsdkDir}/middleware/usb_1.0.0/device/usb_device_dci.h"
-"${KsdkDir}/devices/MK22F51212/drivers/fsl_sim.c"
-"${KsdkDir}/devices/MK22F51212/drivers/fsl_clock.h"
-"${KsdkDir}/devices/MK22F51212/drivers/fsl_clock.c"
 "${SrcDir}/include/board/board.c"
 "${SrcDir}/include/board/board.h"
 "${SrcDir}/include/board/clock_config.c"
 "${SrcDir}/include/board/clock_config.h"
 "${SrcDir}/include/board/pin_mux.c"
 "${SrcDir}/include/board/pin_mux.h"
-"${KsdkDir}/devices/MK22F51212/drivers/fsl_gpio.h"
-"${KsdkDir}/devices/MK22F51212/drivers/fsl_gpio.c"
-"${KsdkDir}/devices/MK22F51212/drivers/fsl_smc.h"
-"${KsdkDir}/devices/MK22F51212/drivers/fsl_smc.c"
 )
 
 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -T${SrcDir}/build/kds/MK22FN512xxx12_flash.ld -static")