diff --git a/configs/cloudctrl/include/board.h b/configs/cloudctrl/include/board.h
index 3afdb9cb832..b5ae3d4f559 100644
--- a/configs/cloudctrl/include/board.h
+++ b/configs/cloudctrl/include/board.h
@@ -48,7 +48,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 #include <nuttx/arch.h>
 
diff --git a/configs/cloudctrl/src/up_autoleds.c b/configs/cloudctrl/src/up_autoleds.c
index 83df13510fe..83e0b9e684f 100644
--- a/configs/cloudctrl/src/up_autoleds.c
+++ b/configs/cloudctrl/src/up_autoleds.c
@@ -51,7 +51,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 /****************************************************************************
diff --git a/configs/cloudctrl/src/up_nsh.c b/configs/cloudctrl/src/up_nsh.c
index 6baeeeab8eb..a43b98d47e9 100644
--- a/configs/cloudctrl/src/up_nsh.c
+++ b/configs/cloudctrl/src/up_nsh.c
@@ -46,7 +46,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 /****************************************************************************
diff --git a/configs/cloudctrl/src/up_spi.c b/configs/cloudctrl/src/up_spi.c
index 47ade8488a7..84bf8559586 100644
--- a/configs/cloudctrl/src/up_spi.c
+++ b/configs/cloudctrl/src/up_spi.c
@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI3)
diff --git a/configs/cloudctrl/src/up_usb.c b/configs/cloudctrl/src/up_usb.c
index a5560be85f7..51167bcb2e8 100644
--- a/configs/cloudctrl/src/up_usb.c
+++ b/configs/cloudctrl/src/up_usb.c
@@ -53,7 +53,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS
diff --git a/configs/cloudctrl/src/up_usbmsc.c b/configs/cloudctrl/src/up_usbmsc.c
index 95fc0189a32..04f35efea4c 100644
--- a/configs/cloudctrl/src/up_usbmsc.c
+++ b/configs/cloudctrl/src/up_usbmsc.c
@@ -46,7 +46,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/configs/cloudctrl/src/up_userleds.c b/configs/cloudctrl/src/up_userleds.c
index bbb7cc62c4c..6c39b1442c7 100644
--- a/configs/cloudctrl/src/up_userleds.c
+++ b/configs/cloudctrl/src/up_userleds.c
@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "cloudctrl-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/configs/fire-stm32v2/include/board.h b/configs/fire-stm32v2/include/board.h
index acd70933a28..efdf07ec556 100644
--- a/configs/fire-stm32v2/include/board.h
+++ b/configs/fire-stm32v2/include/board.h
@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/fire-stm32v2/src/up_autoleds.c b/configs/fire-stm32v2/src/up_autoleds.c
index 5ecef46c0ee..dcc3d8708c7 100644
--- a/configs/fire-stm32v2/src/up_autoleds.c
+++ b/configs/fire-stm32v2/src/up_autoleds.c
@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 /****************************************************************************
diff --git a/configs/fire-stm32v2/src/up_nsh.c b/configs/fire-stm32v2/src/up_nsh.c
index fa261f56183..7c0b3dc387c 100644
--- a/configs/fire-stm32v2/src/up_nsh.c
+++ b/configs/fire-stm32v2/src/up_nsh.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 /****************************************************************************
diff --git a/configs/fire-stm32v2/src/up_selectlcd.c b/configs/fire-stm32v2/src/up_selectlcd.c
index 99d18cd2775..060d7552116 100644
--- a/configs/fire-stm32v2/src/up_selectlcd.c
+++ b/configs/fire-stm32v2/src/up_selectlcd.c
@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 #ifdef CONFIG_STM32_FSMC
diff --git a/configs/fire-stm32v2/src/up_spi.c b/configs/fire-stm32v2/src/up_spi.c
index b2ef301b672..78a3bc25502 100644
--- a/configs/fire-stm32v2/src/up_spi.c
+++ b/configs/fire-stm32v2/src/up_spi.c
@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)
diff --git a/configs/fire-stm32v2/src/up_usbdev.c b/configs/fire-stm32v2/src/up_usbdev.c
index e335edd4320..b1ca36cb7c5 100644
--- a/configs/fire-stm32v2/src/up_usbdev.c
+++ b/configs/fire-stm32v2/src/up_usbdev.c
@@ -49,7 +49,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 /************************************************************************************
diff --git a/configs/fire-stm32v2/src/up_usbmsc.c b/configs/fire-stm32v2/src/up_usbmsc.c
index f1f6ee69c25..98c06336f3e 100644
--- a/configs/fire-stm32v2/src/up_usbmsc.c
+++ b/configs/fire-stm32v2/src/up_usbmsc.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/configs/fire-stm32v2/src/up_userleds.c b/configs/fire-stm32v2/src/up_userleds.c
index 3dd1843ee9f..574c2c5b3d8 100644
--- a/configs/fire-stm32v2/src/up_userleds.c
+++ b/configs/fire-stm32v2/src/up_userleds.c
@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "fire-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/configs/hymini-stm32v/include/board.h b/configs/hymini-stm32v/include/board.h
index 333f83b897f..7751946e79c 100644
--- a/configs/hymini-stm32v/include/board.h
+++ b/configs/hymini-stm32v/include/board.h
@@ -52,7 +52,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/hymini-stm32v/src/ssd1289.c b/configs/hymini-stm32v/src/ssd1289.c
index 0ebf822747e..b9930f33c57 100644
--- a/configs/hymini-stm32v/src/ssd1289.c
+++ b/configs/hymini-stm32v/src/ssd1289.c
@@ -51,7 +51,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "hymini_stm32v-internal.h"
 
 #include "ssd1289.h"
diff --git a/configs/hymini-stm32v/src/up_leds.c b/configs/hymini-stm32v/src/up_leds.c
index 3cd0d44bdef..5eac5a04533 100644
--- a/configs/hymini-stm32v/src/up_leds.c
+++ b/configs/hymini-stm32v/src/up_leds.c
@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "hymini_stm32v-internal.h"
 
 /****************************************************************************
diff --git a/configs/hymini-stm32v/src/up_nsh.c b/configs/hymini-stm32v/src/up_nsh.c
index 5b823012d9c..e8cdd4a8b96 100644
--- a/configs/hymini-stm32v/src/up_nsh.c
+++ b/configs/hymini-stm32v/src/up_nsh.c
@@ -55,7 +55,7 @@
 #  include <nuttx/mmcsd.h>
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "hymini_stm32v-internal.h"
 
 /****************************************************************************
diff --git a/configs/hymini-stm32v/src/up_spi.c b/configs/hymini-stm32v/src/up_spi.c
index 631c70ce9a0..db0bb61bc5e 100644
--- a/configs/hymini-stm32v/src/up_spi.c
+++ b/configs/hymini-stm32v/src/up_spi.c
@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "hymini_stm32v-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)
diff --git a/configs/hymini-stm32v/src/up_ts.c b/configs/hymini-stm32v/src/up_ts.c
index e5a77960527..46765e0aad2 100644
--- a/configs/hymini-stm32v/src/up_ts.c
+++ b/configs/hymini-stm32v/src/up_ts.c
@@ -43,7 +43,6 @@
 #include <debug.h>
 
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "hymini_stm32v-internal.h"
 
 #include <nuttx/input/touchscreen.h>
diff --git a/configs/hymini-stm32v/src/up_usbdev.c b/configs/hymini-stm32v/src/up_usbdev.c
index 061ed9234e9..fad29f7d1b2 100644
--- a/configs/hymini-stm32v/src/up_usbdev.c
+++ b/configs/hymini-stm32v/src/up_usbdev.c
@@ -49,7 +49,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "hymini_stm32v-internal.h"
 
 /************************************************************************************
diff --git a/configs/hymini-stm32v/src/up_usbmsc.c b/configs/hymini-stm32v/src/up_usbmsc.c
index da8f025338f..c5abaa9110a 100644
--- a/configs/hymini-stm32v/src/up_usbmsc.c
+++ b/configs/hymini-stm32v/src/up_usbmsc.c
@@ -48,7 +48,7 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /* There is nothing to do here if SDIO support is not selected. */
 
