diff --git a/firmware/Makefile b/firmware/Makefile
index 7a37395273..c3b183e1fb 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -147,24 +147,23 @@ ifeq ($(USE_FATFS),yes)
 include $(PROJECT_DIR)/ext/fatfs.mk
 endif
 
-include $(PROJECT_DIR)/hw_layer/hw_layer.mk
-include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
-include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
-include $(PROJECT_DIR)/hw_layer/mass_storage/mass_storage.mk
-include $(PROJECT_DIR)/development/development.mk
-
-include $(PROJECT_DIR)/util/util.mk
 include $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/board.mk
 include $(PROJECT_DIR)/config/engines/engines.mk
-include $(PROJECT_DIR)/controllers/controllers.mk
+include $(PROJECT_DIR)/console/console.mk
 include $(PROJECT_DIR)/controllers/algo/algo.mk
+include $(PROJECT_DIR)/controllers/controllers.mk
 include $(PROJECT_DIR)/controllers/core/core.mk
 include $(PROJECT_DIR)/controllers/math/math.mk
 include $(PROJECT_DIR)/controllers/sensors/sensors.mk
 include $(PROJECT_DIR)/controllers/system/system.mk
 include $(PROJECT_DIR)/controllers/trigger/trigger.mk
-include $(PROJECT_DIR)/console/console.mk
+include $(PROJECT_DIR)/development/development.mk
+include $(PROJECT_DIR)/hw_layer/hw_layer.mk
+include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
+include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
+include $(PROJECT_DIR)/hw_layer/mass_storage/mass_storage.mk
 include $(PROJECT_DIR)/init/init.mk
+include $(PROJECT_DIR)/util/util.mk
 
 ifeq ($(BOOTLOADERINC),)
   # include default bootloader code
@@ -301,18 +300,12 @@ INCDIR = $(CHIBIOS)/os/license \
 	$(HW_LAYER_DRIVERS_INC) \
 	$(UTIL_INC) \
 	init \
-	development \
+	$(DEVELOPMENT_DIR) \
 	development/hw_layer \
 	development/test \
 	$(CONTROLLERS_INC) \
 	controllers/sensors \
-	controllers/sensors/converters \
-	controllers/system \
-	controllers/algo \
-	controllers/core \
-	controllers/math \
-	controllers/trigger/decoders \
-	controllers/trigger
+	controllers/sensors/converters
 
 #
 # Project, sources and paths
diff --git a/firmware/controllers/controllers.mk b/firmware/controllers/controllers.mk
index e88be2f023..8a3c4688b4 100644
--- a/firmware/controllers/controllers.mk
+++ b/firmware/controllers/controllers.mk
@@ -28,6 +28,12 @@ CONTROLLERS_SRC_CPP = \
 CONTROLLERS_INC=\
 	$(CONTROLLERS_DIR) \
 	$(CONTROLLERS_DIR)/scheduling \
+	$(CONTROLLERS_DIR)/system \
+	$(CONTROLLERS_DIR)/algo \
+	$(CONTROLLERS_DIR)/trigger/decoders \
+	$(CONTROLLERS_DIR)/trigger \
+	$(CONTROLLERS_DIR)/core \
+	$(CONTROLLERS_DIR)/math \
 	$(CONTROLLERS_DIR)/generated \
 	$(CONTROLLERS_DIR)/actuators \
 
diff --git a/firmware/development/development.mk b/firmware/development/development.mk
index 4217acd2f2..96a9764189 100644
--- a/firmware/development/development.mk
+++ b/firmware/development/development.mk
@@ -1,13 +1,14 @@
+DEVELOPMENT_DIR=$(PROJECT_DIR)/development
 
-DEV_SRC = development/test/test.c \
-	development/test/testbmk.c
+DEV_SRC = $(DEVELOPMENT_DIR)/test/test.c \
+	$(DEVELOPMENT_DIR)/test/testbmk.c
 	
-DEV_SRC_CPP = development/trigger_emulator.cpp \
-	development/hw_layer/poten.cpp \
-	development/sensor_chart.cpp \
-	development/rfi_perftest.cpp \
-	development/engine_emulator.cpp \
-	$(PROJECT_DIR)/development/engine_sniffer.cpp \
-	development/wave_analyzer.cpp
+DEV_SRC_CPP = $(DEVELOPMENT_DIR)/trigger_emulator.cpp \
+	$(DEVELOPMENT_DIR)/hw_layer/poten.cpp \
+	$(DEVELOPMENT_DIR)/sensor_chart.cpp \
+	$(DEVELOPMENT_DIR)/rfi_perftest.cpp \
+	$(DEVELOPMENT_DIR)/engine_emulator.cpp \
+	$(DEVELOPMENT_DIR)/engine_sniffer.cpp \
+	$(DEVELOPMENT_DIR)/wave_analyzer.cpp
 	
