diff --git a/cpu/cortexm_common/Kconfig b/cpu/cortexm_common/Kconfig
index ca49184a58..a89e5e67fd 100644
--- a/cpu/cortexm_common/Kconfig
+++ b/cpu/cortexm_common/Kconfig
@@ -11,6 +11,7 @@ config MODULE_CORTEXM_COMMON
     imply MODULE_NEWLIB_NANO
     select MODULE_PERIPH
     select MODULE_MALLOC_THREAD_SAFE if TEST_KCONFIG
+    select PACKAGE_CMSIS if TEST_KCONFIG
     help
         Common code for Cortex-M cores.
 
diff --git a/cpu/cortexm_common/Makefile.dep b/cpu/cortexm_common/Makefile.dep
index d6ca0bb457..2974cd0677 100644
--- a/cpu/cortexm_common/Makefile.dep
+++ b/cpu/cortexm_common/Makefile.dep
@@ -26,3 +26,6 @@ endif
 
 # Make calls to malloc and friends thread-safe
 USEMODULE += malloc_thread_safe
+
+# CMSIS headers are fetched using a package
+USEPKG += cmsis
diff --git a/cpu/cortexm_common/Makefile.include b/cpu/cortexm_common/Makefile.include
index f719989272..0caaab4e56 100644
--- a/cpu/cortexm_common/Makefile.include
+++ b/cpu/cortexm_common/Makefile.include
@@ -1,6 +1,5 @@
 # include module specific includes
 INCLUDES += -I$(RIOTCPU)/cortexm_common/include
-INCLUDES += -I$(RIOTCPU)/cortexm_common/include/vendor
 
 # All variables must be defined in the CPU configuration when using the common
 # `ldscripts/cortexm.ld`