Unit tests: Remove redundant CMake target mbed-headers-base

Individual libraries' `target_h` stub headers have now all been moved from `mbed-headers-base` to `mbed-headers-<library>`. Note: Even though headers previously in `target_h` are technically stubs/fakes too, they are used by not only unit tests but also regular libraries when compiled for unit tests, because no target-specific HAL implementation exists in this case. In order for regular library sources to pick up `target_h` headers, those headers must * have the same names as regular headers * appear first in include paths This is why those headers are part of `mbed-headers-<library>` and not `mbed-stubs-<library>`. Before this refactoring, `mbed-headers-base` was the first in unit tests' include paths.
2021-07-16 14:23:39 +01:00 · 2021-07-16 14:23:39 +01:00 · dca2aa79a0
parent 6731f553ce
commit dca2aa79a0
52 changed files with 0 additions and 65 deletions
--- a/UNITTESTS/stubs/CMakeLists.txt
+++ b/UNITTESTS/stubs/CMakeLists.txt
@ -3,11 +3,9 @@

 add_library(mbed-stubs-headers INTERFACE)
 add_library(mbed-headers INTERFACE)
-add_library(mbed-headers-base INTERFACE)

 target_link_libraries(mbed-headers
    INTERFACE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-drivers
        mbed-headers-hal
@ -15,18 +13,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
    INTERFACE
        ${mbed-os_SOURCE_DIR}/features
--- 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-stubs-platform
        mbed-headers-rtos
        mbed-headers-drivers
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/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-headers-rtos
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
@ -29,7 +29,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-events
        mbed-headers-rtos
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
@ -21,7 +21,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-events
        mbed-headers-rtos
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
@ -22,7 +22,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-events
        mbed-headers-rtos
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
@ -22,7 +22,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-events
        mbed-headers-rtos
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt
@ -27,7 +27,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-events
        mbed-headers-rtos
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
@ -26,7 +26,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-events
        mbed-headers-rtos
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
@ -31,7 +31,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-events
        mbed-headers-rtos
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
@ -29,7 +29,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-events
        mbed-headers-rtos
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
@ -30,7 +30,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-events
        mbed-headers-rtos
--- a/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
@ -40,7 +40,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
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/CMakeLists.txt
@ -35,7 +35,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/CMakeLists.txt
@ -20,7 +20,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/CMakeLists.txt
@ -20,7 +20,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/CMakeLists.txt
@ -20,7 +20,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-mbedtls
        mbed-headers-lorawan
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/CMakeLists.txt
@ -24,7 +24,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/CMakeLists.txt
@ -22,7 +22,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/CMakeLists.txt
@ -28,7 +28,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/CMakeLists.txt
@ -28,7 +28,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/CMakeLists.txt
@ -22,7 +22,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt
@ -22,7 +22,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/CMakeLists.txt
@ -22,7 +22,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/CMakeLists.txt
@ -22,7 +22,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt
@ -22,7 +22,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt
@ -28,7 +28,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt
@ -21,7 +21,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/CMakeLists.txt
@ -22,7 +22,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-hal
        mbed-headers-platform
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/CMakeLists.txt
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/CMakeLists.txt
@ -21,7 +21,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-events
        mbed-headers-platform
        mbed-headers-lorawan
--- a/drivers/tests/UNITTESTS/PwmOut/CMakeLists.txt
+++ b/drivers/tests/UNITTESTS/PwmOut/CMakeLists.txt
@ -20,7 +20,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-hal
        mbed-headers-drivers
--- a/drivers/tests/UNITTESTS/Watchdog/CMakeLists.txt
+++ b/drivers/tests/UNITTESTS/Watchdog/CMakeLists.txt
@ -21,7 +21,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-hal
        mbed-headers-drivers
        mbed-headers-platform
--- 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
--- 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
--- a/events/tests/UNITTESTS/equeue/CMakeLists.txt
+++ b/events/tests/UNITTESTS/equeue/CMakeLists.txt
@ -25,7 +25,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-platform
        mbed-headers-events
        mbed-stubs-events
--- 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
--- 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
        gmock_main
--- 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
--- a/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
@ -20,7 +20,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-blockdevice
        mbed-headers-platform
        mbed-stubs-platform
--- 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
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
@ -15,7 +15,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-blockdevice
        mbed-headers-platform
        mbed-stubs-headers
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
 )
--- a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
+++ b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
@ -33,7 +33,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-blockdevice
        mbed-headers-drivers
        mbed-headers-filesystem
--- a/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
+++ b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
@ -17,7 +17,6 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers-base
        mbed-headers-blockdevice
        mbed-headers-drivers
        mbed-headers-hal