diff --git a/firmware/config/boards/me7_pnp/board_configuration.cpp b/firmware/config/boards/me7_pnp/board_configuration.cpp
index c31eb165d8..d3be5b6e82 100644
--- a/firmware/config/boards/me7_pnp/board_configuration.cpp
+++ b/firmware/config/boards/me7_pnp/board_configuration.cpp
@@ -13,8 +13,7 @@
 #include "engine_configuration.h"
 #include "smart_gpio.h"
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 }
diff --git a/firmware/config/engines/me7pnp.cpp b/firmware/config/engines/me7pnp.cpp
index 2fc83d8525..0fd4fe5525 100644
--- a/firmware/config/engines/me7pnp.cpp
+++ b/firmware/config/engines/me7pnp.cpp
@@ -14,8 +14,7 @@
 #include "engine_configuration.h"
 #include "smart_gpio.h"
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 
diff --git a/firmware/console/binary/bluetooth.cpp b/firmware/console/binary/bluetooth.cpp
index 5667721f7e..e9bfa74e77 100644
--- a/firmware/console/binary/bluetooth.cpp
+++ b/firmware/console/binary/bluetooth.cpp
@@ -34,8 +34,7 @@ static thread_reference_t btThreadRef = nullptr; // used by thread suspend/resum
 static LoggingWithStorage btLogger("bluetooth");
 
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 
 // Main communication code
diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
index 1f73b95042..a3a514db8a 100644
--- a/firmware/console/binary/tunerstudio.cpp
+++ b/firmware/console/binary/tunerstudio.cpp
@@ -103,8 +103,7 @@
 #endif /* EFI_IDLE_CONTROL */
 
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 extern persistent_config_container_s persistentState;
 
diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp
index 753e405c09..c0cc2a74b6 100644
--- a/firmware/console/status_loop.cpp
+++ b/firmware/console/status_loop.cpp
@@ -102,7 +102,6 @@ extern WaveChart waveChart;
 
 int warningEnabled = true;
 
-extern bool hasFirmwareErrorFlag;
 extern int maxTriggerReentraint;
 extern uint32_t maxLockedDuration;
 
@@ -172,8 +171,7 @@ static void reportSensorI(Logging *log, const char *caption, const char *units,
 #endif /* EFI_FILE_LOGGING */
 }
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static char buf[6];
 
diff --git a/firmware/controllers/actuators/alternator_controller.cpp b/firmware/controllers/actuators/alternator_controller.cpp
index ed66d91ac3..816e30e67d 100644
--- a/firmware/controllers/actuators/alternator_controller.cpp
+++ b/firmware/controllers/actuators/alternator_controller.cpp
@@ -30,8 +30,7 @@
 #error "Unexpected OS ACCESS HERE"
 #endif /* HAS_OS_ACCESS */
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static Logging *logger;
 
diff --git a/firmware/controllers/actuators/aux_pid.cpp b/firmware/controllers/actuators/aux_pid.cpp
index 7a71fdcfc9..f1cb38c4c5 100644
--- a/firmware/controllers/actuators/aux_pid.cpp
+++ b/firmware/controllers/actuators/aux_pid.cpp
@@ -25,8 +25,7 @@
 #error "Unexpected OS ACCESS HERE"
 #endif /* HAS_OS_ACCESS */
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 extern fsio8_Map3D_f32t fsioTable1;
 
diff --git a/firmware/controllers/actuators/idle_thread.cpp b/firmware/controllers/actuators/idle_thread.cpp
index 08e15f63b3..4f14bb29e0 100644
--- a/firmware/controllers/actuators/idle_thread.cpp
+++ b/firmware/controllers/actuators/idle_thread.cpp
@@ -52,8 +52,7 @@ static StepperMotor iacMotor;
 
 static Logging *logger;
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static bool shouldResetPid = false;
 // The idea of 'mightResetPid' is to reset PID only once - each time when TPS > idlePidDeactivationTpsThreshold.
