diff --git a/firmware/controllers/actuators/ac_control.cpp b/firmware/controllers/actuators/ac_control.cpp
index 2c36f1c747..f5995f5cb4 100644
--- a/firmware/controllers/actuators/ac_control.cpp
+++ b/firmware/controllers/actuators/ac_control.cpp
@@ -1,7 +1,4 @@
-
 #include "pch.h"
-//#include "pch_util.h"
-//#include "efi_gpio.h" //but need enginePins
 
 #include "ac_control.h"
 #include "deadband.h"
diff --git a/firmware/controllers/actuators/ac_control.h b/firmware/controllers/actuators/ac_control.h
index 08f941999a..c159a9d90c 100644
--- a/firmware/controllers/actuators/ac_control.h
+++ b/firmware/controllers/actuators/ac_control.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ac_control_generated.h"
+#include "timer.h"
 
 class AcController final : public ac_control_s, public EngineModule {
 public:
diff --git a/firmware/controllers/algo/fuel/dfco.h b/firmware/controllers/algo/fuel/dfco.h
index 5602f7215e..9e9765d4a0 100644
--- a/firmware/controllers/algo/fuel/dfco.h
+++ b/firmware/controllers/algo/fuel/dfco.h
@@ -3,6 +3,8 @@
  */
 
 #pragma once
+#include "engine_module.h"
+#include "timer.h"
 
 // DFCO = deceleration fuel cut off, ie, save gas when your foot is off the pedal
 class DfcoController : public EngineModule {
diff --git a/firmware/controllers/algo/fuel/injector_model.cpp b/firmware/controllers/algo/fuel/injector_model.cpp
index c309626110..6a4d0c5425 100644
--- a/firmware/controllers/algo/fuel/injector_model.cpp
+++ b/firmware/controllers/algo/fuel/injector_model.cpp
@@ -1,5 +1,10 @@
 
-#include "pch_util.h"
+// here am flirting with not using pch.h and not including at least Engine
+#include <rusefi/interpolation.h>
+#include <rusefi/arrays.h>
+#include "engine_configuration.h"
+#include "sensor.h"
+#include "error_handling.h"
 
 #include "injector_model.h"
 #include "fuel_computer.h"
diff --git a/firmware/pch/pch.h b/firmware/pch/pch.h
index 0f5ebcab56..a1e4f698bb 100644
--- a/firmware/pch/pch.h
+++ b/firmware/pch/pch.h
@@ -17,10 +17,12 @@
 #define TRUE (!(FALSE))
 #endif /* TRUE */
 
-#include "pch_util.h"
+#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 "efifeatures.h"
@@ -30,12 +32,13 @@
 #include "global.h"
 #include "efi_gpio.h"
 #include "tunerstudio_outputs.h"
-// evil god object lives here!
 #include "engine.h"
+#include "engine_configuration.h"
 #include "engine_controller.h"
 #include "engine_math.h"
 #include "pwm_generator_logic.h"
 #include "allsensors.h"
+#include "sensor.h"
 #include "settings.h"
 #include "efi_interpolation.h"
 #include "perf_trace.h"