diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
index 8fe0d3509239..3a2c630b39a0 100644
--- a/UNITTESTS/stubs/CMakeLists.txt
+++ b/UNITTESTS/stubs/CMakeLists.txt
@@ -3,12 +3,10 @@
 
 add_library(mbed-stubs-headers INTERFACE)
 add_library(mbed-headers INTERFACE)
-add_library(mbed-headers-base INTERFACE)
 add_library(mbed-headers-connectivity INTERFACE)
 
 target_link_libraries(mbed-headers
     INTERFACE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-connectivity
         mbed-headers-drivers
@@ -17,17 +15,6 @@ target_link_libraries(mbed-headers
         mbed-headers-rtos
 )
 
-target_include_directories(mbed-headers-base
-    INTERFACE
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/platform
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/platform/cxxsupport
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/drivers
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/rtos/include
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/rtos
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/sys
-)
-
 target_include_directories(mbed-headers-connectivity
     INTERFACE
         ${mbed-os_SOURCE_DIR}/connectivity
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
index 8e310cceeefc..1c63f152b157 100644
--- a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -49,7 +49,6 @@ target_sources(mbed-stubs-cellular
 
 target_link_libraries(mbed-stubs-cellular
     PRIVATE
-        mbed-headers-base
         mbed-headers-connectivity
         mbed-stubs-platform
         mbed-headers-rtos
diff --git a/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
index ab15847a01a7..900bdbb78ce7 100644
--- a/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -39,7 +39,6 @@ target_sources(mbed-stubs-lorawan
 
 target_link_libraries(mbed-stubs-lorawan
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-stubs-headers
diff --git a/drivers/tests/UNITTESTS/PwmOut/CMakeLists.txt b/drivers/tests/UNITTESTS/PwmOut/CMakeLists.txt
index eac893dc0930..93207a158528 100644
--- a/drivers/tests/UNITTESTS/PwmOut/CMakeLists.txt
+++ b/drivers/tests/UNITTESTS/PwmOut/CMakeLists.txt
@@ -18,7 +18,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-hal
         mbed-headers-drivers
diff --git a/drivers/tests/UNITTESTS/Watchdog/CMakeLists.txt b/drivers/tests/UNITTESTS/Watchdog/CMakeLists.txt
index 1475a74d087c..033b5462f518 100644
--- a/drivers/tests/UNITTESTS/Watchdog/CMakeLists.txt
+++ b/drivers/tests/UNITTESTS/Watchdog/CMakeLists.txt
@@ -19,7 +19,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-hal
         mbed-headers-drivers
         mbed-headers-platform
diff --git a/drivers/tests/UNITTESTS/doubles/CMakeLists.txt b/drivers/tests/UNITTESTS/doubles/CMakeLists.txt
index cb6485009452..042d02c8b3a3 100644
--- a/drivers/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/drivers/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -28,7 +28,6 @@ target_compile_definitions(mbed-stubs-drivers
 
 target_link_libraries(mbed-stubs-drivers
     PRIVATE
-        mbed-headers-base
         mbed-headers-hal
         mbed-headers-drivers
         mbed-headers-platform
diff --git a/events/tests/UNITTESTS/doubles/CMakeLists.txt b/events/tests/UNITTESTS/doubles/CMakeLists.txt
index 1569b6edb47a..c936d0ddbd99 100644
--- a/events/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/events/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -32,7 +32,6 @@ target_include_directories(mbed-stubs-events
 
 target_link_libraries(mbed-stubs-events
     PRIVATE
-        mbed-headers-base
         mbed-headers-drivers
         mbed-headers-hal
         mbed-headers-events
diff --git a/events/tests/UNITTESTS/equeue/CMakeLists.txt b/events/tests/UNITTESTS/equeue/CMakeLists.txt
index bafed4450eb7..9c5973a08c71 100644
--- a/events/tests/UNITTESTS/equeue/CMakeLists.txt
+++ b/events/tests/UNITTESTS/equeue/CMakeLists.txt
@@ -23,7 +23,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-events
         mbed-stubs-events
diff --git a/hal/tests/UNITTESTS/doubles/CMakeLists.txt b/hal/tests/UNITTESTS/doubles/CMakeLists.txt
index f82ceb58c978..896617bc2498 100644
--- a/hal/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/hal/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -28,7 +28,6 @@ target_sources(mbed-stubs-hal
 
 target_link_libraries(mbed-stubs-hal
     PRIVATE
-        mbed-headers-base
         mbed-headers-hal
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/platform/tests/UNITTESTS/doubles/CMakeLists.txt b/platform/tests/UNITTESTS/doubles/CMakeLists.txt
index 9e44fe78ac22..74f89efdbc63 100644
--- a/platform/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/platform/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -39,7 +39,6 @@ target_include_directories(mbed-stubs-platform
 )
 target_link_libraries(mbed-stubs-platform
     PUBLIC
-        mbed-headers-base
         mbed-headers-hal
         mbed-headers-platform
 )
diff --git a/rtos/tests/UNITTESTS/doubles/CMakeLists.txt b/rtos/tests/UNITTESTS/doubles/CMakeLists.txt
index ed8440daec8d..70d414edc21e 100644
--- a/rtos/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/rtos/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -36,7 +36,6 @@ target_sources(mbed-stubs-rtos
 
 target_link_libraries(mbed-stubs-rtos
     PRIVATE        
-        mbed-headers-base
         mbed-headers-rtos
         mbed-headers-platform
         mbed-headers-drivers
diff --git a/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
index 063e3bdf2112..f04420bedafc 100644
--- a/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
@@ -18,7 +18,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-platform
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
index 83e32eaa47a3..282e2ac887a1 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
index 5815436c81e1..6a8eb81d5b5c 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
index d5f019b99a4b..0b26310fdec1 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
index f6f1383dbba5..1465d5ee456e 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
index c965c0652626..84e01fac0e8e 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-platform
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
index fdddb9d803ce..0847aff44105 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
index 63d3c6f7d2de..f928ca4a0ee6 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
@@ -14,7 +14,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
index 93ee6ee497cd..6892156990fd 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
index 281d2be0adee..37484253d473 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
index de7456a0b992..b8889404854c 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
@@ -14,7 +14,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-platform
diff --git a/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt
index f322f98e23c5..bd1295de6c88 100644
--- a/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -32,7 +32,6 @@ target_sources(mbed-stubs-blockdevice
 
 target_link_libraries(mbed-stubs-blockdevice
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-blockdevice
 )
diff --git a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
index c7c6b519ef70..f7e8f659da11 100644
--- a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
+++ b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
@@ -31,7 +31,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-drivers
         mbed-headers-filesystem
diff --git a/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
index 4afbff93ae96..ba2b7f419f46 100644
--- a/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
+++ b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
@@ -15,7 +15,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-drivers
         mbed-headers-hal