diff --git a/configs/olimex-stm32-p107/include/board.h b/configs/olimex-stm32-p107/include/board.h
index 96051e25c29..d01c7dfcd7c 100644
--- a/configs/olimex-stm32-p107/include/board.h
+++ b/configs/olimex-stm32-p107/include/board.h
@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/configs/shenzhou/include/board.h b/configs/shenzhou/include/board.h
index 7c4d983a141..3e10a32e778 100644
--- a/configs/shenzhou/include/board.h
+++ b/configs/shenzhou/include/board.h
@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 #include <nuttx/arch.h>
 
diff --git a/configs/shenzhou/src/up_autoleds.c b/configs/shenzhou/src/up_autoleds.c
index 3c467c8ad71..1ce25e80e9b 100644
--- a/configs/shenzhou/src/up_autoleds.c
+++ b/configs/shenzhou/src/up_autoleds.c
@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 /****************************************************************************
diff --git a/configs/shenzhou/src/up_ili93xx.c b/configs/shenzhou/src/up_ili93xx.c
index 1a099f82092..f090ced62b4 100644
--- a/configs/shenzhou/src/up_ili93xx.c
+++ b/configs/shenzhou/src/up_ili93xx.c
@@ -128,7 +128,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "shenzhou-internal.h"
 
 /************************************************************************************
diff --git a/configs/shenzhou/src/up_nsh.c b/configs/shenzhou/src/up_nsh.c
index d68a734e0a3..0b980258107 100644
--- a/configs/shenzhou/src/up_nsh.c
+++ b/configs/shenzhou/src/up_nsh.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 /****************************************************************************
diff --git a/configs/shenzhou/src/up_spi.c b/configs/shenzhou/src/up_spi.c
index 28c54708663..08c7969485b 100644
--- a/configs/shenzhou/src/up_spi.c
+++ b/configs/shenzhou/src/up_spi.c
@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI3)
diff --git a/configs/shenzhou/src/up_ssd1289.c b/configs/shenzhou/src/up_ssd1289.c
index 50a99bddf76..8320a6c4e28 100644
--- a/configs/shenzhou/src/up_ssd1289.c
+++ b/configs/shenzhou/src/up_ssd1289.c
@@ -59,7 +59,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "shenzhou-internal.h"
 
 #ifdef CONFIG_LCD_SSD1289
diff --git a/configs/shenzhou/src/up_touchscreen.c b/configs/shenzhou/src/up_touchscreen.c
index 4740f60a507..63602f1345b 100644
--- a/configs/shenzhou/src/up_touchscreen.c
+++ b/configs/shenzhou/src/up_touchscreen.c
@@ -51,7 +51,7 @@
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/ads7843e.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 /****************************************************************************
diff --git a/configs/shenzhou/src/up_usb.c b/configs/shenzhou/src/up_usb.c
index 6c4d15d4b99..86af406cfaf 100644
--- a/configs/shenzhou/src/up_usb.c
+++ b/configs/shenzhou/src/up_usb.c
@@ -52,7 +52,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenshou-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS
diff --git a/configs/shenzhou/src/up_usbmsc.c b/configs/shenzhou/src/up_usbmsc.c
index eaecfb49698..d957b76da70 100644
--- a/configs/shenzhou/src/up_usbmsc.c
+++ b/configs/shenzhou/src/up_usbmsc.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/configs/shenzhou/src/up_userleds.c b/configs/shenzhou/src/up_userleds.c
index 4e1493a8da1..0e690e82543 100644
--- a/configs/shenzhou/src/up_userleds.c
+++ b/configs/shenzhou/src/up_userleds.c
@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "shenzhou-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/configs/stm3210e-eval/include/board.h b/configs/stm3210e-eval/include/board.h
index 8a479a7e543..1f0898441c5 100644
--- a/configs/stm3210e-eval/include/board.h
+++ b/configs/stm3210e-eval/include/board.h
@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/stm3210e-eval/src/up_composite.c b/configs/stm3210e-eval/src/up_composite.c
index de5759c7882..5102da9cc30 100644
--- a/configs/stm3210e-eval/src/up_composite.c
+++ b/configs/stm3210e-eval/src/up_composite.c
@@ -49,7 +49,7 @@
 #include <nuttx/mmcsd.h>
 #include <nuttx/usb/composite.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /* There is nothing to do here if SDIO support is not selected. */
 