diff --git a/firmware/controllers/algo/accel_enrichment.cpp b/firmware/controllers/algo/accel_enrichment.cpp
index 157f5c202c..1d2e788334 100644
--- a/firmware/controllers/algo/accel_enrichment.cpp
+++ b/firmware/controllers/algo/accel_enrichment.cpp
@@ -32,8 +32,7 @@
 #include "tunerstudio_configuration.h"
 #endif /* EFI_TUNER_STUDIO */
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 tps_tps_Map3D_t tpsTpsMap("tpsTps");
 
diff --git a/firmware/controllers/algo/advance_map.cpp b/firmware/controllers/algo/advance_map.cpp
index 173c7b1c2a..3907437dca 100644
--- a/firmware/controllers/algo/advance_map.cpp
+++ b/firmware/controllers/algo/advance_map.cpp
@@ -31,8 +31,7 @@
 
 #if EFI_ENGINE_CONTROL
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static ign_Map3D_t advanceMap("advance");
 // This coeff in ctor parameter is sufficient for int16<->float conversion!
diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 7619dce82f..9a55c2af94 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -39,8 +39,7 @@ static TriggerState initState CCM_OPTIONAL;
 
 LoggingWithStorage engineLogger("engine");
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 #if EFI_ENGINE_SNIFFER
 #include "engine_sniffer.h"
diff --git a/firmware/controllers/algo/engine2.cpp b/firmware/controllers/algo/engine2.cpp
index 0ad9dcbad7..93db31a200 100644
--- a/firmware/controllers/algo/engine2.cpp
+++ b/firmware/controllers/algo/engine2.cpp
@@ -28,8 +28,7 @@
 extern fuel_Map3D_t veMap;
 extern afr_Map3D_t afrMap;
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 // this does not look exactly right
 extern LoggingWithStorage engineLogger;
diff --git a/firmware/controllers/algo/fuel_math.cpp b/firmware/controllers/algo/fuel_math.cpp
index 72bb80fb9e..1b11283a4f 100644
--- a/firmware/controllers/algo/fuel_math.cpp
+++ b/firmware/controllers/algo/fuel_math.cpp
@@ -31,8 +31,7 @@
 #include "speed_density.h"
 #include "perf_trace.h"
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 fuel_Map3D_t fuelMap("fuel");
 static fuel_Map3D_t fuelPhaseMap("fl ph");
