diff --git a/os/rt/ports/ARMCMx/devices/STM32F0xx/stm32f0xx.h b/os/ext/CMSIS/ST/stm32f0xx.h
similarity index 100%
rename from os/rt/ports/ARMCMx/devices/STM32F0xx/stm32f0xx.h
rename to os/ext/CMSIS/ST/stm32f0xx.h
diff --git a/os/rt/ports/ARMCMx/devices/STM32F30x/stm32f30x.h b/os/ext/CMSIS/ST/stm32f30x.h
similarity index 100%
rename from os/rt/ports/ARMCMx/devices/STM32F30x/stm32f30x.h
rename to os/ext/CMSIS/ST/stm32f30x.h
diff --git a/os/rt/ports/ARMCMx/devices/STM32F4xx/stm32f4xx.h b/os/ext/CMSIS/ST/stm32f4xx.h
similarity index 100%
rename from os/rt/ports/ARMCMx/devices/STM32F4xx/stm32f4xx.h
rename to os/ext/CMSIS/ST/stm32f4xx.h
diff --git a/os/rt/ports/ARMCMx/devices/STM32F0xx/system_stm32f0xx.h b/os/ext/CMSIS/ST/system_stm32f0xx.h
similarity index 100%
rename from os/rt/ports/ARMCMx/devices/STM32F0xx/system_stm32f0xx.h
rename to os/ext/CMSIS/ST/system_stm32f0xx.h
diff --git a/os/rt/ports/ARMCMx/devices/STM32F30x/system_stm32f30x.h b/os/ext/CMSIS/ST/system_stm32f30x.h
similarity index 100%
rename from os/rt/ports/ARMCMx/devices/STM32F30x/system_stm32f30x.h
rename to os/ext/CMSIS/ST/system_stm32f30x.h
diff --git a/os/rt/ports/ARMCMx/devices/STM32F4xx/system_stm32f4xx.h b/os/ext/CMSIS/ST/system_stm32f4xx.h
similarity index 100%
rename from os/rt/ports/ARMCMx/devices/STM32F4xx/system_stm32f4xx.h
rename to os/ext/CMSIS/ST/system_stm32f4xx.h
diff --git a/os/rt/ports/ARMCMx/devices/STM32F0xx/port.mk b/os/rt/ports/ARMCMx/devices/STM32F0xx/port.mk
index 355cdcdeb..23a461a32 100644
--- a/os/rt/ports/ARMCMx/devices/STM32F0xx/port.mk
+++ b/os/rt/ports/ARMCMx/devices/STM32F0xx/port.mk
@@ -7,6 +7,7 @@ PORTSRC = ${CHIBIOS}/os/rt/ports/ARMCMx/chcore.c \
 PORTASM = $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
 
 PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \
+          ${CHIBIOS}/os/ext/CMSIS/ST \
           ${CHIBIOS}/os/rt/ports/ARMCMx \
           ${CHIBIOS}/os/rt/ports/ARMCMx/compilers/GCC \
           ${CHIBIOS}/os/rt/ports/ARMCMx/devices/STM32F0xx
diff --git a/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk b/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk
index 8ff32a4a3..f22a8e78b 100644
--- a/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk
+++ b/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk
@@ -7,6 +7,7 @@ PORTSRC = ${CHIBIOS}/os/rt/ports/ARMCMx/chcore.c \
 PORTASM = $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
 
 PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \
+          ${CHIBIOS}/os/ext/CMSIS/ST \
           ${CHIBIOS}/os/rt/ports/ARMCMx \
           ${CHIBIOS}/os/rt/ports/ARMCMx/compilers/GCC \
           ${CHIBIOS}/os/rt/ports/ARMCMx/devices/STM32F30x
diff --git a/os/rt/ports/ARMCMx/devices/STM32F4xx/port.mk b/os/rt/ports/ARMCMx/devices/STM32F4xx/port.mk
index 2e554ddcd..69e30009b 100644
--- a/os/rt/ports/ARMCMx/devices/STM32F4xx/port.mk
+++ b/os/rt/ports/ARMCMx/devices/STM32F4xx/port.mk
@@ -7,6 +7,7 @@ PORTSRC = ${CHIBIOS}/os/rt/ports/ARMCMx/chcore.c \
 PORTASM = $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
 
 PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \
+          ${CHIBIOS}/os/ext/CMSIS/ST \
           ${CHIBIOS}/os/rt/ports/ARMCMx \
           ${CHIBIOS}/os/rt/ports/ARMCMx/compilers/GCC \
           ${CHIBIOS}/os/rt/ports/ARMCMx/devices/STM32F4xx