diff --git a/configs/stm3210e-eval/src/up_extmem.c b/configs/stm3210e-eval/src/up_extmem.c
index a47d0fe12a6..d76114abeec 100644
--- a/configs/stm3210e-eval/src/up_extmem.c
+++ b/configs/stm3210e-eval/src/up_extmem.c
@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 /************************************************************************************
diff --git a/configs/stm3210e-eval/src/up_lcd.c b/configs/stm3210e-eval/src/up_lcd.c
index 81cc3f20a4e..33eef2b302a 100644
--- a/configs/stm3210e-eval/src/up_lcd.c
+++ b/configs/stm3210e-eval/src/up_lcd.c
@@ -76,7 +76,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "stm3210e-internal.h"
 
 /**************************************************************************************
diff --git a/configs/stm3210e-eval/src/up_leds.c b/configs/stm3210e-eval/src/up_leds.c
index 5a02588ab22..45a24684b35 100644
--- a/configs/stm3210e-eval/src/up_leds.c
+++ b/configs/stm3210e-eval/src/up_leds.c
@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 /****************************************************************************
diff --git a/configs/stm3210e-eval/src/up_nsh.c b/configs/stm3210e-eval/src/up_nsh.c
index 544a0e75e4a..28996d2fdcb 100644
--- a/configs/stm3210e-eval/src/up_nsh.c
+++ b/configs/stm3210e-eval/src/up_nsh.c
@@ -55,7 +55,7 @@
 #  include <nuttx/mmcsd.h>
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/configs/stm3210e-eval/src/up_spi.c b/configs/stm3210e-eval/src/up_spi.c
index ea8670b1834..03fb715c9ed 100644
--- a/configs/stm3210e-eval/src/up_spi.c
+++ b/configs/stm3210e-eval/src/up_spi.c
@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)
diff --git a/configs/stm3210e-eval/src/up_usbdev.c b/configs/stm3210e-eval/src/up_usbdev.c
index 2ac9e50f49a..fb472d18f20 100644
--- a/configs/stm3210e-eval/src/up_usbdev.c
+++ b/configs/stm3210e-eval/src/up_usbdev.c
@@ -49,7 +49,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3210e-internal.h"
 
 /************************************************************************************
diff --git a/configs/stm3210e-eval/src/up_usbmsc.c b/configs/stm3210e-eval/src/up_usbmsc.c
index d1727174e00..185f50bb04c 100644
--- a/configs/stm3210e-eval/src/up_usbmsc.c
+++ b/configs/stm3210e-eval/src/up_usbmsc.c
@@ -48,7 +48,7 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /* There is nothing to do here if SDIO support is not selected. */
 
