diff --git a/firmware/controllers/actuators/electronic_throttle.h b/firmware/controllers/actuators/electronic_throttle.h
index 531f71c916..de4818e813 100644
--- a/firmware/controllers/actuators/electronic_throttle.h
+++ b/firmware/controllers/actuators/electronic_throttle.h
@@ -9,6 +9,7 @@
 
 #include "closed_loop_controller.h"
 #include "rusefi_types.h"
+#include "engine_configuration.h"
 
 void initElectronicThrottle();
 void doInitElectronicThrottle();
diff --git a/firmware/controllers/actuators/idle_thread.h b/firmware/controllers/actuators/idle_thread.h
index 3f4b891276..2dc1e35b2c 100644
--- a/firmware/controllers/actuators/idle_thread.h
+++ b/firmware/controllers/actuators/idle_thread.h
@@ -12,6 +12,8 @@
 #include "rusefi_types.h"
 #include "periodic_task.h"
 #include "efi_pid.h"
+#include "sensor.h"
+#include "idle_state_generated.h"
 
 struct IIdleController {
 	enum class Phase : uint8_t {
diff --git a/firmware/util/math/efi_interpolation.h b/firmware/util/math/efi_interpolation.h
index 2505cf70ec..a3d6479c91 100644
--- a/firmware/util/math/efi_interpolation.h
+++ b/firmware/util/math/efi_interpolation.h
@@ -12,6 +12,7 @@
 #include <math.h>
 #include "datalogging.h"
 #include "obd_error_codes.h"
+#include "error_handling.h"
 
 #include <type_traits>
 
diff --git a/firmware/util/math/efi_pid.h b/firmware/util/math/efi_pid.h
index dc24365f18..499dbf14b2 100644
--- a/firmware/util/math/efi_pid.h
+++ b/firmware/util/math/efi_pid.h
@@ -11,6 +11,7 @@
 #pragma once
 
 #include "pid_state_generated.h"
+#include "output_channels_generated.h"
 
 // See PidCic below
 #define PID_AVG_BUF_SIZE_SHIFT 5
diff --git a/unit_tests/mocks.h b/unit_tests/mocks.h
index ff07de9b3e..3f6382cfca 100644
--- a/unit_tests/mocks.h
+++ b/unit_tests/mocks.h
@@ -9,6 +9,7 @@
 #include "stepper.h"
 #include "tunerstudio_io.h"
 #include "idle_thread.h"
+#include "global_execution_queue.h"
 
 #include "gmock/gmock.h"