diff --git a/firmware/console/binary/tunerstudio.h b/firmware/console/binary/tunerstudio.h
index f5cc5cc491..c269573cc2 100644
--- a/firmware/console/binary/tunerstudio.h
+++ b/firmware/console/binary/tunerstudio.h
@@ -15,8 +15,6 @@
 #include "tunerstudio_configuration.h"
 #include "engine.h"
 
-#include <stdint.h>
-
 typedef struct {
 	int queryCommandCounter;
 	int outputChannelsCommandCounter;
diff --git a/firmware/console/eficonsole.cpp b/firmware/console/eficonsole.cpp
index 8fdcdee4ea..30175211ca 100644
--- a/firmware/console/eficonsole.cpp
+++ b/firmware/console/eficonsole.cpp
@@ -22,7 +22,6 @@
  */
 
 #include <stdarg.h>
-#include <stdbool.h>
 #include "global.h"
 #include <chprintf.h>
 #include "eficonsole.h"
diff --git a/firmware/controllers/algo/rusefi_types.h b/firmware/controllers/algo/rusefi_types.h
index e3dd00854d..312a64880c 100644
--- a/firmware/controllers/algo/rusefi_types.h
+++ b/firmware/controllers/algo/rusefi_types.h
@@ -7,6 +7,8 @@
 #ifndef CONTROLLERS_ALGO_RUSEFI_TYPES_H_
 #define CONTROLLERS_ALGO_RUSEFI_TYPES_H_
 
+#include <string.h>
+#include <stdbool.h>
 #include <stdint.h>
 #if defined __GNUC__
 // GCC
diff --git a/firmware/controllers/core/common_headers.h b/firmware/controllers/core/common_headers.h
index 850d2b27cb..63e0c4f188 100644
--- a/firmware/controllers/core/common_headers.h
+++ b/firmware/controllers/core/common_headers.h
@@ -11,7 +11,6 @@
 #include "efifeatures.h"
 
 #include <math.h>
-#include <string.h>
 #include <stdio.h>
 
 #include "error_handling.h"
diff --git a/firmware/controllers/error_handling.h b/firmware/controllers/error_handling.h
index c5224cfbc8..53b3a728e7 100644
--- a/firmware/controllers/error_handling.h
+++ b/firmware/controllers/error_handling.h
@@ -15,7 +15,6 @@ extern "C"
 
 #include "global.h"
 #include "obd_error_codes.h"
-#include "stdbool.h"
 #include "rusefi_types.h"
 
 void addWarningCode(obd_code_e code);
diff --git a/firmware/hw_layer/flash.h b/firmware/hw_layer/flash.h
index 43440c10a0..daaeb940bf 100644
--- a/firmware/hw_layer/flash.h
+++ b/firmware/hw_layer/flash.h
@@ -2,7 +2,6 @@
 #define FLASH_H
 
 #include "global.h"
-#include <stdint.h>
 
 /**
  * @brief Number of sectors in the flash memory.
diff --git a/firmware/util/cli_registry.cpp b/firmware/util/cli_registry.cpp
index af54948a71..3591d6beec 100644
--- a/firmware/util/cli_registry.cpp
+++ b/firmware/util/cli_registry.cpp
@@ -15,8 +15,6 @@
  */
 
 #include <stdarg.h>
-#include <string.h>
-#include <stdbool.h>
 #include "global.h"
 #include "cli_registry.h"
 #include "efilib.h"
diff --git a/firmware/util/datalogging.cpp b/firmware/util/datalogging.cpp
index 6636e9f157..ba5aff3296 100644
--- a/firmware/util/datalogging.cpp
+++ b/firmware/util/datalogging.cpp
@@ -30,7 +30,6 @@
  *
  */
 
-#include <stdbool.h>
 #include "global.h"
 
 #if ! EFI_UNIT_TEST || defined(__DOXYGEN__)
diff --git a/firmware/util/efilib2.h b/firmware/util/efilib2.h
index b1a1d7ea24..69fe8beaed 100644
--- a/firmware/util/efilib2.h
+++ b/firmware/util/efilib2.h
@@ -8,7 +8,6 @@
 #ifndef EFILIB2_H_
 #define EFILIB2_H_
 
-#include <stdint.h>
 #include "global.h"
 
 typedef struct {
diff --git a/unit_tests/global.h b/unit_tests/global.h
index 5c3c0045d3..ee2197f950 100644
--- a/unit_tests/global.h
+++ b/unit_tests/global.h
@@ -12,7 +12,6 @@
 
 #define DEFAULT_ENGINE_TYPE CUSTOM_ENGINE
 
-#include <stdbool.h>
 #include <stdio.h>
 #include <time.h>