diff --git a/configs/stm3220g-eval/include/board.h b/configs/stm3220g-eval/include/board.h
index c70946000ed..c8dccf390a9 100644
--- a/configs/stm3220g-eval/include/board.h
+++ b/configs/stm3220g-eval/include/board.h
@@ -49,7 +49,7 @@
 
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/stm3220g-eval/src/up_autoleds.c b/configs/stm3220g-eval/src/up_autoleds.c
index f77f1d08a42..068c07ab492 100644
--- a/configs/stm3220g-eval/src/up_autoleds.c
+++ b/configs/stm3220g-eval/src/up_autoleds.c
@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/configs/stm3220g-eval/src/up_extmem.c b/configs/stm3220g-eval/src/up_extmem.c
index 179d28f11b2..d5984f35af7 100644
--- a/configs/stm3220g-eval/src/up_extmem.c
+++ b/configs/stm3220g-eval/src/up_extmem.c
@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 /************************************************************************************
diff --git a/configs/stm3220g-eval/src/up_lcd.c b/configs/stm3220g-eval/src/up_lcd.c
index 4a1ce09532d..ce406ce3d85 100644
--- a/configs/stm3220g-eval/src/up_lcd.c
+++ b/configs/stm3220g-eval/src/up_lcd.c
@@ -61,7 +61,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "stm3220g-internal.h"
 
 #if !defined(CONFIG_STM32_ILI9320_DISABLE) || !defined(CONFIG_STM32_ILI9325_DISABLE)
diff --git a/configs/stm3220g-eval/src/up_nsh.c b/configs/stm3220g-eval/src/up_nsh.c
index 068deb1a643..2387348ae72 100644
--- a/configs/stm3220g-eval/src/up_nsh.c
+++ b/configs/stm3220g-eval/src/up_nsh.c
@@ -59,7 +59,7 @@
 #  include "stm32_usbhost.h"
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 /****************************************************************************
diff --git a/configs/stm3220g-eval/src/up_spi.c b/configs/stm3220g-eval/src/up_spi.c
index 47ed8d23003..eb4ba6bc685 100644
--- a/configs/stm3220g-eval/src/up_spi.c
+++ b/configs/stm3220g-eval/src/up_spi.c
@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)
diff --git a/configs/stm3220g-eval/src/up_stmpe811.c b/configs/stm3220g-eval/src/up_stmpe811.c
index a15e6950679..a64c8695887 100644
--- a/configs/stm3220g-eval/src/up_stmpe811.c
+++ b/configs/stm3220g-eval/src/up_stmpe811.c
@@ -51,7 +51,7 @@
 
 #include <arch/irq.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 /****************************************************************************
diff --git a/configs/stm3220g-eval/src/up_usb.c b/configs/stm3220g-eval/src/up_usb.c
index 2ca9b31cb7f..7ac062fb52a 100644
--- a/configs/stm3220g-eval/src/up_usb.c
+++ b/configs/stm3220g-eval/src/up_usb.c
@@ -52,7 +52,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS
diff --git a/configs/stm3220g-eval/src/up_userleds.c b/configs/stm3220g-eval/src/up_userleds.c
index 84510c70379..cc29349e97f 100644
--- a/configs/stm3220g-eval/src/up_userleds.c
+++ b/configs/stm3220g-eval/src/up_userleds.c
@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3220g-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/configs/stm3240g-eval/include/board.h b/configs/stm3240g-eval/include/board.h
index 8fa7d0dd424..f9c8a437cd0 100644
--- a/configs/stm3240g-eval/include/board.h
+++ b/configs/stm3240g-eval/include/board.h
@@ -47,7 +47,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/stm3240g-eval/src/up_autoleds.c b/configs/stm3240g-eval/src/up_autoleds.c
index 6c2cba45559..8e7f40da30c 100644
--- a/configs/stm3240g-eval/src/up_autoleds.c
+++ b/configs/stm3240g-eval/src/up_autoleds.c
@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/configs/stm3240g-eval/src/up_extmem.c b/configs/stm3240g-eval/src/up_extmem.c
index a87c0774133..e6ccfade29a 100644
--- a/configs/stm3240g-eval/src/up_extmem.c
+++ b/configs/stm3240g-eval/src/up_extmem.c
@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 /************************************************************************************
diff --git a/configs/stm3240g-eval/src/up_lcd.c b/configs/stm3240g-eval/src/up_lcd.c
index 74088dc5e39..ff8c174df82 100644
--- a/configs/stm3240g-eval/src/up_lcd.c
+++ b/configs/stm3240g-eval/src/up_lcd.c
@@ -61,7 +61,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "stm3240g-internal.h"
 
 #if !defined(CONFIG_STM32_ILI9320_DISABLE) || !defined(CONFIG_STM32_ILI9325_DISABLE)
diff --git a/configs/stm3240g-eval/src/up_nsh.c b/configs/stm3240g-eval/src/up_nsh.c
index 596f902db0e..49d8332970d 100644
--- a/configs/stm3240g-eval/src/up_nsh.c
+++ b/configs/stm3240g-eval/src/up_nsh.c
@@ -59,7 +59,7 @@
 #  include "stm32_usbhost.h"
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 /****************************************************************************
diff --git a/configs/stm3240g-eval/src/up_spi.c b/configs/stm3240g-eval/src/up_spi.c
index 3ce9d7e2950..e7e8684c18d 100644
--- a/configs/stm3240g-eval/src/up_spi.c
+++ b/configs/stm3240g-eval/src/up_spi.c
@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)
diff --git a/configs/stm3240g-eval/src/up_stmpe811.c b/configs/stm3240g-eval/src/up_stmpe811.c
index 257c886b901..f7f7adf054c 100644
--- a/configs/stm3240g-eval/src/up_stmpe811.c
+++ b/configs/stm3240g-eval/src/up_stmpe811.c
@@ -51,7 +51,7 @@
 
 #include <arch/irq.h>
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 /****************************************************************************
diff --git a/configs/stm3240g-eval/src/up_usb.c b/configs/stm3240g-eval/src/up_usb.c
index bc315a527d4..776d71a3824 100644
--- a/configs/stm3240g-eval/src/up_usb.c
+++ b/configs/stm3240g-eval/src/up_usb.c
@@ -52,7 +52,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS
diff --git a/configs/stm3240g-eval/src/up_userleds.c b/configs/stm3240g-eval/src/up_userleds.c
index 01c4b36d6c6..4faf0dfd2fe 100644
--- a/configs/stm3240g-eval/src/up_userleds.c
+++ b/configs/stm3240g-eval/src/up_userleds.c
@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm3240g-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/configs/stm32f100rc_generic/include/board.h b/configs/stm32f100rc_generic/include/board.h
index 74fcd7daf3a..b5bc69259fc 100644
--- a/configs/stm32f100rc_generic/include/board.h
+++ b/configs/stm32f100rc_generic/include/board.h
@@ -46,7 +46,7 @@
 # include <stdint.h>
 #endif
 #include "stm32_rcc.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/stm32f100rc_generic/src/up_leds.c b/configs/stm32f100rc_generic/src/up_leds.c
index 152c104c48d..c7cf27d8657 100644
--- a/configs/stm32f100rc_generic/src/up_leds.c
+++ b/configs/stm32f100rc_generic/src/up_leds.c
@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f100rc_internal.h"
 
 /****************************************************************************
diff --git a/configs/stm32f3discovery/include/board.h b/configs/stm32f3discovery/include/board.h
index fb3406499ed..f4aedccdf64 100644
--- a/configs/stm32f3discovery/include/board.h
+++ b/configs/stm32f3discovery/include/board.h
@@ -49,7 +49,7 @@
 
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/stm32f3discovery/src/Makefile b/configs/stm32f3discovery/src/Makefile
index 56c053559a7..d47389e49fe 100644
--- a/configs/stm32f3discovery/src/Makefile
+++ b/configs/stm32f3discovery/src/Makefile
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS +=  up_buttons.c
 endif
 
-ifeq ($(CONFIG_STM32_OTGFS),y)
+ifeq ($(CONFIG_STM32_USB),y)
 CSRCS += up_usb.c
 endif
 
diff --git a/configs/stm32f3discovery/src/stm32f3discovery-internal.h b/configs/stm32f3discovery/src/stm32f3discovery-internal.h
index 83223e03242..4dcc17010b1 100644
--- a/configs/stm32f3discovery/src/stm32f3discovery-internal.h
+++ b/configs/stm32f3discovery/src/stm32f3discovery-internal.h
@@ -158,23 +158,10 @@ void weak_function stm32_spiinitialize(void);
  *
  ****************************************************************************************************/
 
