diff --git a/doc/zephyr.doxyfile.in b/doc/zephyr.doxyfile.in
index f5f210ac06c..a88de10a795 100644
--- a/doc/zephyr.doxyfile.in
+++ b/doc/zephyr.doxyfile.in
@@ -795,8 +795,8 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = @ZEPHYR_BASE@/include/cmsis_rtos_v1/cmsis_os.h \
-                         @ZEPHYR_BASE@/include/cmsis_rtos_v2/cmsis_os2.h \
+EXCLUDE                = @ZEPHYR_BASE@/include/portability/cmsis_os.h \
+                         @ZEPHYR_BASE@/include/portability/cmsis_os2.h \
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
diff --git a/include/cmsis_rtos_v1/cmsis_os.h b/include/portability/cmsis_os.h
similarity index 100%
rename from include/cmsis_rtos_v1/cmsis_os.h
rename to include/portability/cmsis_os.h
diff --git a/include/cmsis_rtos_v2/cmsis_os2.h b/include/portability/cmsis_os2.h
similarity index 100%
rename from include/cmsis_rtos_v2/cmsis_os2.h
rename to include/portability/cmsis_os2.h
diff --git a/samples/portability/cmsis_rtos_v1/philosophers/CMakeLists.txt b/samples/portability/cmsis_rtos_v1/philosophers/CMakeLists.txt
index 12238411b5a..a3b4e1db98b 100644
--- a/samples/portability/cmsis_rtos_v1/philosophers/CMakeLists.txt
+++ b/samples/portability/cmsis_rtos_v1/philosophers/CMakeLists.txt
@@ -14,5 +14,5 @@ if(DEFINED FORKS)
   zephyr_compile_definitions(FORKS=${FORKS})
 endif()
 
-target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/cmsis_rtos_v1)
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
 target_sources(app PRIVATE src/main.c)
diff --git a/samples/portability/cmsis_rtos_v1/timer_synchronization/CMakeLists.txt b/samples/portability/cmsis_rtos_v1/timer_synchronization/CMakeLists.txt
index 05e1d0e7aea..a2b3f320ac1 100644
--- a/samples/portability/cmsis_rtos_v1/timer_synchronization/CMakeLists.txt
+++ b/samples/portability/cmsis_rtos_v1/timer_synchronization/CMakeLists.txt
@@ -4,5 +4,5 @@ cmake_minimum_required(VERSION 3.13.1)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(cmsis_rtos_v1_synchronization)
 
-target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/cmsis_rtos_v1)
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
 target_sources(app PRIVATE src/main.c)
diff --git a/samples/portability/cmsis_rtos_v2/philosophers/CMakeLists.txt b/samples/portability/cmsis_rtos_v2/philosophers/CMakeLists.txt
index ff981597156..45a6500bf92 100644
--- a/samples/portability/cmsis_rtos_v2/philosophers/CMakeLists.txt
+++ b/samples/portability/cmsis_rtos_v2/philosophers/CMakeLists.txt
@@ -14,5 +14,5 @@ if(DEFINED FORKS)
   zephyr_compile_definitions(FORKS=${FORKS})
 endif()
 
-target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/cmsis_rtos_v2)
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
 target_sources(app PRIVATE src/main.c)
diff --git a/samples/portability/cmsis_rtos_v2/timer_synchronization/CMakeLists.txt b/samples/portability/cmsis_rtos_v2/timer_synchronization/CMakeLists.txt
index 41ef92d231b..f75c22cd1a5 100644
--- a/samples/portability/cmsis_rtos_v2/timer_synchronization/CMakeLists.txt
+++ b/samples/portability/cmsis_rtos_v2/timer_synchronization/CMakeLists.txt
@@ -4,5 +4,5 @@ cmake_minimum_required(VERSION 3.13.1)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(cmsis_synchronization)
 
-target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/cmsis_rtos_v2)
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
 target_sources(app PRIVATE src/main.c)
diff --git a/subsys/portability/cmsis_rtos_v1/CMakeLists.txt b/subsys/portability/cmsis_rtos_v1/CMakeLists.txt
index b67f971de09..33dd648c899 100644
--- a/subsys/portability/cmsis_rtos_v1/CMakeLists.txt
+++ b/subsys/portability/cmsis_rtos_v1/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 add_library(CMSIS INTERFACE)
 
-target_include_directories(CMSIS INTERFACE ${PROJECT_SOURCE_DIR}/include/cmsis_rtos_v1)
+target_include_directories(CMSIS INTERFACE ${PROJECT_SOURCE_DIR}/include/portability)
 
 zephyr_library()
 zephyr_library_sources_ifdef(
diff --git a/subsys/portability/cmsis_rtos_v2/CMakeLists.txt b/subsys/portability/cmsis_rtos_v2/CMakeLists.txt
index c4c8129b9f4..88375013b34 100644
--- a/subsys/portability/cmsis_rtos_v2/CMakeLists.txt
+++ b/subsys/portability/cmsis_rtos_v2/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 add_library(CMSIS INTERFACE)
 
-target_include_directories(CMSIS INTERFACE ${PROJECT_SOURCE_DIR}/include/cmsis_rtos_v2)
+target_include_directories(CMSIS INTERFACE ${PROJECT_SOURCE_DIR}/include/portability)
 
 zephyr_library()
 zephyr_library_sources_ifdef(
diff --git a/tests/portability/cmsis_rtos_v1/CMakeLists.txt b/tests/portability/cmsis_rtos_v1/CMakeLists.txt
index adaaa424456..368cbc0919a 100644
--- a/tests/portability/cmsis_rtos_v1/CMakeLists.txt
+++ b/tests/portability/cmsis_rtos_v1/CMakeLists.txt
@@ -4,6 +4,6 @@ cmake_minimum_required(VERSION 3.13.1)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(cmsis_rtos_v1)
 
-target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/cmsis_rtos_v1)
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
diff --git a/tests/portability/cmsis_rtos_v2/CMakeLists.txt b/tests/portability/cmsis_rtos_v2/CMakeLists.txt
index 0f305a96cd0..71ce8eee8c5 100644
--- a/tests/portability/cmsis_rtos_v2/CMakeLists.txt
+++ b/tests/portability/cmsis_rtos_v2/CMakeLists.txt
@@ -4,6 +4,6 @@ cmake_minimum_required(VERSION 3.13.1)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(cmsis_rtos_v2)
 
-target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/cmsis_rtos_v2)
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})