diff --git a/firmware/controllers/trigger/trigger_central.h b/firmware/controllers/trigger/trigger_central.h
index ef7c0e9813..b76b6d8b6f 100644
--- a/firmware/controllers/trigger/trigger_central.h
+++ b/firmware/controllers/trigger/trigger_central.h
@@ -14,6 +14,7 @@
 #include "timer.h"
 #include "pin_repository.h"
 #include "local_version_holder.h"
+#include "cyclic_buffer.h"
 
 #define MAP_CAM_BUFFER 64
 
diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp
index b4c69694de..dc884c45c6 100644
--- a/firmware/controllers/trigger/trigger_decoder.cpp
+++ b/firmware/controllers/trigger/trigger_decoder.cpp
@@ -24,13 +24,8 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <rusefi/arrays.h>
-#include <rusefi/crc.h>
-#include <rusefi/fragments.h>
-#include <rusefi/interpolation.h>
 #include <rusefi/isnan.h>
 #include <rusefi/math.h>
-#include <rusefi/pt2001.h>
 
 #include "global.h"
 #include "efifeatures.h"
@@ -43,7 +38,6 @@
 #include "engine_configuration.h"
 #include "engine_controller.h"
 #include "engine_math.h"
-#include "pwm_generator_logic.h"
 #include "perf_trace.h"
 
 
diff --git a/firmware/util/containers/table_helper.h b/firmware/util/containers/table_helper.h
index 85b1f58c36..2bac3a0ecd 100644
--- a/firmware/util/containers/table_helper.h
+++ b/firmware/util/containers/table_helper.h
@@ -12,6 +12,7 @@
 #include "efilib.h"
 #include "efi_ratio.h"
 #include "efi_scaled_channel.h"
+#include <rusefi/interpolation.h>
 
 // popular left edge of CLT-based correction curves
 #define CLT_CURVE_RANGE_FROM -40