-#ifdef CONFIG_STM32_OTGFS
+#ifdef CONFIG_STM32_USB
 void weak_function stm32_usbinitialize(void);
 #endif
 
-/****************************************************************************************************
- * Name: stm32_usbhost_initialize
- *
- * Description:
- *   Called at application startup time to initialize the USB host functionality. This function will
- *   start a thread that will monitor for device connection/disconnection events.
- *
- ****************************************************************************************************/
-
-#if defined(CONFIG_STM32_OTGFS) && defined(CONFIG_USBHOST)
-int stm32_usbhost_initialize(void);
-#endif
-
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_INTERNAL_H */
 
diff --git a/configs/stm32f3discovery/src/up_boot.c b/configs/stm32f3discovery/src/up_boot.c
index 09849cb8250..8055c381089 100644
--- a/configs/stm32f3discovery/src/up_boot.c
+++ b/configs/stm32f3discovery/src/up_boot.c
@@ -82,13 +82,12 @@ void stm32_boardinitialize(void)
     }
 #endif
 
-  /* Initialize USB if the 1) OTG FS controller is in the configuration and 2)
+  /* Initialize USB if the 1) USB device controller is in the configuration and 2)
    * disabled, and 3) the weak function stm32_usbinitialize() has been brought 
-   * the weak function stm32_usbinitialize() has been brought into the build.
-   * Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also selected.
+   * into the build. Presumeably either CONFIG_USBDEV is also selected.
    */
 