-DEV_SIMULATOR_SRC_CPP = $(PROJECT_DIR)/development/engine_sniffer.cpp
\ No newline at end of file
+DEV_SIMULATOR_SRC_CPP = $(DEVELOPMENT_DIR)/engine_sniffer.cpp
\ No newline at end of file
diff --git a/simulator/Makefile b/simulator/Makefile
index 52c0ab88d3..b221a477a8 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -117,7 +117,8 @@ else
   include ${CHIBIOS}/os/hal/ports/simulator/posix/platform.mk
 endif
 
-include $(PROJECT_DIR)/util/util.mk
+include $(PROJECT_DIR)/console/binary/tunerstudio.mk
+include $(PROJECT_DIR)/console/console.mk
 include $(PROJECT_DIR)/config/engines/engines.mk
 include $(PROJECT_DIR)/controllers/controllers.mk
 include $(PROJECT_DIR)/controllers/algo/algo.mk
@@ -126,13 +127,11 @@ include $(PROJECT_DIR)/controllers/math/math.mk
 include $(PROJECT_DIR)/controllers/sensors/sensors.mk
 include $(PROJECT_DIR)/controllers/trigger/trigger.mk
 include $(PROJECT_DIR)/controllers/system/system.mk
-include $(PROJECT_DIR)/console/console.mk
-include $(PROJECT_DIR)/init/init.mk
-include $(PROJECT_DIR)/console/binary/tunerstudio.mk
 include $(PROJECT_DIR)/development/development.mk
 include $(PROJECT_DIR)/hw_layer/hw_layer.mk
 include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
-
+include $(PROJECT_DIR)/init/init.mk
+include $(PROJECT_DIR)/util/util.mk
 
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
@@ -202,16 +201,10 @@ INCDIR = . \
           $(PROJECT_DIR)/hw_layer \
           $(PROJECT_DIR)/hw_layer/algo \
           $(HW_SENSORS_INC) \
-          $(CONTROLLERS_INC) \
-          $(PROJECT_DIR)/development \
-          $(PROJECT_DIR)/controllers/algo \
-          $(PROJECT_DIR)/controllers/core \
-          $(PROJECT_DIR)/controllers/math \
-          $(PROJECT_DIR)/controllers/sensors \
-          $(PROJECT_DIR)/controllers/sensors/converters \
-          $(PROJECT_DIR)/controllers/system \
-          $(PROJECT_DIR)/controllers/trigger \
-          $(PROJECT_DIR)/controllers/trigger/decoders \
+    $(CONTROLLERS_INC) \
+ 	$(DEVELOPMENT_DIR) \
+    $(PROJECT_DIR)/controllers/sensors \
+    $(PROJECT_DIR)/controllers/sensors/converters \
           ${CHIBIOS}/os/various \
           $(CHIBIOS)/os/hal/lib/streams \
           simulator
diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index d21db4246d..96b9d5b552 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -89,7 +89,6 @@ PROJECT = rusefi_test
 #DDEFS += -D$(PROJECT_BOARD)
 
 # Imported source files and paths
-include $(PROJECT_DIR)/util/util.mk
 include $(PROJECT_DIR)/config/engines/engines.mk
 include $(PROJECT_DIR)/controllers/controllers.mk
 include $(PROJECT_DIR)/controllers/algo/algo.mk
@@ -98,9 +97,11 @@ include $(PROJECT_DIR)/controllers/math/math.mk
 include $(PROJECT_DIR)/controllers/system/system.mk
 include $(PROJECT_DIR)/controllers/sensors/sensors.mk
 include $(PROJECT_DIR)/controllers/trigger/trigger.mk
+include $(PROJECT_DIR)/development/development.mk
 include $(PROJECT_DIR)/hw_layer/hw_layer.mk
 include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
 include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
+include $(PROJECT_DIR)/util/util.mk
 include test.mk
 include tests/tests.mk
 
@@ -171,12 +172,7 @@ INCDIR = . \
 	$(PROJECT_DIR)/console \
 	$(PROJECT_DIR)/controllers/sensors \
 	$(PROJECT_DIR)/controllers/sensors/converters \
-	$(PROJECT_DIR)/controllers/algo \
-	$(PROJECT_DIR)/controllers/core \
-	$(PROJECT_DIR)/controllers/math \
-	$(PROJECT_DIR)/controllers/system \
-	$(PROJECT_DIR)/controllers/trigger \
-	$(PROJECT_DIR)/controllers/trigger/decoders \
+ 	$(DEVELOPMENT_DIR) \
 	$(PROJECT_DIR)/ext_algo \
 	$(PROJECT_DIR)/hw_layer \
 	$(PROJECT_DIR)/hw_layer/algo \