diff --git a/firmware/controllers/algo/accel_enrichment.cpp b/firmware/controllers/algo/accel_enrichment.cpp
index f490f39f1d..c6cd0cbc81 100644
--- a/firmware/controllers/algo/accel_enrichment.cpp
+++ b/firmware/controllers/algo/accel_enrichment.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "global.h"
+#include "engine.h"
 #include "trigger_central.h"
 #include "accel_enrichment.h"
 #include "engine_state.h"
@@ -35,7 +36,6 @@ extern TunerStudioOutputChannels tsOutputChannels;
 EXTERN_ENGINE
 ;
 
-
 tps_tps_Map3D_t tpsTpsMap("tpsTps");
 
 static Logging *logger = NULL;
diff --git a/firmware/controllers/algo/algo.cpp b/firmware/controllers/algo/algo.cpp
index 20a662db27..5499562d74 100644
--- a/firmware/controllers/algo/algo.cpp
+++ b/firmware/controllers/algo/algo.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "global.h"
+#include "globalaccess.h"
 #include "algo.h"
 #include "advance_map.h"
 #include "fuel_math.h"
diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index b9e06a8f2a..c1665c089d 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -8,6 +8,7 @@
 #define H_ENGINE_H_
 
 #include "global.h"
+#include "globalaccess.h"
 #include "pid.h"
 #include "rpm_calculator.h"
 #include "event_registry.h"
diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h
index 3c5ecb3c62..d221f1ec08 100644
--- a/firmware/controllers/algo/engine_configuration.h
+++ b/firmware/controllers/algo/engine_configuration.h
@@ -12,6 +12,7 @@
 #include "global.h"
 #include "crc.h"
 #include "engine_configuration_generated_structures.h"
+#include "globalaccess.h"
 
 #ifndef DEFAULT_ENGINE_TYPE
 #define DEFAULT_ENGINE_TYPE CUSTOM_ENGINE
diff --git a/firmware/controllers/global_shared.h b/firmware/controllers/global_shared.h
index 8f30379d8b..b98c0491d7 100644
--- a/firmware/controllers/global_shared.h
+++ b/firmware/controllers/global_shared.h
@@ -5,7 +5,7 @@
  * See also common_headers.h
  *
  * Dec 25, 2018
- * @author Andrey Belomutskiy, (c) 2012-2018
+ * @author Andrey Belomutskiy, (c) 2012-2019
  */
 
 #ifndef GLOBAL_SHARED_H_
diff --git a/firmware/controllers/trigger/decoders/trigger_structure.h b/firmware/controllers/trigger/decoders/trigger_structure.h
index eed32d1560..8128ff55a7 100644
--- a/firmware/controllers/trigger/decoders/trigger_structure.h
+++ b/firmware/controllers/trigger/decoders/trigger_structure.h
@@ -11,6 +11,7 @@
 #include "global.h"
 #include "engine_configuration_generated_structures.h"
 #include "EfiWave.h"
+#include "globalaccess.h"
 
 #define FOUR_STROKE_ENGINE_CYCLE 720
 
diff --git a/firmware/controllers/trigger/rpm_calculator.cpp b/firmware/controllers/trigger/rpm_calculator.cpp
index 8e3f1db2d9..70e17f733c 100644
--- a/firmware/controllers/trigger/rpm_calculator.cpp
+++ b/firmware/controllers/trigger/rpm_calculator.cpp
@@ -10,8 +10,8 @@
  * @author Andrey Belomutskiy, (c) 2012-2018
  */
 
-#include "rpm_calculator.h"
 #include "engine.h"
+#include "rpm_calculator.h"
 
 #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
 
diff --git a/firmware/globalaccess.h b/firmware/globalaccess.h
new file mode 100644
index 0000000000..101a8c1ef8
--- /dev/null
+++ b/firmware/globalaccess.h
@@ -0,0 +1,15 @@
+/*
+ * globalaccess.h
+ *
+ * @date Jan 28, 2019
+ * @author Andrey Belomutskiy, (c) 2012-2019
+ */
+
+#ifndef GLOBALACCESS_H_
+#define GLOBALACCESS_H_
+
+
+
+
+
+#endif /* GLOBALACCESS_H_ */
diff --git a/simulator/simulator/globalaccess.h b/simulator/simulator/globalaccess.h
new file mode 100644
index 0000000000..db96d101a3
--- /dev/null
+++ b/simulator/simulator/globalaccess.h
@@ -0,0 +1,15 @@
+/*
+ * @file globalaccess.h
+ *
+ * @date Jan 28, 2019
+ * @author Andrey Belomutskiy, (c) 2012-2019
+ */
+
+#ifndef SIMULATOR_GLOBALACCESS_H_
+#define SIMULATOR_GLOBALACCESS_H_
+
+
+
+
+
+#endif /* SIMULATOR_GLOBALACCESS_H_ */
diff --git a/unit_tests/global.h b/unit_tests/global.h
index abcd93361d..cb3d7cd94d 100644
--- a/unit_tests/global.h
+++ b/unit_tests/global.h
@@ -69,18 +69,6 @@ void print(const char *fmt, ...);
 #define EXTERN_ENGINE extern EnginePins enginePins
 #define EXTERN_CONFIG
 