diff --git a/firmware/controllers/algo/launch_control.cpp b/firmware/controllers/algo/launch_control.cpp
index a9a9bff6a7..7b9261d21a 100644
--- a/firmware/controllers/algo/launch_control.cpp
+++ b/firmware/controllers/algo/launch_control.cpp
@@ -30,8 +30,7 @@ static Logging *logger;
 extern TunerStudioOutputChannels tsOutputChannels;
 #endif /* EFI_TUNER_STUDIO */
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static bool getActivateSwitchCondition(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	switch (engineConfiguration->launchActivationMode) {
diff --git a/firmware/controllers/bench_test.cpp b/firmware/controllers/bench_test.cpp
index 219fbc6b3d..4eefe45b88 100644
--- a/firmware/controllers/bench_test.cpp
+++ b/firmware/controllers/bench_test.cpp
@@ -51,8 +51,7 @@
 
 
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static Logging * logger;
 static bool isRunningBench = false;
diff --git a/firmware/controllers/can/obd2.cpp b/firmware/controllers/can/obd2.cpp
index d753a8a811..dbf74c8b7f 100644
--- a/firmware/controllers/can/obd2.cpp
+++ b/firmware/controllers/can/obd2.cpp
@@ -39,8 +39,7 @@
 #include "fuel_math.h"
 #include "thermistors.h"
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static LoggingWithStorage logger("obd2");
 
diff --git a/firmware/controllers/core/error_handling.h b/firmware/controllers/core/error_handling.h
index f03f823cce..f5bf9e3d31 100644
--- a/firmware/controllers/core/error_handling.h
+++ b/firmware/controllers/core/error_handling.h
@@ -31,6 +31,8 @@ typedef uint8_t critical_msg_t[ERROR_BUFFER_SIZE];
  */
 void firmwareError(obd_code_e code, const char *fmt, ...);
 
+extern bool hasFirmwareErrorFlag;
+
 #define hasFirmwareError() hasFirmwareErrorFlag
 
 // todo: rename to getCriticalErrorMessage
diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp
index 4606234c0e..380c42c04a 100644
--- a/firmware/controllers/core/fsio_impl.cpp
+++ b/firmware/controllers/core/fsio_impl.cpp
@@ -15,6 +15,8 @@
 #include "fsio_impl.h"
 #include "allsensors.h"
 
+EXTERN_ENGINE;
+
 #if EFI_FSIO
 
 #include "os_access.h"
@@ -106,9 +108,6 @@ static LEElement * starterRelayDisableLogic;
 static LEElement * mainRelayLogic;
 #endif /* EFI_MAIN_RELAY_CONTROL */
 
-EXTERN_ENGINE
-;
-
 static Logging *logger;
 #if EFI_PROD_CODE || EFI_SIMULATOR
 
@@ -732,9 +731,6 @@ void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
 
 #else /* !EFI_FSIO */
 
-EXTERN_ENGINE
-;
-
 // "Limp-mode" implementation for some RAM-limited configs without FSIO
 void runHardcodedFsio(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	// see MAIN_RELAY_LOGIC
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index da02450eea..5f13176176 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -102,8 +102,6 @@ EXTERN_ENGINE;
 
 #if !EFI_UNIT_TEST
 
-extern bool hasFirmwareErrorFlag;
-
 static LoggingWithStorage logger("Engine Controller");
 
 /**
diff --git a/firmware/controllers/engine_cycle/aux_valves.cpp b/firmware/controllers/engine_cycle/aux_valves.cpp
index cb620876a1..cedec38446 100644
--- a/firmware/controllers/engine_cycle/aux_valves.cpp
+++ b/firmware/controllers/engine_cycle/aux_valves.cpp
@@ -19,8 +19,7 @@
 #include "trigger_central.h"
 #include "spark_logic.h"
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 void plainPinTurnOn(AuxActor *current) {
 	NamedOutputPin *output = &enginePins.auxValve[current->valveIndex];
diff --git a/firmware/controllers/engine_cycle/main_trigger_callback.cpp b/firmware/controllers/engine_cycle/main_trigger_callback.cpp
index 1639544e17..7770104bb0 100644
--- a/firmware/controllers/engine_cycle/main_trigger_callback.cpp
+++ b/firmware/controllers/engine_cycle/main_trigger_callback.cpp
@@ -51,9 +51,7 @@
 
 #include "backup_ram.h"
 
-EXTERN_ENGINE
-;
-extern bool hasFirmwareErrorFlag;
+EXTERN_ENGINE;
 
 static const char *prevOutputName = nullptr;
 
diff --git a/firmware/controllers/engine_cycle/map_averaging.cpp b/firmware/controllers/engine_cycle/map_averaging.cpp
index 8167ee0b42..db5ac4ab33 100644
--- a/firmware/controllers/engine_cycle/map_averaging.cpp
+++ b/firmware/controllers/engine_cycle/map_averaging.cpp
@@ -93,8 +93,7 @@ static int averagedMapBufIdx = 0;
 // this is 'minimal averaged' MAP within avegaging window
 static float currentPressure = NO_VALUE_YET;
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 /**
  * here we have averaging start and averaging end points for each cylinder
diff --git a/firmware/controllers/engine_cycle/rpm_calculator.cpp b/firmware/controllers/engine_cycle/rpm_calculator.cpp
index cd154d9ca4..4a6628e9d4 100644
--- a/firmware/controllers/engine_cycle/rpm_calculator.cpp
+++ b/firmware/controllers/engine_cycle/rpm_calculator.cpp
@@ -81,10 +81,7 @@ int RpmCalculator::getRpm(DECLARE_ENGINE_PARAMETER_SIGNATURE) const {
 
 #if EFI_SHAFT_POSITION_INPUT
 
-EXTERN_ENGINE
-;
-
-extern bool hasFirmwareErrorFlag;
+EXTERN_ENGINE;
 
 static Logging * logger;
 
diff --git a/firmware/controllers/gauges/lcd_controller.cpp b/firmware/controllers/gauges/lcd_controller.cpp
index cf52dd1536..9621b62c2d 100644
--- a/firmware/controllers/gauges/lcd_controller.cpp
+++ b/firmware/controllers/gauges/lcd_controller.cpp
@@ -42,9 +42,7 @@
 #include "fuel_math.h"
 
 
-EXTERN_ENGINE
-;
-extern bool hasFirmwareErrorFlag;
+EXTERN_ENGINE;
 
 static MenuItem ROOT(NULL, NULL);
 
diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp
index 1f7a9e3c5d..246c78989d 100644
--- a/firmware/controllers/math/engine_math.cpp
+++ b/firmware/controllers/math/engine_math.cpp
@@ -30,8 +30,7 @@
 #include "advance_map.h"
 #include "config_engine_specs.h"
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 #if EFI_UNIT_TEST
 extern bool verboseMode;
 #endif /* EFI_UNIT_TEST */
diff --git a/firmware/controllers/sensors/maf.cpp b/firmware/controllers/sensors/maf.cpp
index 496798f9cf..6978a43aa9 100644
--- a/firmware/controllers/sensors/maf.cpp
+++ b/firmware/controllers/sensors/maf.cpp
@@ -3,8 +3,7 @@
 #include "adc_inputs.h"
 #include "maf.h"
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 /**
  * @return MAF sensor voltage
diff --git a/firmware/controllers/sensors/stored_value_sensor.h b/firmware/controllers/sensors/stored_value_sensor.h
index 96280a089e..6920f14cbd 100644
--- a/firmware/controllers/sensors/stored_value_sensor.h
+++ b/firmware/controllers/sensors/stored_value_sensor.h
@@ -29,7 +29,7 @@
  */
 class StoredValueSensor : public Sensor {
 public:
-	SensorResult get() const final {
+	SensorResult get() const final override {
 		bool valid = m_isValid;
 		float value = m_value;
 
diff --git a/firmware/controllers/sensors/thermistors.cpp b/firmware/controllers/sensors/thermistors.cpp
index e4268acb98..1d83d9eca9 100644
--- a/firmware/controllers/sensors/thermistors.cpp
+++ b/firmware/controllers/sensors/thermistors.cpp
@@ -24,8 +24,7 @@
 #define LIMPING_MODE_CLT_TEMPERATURE 70.0f
 #define NO_CLT_SENSOR_TEMPERATURE 72.0f
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static Logging *logger = nullptr;
 
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index 3e0377ffbd..5ba3d2f01f 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -58,8 +58,7 @@ extern WaveChart waveChart;
 static char LOGGING_BUFFER[SETTINGS_LOGGING_BUFFER_SIZE];
 static Logging logger("settings control", LOGGING_BUFFER, sizeof(LOGGING_BUFFER));
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 /*
  static void printIntArray(int array[], int size) {
diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp
index af7dc0b523..41c22ac6d4 100644
--- a/firmware/controllers/trigger/trigger_central.cpp
+++ b/firmware/controllers/trigger/trigger_central.cpp
@@ -396,8 +396,7 @@ void TriggerCentral::handleShaftSignal(trigger_event_e signal, efitick_t timesta
 	}
 }
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static void triggerShapeInfo(void) {
 #if EFI_PROD_CODE || EFI_SIMULATOR
diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp
index e896531167..140115fbb0 100644
--- a/firmware/controllers/trigger/trigger_decoder.cpp
+++ b/firmware/controllers/trigger/trigger_decoder.cpp
@@ -104,8 +104,7 @@ TriggerStateWithRunningStatistics::TriggerStateWithRunningStatistics() :
 
 #if EFI_SHAFT_POSITION_INPUT
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 #if ! EFI_PROD_CODE
 bool printTriggerDebug = false;
diff --git a/firmware/controllers/trigger/trigger_emulator_algo.cpp b/firmware/controllers/trigger/trigger_emulator_algo.cpp
index 086721bdd9..7363951cb2 100644
--- a/firmware/controllers/trigger/trigger_emulator_algo.cpp
+++ b/firmware/controllers/trigger/trigger_emulator_algo.cpp
@@ -41,8 +41,7 @@ bool needEvent(const int currentIndex, const int size, MultiChannelStateSequence
 TriggerEmulatorHelper::TriggerEmulatorHelper() {
 }
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 void TriggerEmulatorHelper::handleEmulatorCallback(PwmConfig *state, int stateIndex) {
 	efitick_t stamp = getTimeNowNt();
diff --git a/firmware/development/engine_emulator.cpp b/firmware/development/engine_emulator.cpp
index 5df8e39dee..dd883c9a19 100644
--- a/firmware/development/engine_emulator.cpp
+++ b/firmware/development/engine_emulator.cpp
@@ -22,8 +22,6 @@
 #include "poten.h"
 #include "trigger_emulator.h"
 
-extern bool hasFirmwareErrorFlag;
-
 static THD_WORKING_AREA(eeThreadStack, UTILITY_THREAD_STACK_SIZE);
 
 #define DIAG_PIN GPIOD_0
diff --git a/firmware/development/engine_sniffer.cpp b/firmware/development/engine_sniffer.cpp
index 931508eee9..7b850d1ab5 100644
--- a/firmware/development/engine_sniffer.cpp
+++ b/firmware/development/engine_sniffer.cpp
@@ -38,8 +38,7 @@
 
 #define CHART_DELIMETER	'!'
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 extern uint32_t maxLockedDuration;
 
 /**
diff --git a/firmware/development/logic_analyzer.cpp b/firmware/development/logic_analyzer.cpp
index 7a024e3b62..3cf7259b3a 100644
--- a/firmware/development/logic_analyzer.cpp
+++ b/firmware/development/logic_analyzer.cpp
@@ -37,7 +37,6 @@ EXTERN_ENGINE;
 #if EFI_ENGINE_SNIFFER
 extern WaveChart waveChart;
 #endif /* EFI_ENGINE_SNIFFER */
-extern bool hasFirmwareErrorFlag;
 
 /**
  * Difference between current 1st trigger event and previous 1st trigger event.
diff --git a/firmware/hw_layer/drivers/can/can_hw.cpp b/firmware/hw_layer/drivers/can/can_hw.cpp
index 9133266841..2edee22996 100644
--- a/firmware/hw_layer/drivers/can/can_hw.cpp
+++ b/firmware/hw_layer/drivers/can/can_hw.cpp
@@ -22,8 +22,7 @@
 #include "mpu_util.h"
 #include "engine.h"
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static int canReadCounter = 0;
 static int canWriteOk = 0;
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 67b204c531..ed487ebe9b 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -61,9 +61,7 @@
 #include "flash_main.h"
 #endif
 
-EXTERN_ENGINE
-;
-extern bool hasFirmwareErrorFlag;
+EXTERN_ENGINE;
 
 static mutex_t spiMtx;
 
diff --git a/firmware/hw_layer/hip9011.cpp b/firmware/hw_layer/hip9011.cpp
index 1dcd6a41f5..1dbbd94410 100644
--- a/firmware/hw_layer/hip9011.cpp
+++ b/firmware/hw_layer/hip9011.cpp
@@ -132,9 +132,7 @@ void Hip9011Hardware::sendCommand(unsigned char command) {
 	spiStartExchangeI(driver, 1, tx_buff, rx_buff);
 }
 
-EXTERN_ENGINE
-;
-
+EXTERN_ENGINE;
 
 static char hipPinNameBuffer[16];
 
diff --git a/firmware/hw_layer/microsecond_timer.cpp b/firmware/hw_layer/microsecond_timer.cpp
index c00d583609..e1129932f1 100644
--- a/firmware/hw_layer/microsecond_timer.cpp
+++ b/firmware/hw_layer/microsecond_timer.cpp
@@ -61,8 +61,6 @@ static int timerFreezeCounter = 0;
 static volatile int setHwTimerCounter = 0;
 static volatile bool hwStarted = false;
 
-extern bool hasFirmwareErrorFlag;
-
 /**
  * sets the alarm to the specified number of microseconds from now.
  * This function should be invoked under kernel lock which would disable interrupts.
diff --git a/firmware/hw_layer/sensors/joystick.cpp b/firmware/hw_layer/sensors/joystick.cpp
index acaec71775..9c72411725 100644
--- a/firmware/hw_layer/sensors/joystick.cpp
+++ b/firmware/hw_layer/sensors/joystick.cpp
@@ -20,8 +20,7 @@
 #include "pin_repository.h"
 #include "digital_input_exti.h"
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static int joyTotal = 0;
 static int joyCenter;
diff --git a/firmware/hw_layer/trigger_input_comp.cpp b/firmware/hw_layer/trigger_input_comp.cpp
index 1158a4eaaa..f454ce18fd 100644
--- a/firmware/hw_layer/trigger_input_comp.cpp
+++ b/firmware/hw_layer/trigger_input_comp.cpp
@@ -16,11 +16,8 @@
 #include "trigger_input.h"
 #include "digital_input_icu.h"
 
+EXTERN_ENGINE;
 
-extern bool hasFirmwareErrorFlag;
-
-EXTERN_ENGINE
-;
 static Logging *logger;
 
 static volatile int centeredDacValue = 127;
diff --git a/firmware/hw_layer/trigger_input_exti.cpp b/firmware/hw_layer/trigger_input_exti.cpp
index d4512f0652..981446029f 100644
--- a/firmware/hw_layer/trigger_input_exti.cpp
+++ b/firmware/hw_layer/trigger_input_exti.cpp
@@ -21,8 +21,6 @@
 	#error "PAL_USE_CALLBACKS should be enabled to use HAL_TRIGGER_USE_PAL"
 #endif
 
-extern bool hasFirmwareErrorFlag;
-
 static Logging *logger;
 
 EXTERN_ENGINE;
diff --git a/firmware/hw_layer/trigger_input_icu.cpp b/firmware/hw_layer/trigger_input_icu.cpp
index f40fee228f..108afd79c9 100644
--- a/firmware/hw_layer/trigger_input_icu.cpp
+++ b/firmware/hw_layer/trigger_input_icu.cpp
@@ -24,8 +24,6 @@ int icuFallingCallbackCounter = 0;
 
 EXTERN_ENGINE;
 
-extern bool hasFirmwareErrorFlag;
-
 static Logging *logger;
 
 static void vvtRisingCallback(void *) {
diff --git a/firmware/hw_layer/vehicle_speed.cpp b/firmware/hw_layer/vehicle_speed.cpp
index 2fc76af6a3..9e9aabb136 100644
--- a/firmware/hw_layer/vehicle_speed.cpp
+++ b/firmware/hw_layer/vehicle_speed.cpp
@@ -13,8 +13,7 @@
 #include "digital_input_icu.h"
 #include "pin_repository.h"
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 static Logging *logger;
 
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 3beb411559..599a746a7f 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -137,12 +137,9 @@ bool main_loop_started = false;
 
 static char panicMessage[200];
 
-extern bool hasFirmwareErrorFlag;
-
 static virtual_timer_t resetTimer;
 
-EXTERN_ENGINE
-;
+EXTERN_ENGINE;
 
 // todo: move this into a hw-specific file
 void rebootNow(void) {