diff --git a/firmware/Makefile b/firmware/Makefile
index 002ea5cc6e..dbed80ef15 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -127,8 +127,8 @@ include $(PROJECT_DIR)/ext/fatfs.mk
 include $(PROJECT_DIR)/hw_layer/hw_layer.mk
 include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
 include $(PROJECT_DIR)/hw_layer/mass_storage/mass_storage.mk
-include development/development.mk
-include controllers/controllers.mk
+include $(PROJECT_DIR)/development/development.mk
+include $(PROJECT_DIR)/controllers/controllers.mk
 
 include $(PROJECT_DIR)/util/util.mk
 include $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/board.mk
diff --git a/firmware/controllers/injector_central.cpp b/firmware/controllers/injector_central.cpp
index c42ca2526e..e00c92a17f 100644
--- a/firmware/controllers/injector_central.cpp
+++ b/firmware/controllers/injector_central.cpp
@@ -233,10 +233,10 @@ static msg_t benchThread(int param) {
 void OutputPin::unregisterOutput(brain_pin_e oldPin, brain_pin_e newPin) {
 	if (oldPin != GPIO_UNASSIGNED && oldPin != newPin) {
 		scheduleMsg(logger, "unregistering %s", hwPortname(oldPin));
-		unmarkPin(oldPin);
 #if EFI_GPIO_HARDWARE || defined(__DOXYGEN__)
+		unmarkPin(oldPin);
 		port = NULL;
-#endif /* EFI_PROD_CODE */
+#endif /* EFI_GPIO_HARDWARE */
 	}
 }
 
diff --git a/simulator/Makefile b/simulator/Makefile
index 49295056ae..15b29e5768 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -94,6 +94,7 @@ endif
 
 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
 include $(PROJECT_DIR)/controllers/core/core.mk
 include $(PROJECT_DIR)/controllers/math/math.mk
@@ -124,26 +125,11 @@ CSRC =  ${PORTSRC} \
         $(UTILSRC) \
         main.c
 
-# todo: reuse controllers.mk here 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 CPPSRC = $(UTILSRC_CPP) \
 	$(CONTROLLERS_ALGO_SRC_CPP) \
-	$(PROJECT_DIR)/controllers/settings.cpp \
-	$(PROJECT_DIR)/controllers/electronic_throttle.cpp \
-	$(PROJECT_DIR)/controllers/error_handling.cpp \
-	$(PROJECT_DIR)/controllers/map_averaging.cpp \
-	$(PROJECT_DIR)/controllers/flash_main.cpp \
-	$(PROJECT_DIR)/controllers/injector_central.cpp \
-	$(PROJECT_DIR)/controllers/idle_thread.cpp \
-	$(PROJECT_DIR)/controllers/PwmTester.cpp \
-	$(PROJECT_DIR)/controllers/obd2.cpp \
-	$(PROJECT_DIR)/controllers/malfunction_indicator.cpp \
-	$(PROJECT_DIR)/controllers/alternatorController.cpp \
-	$(PROJECT_DIR)/controllers/lcd_controller.cpp \
-	$(PROJECT_DIR)/controllers/tachometer.cpp \
-	$(PROJECT_DIR)/controllers/engine_controller.cpp \
-	$(PROJECT_DIR)/controllers/persistent_store.cpp \
+	$(CONTROLLERS_SRC_CPP) \
 	$(PROJECT_DIR)/development/sensor_chart.cpp \
 	$(PROJECT_DIR)/development/trigger_emulator.cpp \
 	$(TRIGGER_SRC_CPP) \