diff --git a/firmware/controllers/controllers.mk b/firmware/controllers/controllers.mk
index 4c8248f349..86e65a4bea 100644
--- a/firmware/controllers/controllers.mk
+++ b/firmware/controllers/controllers.mk
@@ -31,6 +31,7 @@ CONTROLLERS_SRC_CPP = \
 	$(CONTROLLERS_DIR)/settings.cpp \
 	$(CONTROLLERS_DIR)/core/error_handling.cpp \
 	$(CONTROLLERS_DIR)/engine_cycle/map_averaging.cpp \
+	$(CONTROLLERS_DIR)/engine_cycle/high_pressure_fuel_pump.cpp \
 	$(CONTROLLERS_DIR)/engine_cycle/rpm_calculator.cpp \
 	$(CONTROLLERS_DIR)/engine_cycle/spark_logic.cpp \
 	$(CONTROLLERS_DIR)/engine_cycle/main_trigger_callback.cpp \
diff --git a/firmware/controllers/engine_cycle/aux_valves.cpp b/firmware/controllers/engine_cycle/aux_valves.cpp
index b248ddc10e..898e46a8b9 100644
--- a/firmware/controllers/engine_cycle/aux_valves.cpp
+++ b/firmware/controllers/engine_cycle/aux_valves.cpp
@@ -1,5 +1,5 @@
 /*
- * aux_valves.cpp
+ * @file aux_valves.cpp
  *
  *
  * Here we have two auxilary digital on/off outputs which would open once per each 360 degrees of engine crank revolution.
diff --git a/firmware/controllers/engine_cycle/high_pressure_fuel_pump.cpp b/firmware/controllers/engine_cycle/high_pressure_fuel_pump.cpp
new file mode 100644
index 0000000000..0c1fabb855
--- /dev/null
+++ b/firmware/controllers/engine_cycle/high_pressure_fuel_pump.cpp
@@ -0,0 +1,12 @@
+/*
+ * @file high_pressure_fuel_pump.cpp
+ *
+ *
+ * todo: there is some similarity with aux_valves.cpp and even map_averaging.cpp maybe reduce code duplication?
+ *
+ * @date Nov 5, 2020
+ * @author Andrey Belomutskiy, (c) 2012-2020
+ */
+
+#include "high_pressure_fuel_pump.h"
+
diff --git a/firmware/controllers/engine_cycle/high_pressure_fuel_pump.h b/firmware/controllers/engine_cycle/high_pressure_fuel_pump.h
new file mode 100644
index 0000000000..075348075f
--- /dev/null
+++ b/firmware/controllers/engine_cycle/high_pressure_fuel_pump.h
@@ -0,0 +1,10 @@
+/*
+ * @file high_pressure_fuel_pump.h
+ *
+ * @date Nov 5, 2020
+ * @author Andrey Belomutskiy, (c) 2012-2020
+ */
+
+#pragma once
+
+#include "engine.h"
diff --git a/firmware/controllers/engine_cycle/map_averaging.cpp b/firmware/controllers/engine_cycle/map_averaging.cpp
index b20a1f19b6..fc2293c3fd 100644
--- a/firmware/controllers/engine_cycle/map_averaging.cpp
+++ b/firmware/controllers/engine_cycle/map_averaging.cpp
@@ -22,12 +22,11 @@
  */
 
 #include "global.h"
-#include "os_access.h"
-
-#include "map.h"
 
 #if EFI_MAP_AVERAGING
 
+#include "os_access.h"
+#include "map.h"
 #include "map_averaging.h"
 #include "trigger_central.h"
 #include "adc_inputs.h"