diff --git a/configs/stm3210e-eval/src/up_extmem.c b/configs/stm3210e-eval/src/up_extmem.c
index 18c39e84447..2209d16c249 100644
--- a/configs/stm3210e-eval/src/up_extmem.c
+++ b/configs/stm3210e-eval/src/up_extmem.c
@@ -46,8 +46,9 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
 #include "chip.h"
+#include "up_arch.h"
+
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
 #include "stm32_internal.h"
diff --git a/configs/stm3210e-eval/src/up_selectnor.c b/configs/stm3210e-eval/src/up_selectnor.c
index 3c41b1c9fcc..a625abc82f2 100644
--- a/configs/stm3210e-eval/src/up_selectnor.c
+++ b/configs/stm3210e-eval/src/up_selectnor.c
@@ -43,9 +43,12 @@
 #include <stdint.h>
 #include <debug.h>
 
+#include "chip.h"
 #include "up_arch.h"
+
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
+#include "stm32_internal.h"
 #include "stm3210e-internal.h"
 
 #ifdef CONFIG_STM32_FSMC
diff --git a/configs/stm3210e-eval/src/up_selectsram.c b/configs/stm3210e-eval/src/up_selectsram.c
index 0b3d2d4952c..67515a52d6f 100644
--- a/configs/stm3210e-eval/src/up_selectsram.c
+++ b/configs/stm3210e-eval/src/up_selectsram.c
@@ -43,9 +43,12 @@
 #include <stdint.h>
 #include <debug.h>
 
+#include "chip.h"
 #include "up_arch.h"
+
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
+#include "stm32_internal.h"
 #include "stm3210e-internal.h"
 
 #ifdef CONFIG_STM32_FSMC