diff --git a/left/src/init_peripherals.c b/left/src/init_peripherals.c
index dc0d3b3..7ca20c9 100644
--- a/left/src/init_peripherals.c
+++ b/left/src/init_peripherals.c
@@ -46,7 +46,7 @@ static void i2cSlaveCallback(I2C_Type *base, i2c_slave_transfer_t *xfer, void *u
     prevEvent = xfer->event;
 }
 
-void InitInterruptPriorities()
+void InitInterruptPriorities(void)
 {
     NVIC_SetPriority(I2C0_IRQn, 1);
     NVIC_SetPriority(TPM1_IRQn, 1);
diff --git a/right/src/eeprom.c b/right/src/eeprom.c
index c9cb78b..8996028 100644
--- a/right/src/eeprom.c
+++ b/right/src/eeprom.c
@@ -38,7 +38,7 @@ static status_t i2cAsyncRead(uint8_t *data, size_t dataSize)
     return I2C_MasterTransferNonBlocking(I2C_EEPROM_BUS_BASEADDR, &i2cHandle, &i2cTransfer);
 }
 
-static status_t writePage()
+static status_t writePage(void)
 {
     static uint8_t buffer[EEPROM_BUFFER_SIZE];
     uint16_t targetEepromOffset = sourceOffset + eepromStartAddress;
diff --git a/right/src/i2c_watchdog.c b/right/src/i2c_watchdog.c
index 70e6ae3..af1b955 100644
--- a/right/src/i2c_watchdog.c
+++ b/right/src/i2c_watchdog.c
@@ -34,7 +34,7 @@ void PIT_I2C_WATCHDOG_HANDLER(void)
     PIT_ClearStatusFlags(PIT, kPIT_Chnl_0, PIT_TFLG_TIF_MASK);
 }
 
