diff --git a/firmware/config/engines/me7pnp.cpp b/firmware/config/engines/me7pnp.cpp
index 07bd1d93ee..2fc83d8525 100644
--- a/firmware/config/engines/me7pnp.cpp
+++ b/firmware/config/engines/me7pnp.cpp
@@ -7,7 +7,6 @@
 
 #include "me7pnp.h"
 
-#include "global.h"
 #include "engine.h"
 #include "engine_math.h"
 #include "allsensors.h"
diff --git a/firmware/console/binary/tunerstudio_io.cpp b/firmware/console/binary/tunerstudio_io.cpp
index 1c2c44a54f..43d86c1503 100644
--- a/firmware/console/binary/tunerstudio_io.cpp
+++ b/firmware/console/binary/tunerstudio_io.cpp
@@ -5,11 +5,10 @@
  * @author Andrey Belomutskiy, (c) 2012-2020
  */
 
-#include "global.h"
+#include "engine.h"
 #include "os_access.h"
 #include "tunerstudio_io.h"
 #include "console_io.h"
-#include "engine.h"
 #if EFI_SIMULATOR
 #include "rusEfiFunctionalTest.h"
 #endif
diff --git a/firmware/console/console_io.cpp b/firmware/console/console_io.cpp
index 085b3aa4c2..1d9b232c95 100644
--- a/firmware/console/console_io.cpp
+++ b/firmware/console/console_io.cpp
@@ -18,7 +18,6 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "global.h"
 #include "engine.h"
 #include "console_io.h"
 #include "os_util.h"
diff --git a/firmware/controllers/actuators/boost_control.h b/firmware/controllers/actuators/boost_control.h
index 33407167fb..9add50cb01 100644
--- a/firmware/controllers/actuators/boost_control.h
+++ b/firmware/controllers/actuators/boost_control.h
@@ -9,10 +9,6 @@
 #include "engine.h"
 #include "periodic_task.h"
 
-
-
-
-
 void startBoostPin(void);
 void stopBoostPin(void);
 void initBoostCtrl(Logging *sharedLogger);
@@ -22,6 +18,3 @@ void setBoostDFactor(float d);
 void setDefaultBoostParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE);
 void showBoostInfo(void);
 void onConfigurationChangeBoostCallback(engine_configuration_s *previousConfiguration);
-
-
-
diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index dbb347c80c..911866fcc5 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -9,7 +9,6 @@
  * @author Andrey Belomutskiy, (c) 2012-2020
  */
 
-#include "global.h"
 #include "engine.h"
 #include "allsensors.h"
 #include "efi_gpio.h"
diff --git a/firmware/controllers/core/error_handling.cpp b/firmware/controllers/core/error_handling.cpp
index 7ea2198586..88e382d97d 100644
--- a/firmware/controllers/core/error_handling.cpp
+++ b/firmware/controllers/core/error_handling.cpp
@@ -5,9 +5,8 @@
  * @author Andrey Belomutskiy, (c) 2012-2020
  */
 
-#include "global.h"
-#include "os_access.h"
 #include "engine.h"
+#include "os_access.h"
 
 #if EFI_SIMULATOR || EFI_PROD_CODE
 //todo: move into simulator global
diff --git a/firmware/controllers/engine_cycle/main_trigger_callback.cpp b/firmware/controllers/engine_cycle/main_trigger_callback.cpp
index 2f226cda97..397d45d0dd 100644
--- a/firmware/controllers/engine_cycle/main_trigger_callback.cpp
+++ b/firmware/controllers/engine_cycle/main_trigger_callback.cpp
@@ -23,9 +23,6 @@
 
 #include "global.h"
 #include "os_access.h"
-#if EFI_PROD_CODE
-#include <nvic.h>
-#endif
 
 #if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT