diff --git a/right/src/usb_commands/usb_command_get_adc_value.c b/right/src/usb_commands/usb_command_get_adc_value.c
index b6eb210..1b99e6a 100644
--- a/right/src/usb_commands/usb_command_get_adc_value.c
+++ b/right/src/usb_commands/usb_command_get_adc_value.c
@@ -1,4 +1,5 @@
 #include "usb_protocol_handler.h"
+#include "usb_commands/usb_command_get_adc_value.h"
 #include "peripherals/adc.h"
 
 void UsbCommand_GetAdcValue(void)
diff --git a/right/src/usb_commands/usb_command_launch_eeprom_transfer_legacy.c b/right/src/usb_commands/usb_command_launch_eeprom_transfer_legacy.c
index bda402b..332478d 100644
--- a/right/src/usb_commands/usb_command_launch_eeprom_transfer_legacy.c
+++ b/right/src/usb_commands/usb_command_launch_eeprom_transfer_legacy.c
@@ -1,5 +1,5 @@
 #include "fsl_common.h"
-#include "usb_commands/usb_command_write_config.h"
+#include "usb_commands/usb_command_launch_eeprom_transfer_legacy.h"
 #include "usb_protocol_handler.h"
 #include "eeprom.h"
 
diff --git a/right/src/usb_commands/usb_command_send_kboot_command.c b/right/src/usb_commands/usb_command_send_kboot_command.c
index bf1a851..e46a4ef 100644
--- a/right/src/usb_commands/usb_command_send_kboot_command.c
+++ b/right/src/usb_commands/usb_command_send_kboot_command.c
@@ -1,4 +1,5 @@
 #include "usb_protocol_handler.h"
+#include "usb_commands/usb_command_send_kboot_command.h"
 #include "slave_drivers/kboot_driver.h"
 
 void UsbCommand_SendKbootCommand(void)
diff --git a/right/src/usb_commands/usb_command_set_led_pwm_brightness.c b/right/src/usb_commands/usb_command_set_led_pwm_brightness.c
index 8340092..635e5af 100644
--- a/right/src/usb_commands/usb_command_set_led_pwm_brightness.c
+++ b/right/src/usb_commands/usb_command_set_led_pwm_brightness.c
@@ -1,4 +1,5 @@
 #include "usb_protocol_handler.h"
+#include "usb_commands/usb_command_set_led_pwm_brightness.h"
 #include "slave_drivers/uhk_module_driver.h"
 #include "led_pwm.h"
 
diff --git a/right/src/usb_commands/usb_command_set_test_led.c b/right/src/usb_commands/usb_command_set_test_led.c
index abda21d..533cf4d 100644
--- a/right/src/usb_commands/usb_command_set_test_led.c
+++ b/right/src/usb_commands/usb_command_set_test_led.c
@@ -1,11 +1,11 @@
-#include "usb_commands/usb_command_set_test_led.h"
 #include "usb_protocol_handler.h"
+#include "usb_commands/usb_command_set_test_led.h"
 #include "peripherals/test_led.h"
 #include "slave_drivers/uhk_module_driver.h"
 
 void UsbCommand_SetTestLed(void)
 {
-    uint8_t ledState = GET_USB_BUFFER_UINT8(1);
-    TEST_LED_SET(ledState);
-    UhkModuleStates[UhkModuleDriverId_LeftKeyboardHalf].sourceVars.isTestLedOn = ledState;
+    bool isTestLedOn = GET_USB_BUFFER_UINT8(1);
+    TEST_LED_SET(isTestLedOn);
+    UhkModuleStates[UhkModuleDriverId_LeftKeyboardHalf].sourceVars.isTestLedOn = isTestLedOn;
 }