diff --git a/firmware/config/boards/proteus/knock_config.h b/firmware/config/boards/proteus/knock_config.h
index 7edc5b1f5c..c1e113ed8d 100644
--- a/firmware/config/boards/proteus/knock_config.h
+++ b/firmware/config/boards/proteus/knock_config.h
@@ -30,4 +30,4 @@
 
 	#define KNOCK_SAMPLE_TIME ADC_SAMPLE_84
 	#define KNOCK_SAMPLE_RATE (STM32_PCLK2 / (4 * (84 + 12)))
-#endif
\ No newline at end of file
+#endif
diff --git a/firmware/controllers/actuators/electronic_throttle_impl.h b/firmware/controllers/actuators/electronic_throttle_impl.h
index b977d15dcc..b79d5df8bf 100644
--- a/firmware/controllers/actuators/electronic_throttle_impl.h
+++ b/firmware/controllers/actuators/electronic_throttle_impl.h
@@ -10,9 +10,10 @@
 // include the "public" ETB interface
 #include "electronic_throttle.h"
 
-#include "sensor.h"
 #include "efi_pid.h"
 #include "electronic_throttle_generated.h"
+#include "sensor_type.h"
+#include "timer.h"
 
 /**
  * Hard code ETB update speed.
diff --git a/firmware/controllers/algo/fuel_math.cpp b/firmware/controllers/algo/fuel_math.cpp
index 4eacac2509..f58aac5ac7 100644
--- a/firmware/controllers/algo/fuel_math.cpp
+++ b/firmware/controllers/algo/fuel_math.cpp
@@ -30,7 +30,6 @@
 #include "fuel_math.h"
 #include "fuel_computer.h"
 #include "injector_model.h"
-#include "speed_density.h"
 #include "speed_density_base.h"
 #include "lua_hooks.h"
 
diff --git a/firmware/controllers/algo/rusefi_hw_enums.h b/firmware/controllers/algo/rusefi_hw_enums.h
index 2e8f1c57a8..2c641c12a2 100644
--- a/firmware/controllers/algo/rusefi_hw_enums.h
+++ b/firmware/controllers/algo/rusefi_hw_enums.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 // todo: migrate/unify with pin_output_mode_e? rename? something is messy here
 // this enum is currently only used for SPI pins
 typedef enum __attribute__ ((__packed__)) {
diff --git a/firmware/controllers/engine_cycle/knock_logic.h b/firmware/controllers/engine_cycle/knock_logic.h
index b5b604a84d..6ce8163621 100644
--- a/firmware/controllers/engine_cycle/knock_logic.h
+++ b/firmware/controllers/engine_cycle/knock_logic.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include "efitime.h"
+#include "engine_module.h"
 #include "peak_detect.h"
 #include "knock_controller_generated.h"
 
diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp
index 2e3063f82a..e6dcfefd28 100644
--- a/firmware/controllers/math/engine_math.cpp
+++ b/firmware/controllers/math/engine_math.cpp
@@ -21,8 +21,6 @@
 
 #include "pch.h"
 
-#include "event_registry.h"
-#include "fuel_math.h"
 #include "advance_map.h"
 #include "gppwm_channel.h"
 
diff --git a/firmware/controllers/sensors/impl/software_knock.cpp b/firmware/controllers/sensors/impl/software_knock.cpp
index 6e28d7a482..5ce276371b 100644
--- a/firmware/controllers/sensors/impl/software_knock.cpp
+++ b/firmware/controllers/sensors/impl/software_knock.cpp
@@ -95,10 +95,10 @@ void initSoftwareKnock() {
 
 		efiPrintf("Knock sense configuring filter with frequency %.2f khz", freqKhz);
 
-		knockFilter.configureBandpass(KNOCK_SAMPLE_RATE, 1000 * freqKhz, 3);
+		knockFilter.configureBandpass((int)KNOCK_SAMPLE_RATE, 1000 * freqKhz, 3);
 
 		efiSetPadMode("knock ch1", KNOCK_PIN_CH1, PAL_MODE_INPUT_ANALOG);
-#if KNOCK_HAS_CH2		
+#if KNOCK_HAS_CH2	
 		efiSetPadMode("knock ch2", KNOCK_PIN_CH2, PAL_MODE_INPUT_ANALOG);
 #endif
 		kt.start();
diff --git a/firmware/controllers/system/thread_controller.h b/firmware/controllers/system/thread_controller.h
index 1c78a3cdf6..5e1bb3d358 100644
--- a/firmware/controllers/system/thread_controller.h
+++ b/firmware/controllers/system/thread_controller.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include "global.h"
+
 /**
  * @brief A base class for a controller that requires its own thread.
  * 
diff --git a/firmware/init/sensor/init_lambda.cpp b/firmware/init/sensor/init_lambda.cpp
index d6c4788b31..e33517d829 100644
--- a/firmware/init/sensor/init_lambda.cpp
+++ b/firmware/init/sensor/init_lambda.cpp
@@ -3,7 +3,6 @@
 #include "init.h"
 #include "adc_subscription.h"
 #include "linear_func.h"
-#include "live_data.h"
 
 static LinearFunc func;
 
diff --git a/firmware/init/sensor/init_tps.cpp b/firmware/init/sensor/init_tps.cpp
index cc163858e4..02215e4b46 100644
--- a/firmware/init/sensor/init_tps.cpp
+++ b/firmware/init/sensor/init_tps.cpp
@@ -6,7 +6,9 @@
 #include "proxy_sensor.h"
 #include "linear_func.h"
 #include "tps.h"
+#if EFI_UNIT_TEST
 #include "auto_generated_sensor.h"
+#endif
 
 #ifndef MAX_TPS_PPS_DISCREPANCY
 #define MAX_TPS_PPS_DISCREPANCY 5.0f
diff --git a/firmware/util/efilib.h b/firmware/util/efilib.h
index 1da3092cf4..354355c039 100644
--- a/firmware/util/efilib.h
+++ b/firmware/util/efilib.h
@@ -9,6 +9,7 @@
 
 #include <stdint.h>
 #include <rusefi/arrays.h>
+#include "rusefi_hw_enums.h"
 
 int djb2lowerCase(const char *str);