-void InitI2cWatchdog()
+void InitI2cWatchdog(void)
 {
     pit_config_t pitConfig;
     PIT_GetDefaultConfig(&pitConfig);
diff --git a/right/src/i2c_watchdog.h b/right/src/i2c_watchdog.h
index cc9ecf5..c7d8f42 100644
--- a/right/src/i2c_watchdog.h
+++ b/right/src/i2c_watchdog.h
@@ -8,6 +8,6 @@
 
 // Functions:
 
-    void InitI2cWatchdog();
+    void InitI2cWatchdog(void);
 
 #endif
diff --git a/right/src/init_clock.h b/right/src/init_clock.h
index 1b0681f..7e01f88 100644
--- a/right/src/init_clock.h
+++ b/right/src/init_clock.h
@@ -3,6 +3,6 @@
 
 // Functions:
 
-    void InitClock();
+    void InitClock(void);
 
 #endif
diff --git a/right/src/init_peripherals.c b/right/src/init_peripherals.c
index ec719d8..73c9735 100644
--- a/right/src/init_peripherals.c
+++ b/right/src/init_peripherals.c
@@ -14,14 +14,14 @@
 #include "eeprom.h"
 #include "microseconds/microseconds_pit.c"
 
-void InitInterruptPriorities()
+void InitInterruptPriorities(void)
 {
     NVIC_SetPriority(I2C0_IRQn, 1);
     NVIC_SetPriority(I2C1_IRQn, 1);
     NVIC_SetPriority(USB0_IRQn, 1);
 }
 
-void InitI2c()
+void InitI2c(void)
 {
     port_pin_config_t pinConfig = {
         .pullSelect = kPORT_PullUp,
diff --git a/right/src/init_peripherals.h b/right/src/init_peripherals.h
index 6352620..beaa006 100644
--- a/right/src/init_peripherals.h
+++ b/right/src/init_peripherals.h
@@ -5,6 +5,6 @@
 
 // Functions:
 
-    void InitPeripherals();
+    void InitPeripherals(void);
 
 #endif
diff --git a/right/src/key_action.h b/right/src/key_action.h
index d2756fb..da76012 100644
--- a/right/src/key_action.h
+++ b/right/src/key_action.h
@@ -90,6 +90,6 @@
 
 // Variables:
 
-    void UpdateActiveUsbReports();
+    void UpdateActiveUsbReports(void);
 
 #endif
diff --git a/right/src/led_pwm.c b/right/src/led_pwm.c
index bdd0b95..46e7e55 100644
--- a/right/src/led_pwm.c
+++ b/right/src/led_pwm.c
@@ -1,7 +1,7 @@
 #include "led_pwm.h"
 #include "fsl_port.h"
 
-void LedPwm_Init() {
+void LedPwm_Init(void) {
     CLOCK_EnableClock(LED_PWM_CLOCK);
     PORT_SetPinMux(LED_PWM_PORT, LED_PWM_PIN, kPORT_MuxAlt4);
 
diff --git a/right/src/led_pwm.h b/right/src/led_pwm.h
index 15f4676..d7cb739 100644
--- a/right/src/led_pwm.h
+++ b/right/src/led_pwm.h
@@ -21,7 +21,7 @@
 
 // Functions:
 
-    void LedPwm_Init();
+    void LedPwm_Init(void);
     void LedPwm_SetBrightness(uint8_t brightnessPercent);
 
 #endif
diff --git a/right/src/macros.c b/right/src/macros.c
index 6c1bbf3..1f355d2 100644
--- a/right/src/macros.c
+++ b/right/src/macros.c
@@ -295,4 +295,3 @@ void Macros_ContinueMacro(void)
     }
     ParseMacroAction(&UserConfigBuffer, &currentMacroAction);
 }
-
diff --git a/right/src/main.c b/right/src/main.c
index 38165fd..2d145e7 100644
--- a/right/src/main.c
+++ b/right/src/main.c
@@ -38,7 +38,7 @@ key_matrix_t KeyMatrix = {
 
 uint8_t CurrentKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE];
 
-void UpdateUsbReports()
+void UpdateUsbReports(void)
 {
     if (!IsUsbBasicKeyboardReportSent) {
         return;
@@ -63,17 +63,17 @@ void UpdateUsbReports()
 bool IsEepromInitialized = false;
 bool IsConfigInitialized = false;
 
-void userConfigurationReadFinished()
+void userConfigurationReadFinished(void)
 {
     IsEepromInitialized = true;
 }
 
-void hardwareConfigurationReadFinished()
+void hardwareConfigurationReadFinished(void)
 {
     EEPROM_LaunchTransfer(EepromTransfer_ReadUserConfiguration, userConfigurationReadFinished);
 }
 
-void main() {
+void main(void) {
     InitClock();
     InitPeripherals();
     EEPROM_LaunchTransfer(EepromTransfer_ReadHardwareConfiguration, hardwareConfigurationReadFinished);
diff --git a/right/src/main.h b/right/src/main.h
index 89fd951..7889406 100644
--- a/right/src/main.h
+++ b/right/src/main.h
@@ -18,6 +18,6 @@
     extern key_matrix_t KeyMatrix;
     extern uint8_t PreviousKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE];
     extern uint8_t CurrentKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE];
-    extern void UpdateUsbReports();
+    extern void UpdateUsbReports(void);
 
 #endif
diff --git a/right/src/peripherals/led_driver.c b/right/src/peripherals/led_driver.c
index 8a9c28b..756c492 100644
--- a/right/src/peripherals/led_driver.c
+++ b/right/src/peripherals/led_driver.c
@@ -1,7 +1,7 @@
 #include "peripherals/led_driver.h"
 #include "i2c_addresses.h"
 
-void InitLedDriver()
+void InitLedDriver(void)
 {
     CLOCK_EnableClock(LED_DRIVER_SDB_CLOCK);
     PORT_SetPinMux(LED_DRIVER_SDB_PORT, LED_DRIVER_SDB_PIN, kPORT_MuxAsGpio);
diff --git a/right/src/peripherals/led_driver.h b/right/src/peripherals/led_driver.h
index 2197e4d..1ad835f 100644
--- a/right/src/peripherals/led_driver.h
+++ b/right/src/peripherals/led_driver.h
@@ -44,6 +44,6 @@
 
 // Functions:
 
-    void InitLedDriver();
+    void InitLedDriver(void);
 
 #endif
diff --git a/right/src/peripherals/merge_sensor.c b/right/src/peripherals/merge_sensor.c
index e395072..a10728d 100644
--- a/right/src/peripherals/merge_sensor.c
+++ b/right/src/peripherals/merge_sensor.c
@@ -1,7 +1,7 @@
 #include "merge_sensor.h"
 #include "fsl_port.h"
 
-void InitMergeSensor() {
+void InitMergeSensor(void) {
     CLOCK_EnableClock(MERGE_SENSOR_CLOCK);
     PORT_SetPinConfig(MERGE_SENSOR_PORT, MERGE_SENSOR_PIN,
                       &(port_pin_config_t){.pullSelect=kPORT_PullUp, .mux=kPORT_MuxAsGpio});
diff --git a/right/src/peripherals/merge_sensor.h b/right/src/peripherals/merge_sensor.h
index 283d252..7ef052b 100644
--- a/right/src/peripherals/merge_sensor.h
+++ b/right/src/peripherals/merge_sensor.h
@@ -18,6 +18,6 @@
 
 // Functions:
 
-    void InitMergeSensor();
+    void InitMergeSensor(void);
 
 #endif
diff --git a/right/src/peripherals/reset_button.c b/right/src/peripherals/reset_button.c
index ce73da8..5c48ee7 100644
--- a/right/src/peripherals/reset_button.c
+++ b/right/src/peripherals/reset_button.c
@@ -1,7 +1,7 @@
 #include "reset_button.h"
 #include "fsl_port.h"
 
-void InitResetButton() {
+void InitResetButton(void) {
     CLOCK_EnableClock(RESET_BUTTON_CLOCK);
     PORT_SetPinConfig(RESET_BUTTON_PORT, RESET_BUTTON_PIN,
                       &(port_pin_config_t){.pullSelect=kPORT_PullUp, .mux=kPORT_MuxAsGpio});
diff --git a/right/src/peripherals/reset_button.h b/right/src/peripherals/reset_button.h
index 58c1d5a..1c3bdfa 100644
--- a/right/src/peripherals/reset_button.h
+++ b/right/src/peripherals/reset_button.h
@@ -18,6 +18,6 @@
 
 // Functions:
 
-    void InitResetButton();
+    void InitResetButton(void);
 
 #endif
diff --git a/right/src/peripherals/test_led.c b/right/src/peripherals/test_led.c
index d85f09d..8c20cf8 100644
--- a/right/src/peripherals/test_led.c
+++ b/right/src/peripherals/test_led.c
@@ -1,7 +1,7 @@
 #include "test_led.h"
 #include "fsl_port.h"
 
-extern void InitTestLed()
+extern void InitTestLed(void)
 {
     CLOCK_EnableClock(TEST_LED_CLOCK);
     PORT_SetPinMux(TEST_LED_GPIO_PORT, TEST_LED_GPIO_PIN, kPORT_MuxAsGpio);
diff --git a/right/src/peripherals/test_led.h b/right/src/peripherals/test_led.h
index 04be5d7..cd90365 100644
--- a/right/src/peripherals/test_led.h
+++ b/right/src/peripherals/test_led.h
@@ -22,6 +22,6 @@
 
 // Functions:
 
-    void InitTestLed();
+    void InitTestLed(void);
 
 #endif
diff --git a/right/src/slave_drivers/uhk_module_driver.c b/right/src/slave_drivers/uhk_module_driver.c
index 8eabffb..42ff23f 100644
--- a/right/src/slave_drivers/uhk_module_driver.c
+++ b/right/src/slave_drivers/uhk_module_driver.c
@@ -15,11 +15,11 @@ static uhk_module_phase_t uhkModulePhases[UHK_MODULE_MAX_COUNT];
 static i2c_message_t rxMessage;
 static i2c_message_t txMessage;
 
-static status_t tx() {
+static status_t tx(void) {
     return I2cAsyncWriteMessage(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, &txMessage);
 }
 
-static status_t rx() {
+static status_t rx(void) {
     return I2cAsyncReadMessage(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, &rxMessage);
 }
 
diff --git a/right/src/slave_scheduler.c b/right/src/slave_scheduler.c
index cf3cf4d..da76e0b 100644
--- a/right/src/slave_scheduler.c
+++ b/right/src/slave_scheduler.c
@@ -51,7 +51,7 @@ static void masterCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t
     } while (!isTransferScheduled);
 }
 
-void InitSlaveScheduler()
+void InitSlaveScheduler(void)
 {
     previousSlaveId = 0;
     currentSlaveId = 0;
diff --git a/right/src/slave_scheduler.h b/right/src/slave_scheduler.h
index dd36ca4..71b91df 100644
--- a/right/src/slave_scheduler.h
+++ b/right/src/slave_scheduler.h
@@ -39,7 +39,7 @@
 
 // Functions:
 
-    void InitSlaveScheduler();
+    void InitSlaveScheduler(void);
     void SetLeds(uint8_t ledBrightness);
 
 #endif
diff --git a/right/src/usb_composite_device.c b/right/src/usb_composite_device.c
index 785b1f1..014d358 100644
--- a/right/src/usb_composite_device.c
+++ b/right/src/usb_composite_device.c
@@ -106,7 +106,7 @@ void USB0_IRQHandler(void)
         : UsbCompositeDevice.deviceHandle);
 }
 
-void InitUsb()
+void InitUsb(void)
 {
     uint8_t usbDeviceKhciIrq[] = USB_IRQS;
     uint8_t irqNumber = usbDeviceKhciIrq[CONTROLLER_ID - kUSB_ControllerKhci0];
diff --git a/right/src/usb_composite_device.h b/right/src/usb_composite_device.h
index 310c54e..34e9509 100644
--- a/right/src/usb_composite_device.h
+++ b/right/src/usb_composite_device.h
@@ -32,6 +32,6 @@
 
 //Functions:
 
-    void InitUsb();
+    void InitUsb(void);
 
 #endif
diff --git a/right/src/usb_interfaces/usb_interface_basic_keyboard.c b/right/src/usb_interfaces/usb_interface_basic_keyboard.c
index d0fa045..4994509 100644
--- a/right/src/usb_interfaces/usb_interface_basic_keyboard.c
+++ b/right/src/usb_interfaces/usb_interface_basic_keyboard.c
@@ -44,17 +44,17 @@ static usb_basic_keyboard_report_t usbBasicKeyboardReports[2];
 usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport = usbBasicKeyboardReports;
 bool IsUsbBasicKeyboardReportSent = false;
 
-usb_basic_keyboard_report_t* getInactiveUsbBasicKeyboardReport()
+usb_basic_keyboard_report_t* getInactiveUsbBasicKeyboardReport(void)
 {
     return ActiveUsbBasicKeyboardReport == usbBasicKeyboardReports ? usbBasicKeyboardReports+1 : usbBasicKeyboardReports;
 }
 
-void SwitchActiveUsbBasicKeyboardReport()
+void SwitchActiveUsbBasicKeyboardReport(void)
 {
     ActiveUsbBasicKeyboardReport = getInactiveUsbBasicKeyboardReport();
 }
 
-void ResetActiveUsbBasicKeyboardReport()
+void ResetActiveUsbBasicKeyboardReport(void)
 {
     bzero(ActiveUsbBasicKeyboardReport, USB_BASIC_KEYBOARD_REPORT_LENGTH);
 }
diff --git a/right/src/usb_interfaces/usb_interface_basic_keyboard.h b/right/src/usb_interfaces/usb_interface_basic_keyboard.h
index eb781fe..a2daec0 100644
--- a/right/src/usb_interfaces/usb_interface_basic_keyboard.h
+++ b/right/src/usb_interfaces/usb_interface_basic_keyboard.h
@@ -40,7 +40,7 @@
     usb_status_t UsbBasicKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration);
     usb_status_t UsbBasicKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting);
 
-    void ResetActiveUsbBasicKeyboardReport();
-    void SwitchActiveUsbBasicKeyboardReport();
+    void ResetActiveUsbBasicKeyboardReport(void);
+    void SwitchActiveUsbBasicKeyboardReport(void);
 
 #endif
diff --git a/right/src/usb_interfaces/usb_interface_generic_hid.c b/right/src/usb_interfaces/usb_interface_generic_hid.c
index e5a80ce..c24d19f 100644
--- a/right/src/usb_interfaces/usb_interface_generic_hid.c
+++ b/right/src/usb_interfaces/usb_interface_generic_hid.c
@@ -44,7 +44,7 @@ usb_device_class_struct_t UsbGenericHidClass = {
 uint8_t GenericHidInBuffer[USB_GENERIC_HID_IN_BUFFER_LENGTH];
 uint8_t GenericHidOutBuffer[USB_GENERIC_HID_OUT_BUFFER_LENGTH];
 
-static usb_status_t UsbReceiveData()
+static usb_status_t UsbReceiveData(void)
 {
     return USB_DeviceHidRecv(UsbCompositeDevice.genericHidHandle,
                              USB_GENERIC_HID_ENDPOINT_OUT_INDEX,
diff --git a/right/src/usb_interfaces/usb_interface_media_keyboard.c b/right/src/usb_interfaces/usb_interface_media_keyboard.c
index 753b95c..5b2c0cd 100644
--- a/right/src/usb_interfaces/usb_interface_media_keyboard.c
+++ b/right/src/usb_interfaces/usb_interface_media_keyboard.c
@@ -44,17 +44,17 @@ static usb_media_keyboard_report_t usbMediaKeyboardReports[2];
 usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport = usbMediaKeyboardReports;
 bool IsUsbMediaKeyboardReportSent = false;
 
-usb_media_keyboard_report_t* getInactiveUsbMediaKeyboardReport()
+usb_media_keyboard_report_t* getInactiveUsbMediaKeyboardReport(void)
 {
     return ActiveUsbMediaKeyboardReport == usbMediaKeyboardReports ? usbMediaKeyboardReports+1 : usbMediaKeyboardReports;
 }
 
-void SwitchActiveUsbMediaKeyboardReport()
+void SwitchActiveUsbMediaKeyboardReport(void)
 {
     ActiveUsbMediaKeyboardReport = getInactiveUsbMediaKeyboardReport();
 }
 
-void ResetActiveUsbMediaKeyboardReport()
+void ResetActiveUsbMediaKeyboardReport(void)
 {
     bzero(ActiveUsbMediaKeyboardReport, USB_MEDIA_KEYBOARD_REPORT_LENGTH);
 }
diff --git a/right/src/usb_interfaces/usb_interface_media_keyboard.h b/right/src/usb_interfaces/usb_interface_media_keyboard.h
index fed45bc..16191a8 100644
--- a/right/src/usb_interfaces/usb_interface_media_keyboard.h
+++ b/right/src/usb_interfaces/usb_interface_media_keyboard.h
@@ -38,7 +38,7 @@
     usb_status_t UsbMediaKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration);
     usb_status_t UsbMediaKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting);
 
-    void ResetActiveUsbMediaKeyboardReport();
-    void SwitchActiveUsbMediaKeyboardReport();
+    void ResetActiveUsbMediaKeyboardReport(void);
+    void SwitchActiveUsbMediaKeyboardReport(void);
 
 #endif
diff --git a/right/src/usb_interfaces/usb_interface_mouse.c b/right/src/usb_interfaces/usb_interface_mouse.c
index 26e084e..b593a2b 100644
--- a/right/src/usb_interfaces/usb_interface_mouse.c
+++ b/right/src/usb_interfaces/usb_interface_mouse.c
@@ -39,7 +39,7 @@ usb_device_class_struct_t UsbMouseClass = {
 
 usb_mouse_report_t UsbMouseReport;
 
-static volatile usb_status_t usbMouseAction()
+static volatile usb_status_t usbMouseAction(void)
 {
     return USB_DeviceHidSend(UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX,
                              (uint8_t*)&UsbMouseReport, USB_MOUSE_REPORT_LENGTH);
diff --git a/right/src/usb_interfaces/usb_interface_system_keyboard.c b/right/src/usb_interfaces/usb_interface_system_keyboard.c
index 78f2d7f..359ab90 100644
--- a/right/src/usb_interfaces/usb_interface_system_keyboard.c
+++ b/right/src/usb_interfaces/usb_interface_system_keyboard.c
@@ -49,12 +49,12 @@ usb_system_keyboard_report_t* getInactiveUsbSystemKeyboardReport()
     return ActiveUsbSystemKeyboardReport == usbSystemKeyboardReports ? usbSystemKeyboardReports+1 : usbSystemKeyboardReports;
 }
 
-void SwitchActiveUsbSystemKeyboardReport()
+void SwitchActiveUsbSystemKeyboardReport(void)
 {
     ActiveUsbSystemKeyboardReport = getInactiveUsbSystemKeyboardReport();
 }
 
-void ResetActiveUsbSystemKeyboardReport()
+void ResetActiveUsbSystemKeyboardReport(void)
 {
     bzero(ActiveUsbSystemKeyboardReport, USB_SYSTEM_KEYBOARD_REPORT_LENGTH);
 }
diff --git a/right/src/usb_interfaces/usb_interface_system_keyboard.h b/right/src/usb_interfaces/usb_interface_system_keyboard.h
index 96112e1..42e2f0c 100644
--- a/right/src/usb_interfaces/usb_interface_system_keyboard.h
+++ b/right/src/usb_interfaces/usb_interface_system_keyboard.h
@@ -38,7 +38,7 @@
     usb_status_t UsbSystemKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration);
     usb_status_t UsbSystemKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting);
 
-    void ResetActiveUsbSystemKeyboardReport();
-    void SwitchActiveUsbSystemKeyboardReport();
+    void ResetActiveUsbSystemKeyboardReport(void);
+    void SwitchActiveUsbSystemKeyboardReport(void);
 
 #endif
diff --git a/right/src/usb_protocol_handler.h b/right/src/usb_protocol_handler.h
index 0837c18..0fae7c1 100644
--- a/right/src/usb_protocol_handler.h
+++ b/right/src/usb_protocol_handler.h
@@ -37,7 +37,7 @@
 
 // Functions:
 
-    void UsbProtocolHandler();
+    void UsbProtocolHandler(void);
     void ApplyConfig(void);
 
 #endif
diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c
index eda1862..e198cc6 100644
--- a/right/src/usb_report_updater.c
+++ b/right/src/usb_report_updater.c
@@ -72,7 +72,7 @@ void processMouseAction(key_action_t action)
     wasPreviousMouseActionWheelAction = isWheelAction;
 }
 
-uint8_t getActiveLayer()
+uint8_t getActiveLayer(void)
 {
     uint8_t activeLayer = LAYER_ID_BASE;
     for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) {
@@ -88,7 +88,7 @@ uint8_t getActiveLayer()
     return activeLayer;
 }
 
-void UpdateActiveUsbReports()
+void UpdateActiveUsbReports(void)
 {
     bzero(&UsbMouseReport, sizeof(usb_mouse_report_t));