diff --git a/firmware/controllers/system/efiGpio.cpp b/firmware/controllers/system/efiGpio.cpp
index cd92412171..d55556eb6a 100644
--- a/firmware/controllers/system/efiGpio.cpp
+++ b/firmware/controllers/system/efiGpio.cpp
@@ -1,5 +1,6 @@
 /**
  * @file	efiGpio.cpp
+ * @brief	EFI-related GPIO code
  *
  * @date Sep 26, 2014
  * @author Andrey Belomutskiy, (c) 2012-2017
diff --git a/firmware/controllers/system/efiGpio.h b/firmware/controllers/system/efiGpio.h
index f96d6f7e0d..c036bd9bba 100644
--- a/firmware/controllers/system/efiGpio.h
+++ b/firmware/controllers/system/efiGpio.h
@@ -1,5 +1,7 @@
 /**
  * @file	efiGpio.h
+ * @brief	EFI-related GPIO code
+ *
  *
  * @date Sep 26, 2014
  * @author Andrey Belomutskiy, (c) 2012-2017
@@ -7,15 +9,20 @@
 #ifndef EFIGPIO_H_
 #define EFIGPIO_H_
 
-#include "main.h"
 #include "io_pins.h"
+#include "main.h"
 
 #define INITIAL_PIN_STATE -1
 
-// mode >= 0  is always true since that's an unsigned
-#define assertOMode(mode) { \
-	efiAssertVoid(mode <= OM_OPENDRAIN_INVERTED, "invalid pin_output_mode_e"); \
- }
+void initPrimaryPins(void);
+void initOutputPins(void);
+
+#if EFI_GPIO || defined(__DOXYGEN__)
+void turnAllPinsOff(void);
+#else /* EFI_GPIO */
+#define turnAllPinsOff() {}
+#endif /* EFI_GPIO */
+
 
 /**
  * @brief   Single output pin reference and state
diff --git a/firmware/hw_layer/io_pins.cpp b/firmware/hw_layer/io_pins.cpp
index 999a08cb49..f66e0cbcba 100644
--- a/firmware/hw_layer/io_pins.cpp
+++ b/firmware/hw_layer/io_pins.cpp
@@ -1,6 +1,7 @@
 /**
  * @file	io_pins.cpp
- * @brief	It could be that the main purpose of this file is the status LED blinking
+ * @brief	his file is about general input/output utility methods, not much EFI-specifics
+ *
  *
  * @date Jan 24, 2013
  * @author Andrey Belomutskiy, (c) 2012-2017
diff --git a/firmware/controllers/algo/io_pins.h b/firmware/hw_layer/io_pins.h
similarity index 72%
rename from firmware/controllers/algo/io_pins.h
rename to firmware/hw_layer/io_pins.h
index 4d7c5f13eb..03cd9d0f16 100644
--- a/firmware/controllers/algo/io_pins.h
+++ b/firmware/hw_layer/io_pins.h
@@ -1,5 +1,6 @@
 /**
  * @file	io_pins.h
+ * @brief	his file is about general input/output utility methods, not much EFI-specifics
  *
  * @date Jan 24, 2013
  * @author Andrey Belomutskiy, (c) 2012-2017
@@ -9,25 +10,14 @@
 #define IO_PINS_H_
 
 #include "rusefi_enums.h"
+#include "main.h"
 
 #define GPIO_NULL NULL
 
-typedef enum {
-	INJECTOR_1,
-	INJECTOR_2,
-	INJECTOR_3,
-	INJECTOR_4,
-	INJECTOR_5,
-	INJECTOR_6,
-	INJECTOR_7,
-	INJECTOR_8,
-	INJECTOR_9_,
-	INJECTOR_10,
-	INJECTOR_11,
-	INJECTOR_12,
-
-	INJECTOR_NONE,
-} injector_channel_e;
+// mode >= 0  is always true since that's an unsigned
+#define assertOMode(mode) { \
+	efiAssertVoid(mode <= OM_OPENDRAIN_INVERTED, "invalid pin_output_mode_e"); \
+ }
 
 
 /**
@@ -61,13 +51,5 @@ typedef enum {
 //	LED_HUGE_19,
 //	LED_HUGE_20,
 
-void initPrimaryPins(void);
-void initOutputPins(void);
-
-#if EFI_GPIO
-void turnAllPinsOff(void);
-#else
-#define turnAllPinsOff() {}
-#endif
 
 #endif /* IO_PINS_H_ */