diff --git a/configs/olimex-stm32-p407/include/board.h b/configs/olimex-stm32-p407/include/board.h
index d845893140..888ddad873 100644
--- a/configs/olimex-stm32-p407/include/board.h
+++ b/configs/olimex-stm32-p407/include/board.h
@@ -45,8 +45,6 @@
 #ifndef __ASSEMBLY__
 # include <stdint.h>
 #endif
-#include "stm32_rcc.h"
-#include "stm32.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/configs/olimex-stm32-p407/src/stm32_bringup.c b/configs/olimex-stm32-p407/src/stm32_bringup.c
index 0894f48b92..2529cbd87a 100644
--- a/configs/olimex-stm32-p407/src/stm32_bringup.c
+++ b/configs/olimex-stm32-p407/src/stm32_bringup.c
@@ -47,6 +47,7 @@
 
 #include <nuttx/board.h>
 #include <nuttx/mmcsd.h>
+#include <nuttx/input/buttons.h>
 
 #ifdef CONFIG_USBMONITOR
 #  include <nuttx/usb/usbmonitor.h>
@@ -169,6 +170,16 @@ int stm32_bringup(void)
     }
 #endif
 
+#ifdef CONFIG_BUTTONS
+  /* Register the BUTTON driver */
+
+  ret = btn_lower_initialize("/dev/buttons");
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: btn_lower_initialize() failed: %d\n", ret);
+    }
+#endif
+
   UNUSED(ret);
   return OK;
 }
diff --git a/configs/olimex-stm32-p407/src/stm32_buttons.c b/configs/olimex-stm32-p407/src/stm32_buttons.c
index 463048055e..ab07a2ed1e 100644
--- a/configs/olimex-stm32-p407/src/stm32_buttons.c
+++ b/configs/olimex-stm32-p407/src/stm32_buttons.c
@@ -45,18 +45,12 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
+#include "stm32_gpio.h"
+
 #include "olimex-stm32-p407.h"
 
 #ifdef CONFIG_ARCH_BUTTONS
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/