-#ifdef CONFIG_STM32_OTGFS
+#ifdef CONFIG_STM32_USB
   if (stm32_usbinitialize)
     {
       stm32_usbinitialize();
diff --git a/configs/stm32f3discovery/src/up_nsh.c b/configs/stm32f3discovery/src/up_nsh.c
index e5321731ecc..a7d20135800 100644
--- a/configs/stm32f3discovery/src/up_nsh.c
+++ b/configs/stm32f3discovery/src/up_nsh.c
@@ -58,7 +58,7 @@
 #  include "stm32_usbhost.h"
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f3discovery-internal.h"
 
 /****************************************************************************
diff --git a/configs/stm32f3discovery/src/up_spi.c b/configs/stm32f3discovery/src/up_spi.c
index c5eb9779ee3..1a7a07354b6 100644
--- a/configs/stm32f3discovery/src/up_spi.c
+++ b/configs/stm32f3discovery/src/up_spi.c
@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f3discovery-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)
diff --git a/configs/stm32f3discovery/src/up_usb.c b/configs/stm32f3discovery/src/up_usb.c
index a06508b6304..9b735eed9f0 100644
--- a/configs/stm32f3discovery/src/up_usb.c
+++ b/configs/stm32f3discovery/src/up_usb.c
@@ -52,83 +52,30 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f3discovery-internal.h"
 
-#ifdef CONFIG_STM32_OTGFS
+#ifdef CONFIG_STM32_USB
 
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
 
-#if defined(CONFIG_USBDEV) || defined(CONFIG_USBHOST)
+#ifdef CONFIG_USBDEV
 #  define HAVE_USB 1
 #else
-#  warning "CONFIG_STM32_OTGFS is enabled but neither CONFIG_USBDEV nor CONFIG_USBHOST"
+#  warning "CONFIG_STM32_USB is enabled but CONFIG_USBDEV is not"
 #  undef HAVE_USB
 #endif
 
-#ifndef CONFIG_USBHOST_DEFPRIO
-#  define CONFIG_USBHOST_DEFPRIO 50
-#endif
-
-#ifndef CONFIG_USBHOST_STACKSIZE
-#  define CONFIG_USBHOST_STACKSIZE 1024
-#endif
-
 /************************************************************************************
  * Private Data
  ************************************************************************************/
 
-#ifdef CONFIG_USBHOST
-static struct usbhost_driver_s *g_drvr;
-#endif
-
 /************************************************************************************
  * Private Functions
  ************************************************************************************/
 
-/************************************************************************************
- * Name: usbhost_waiter
- *
- * Description:
- *   Wait for USB devices to be connected.
- *
- ************************************************************************************/
-
-#ifdef CONFIG_USBHOST
-static int usbhost_waiter(int argc, char *argv[])
-{
-  bool connected = false;
-  int ret;
-
-  uvdbg("Running\n");
-  for (;;)
-    {
-      /* Wait for the device to change state */
-
-      ret = DRVR_WAIT(g_drvr, connected);
-      DEBUGASSERT(ret == OK);
-
-      connected = !connected;
-      uvdbg("%s\n", connected ? "connected" : "disconnected");
-
-      /* Did we just become connected? */
-
-      if (connected)
-        {
-          /* Yes.. enumerate the newly connected device */
-
-          (void)DRVR_ENUMERATE(g_drvr);
-        }
-    }
-
-  /* Keep the compiler from complaining */
-
-  return 0;
-}
-#endif
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -144,131 +91,24 @@ static int usbhost_waiter(int argc, char *argv[])
 
 void stm32_usbinitialize(void)
 {
-  /* The OTG FS has an internal soft pull-up.  No GPIO configuration is required */
-
-  /* Configure the OTG FS VBUS sensing GPIO, Power On, and Overcurrent GPIOs */
-
-#ifdef CONFIG_STM32_OTGFS
-  stm32_configgpio(GPIO_OTGFS_VBUS);
-  stm32_configgpio(GPIO_OTGFS_PWRON);
-  stm32_configgpio(GPIO_OTGFS_OVER);
-#endif
+  /* Does the STM32 F3 hava an external soft pull-up? */
 }
 
-/***********************************************************************************
- * Name: stm32_usbhost_initialize
- *
- * Description:
- *   Called at application startup time to initialize the USB host functionality.
- *   This function will start a thread that will monitor for device
- *   connection/disconnection events.
- *
- ***********************************************************************************/
-
-#ifdef CONFIG_USBHOST
-int stm32_usbhost_initialize(void)
-{
-  int pid;
-  int ret;
-
-  /* First, register all of the class drivers needed to support the drivers
-   * that we care about:
-   */
-
-  uvdbg("Register class drivers\n");
-  ret = usbhost_storageinit();
-  if (ret != OK)
-    {
-      udbg("Failed to register the mass storage class\n");
-    }
-
-  /* Then get an instance of the USB host interface */
-
-  uvdbg("Initialize USB host\n");
-  g_drvr = usbhost_initialize(0);
-  if (g_drvr)
-    {
-      /* Start a thread to handle device connection. */
-
-      uvdbg("Start usbhost_waiter\n");
-
-      pid = TASK_CREATE("usbhost", CONFIG_USBHOST_DEFPRIO,
-                        CONFIG_USBHOST_STACKSIZE,
-                        (main_t)usbhost_waiter, (FAR char * const *)NULL);
-      return pid < 0 ? -ENOEXEC : OK;
-    }
-
-  return -ENODEV;
-}
-#endif
-
-/***********************************************************************************
- * Name: stm32_usbhost_vbusdrive
- *
- * Description:
- *   Enable/disable driving of VBUS 5V output.  This function must be provided be
- *   each platform that implements the STM32 OTG FS host interface
- *
- *   "On-chip 5 V VBUS generation is not supported. For this reason, a charge pump 
- *    or, if 5 V are available on the application board, a basic power switch, must 
- *    be added externally to drive the 5 V VBUS line. The external charge pump can 
- *    be driven by any GPIO output. When the application decides to power on VBUS 
- *    using the chosen GPIO, it must also set the port power bit in the host port 
- *    control and status register (PPWR bit in OTG_FS_HPRT).
- *
- *   "The application uses this field to control power to this port, and the core 
- *    clears this bit on an overcurrent condition."
- *
- * Input Parameters:
- *   iface - For future growth to handle multiple USB host interface.  Should be zero.
- *   enable - true: enable VBUS power; false: disable VBUS power
- *
- * Returned Value:
- *   None
- *
- ***********************************************************************************/
-
-#ifdef CONFIG_USBHOST
-void stm32_usbhost_vbusdrive(int iface, bool enable)
-{
-  DEBUGASSERT(iface == 0);
-  
-  if (enable)
-    {
-      /* Enable the Power Switch by driving the enable pin low */
-
-      stm32_gpiowrite(GPIO_OTGFS_PWRON, false);
-    }
-  else
-    { 
-      /* Disable the Power Switch by driving the enable pin high */
- 
-      stm32_gpiowrite(GPIO_OTGFS_PWRON, true);
-    }
-}
-#endif
-
 /************************************************************************************
- * Name: stm32_setup_overcurrent
+ * Name:  stm32_usbpullup
  *
  * Description:
- *   Setup to receive an interrupt-level callback if an overcurrent condition is
- *   detected.
- *
- * Input paramter:
- *   handler - New overcurrent interrupt handler
- *
- * Returned value:
- *   Old overcurrent interrupt handler
+ *   If USB is supported and the board supports a pullup via GPIO (for USB software
+ *   connect and disconnect), then the board software must provide stm32_pullup.
+ *   See include/nuttx/usb/usbdev.h for additional description of this method.
  *
  ************************************************************************************/
 
-#ifdef CONFIG_USBHOST
-xcpt_t stm32_setup_overcurrent(xcpt_t handler)
+int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 {
-  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+  usbtrace(TRACE_DEVPULLUP, (uint16_t)enable);
+  return OK;
 }
-#endif
 
 /************************************************************************************
  * Name:  stm32_usbsuspend
@@ -281,14 +121,12 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
  *
  ************************************************************************************/
 
-#ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
   ulldbg("resume: %d\n", resume);
 }
-#endif
 
-#endif /* CONFIG_STM32_OTGFS */
+#endif /* CONFIG_STM32_USB */
 
 
 
diff --git a/configs/stm32f4discovery/include/board.h b/configs/stm32f4discovery/include/board.h
index 6171c3e403b..793592b0b00 100644
--- a/configs/stm32f4discovery/include/board.h
+++ b/configs/stm32f4discovery/include/board.h
@@ -49,7 +49,7 @@
 
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/stm32f4discovery/src/up_autoleds.c b/configs/stm32f4discovery/src/up_autoleds.c
index e38d2f3b129..c72a54a026f 100644
--- a/configs/stm32f4discovery/src/up_autoleds.c
+++ b/configs/stm32f4discovery/src/up_autoleds.c
@@ -49,7 +49,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/configs/stm32f4discovery/src/up_boot.c b/configs/stm32f4discovery/src/up_boot.c
index 3e9b7242d9a..51ec4b9770f 100644
--- a/configs/stm32f4discovery/src/up_boot.c
+++ b/configs/stm32f4discovery/src/up_boot.c
@@ -84,8 +84,8 @@ void stm32_boardinitialize(void)
 
   /* Initialize USB if the 1) OTG FS controller is in the configuration and 2)
    * disabled, and 3) the weak function stm32_usbinitialize() has been brought 
-   * the weak function stm32_usbinitialize() has been brought into the build.
-   * Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also selected.
+   * into the build. Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also
+   * selected.
    */
 
 #ifdef CONFIG_STM32_OTGFS
