diff --git a/firmware/controllers/core/common_headers.h b/firmware/controllers/core/common_headers.h
index de7894b08e..b3239ab3b5 100644
--- a/firmware/controllers/core/common_headers.h
+++ b/firmware/controllers/core/common_headers.h
@@ -9,6 +9,14 @@
 
 #pragma once
 
+#ifndef FALSE
+#define FALSE (0)
+#endif /* FALSE */
+
+#ifndef TRUE
+#define TRUE (!(FALSE))
+#endif /* TRUE */
+
 #ifdef __cplusplus
 #define EXTERNC extern "C"
 #else
diff --git a/firmware/hw_layer/cdm_ion_sense.h b/firmware/hw_layer/cdm_ion_sense.h
index c52aadeb72..b13c2e5564 100644
--- a/firmware/hw_layer/cdm_ion_sense.h
+++ b/firmware/hw_layer/cdm_ion_sense.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include "global.h"
+#include "tunerstudio_outputs.h"
 
 class CdmState {
 public:
diff --git a/firmware/pch/pch.h b/firmware/pch/pch.h
index a1e4f698bb..082fae5ee1 100644
--- a/firmware/pch/pch.h
+++ b/firmware/pch/pch.h
@@ -9,14 +9,6 @@
  * this file.
  */
 
-#ifndef FALSE
-#define FALSE (0)
-#endif /* FALSE */
-
-#ifndef TRUE
-#define TRUE (!(FALSE))
-#endif /* TRUE */
-
 #include <rusefi/arrays.h>
 #include <rusefi/crc.h>
 #include <rusefi/fragments.h>
@@ -25,11 +17,11 @@
 #include <rusefi/math.h>
 #include <rusefi/pt2001.h>
 
+#include "global.h"
 #include "efifeatures.h"
 #include "rusefi_generated.h"
 #include "loggingcentral.h"
 #include "error_handling.h"
-#include "global.h"
 #include "efi_gpio.h"
 #include "tunerstudio_outputs.h"
 #include "engine.h"