diff --git a/firmware/bootloader/bootloader_main.cpp b/firmware/bootloader/bootloader_main.cpp
index c35823dfa5..433ba61254 100644
--- a/firmware/bootloader/bootloader_main.cpp
+++ b/firmware/bootloader/bootloader_main.cpp
@@ -10,7 +10,7 @@ extern "C" {
 
 class BlinkyThread : public chibios_rt::BaseStaticThread<256> {
 protected:
-	void main(void) override {
+	void main() override {
 		Gpio yellow = getWarningLedPin();
 		Gpio blue = getCommsLedPin();
 		Gpio green = getRunningLedPin();
@@ -53,7 +53,7 @@ class BlinkyThread : public chibios_rt::BaseStaticThread<256> {
 
 static BlinkyThread blinky;
 
-int main(void) {
+int main() {
 	halInit();
 	chSysInit();
 
diff --git a/firmware/config/boards/core48/board_configuration.cpp b/firmware/config/boards/core48/board_configuration.cpp
index 27162b0a3c..965b266c54 100644
--- a/firmware/config/boards/core48/board_configuration.cpp
+++ b/firmware/config/boards/core48/board_configuration.cpp
@@ -85,7 +85,7 @@ setupVbatt() {
 	engineConfiguration->analogInputDividerCoefficient = 1.56f;
 	
 	// 6.34k high side/ 1k low side
-	engineConfiguration->vbattDividerCoeff = (6.34 + 1) / 1; 
+	engineConfiguration->vbattDividerCoeff = (6.34 + 1) / 1;
 
 	// Battery sense on PA7
 	engineConfiguration->vbattAdcChannel = EFI_ADC_9;
@@ -102,7 +102,7 @@ static void setStepperConfig() {
 static void setupSdCard() {
 	
 	//SD CARD overwrites
-	engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;		
+	engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
 
 	engineConfiguration->is_enabled_spi_3 = true;
 	engineConfiguration->spi3sckPin = Gpio::C10;
@@ -170,7 +170,7 @@ static void setupDefaultSensorInputs() {
 }
 
 
-void setBoardDefaultConfiguration(void) {
+void setBoardDefaultConfiguration() {
 	setInjectorPins();
 	setIgnitionPins();
 	setupDefaultSensorInputs();
diff --git a/firmware/config/boards/core8/board_configuration.cpp b/firmware/config/boards/core8/board_configuration.cpp
index c0e40c3e2a..0ac0ecd4cd 100644
--- a/firmware/config/boards/core8/board_configuration.cpp
+++ b/firmware/config/boards/core8/board_configuration.cpp
@@ -66,7 +66,7 @@ static void setupVbatt() {
 	engineConfiguration->analogInputDividerCoefficient = 1.56f;
 	
 	// 6.34k high side/ 1k low side
-	engineConfiguration->vbattDividerCoeff = (6.34 + 1) / 1; 
+	engineConfiguration->vbattDividerCoeff = (6.34 + 1) / 1;
 
 	// Battery sense on PA7
 	engineConfiguration->vbattAdcChannel = EFI_ADC_0;
@@ -122,7 +122,7 @@ static void setupDefaultSensorInputs() {
 
 }
 
-void setBoardDefaultConfiguration(void) {
+void setBoardDefaultConfiguration() {
 	setInjectorPins();
 	setIgnitionPins();
 
diff --git a/firmware/config/boards/f429-discovery/board_configuration.cpp b/firmware/config/boards/f429-discovery/board_configuration.cpp
index cb71262a83..221613e6bb 100644
--- a/firmware/config/boards/f429-discovery/board_configuration.cpp
+++ b/firmware/config/boards/f429-discovery/board_configuration.cpp
@@ -4,8 +4,7 @@
  * @brief Board-specific initialization code.
  * @todo  Add your board-specific code, if any.
  */
-void boardInit(void)
-{
+void boardInit() {
 	/* NOP */
 }
 
diff --git a/firmware/console/binary/serial_can.cpp b/firmware/console/binary/serial_can.cpp
index 6ac0350eb1..18514db400 100644
--- a/firmware/console/binary/serial_can.cpp
+++ b/firmware/console/binary/serial_can.cpp
@@ -397,7 +397,7 @@ can_msg_t CanStreamer::receive(canmbx_t /*mailbox*/, CANRxFrame *crfp, can_sysin
 	return CAN_MSG_TIMEOUT;
 }
 
-void canStreamInit(void) {
+void canStreamInit() {
 	streamer.init();
 }
 
diff --git a/firmware/console/binary/serial_can.h b/firmware/console/binary/serial_can.h
index 64039ca14a..be91874356 100644
--- a/firmware/console/binary/serial_can.h
+++ b/firmware/console/binary/serial_can.h
@@ -134,7 +134,7 @@ class CanStreamer : public ICanStreamer {
 	virtual can_msg_t receive(canmbx_t mailbox, CANRxFrame *crfp, can_sysinterval_t timeout) override;
 };
 
-void canStreamInit(void);
+void canStreamInit();
 
 // we don't have canStreamSendTimeout() because we need to "bufferize" the stream and send it in fixed-length packets
 msg_t canStreamAddToTxTimeout(size_t *np, const uint8_t *txbuf, sysinterval_t timeout);
diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
index d90c3e112c..13abe7a7f3 100644
--- a/firmware/console/binary/tunerstudio.cpp
+++ b/firmware/console/binary/tunerstudio.cpp
@@ -242,7 +242,7 @@ void TunerStudio::handlePageReadCommand(TsChannelBase* tsChannel, uint16_t offse
 
 #endif // EFI_TUNER_STUDIO
 
-void requestBurn(void) {
+void requestBurn() {
 #if !EFI_UNIT_TEST
 	onBurnRequest();
 
@@ -709,7 +709,7 @@ static char tsErrorBuff[80];
 
 #endif // EFI_PROD_CODE || EFI_SIMULATOR
 
-void startTunerStudioConnectivity(void) {
+void startTunerStudioConnectivity() {
 	// Assert tune & output channel struct sizes
 	static_assert(sizeof(persistent_config_s) == TOTAL_CONFIG_SIZE, "TS datapage size mismatch");
 // useful trick if you need to know how far off is the static_assert
diff --git a/firmware/console/binary/tunerstudio.h b/firmware/console/binary/tunerstudio.h
index 6acbecf31a..1f1bf554c4 100644
--- a/firmware/console/binary/tunerstudio.h
+++ b/firmware/console/binary/tunerstudio.h
@@ -37,9 +37,9 @@ uint8_t* getWorkingPageAddr();
 
 void updateTunerStudioState();
 
-void requestBurn(void);
+void requestBurn();
 
-void startTunerStudioConnectivity(void);
+void startTunerStudioConnectivity();
 
 typedef struct {
 	short int offset;
diff --git a/firmware/controllers/actuators/electronic_throttle_impl.h b/firmware/controllers/actuators/electronic_throttle_impl.h
index d03fbad086..b7de81dde8 100644
--- a/firmware/controllers/actuators/electronic_throttle_impl.h
+++ b/firmware/controllers/actuators/electronic_throttle_impl.h
@@ -123,7 +123,7 @@ class EtbController : public IEtbController, public electronic_throttle_s {
 	// These are set to correct order of magnitude starting points
 	// so we converge more quickly on the correct values
 	float m_a = 8;
-	float m_tu = 0.1f; 
+	float m_tu = 0.1f;
 
 	uint8_t m_autotuneCounter = 0;
 	uint8_t m_autotuneCurrentParam = 0;
diff --git a/firmware/controllers/actuators/idle_thread.h b/firmware/controllers/actuators/idle_thread.h
index 0b95ecb712..5fd52a79f4 100644
--- a/firmware/controllers/actuators/idle_thread.h
+++ b/firmware/controllers/actuators/idle_thread.h
@@ -96,7 +96,7 @@ void setManualIdleValvePosition(int positionPercent);
 
 void startIdleThread();
 void setDefaultIdleParameters();
-void startIdleBench(void);
+void startIdleBench();
 void setIdleMode(idle_mode_e value);
 void setTargetIdleRpm(int value);
 void startPedalPins();
diff --git a/firmware/controllers/actuators/idle_thread_io.cpp b/firmware/controllers/actuators/idle_thread_io.cpp
index 6145526fb2..0208c2d2eb 100644
--- a/firmware/controllers/actuators/idle_thread_io.cpp
+++ b/firmware/controllers/actuators/idle_thread_io.cpp
@@ -96,7 +96,7 @@ void setTargetIdleRpm(int value) {
 /**
  * Idle test would activate the solenoid for three seconds
  */
-void startIdleBench(void) {
+void startIdleBench() {
 	engine->timeToStopIdleTest = getTimeNowUs() + MS2US(3000); // 3 seconds
 	efiPrintf("idle valve bench test");
 }
diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 3dc9d3b716..a89cb1cdb5 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -228,7 +228,7 @@ Engine::Engine() {
 	reset();
 }
 
-int Engine::getGlobalConfigurationVersion(void) const {
+int Engine::getGlobalConfigurationVersion() const {
 	return globalConfigurationVersion;
 }
 
diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index 9251ad742b..ccf2c297f6 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -225,7 +225,7 @@ class Engine final : public TriggerStateListener {
 #endif /* EFI_UNIT_TEST */
 
 
-	int getGlobalConfigurationVersion(void) const;
+	int getGlobalConfigurationVersion() const;
 
 
 	// a pointer with interface type would make this code nicer but would carry extra runtime
diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h
index a1e8ea5dd9..0d31828beb 100644
--- a/firmware/controllers/algo/engine_configuration.h
+++ b/firmware/controllers/algo/engine_configuration.h
@@ -59,8 +59,8 @@ void resetConfigurationExt(engine_type_e engineType);
 void rememberCurrentConfiguration();
 #endif /* __cplusplus */
 
-void setBoardDefaultConfiguration(void);
-void setBoardConfigOverrides(void);
+void setBoardDefaultConfiguration();
+void setBoardConfigOverrides();
 void boardOnConfigurationChange(engine_configuration_s *previousConfiguration);
 Gpio getCommsLedPin();
 Gpio getWarningLedPin();
diff --git a/firmware/controllers/algo/fuel_math.cpp b/firmware/controllers/algo/fuel_math.cpp
index 968985f90a..7080aca157 100644
--- a/firmware/controllers/algo/fuel_math.cpp
+++ b/firmware/controllers/algo/fuel_math.cpp
@@ -409,7 +409,7 @@ percent_t getFuelALSCorrection(int rpm) {
 			config->alsFuelAdjustmentLoadBins, throttleIntent,
 			config->alsFuelAdjustmentrpmBins, rpm
 		);
-		return AlsFuelAdd;	
+		return AlsFuelAdd;
 	} else
 #endif /* EFI_ANTILAG_SYSTEM */
 	{
diff --git a/firmware/controllers/algo/runtime_state.cpp b/firmware/controllers/algo/runtime_state.cpp
index 2e30fc2778..a92f6947e1 100644
--- a/firmware/controllers/algo/runtime_state.cpp
+++ b/firmware/controllers/algo/runtime_state.cpp
@@ -39,7 +39,7 @@ void resetMaxValues() {
 #endif // EFI_PROD_CODE
 }
 
-void printRuntimeStats(void) {
+void printRuntimeStats() {
 	efiPrintf("maxSchedulingPrecisionLoss=%lu", maxSchedulingPrecisionLoss);
 
 #if EFI_CLOCK_LOCKS
diff --git a/firmware/controllers/gauges/malfunction_central.cpp b/firmware/controllers/gauges/malfunction_central.cpp
index 01b2cf7a58..8240483e70 100644
--- a/firmware/controllers/gauges/malfunction_central.cpp
+++ b/firmware/controllers/gauges/malfunction_central.cpp
@@ -26,7 +26,7 @@ static int find_position(ObdCode e_code)							// Search if code is present
 	return -1;														// -1 if code not found
 }
 
-void clearWarnings(void) {
+void clearWarnings() {
 	error_codes_set.count = 0;
 }
 
@@ -62,6 +62,6 @@ void getErrorCodes(error_codes_set_s * copy) {
 	copyArray(copy->error_codes, error_codes_set.error_codes);
 }
 
-bool hasErrorCodes(void) {
+bool hasErrorCodes() {
 	return error_codes_set.count > 0;
 }
diff --git a/firmware/controllers/gauges/malfunction_central.h b/firmware/controllers/gauges/malfunction_central.h
index 881f94fcda..235d4e7340 100644
--- a/firmware/controllers/gauges/malfunction_central.h
+++ b/firmware/controllers/gauges/malfunction_central.h
@@ -32,10 +32,10 @@ void removeError(ObdCode errorCode);
 
 void setError(bool isError, ObdCode errorCode);
 
-void clearWarnings(void);
+void clearWarnings();
 /**
  * @brief Copies the current set of errors into the specified buffer
  */
 void getErrorCodes(error_codes_set_s * buffer);
 
-bool hasErrorCodes(void);
+bool hasErrorCodes();
diff --git a/firmware/controllers/gauges/malfunction_indicator.cpp b/firmware/controllers/gauges/malfunction_indicator.cpp
index 027058a1e9..297529f10a 100644
--- a/firmware/controllers/gauges/malfunction_indicator.cpp
+++ b/firmware/controllers/gauges/malfunction_indicator.cpp
@@ -117,7 +117,7 @@ bool isMilEnabled() {
 	return isBrainPinValid(engineConfiguration->malfunctionIndicatorPin);
 }
 
-void initMalfunctionIndicator(void) {
+void initMalfunctionIndicator() {
 	if (!isMilEnabled()) {
 		return;
 	}
diff --git a/simulator/simulator/framework.cpp b/simulator/simulator/framework.cpp
index c490f678d9..33fa078997 100644
--- a/simulator/simulator/framework.cpp
+++ b/simulator/simulator/framework.cpp
@@ -9,6 +9,6 @@
 
 // Since all the time logic in the firmware is centered around this function, we only provide this
 // function in the firmware.  It forces us to exercise the functions that build on this one.
-uint32_t getTimeNowLowerNt(void) {
+uint32_t getTimeNowLowerNt() {
 	return US2NT(chVTGetSystemTimeX() * (1000000 / CH_CFG_ST_FREQUENCY));
 }