diff --git a/src/drivers/boards/mindpx-v2/board_config.h b/src/drivers/boards/mindpx-v2/board_config.h
index f7aa6cb12d..b02b3778bf 100644
--- a/src/drivers/boards/mindpx-v2/board_config.h
+++ b/src/drivers/boards/mindpx-v2/board_config.h
@@ -311,6 +311,19 @@
 		{GPIO_GPIO6_INPUT,       GPIO_GPIO6_OUTPUT,       0}, \
 		{GPIO_GPIO7_INPUT,       GPIO_GPIO7_OUTPUT,       0}, }
 
+/*
+ * GPIO numbers.
+ *
+ * There are no alternate functions on this board.
+ */
+#define GPIO_SERVO_1			(1<<0)		/**< servo 1 output */
+#define GPIO_SERVO_2			(1<<1)		/**< servo 2 output */
+#define GPIO_SERVO_3			(1<<2)		/**< servo 3 output */
+#define GPIO_SERVO_4			(1<<3)		/**< servo 4 output */
+#define GPIO_SERVO_5			(1<<4)		/**< servo 5 output */
+#define GPIO_SERVO_6			(1<<5)		/**< servo 6 output */
+#define GPIO_SERVO_7			(1<<6)		/**< servo 7 output */
+#define GPIO_SERVO_8			(1<<7)		/**< servo 8 output */
 
 /* This board provides a DMA pool and APIs */
 
diff --git a/src/drivers/drv_gpio.h b/src/drivers/drv_gpio.h
index 65069d75c6..f504f118e0 100644
--- a/src/drivers/drv_gpio.h
+++ b/src/drivers/drv_gpio.h
@@ -50,28 +50,6 @@
 #define PX4FMU_DEVICE_PATH	"/dev/px4fmu"
 #define PX4IO_DEVICE_PATH	"/dev/px4io"
 
-#if  defined(CONFIG_ARCH_BOARD_MINDPX_V2)
-/*
- * MindPXv2 GPIO numbers.
- *
- * There are no alternate functions on this board.
- */
-# define GPIO_SERVO_1			(1<<0)		/**< servo 1 output */
-# define GPIO_SERVO_2			(1<<1)		/**< servo 2 output */
-# define GPIO_SERVO_3			(1<<2)		/**< servo 3 output */
-# define GPIO_SERVO_4			(1<<3)		/**< servo 4 output */
-# define GPIO_SERVO_5			(1<<4)		/**< servo 5 output */
-# define GPIO_SERVO_6			(1<<5)		/**< servo 6 output */
-# define GPIO_SERVO_7			(1<<6)		/**< servo 7 output */
-# define GPIO_SERVO_8			(1<<7)		/**< servo 8 output */
-
-/**
- * Device paths for things that support the GPIO ioctl protocol.
- */
-# define PX4FMU_DEVICE_PATH	"/dev/px4fmu"
-
-#endif
-
 #ifdef CONFIG_ARCH_BOARD_TAP_V1
 /*
  * PX4FMUv3 GPIO numbers.
@@ -132,7 +110,6 @@
 #if	!defined(BOARD_HAS_FMU_GPIO)                     && \
 	!defined(CONFIG_ARCH_BOARD_AEROFC_V1)            && \
 	!defined(CONFIG_ARCH_BOARD_CRAZYFLIE)            && \
-	!defined(CONFIG_ARCH_BOARD_MINDPX_V2)            && \
 	!defined(CONFIG_ARCH_BOARD_PX4_STM32F4DISCOVERY) && \
 	!defined(CONFIG_ARCH_BOARD_PX4IO_V1)             && \
 	!defined(CONFIG_ARCH_BOARD_PX4IO_V2)             && \