diff --git a/firmware/controllers/algo/nmea.c b/firmware/controllers/algo/nmea.c
index c6e0cb35de..483d00e4ae 100644
--- a/firmware/controllers/algo/nmea.c
+++ b/firmware/controllers/algo/nmea.c
@@ -19,9 +19,9 @@
  *
  * see #testGpsParser
  */
+#include "global.h"
 #include <math.h>
 #include <time.h>
-#include "main.h"
 #include "nmea.h"
 
 long hex2int(char *a, int len) {
diff --git a/firmware/controllers/alternatorController.cpp b/firmware/controllers/alternatorController.cpp
index e915e572fc..dd1a57d9da 100644
--- a/firmware/controllers/alternatorController.cpp
+++ b/firmware/controllers/alternatorController.cpp
@@ -7,7 +7,6 @@
  * @author Andrey Belomutskiy, (c) 2012-2018
  */
 
-#include "main.h"
 #include "engine.h"
 #include "rpm_calculator.h"
 #include "alternatorController.h"
diff --git a/firmware/development/trigger_emulator.cpp b/firmware/development/trigger_emulator.cpp
index b2d0c44903..3ad710b436 100644
--- a/firmware/development/trigger_emulator.cpp
+++ b/firmware/development/trigger_emulator.cpp
@@ -12,8 +12,6 @@
 #include "trigger_emulator.h"
 #include "eficonsole.h"
 #include "main_trigger_callback.h"
-#include "datalogging.h"
-#include "engine_configuration.h"
 #include "io_pins.h"
 #include "trigger_emulator_algo.h"
 #include "trigger_central.h"
diff --git a/firmware/development/wave_analyzer.h b/firmware/development/wave_analyzer.h
index c33417b426..72771ebba6 100644
--- a/firmware/development/wave_analyzer.h
+++ b/firmware/development/wave_analyzer.h
@@ -14,8 +14,6 @@
 
 #if EFI_WAVE_ANALYZER || defined(__DOXYGEN__)
 
-#include "datalogging.h"
-
 #include "digital_input_hw.h"
 #include "engine_sniffer.h"