diff --git a/firmware/controllers/algo/algo.mk b/firmware/controllers/algo/algo.mk
index 9644f671e9..5def1b0d2c 100644
--- a/firmware/controllers/algo/algo.mk
+++ b/firmware/controllers/algo/algo.mk
@@ -1,6 +1,5 @@
 
 CONTROLLERS_ALGO_SRC = $(PROJECT_DIR)/controllers/algo/map_adjuster.c \
-	$(PROJECT_DIR)/controllers/algo/signal_executor.c \
 	$(PROJECT_DIR)/controllers/algo/malfunction_central.c \
 	$(PROJECT_DIR)/controllers/algo/nmea.c
 	
@@ -15,5 +14,6 @@ CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/OutputSignalArray.cpp
 	$(PROJECT_DIR)/controllers/algo/event_registry.cpp \
 	$(PROJECT_DIR)/controllers/algo/algo.cpp \
 	$(PROJECT_DIR)/controllers/algo/wave_chart.cpp \
+	$(PROJECT_DIR)/controllers/algo/signal_executor.cpp \
 	$(PROJECT_DIR)/controllers/algo/enum_strings.cpp
 	
diff --git a/firmware/controllers/algo/signal_executor.c b/firmware/controllers/algo/signal_executor.cpp
similarity index 99%
rename from firmware/controllers/algo/signal_executor.c
rename to firmware/controllers/algo/signal_executor.cpp
index 2aa6f90c7a..048bee75ff 100644
--- a/firmware/controllers/algo/signal_executor.c
+++ b/firmware/controllers/algo/signal_executor.cpp
@@ -26,12 +26,10 @@
 #include "signal_executor.h"
 #include "efiGpio.h"
 
-#if EFI_WAVE_CHART
 /**
  * Signal executors feed digital events right into WaveChart used by Sniffer tab of Dev Console
  */
 #include "rpm_calculator.h"
-#endif
 
 #if EFI_WAVE_ANALYZER