diff --git a/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
index 25f9207f58..063e3bdf21 100644
--- a/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
@@ -18,8 +18,9 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-platform
         mbed-stubs-platform
         gmock_main
 )
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
index 8e20de29c5..83e32eaa47 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
@@ -13,8 +13,9 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-platform
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
index b994c42c61..6cd0e18ff5 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
@@ -14,8 +14,9 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-platform
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
index 7209f6305a..d5f019b99a 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
@@ -13,8 +13,9 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-platform
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
index 6661f795fb..f6f1383dbb 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
@@ -13,8 +13,9 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-platform
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
index c6a1e12816..0f8d4d881b 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
@@ -57,8 +57,9 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-platform
         mbed-stubs-platform
         mbed-stubs-blockdevice
         gmock_main
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
index 33943640f4..fdddb9d803 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
@@ -13,8 +13,9 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-platform
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
index c1a0a4b3a3..63d3c6f7d2 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
@@ -14,8 +14,9 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-platform
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
index 767c5cae01..4c0415a106 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
@@ -14,8 +14,9 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-platform
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
index d23fcf1e69..73865d45cc 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
@@ -14,8 +14,9 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-platform
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
index 37d8ed9aa5..de7456a0b9 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
@@ -14,8 +14,9 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-platform
         mbed-stubs-platform
         mbed-stubs-blockdevice
         gmock_main
diff --git a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
index a11b900194..5503b5fd42 100644
--- a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
+++ b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
@@ -32,10 +32,13 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-drivers
         mbed-headers-filesystem
+        mbed-headers-hal
         mbed-headers-kvstore
+        mbed-headers-platform
         mbed-stubs-platform
         mbed-stubs-filesystemstore
         gmock_main
diff --git a/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
index 46dd748b1f..92a8597ebf 100644
--- a/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
+++ b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
@@ -20,9 +20,12 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers
+        mbed-headers-base
         mbed-headers-blockdevice
+        mbed-headers-drivers
+        mbed-headers-hal
         mbed-headers-kvstore
+        mbed-headers-platform
         mbed-stubs-platform
         gmock_main
 )