diff --git a/boards/arm/stm32/stm32f429i-disco/include/board.h b/boards/arm/stm32/stm32f429i-disco/include/board.h
index be1e21a5238..c115f19c64b 100644
--- a/boards/arm/stm32/stm32f429i-disco/include/board.h
+++ b/boards/arm/stm32/stm32f429i-disco/include/board.h
@@ -46,6 +46,8 @@
 # include <stdint.h>
 #endif
 
+/* DO NOT include STM32 internal header files here */
+
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_ili93414ws.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_ili93414ws.c
index 8dd5eeb4f8d..67351abe5d1 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_ili93414ws.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_ili93414ws.c
@@ -55,10 +55,13 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/spi/spi.h>
-#include <arch/board/board.h>
 
+#include "stm32_rcc.h"
+#include "stm32_spi.h"
 #include "stm32f429i-disco.h"
 
+#include <arch/board/board.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c
index 90dca28229a..c4a3c9da57f 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c
@@ -39,21 +39,24 @@
 
 #include <nuttx/config.h>
 
+#include <sys/types.h>
 #include <errno.h>
 #include <debug.h>
 
 #include <nuttx/timers/pwm.h>
-#include <arch/board/board.h>
 
 #include "chip.h"
 #include "up_arch.h"
 #include "stm32_pwm.h"
 #include "stm32f429i-disco.h"
 
+#include <arch/board/board.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
-/* Configuration *******************************************************************/
+
+/* Configuration ************************************************************/
 
 /* PWM Timer */
 
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h b/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h
index e649ed3dd95..8e1fa4fb219 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h
  *
- *   Copyright (C) 2011-2012, 2018 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2012, 2018-2019 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
  *            Marco Krahl <ocram.lhark@gmail.com>
  *
@@ -51,6 +51,8 @@
 
 #include <arch/stm32/chip.h>
 
+#include "stm32_gpio.h"
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/