diff --git a/src/drivers/boards/aerocore/board_config.h b/src/drivers/boards/aerocore/board_config.h
index 9b12b7419a..e7f630a3c2 100644
--- a/src/drivers/boards/aerocore/board_config.h
+++ b/src/drivers/boards/aerocore/board_config.h
@@ -182,6 +182,24 @@
 		{GPIO_GPIO10_INPUT,      GPIO_GPIO10_OUTPUT,      0}, \
 		{GPIO_GPIO11_INPUT,      GPIO_GPIO11_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<<6)   /**< servo 8 output */
+#define GPIO_SERVO_9             (1<<8)   /**< servo 9 output */
+#define GPIO_SERVO_10            (1<<9)   /**< servo 10 output */
+#define GPIO_SERVO_11            (1<<10)  /**< servo 11 output */
+#define GPIO_SERVO_12            (1<<11)  /**< servo 12 output */
+
 __BEGIN_DECLS
 
 /****************************************************************************************************
diff --git a/src/drivers/drv_gpio.h b/src/drivers/drv_gpio.h
index a31ca57e05..65069d75c6 100644
--- a/src/drivers/drv_gpio.h
+++ b/src/drivers/drv_gpio.h
@@ -94,14 +94,6 @@
 # define PX4FMU_DEVICE_PATH	"/dev/px4fmu"
 #endif
 
-#ifdef CONFIG_ARCH_BOARD_AEROCORE
-/*
- * AeroCore GPIO numbers and configuration.
- *
- */
-# define PX4FMU_DEVICE_PATH	"/dev/px4fmu"
-#endif
-
 #ifdef CONFIG_ARCH_BOARD_CRAZYFLIE
 
 # define GPIO_SERVO_1			(1<<0)		/**< servo 1 output */
@@ -138,7 +130,6 @@
 #endif
 
 #if	!defined(BOARD_HAS_FMU_GPIO)                     && \
-	!defined(CONFIG_ARCH_BOARD_AEROCORE)             && \
 	!defined(CONFIG_ARCH_BOARD_AEROFC_V1)            && \
 	!defined(CONFIG_ARCH_BOARD_CRAZYFLIE)            && \
 	!defined(CONFIG_ARCH_BOARD_MINDPX_V2)            && \