diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp
index b1f6fd09d0..c19895f2aa 100644
--- a/firmware/console/status_loop.cpp
+++ b/firmware/console/status_loop.cpp
@@ -69,10 +69,6 @@ extern bool main_loop_started;
 #include "flash_main.h"
 #endif
 
-#if EFI_MAP_AVERAGING
-#include "map_averaging.h"
-#endif
-
 #if (BOARD_TLE8888_COUNT > 0)
 #include "tle8888.h"
 #endif /* BOARD_TLE8888_COUNT */
diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 586a28ff9b..6f76460f3e 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -17,7 +17,6 @@
 #include "speed_density.h"
 #include "advance_map.h"
 
-#include "map_averaging.h"
 #include "perf_trace.h"
 #include "backup_ram.h"
 #include "idle_thread.h"
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index 8c1b71fc15..abf9d29b52 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -32,7 +32,6 @@
 #include "flash_main.h"
 #include "bench_test.h"
 #include "electronic_throttle.h"
-#include "map_averaging.h"
 #include "high_pressure_fuel_pump.h"
 #include "malfunction_central.h"
 #include "malfunction_indicator.h"
diff --git a/firmware/controllers/engine_cycle/main_trigger_callback.cpp b/firmware/controllers/engine_cycle/main_trigger_callback.cpp
index 6b7a211f74..d6657c4837 100644
--- a/firmware/controllers/engine_cycle/main_trigger_callback.cpp
+++ b/firmware/controllers/engine_cycle/main_trigger_callback.cpp
@@ -30,7 +30,6 @@
 #if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT
 
 #include "spark_logic.h"
-#include "map_averaging.h"
 
 static void handleFuel(efitick_t nowNt, float currentPhase, float nextPhase) {
 	ScopePerf perf(PE::HandleFuel);
diff --git a/firmware/controllers/modules/map_averaging/map_averaging.cpp b/firmware/controllers/modules/map_averaging/map_averaging.cpp
index be3e2f3fed..c1ba420e35 100644
--- a/firmware/controllers/modules/map_averaging/map_averaging.cpp
+++ b/firmware/controllers/modules/map_averaging/map_averaging.cpp
@@ -25,7 +25,6 @@
 
 #if EFI_MAP_AVERAGING
 
-#include "map_averaging.h"
 #include "trigger_central.h"
 
 #if EFI_SENSOR_CHART
diff --git a/firmware/controllers/sensors/sensor_info_printing.cpp b/firmware/controllers/sensors/sensor_info_printing.cpp
index 1abe4b38c7..4fe617d5a4 100644
--- a/firmware/controllers/sensors/sensor_info_printing.cpp
+++ b/firmware/controllers/sensors/sensor_info_printing.cpp
@@ -9,7 +9,6 @@
 #include "resistance_func.h"
 #include "thermistor_func.h"
 #include "identity_func.h"
-#include "map_averaging.h"
 
 void ProxySensor::showInfo(const char* sensorName) const {
 	efiPrintf("Sensor \"%s\" proxied from sensor \"%s\"", sensorName, getSensorName(m_proxiedSensor));
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 8966cd9873..f8726a37ee 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -47,10 +47,6 @@
 #include "mc33816.h"
 #endif /* EFI_MC33816 */
 
-#if EFI_MAP_AVERAGING
-#include "map_averaging.h"
-#endif
-
 #if EFI_INTERNAL_FLASH
 #include "flash_main.h"
 #endif
diff --git a/firmware/hw_layer/ports/stm32/stm32_adc_v4.cpp b/firmware/hw_layer/ports/stm32/stm32_adc_v4.cpp
index 01287e3974..18be77936e 100644
--- a/firmware/hw_layer/ports/stm32/stm32_adc_v4.cpp
+++ b/firmware/hw_layer/ports/stm32/stm32_adc_v4.cpp
@@ -11,7 +11,6 @@
 #if HAL_USE_ADC
 
 #include "mpu_util.h"
-#include "map_averaging.h"
 
 #ifdef ADC_MUX_PIN
 #error "ADC mux not yet supported on STM32H7"
diff --git a/firmware/init/sensor/init_map.cpp b/firmware/init/sensor/init_map.cpp
index 2a648dc2d4..f41fe5ea2f 100644
--- a/firmware/init/sensor/init_map.cpp
+++ b/firmware/init/sensor/init_map.cpp
@@ -4,7 +4,6 @@
 #include "linear_func.h"
 #include "fallback_sensor.h"
 #include "functional_sensor.h"
-#include "map_averaging.h"
 
 static LinearFunc baroConverter;
 static FunctionalSensor baroSensor(SensorType::BarometricPressure, MS2NT(50));