diff --git a/configs/stm32f4discovery/src/up_extmem.c b/configs/stm32f4discovery/src/up_extmem.c
index 08332157841..f58d567e257 100644
--- a/configs/stm32f4discovery/src/up_extmem.c
+++ b/configs/stm32f4discovery/src/up_extmem.c
@@ -51,7 +51,7 @@
 
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 /************************************************************************************
diff --git a/configs/stm32f4discovery/src/up_nsh.c b/configs/stm32f4discovery/src/up_nsh.c
index 565aac724dc..2e78a58d8f2 100644
--- a/configs/stm32f4discovery/src/up_nsh.c
+++ b/configs/stm32f4discovery/src/up_nsh.c
@@ -58,7 +58,7 @@
 #  include "stm32_usbhost.h"
 #endif
 
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 /****************************************************************************
diff --git a/configs/stm32f4discovery/src/up_spi.c b/configs/stm32f4discovery/src/up_spi.c
index 5b812d50c56..d51a6d3d4f2 100644
--- a/configs/stm32f4discovery/src/up_spi.c
+++ b/configs/stm32f4discovery/src/up_spi.c
@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)
diff --git a/configs/stm32f4discovery/src/up_ssd1289.c b/configs/stm32f4discovery/src/up_ssd1289.c
index 4d5a4ab7a0d..6eab054d3fe 100644
--- a/configs/stm32f4discovery/src/up_ssd1289.c
+++ b/configs/stm32f4discovery/src/up_ssd1289.c
@@ -59,7 +59,6 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm32_internal.h"
 #include "stm32f4discovery-internal.h"
 
 #ifdef CONFIG_LCD_SSD1289
diff --git a/configs/stm32f4discovery/src/up_usb.c b/configs/stm32f4discovery/src/up_usb.c
index 653dd9a885b..b06f587f3df 100644
--- a/configs/stm32f4discovery/src/up_usb.c
+++ b/configs/stm32f4discovery/src/up_usb.c
@@ -52,7 +52,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 #ifdef CONFIG_STM32_OTGFS
diff --git a/configs/stm32f4discovery/src/up_userleds.c b/configs/stm32f4discovery/src/up_userleds.c
index 173c1269686..5981a12e6a8 100644
--- a/configs/stm32f4discovery/src/up_userleds.c
+++ b/configs/stm32f4discovery/src/up_userleds.c
@@ -50,7 +50,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32f4discovery-internal.h"
 
 #ifndef CONFIG_ARCH_LEDS
diff --git a/configs/vsn/include/board.h b/configs/vsn/include/board.h
index dbed25c191a..85cd96bd7bd 100644
--- a/configs/vsn/include/board.h
+++ b/configs/vsn/include/board.h
@@ -51,7 +51,7 @@
 #endif
 #include "stm32_rcc.h"
 #include "stm32_sdio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 
 #include "muxbus.h"
 
diff --git a/configs/vsn/src/spi.c b/configs/vsn/src/spi.c
index e8e15e54b83..7c028a92098 100644
--- a/configs/vsn/src/spi.c
+++ b/configs/vsn/src/spi.c
@@ -57,7 +57,7 @@
 #include "up_arch.h"
 #include "chip.h"
 #include "stm32_gpio.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "stm32_waste.h"
 #include "vsn.h"
 
diff --git a/configs/vsn/src/usbdev.c b/configs/vsn/src/usbdev.c
index deb1e9b2d6d..3781aa8e634 100644
--- a/configs/vsn/src/usbdev.c
+++ b/configs/vsn/src/usbdev.c
@@ -52,7 +52,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "stm32_internal.h"
+#include "stm32.h"
 #include "vsn.h"
 
 /************************************************************************************