diff --git a/configs/stm3210e-eval/src/Makefile b/configs/stm3210e-eval/src/Makefile
index 09f0c518f42..1bd9e5581a0 100755
--- a/configs/stm3210e-eval/src/Makefile
+++ b/configs/stm3210e-eval/src/Makefile
@@ -43,6 +43,7 @@ AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c \
 			  up_extcontext.c up_selectnor.c up_deselectnor.c \
 			  up_selectsram.c up_deselectsram.c
+
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
diff --git a/configs/stm3210e-eval/src/up_extcontext.c b/configs/stm3210e-eval/src/up_extcontext.c
index 346692cfc22..64b1d7ea62b 100644
--- a/configs/stm3210e-eval/src/up_extcontext.c
+++ b/configs/stm3210e-eval/src/up_extcontext.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include "up_arch.h"
-#include "stm32_gpio.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 #ifdef CONFIG_STM32_FSMC
diff --git a/configs/stm3210e-eval/src/up_selectnor.c b/configs/stm3210e-eval/src/up_selectnor.c
index a625abc82f2..3115056e05e 100644
--- a/configs/stm3210e-eval/src/up_selectnor.c
+++ b/configs/stm3210e-eval/src/up_selectnor.c
@@ -2,7 +2,7 @@
  * configs/stm3210e-eval/src/up_selectnor.c
  * arch/arm/src/board/up_selectnor.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,9 +46,7 @@
 #include "chip.h"
 #include "up_arch.h"
 
-#include "stm32_fsmc.h"
-#include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.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 67515a52d6f..e756aa0b8f5 100644
--- a/configs/stm3210e-eval/src/up_selectsram.c
+++ b/configs/stm3210e-eval/src/up_selectsram.c
@@ -2,7 +2,7 @@
  * configs/stm3210e-eval/src/up_selectsram.c
  * arch/arm/src/board/up_selectsram.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,9 +46,7 @@
 #include "chip.h"
 #include "up_arch.h"
 
-#include "stm32_fsmc.h"
-#include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 #ifdef CONFIG_STM32_FSMC