diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index 9afd5a95fc..bbf06bc632 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -67,17 +67,6 @@
 #error EFI_PROD_CODE must be defined!
 #endif
 
-#if EFI_SIGNAL_EXECUTOR_ONE_TIMER
-// PROD real firmware uses this implementation
-#include "single_timer_executor.h"
-#endif /* EFI_SIGNAL_EXECUTOR_ONE_TIMER */
-#if EFI_SIGNAL_EXECUTOR_SLEEP
-#include "signal_executor_sleep.h"
-#endif /* EFI_SIGNAL_EXECUTOR_SLEEP */
-#if EFI_UNIT_TEST
-#include "global_execution_queue.h"
-#endif /* EFI_UNIT_TEST */
-
 struct AirmassModelBase;
 
 #define MAF_DECODING_CACHE_SIZE 256
diff --git a/firmware/global.h b/firmware/global.h
index 99d3b01b94..6642f82a09 100644
--- a/firmware/global.h
+++ b/firmware/global.h
@@ -16,6 +16,7 @@
 // *** IMPORTANT *** from painful experience we know that common_headers.h has to be included AFTER hal.h
 // *** https://github.com/rusefi/rusefi/issues/1007 ***
 #include "common_headers.h"
+#include "single_timer_executor.h"
 
 // for US_TO_NT_MULTIPLIER
 #include "mpu_util.h"
diff --git a/simulator/simulator/global.h b/simulator/simulator/global.h
index 68a6534050..2d82d0002e 100644
--- a/simulator/simulator/global.h
+++ b/simulator/simulator/global.h
@@ -15,6 +15,7 @@
 #include <time.h>
 
 #include "common_headers.h"
+#include "signal_executor_sleep.h"
 
 #include "boards.h"
 
diff --git a/unit_tests/global.h b/unit_tests/global.h
index 06b1054309..351b1408b9 100644
--- a/unit_tests/global.h
+++ b/unit_tests/global.h
@@ -13,6 +13,7 @@
 #include <time.h>
 
 #include "common_headers.h"
+#include "global_execution_queue.h"
 
 #define EFU_UNIT_TESTS fail("typo please EFU_UNIT_TEST");