diff --git a/firmware/Makefile b/firmware/Makefile
index 528ca8987a..4419c4bbef 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -236,7 +236,6 @@ CSRC =  check.c \
 	$(HW_LAYER_DRIVERS_CORE) \
 	$(HW_LAYER_DRIVERS) \
 	$(CONTROLLERSSRC) \
-	$(CONTROLLERS_ALGO_SRC) \
 	$(CONTROLLERS_CORE_SRC) \
 	$(CONTROLLERS_SENSORS_SRC) \
 	main_hardfault.c
@@ -245,24 +244,11 @@ CSRC =  check.c \
 # setting.
 CPPSRC = $(ALLCPPSRC) \
     $(BOARDCPPSRC) \
-	$(TRIGGER_SRC_CPP) \
-	$(TRIGGER_DECODERS_SRC_CPP) \
 	$(DEV_SRC_CPP) \
-	$(CONTROLLERS_ALGO_SRC_CPP) \
-	$(UTILSRC_CPP) \
-	$(SYSTEMSRC_CPP) \
-	$(ENGINES_SRC_CPP) \
-	$(HW_LAYER_EMS_CPP) \
 	$(HW_LAYER_DRIVERS_CORE_CPP) \
 	$(HW_LAYER_DRIVERS_CPP) \
-	$(HW_SENSORS_CPP) \
-	$(TUNERSTUDIO_SRC_CPP) \
 	$(CONSOLE_SRC_CPP) \
 	$(CONTROLLERS_SENSORS_SRC_CPP) \
-	$(CONTROLLERS_SRC_CPP) \
-	$(CONTROLLERS_CORE_SRC_CPP) \
-	$(CONTROLLERS_MATH_SRC_CPP) \
-	$(INIT_SRC_CPP) \
 	rusefi.cpp \
 	main.cpp
 
diff --git a/firmware/common.mk b/firmware/common.mk
index ab954912d6..900f51f97a 100644
--- a/firmware/common.mk
+++ b/firmware/common.mk
@@ -9,6 +9,22 @@ include $(PROJECT_DIR)/hw_layer/hw_layer.mk
 include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
 include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
 
+ALLCPPSRC += \
+	$(CONTROLLERS_CORE_SRC_CPP) \
+	$(CONTROLLERS_MATH_SRC_CPP) \
+	$(ENGINES_SRC_CPP) \
+	$(CONTROLLERS_ALGO_SRC_CPP) \
+	$(TUNERSTUDIO_SRC_CPP) \
+	$(HW_LAYER_EMS_CPP) \
+	$(HW_SENSORS_CPP) \
+	$(SYSTEMSRC_CPP) \
+	$(UTILSRC_CPP) \
+	$(TRIGGER_DECODERS_SRC_CPP) \
+	$(TRIGGER_SRC_CPP) \
+	$(CONTROLLERS_SRC_CPP) \
+	$(INIT_SRC_CPP) \
+
+
 ALLINC += \
 	$(CONSOLE_INC) \
  	$(DEVELOPMENT_DIR) \
diff --git a/firmware/controllers/algo/algo.mk b/firmware/controllers/algo/algo.mk
index 2f9db52032..a4bcec4b1d 100644
--- a/firmware/controllers/algo/algo.mk
+++ b/firmware/controllers/algo/algo.mk
@@ -1,4 +1,3 @@
-CONTROLLERS_ALGO_SRC =
 
 CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/advance_map.cpp \
 	$(PROJECT_DIR)/controllers/algo/malfunction_central.cpp \
diff --git a/simulator/Makefile b/simulator/Makefile
index 54164dcad5..28647f57cf 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -160,7 +160,6 @@ include $(PROJECT_DIR)/common.mk
 CSRC =  $(ALLCSRC) \
         $(SYSTEMSRC) \
         $(CONSOLESRC) \
-        $(CONTROLLERS_ALGO_SRC) \
         $(CONTROLLERS_CORE_SRC) \
         $(CONTROLLERS_SENSORS_SRC) \
         $(ENGINES_SRC) \
@@ -171,25 +170,12 @@ CSRC =  $(ALLCSRC) \
 # setting.
 CPPSRC = $(ALLCPPSRC) \
   $(CHIBIOS)/os/various/cpp_wrappers/ch.cpp \
-        $(UTILSRC_CPP) \
-	$(CONTROLLERS_ALGO_SRC_CPP) \
-	$(CONTROLLERS_SRC_CPP) \
 	$(PROJECT_DIR)/development/sensor_chart.cpp \
-	$(HW_LAYER_EMS_CPP) \
-	$(HW_SENSORS_CPP) \
 	$(HW_LAYER_DRIVERS_CPP) \
 	$(HW_LAYER_DRIVERS_CORE_CPP) \
-	$(TRIGGER_SRC_CPP) \
-	$(TRIGGER_DECODERS_SRC_CPP) \
-	$(SYSTEMSRC_CPP) \
-	$(TUNERSTUDIO_SRC_CPP) \
 	$(CONSOLE_SRC_CPP) \
-	$(INIT_SRC_CPP) \
 	$(CONTROLLERS_SENSORS_SRC_CPP) \
-	$(CONTROLLERS_CORE_SRC_CPP) \
-	$(CONTROLLERS_MATH_SRC_CPP) \
 	$(DEV_SIMULATOR_SRC_CPP) \
-	$(ENGINES_SRC_CPP) \
 	simulator/rusEfiFunctionalTest.cpp \
 	simulator/framework.cpp \
 	simulator/boards.cpp \
diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index 1624760a2f..e96dcbb5c7 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -18,7 +18,6 @@ include $(PROJECT_DIR)/common.mk
 # setting.
 CSRC += $(ALLCSRC) \
 	$(UTILSRC) \
-	$(CONTROLLERS_ALGO_SRC) \
 	$(CONTROLLERS_CORE_SRC) \
 	$(CONTROLLERS_MATH_SRC) \
 	$(CONTROLLERS_SENSORS_SRC) \
@@ -29,23 +28,10 @@ CSRC += $(ALLCSRC) \
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 CPPSRC += $(ALLCPPSRC) \
-	$(UTILSRC_CPP) \
-	$(CONTROLLERS_ALGO_SRC_CPP) \
-	$(TRIGGER_DECODERS_SRC_CPP) \
-	$(ENGINES_SRC_CPP) \
-	$(CONTROLLERS_SRC_CPP) \
 	$(HW_LAYER_DRIVERS_CORE_CPP) \
-	$(CONTROLLERS_CORE_SRC_CPP) \
-	$(CONTROLLERS_MATH_SRC_CPP) \
 	$(CONTROLLERS_SENSORS_SRC_CPP) \
 	$(FRAMEWORK_SRC_CPP) \
 	$(TESTS_SRC_CPP) \
-	$(SYSTEMSRC_CPP) \
-	$(HW_LAYER_EMS_CPP) \
-	$(TUNERSTUDIO_SRC_CPP) \
-	$(HW_SENSORS_CPP) \
-	$(TRIGGER_SRC_CPP) \
-	$(INIT_SRC_CPP) \
 	$(PROJECT_DIR)/../unit_tests/logicdata.cpp \
 	$(DEVELOPMENT_DIR)/engine_sniffer.cpp \
 	$(PROJECT_DIR)/../unit_tests/main.cpp \