-/**
- * @see firmware/global.h for explanation
- */
-#define DECLARE_ENGINE_PARAMETER_SIGNATURE Engine *engine, engine_configuration_s *engineConfiguration, persistent_config_s *config, board_configuration_s *boardConfiguration
-#define DECLARE_ENGINE_PARAMETER_SUFFIX , DECLARE_ENGINE_PARAMETER_SIGNATURE
-#define PASS_ENGINE_PARAMETER_SIGNATURE engine, engineConfiguration, config, boardConfiguration
-#define PASS_ENGINE_PARAMETER_SUFFIX , PASS_ENGINE_PARAMETER_SIGNATURE
-
-#define DECLARE_CONFIG_PARAMETER_SIGNATURE engine_configuration_s *engineConfiguration, persistent_config_s *config, board_configuration_s *boardConfiguration
-#define DECLARE_CONFIG_PARAMETER_SUFFIX , DECLARE_CONFIG_PARAMETER_SIGNATURE
-#define PASS_CONFIG_PARAMETER_SIGNATURE engineConfiguration, config, boardConfiguration
-#define PASS_CONFIG_PARAMETER_SUFFIX , PASS_CONFIG_PARAMETER_SIGNATURE
 
 #define DEFINE_CONFIG_PARAM(x, y) , x y
 #define PASS_CONFIG_PARAM(x) , x
diff --git a/unit_tests/globalaccess.h b/unit_tests/globalaccess.h
new file mode 100644
index 0000000000..cbb0010540
--- /dev/null
+++ b/unit_tests/globalaccess.h
@@ -0,0 +1,24 @@
+/*
+ * @file globalaccess.h
+ *
+ * @date Jan 28, 2019
+ * @author Andrey Belomutskiy, (c) 2012-2019
+ */
+
+#ifndef GLOBALACCESS_H_
+#define GLOBALACCESS_H_
+
+/**
+ * @see firmware/global.h for explanation
+ */
+#define DECLARE_ENGINE_PARAMETER_SIGNATURE Engine *engine, engine_configuration_s *engineConfiguration, persistent_config_s *config, board_configuration_s *boardConfiguration
+#define DECLARE_ENGINE_PARAMETER_SUFFIX , DECLARE_ENGINE_PARAMETER_SIGNATURE
+#define PASS_ENGINE_PARAMETER_SIGNATURE engine, engineConfiguration, config, boardConfiguration
+#define PASS_ENGINE_PARAMETER_SUFFIX , PASS_ENGINE_PARAMETER_SIGNATURE
+
+#define DECLARE_CONFIG_PARAMETER_SIGNATURE engine_configuration_s *engineConfiguration, persistent_config_s *config, board_configuration_s *boardConfiguration
+#define DECLARE_CONFIG_PARAMETER_SUFFIX , DECLARE_CONFIG_PARAMETER_SIGNATURE
+#define PASS_CONFIG_PARAMETER_SIGNATURE engineConfiguration, config, boardConfiguration
+#define PASS_CONFIG_PARAMETER_SUFFIX , PASS_CONFIG_PARAMETER_SIGNATURE
+
+#endif /* GLOBALACCESS_H_ */
diff --git a/unit_tests/tests/test_accel_enrichment.cpp b/unit_tests/tests/test_accel_enrichment.cpp
index 0356a71e4d..17d373505c 100644
--- a/unit_tests/tests/test_accel_enrichment.cpp
+++ b/unit_tests/tests/test_accel_enrichment.cpp
@@ -7,8 +7,8 @@
  */
 
 #include "global.h"
-#include "accel_enrichment.h"
 #include "engine_configuration.h"
+#include "accel_enrichment.h"
 #include "engine_test_helper.h"
 
 TEST(big, testAccelEnrichment) {