diff --git a/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
index 25f9207f587..063e3bdf211 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 8e20de29c5b..83e32eaa47a 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 b994c42c61e..5815436c81e 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
@@ -8,14 +8,14 @@ add_executable(${TEST_NAME})
 target_sources(${TEST_NAME}
     PRIVATE
         ${mbed-os_SOURCE_DIR}/storage/blockdevice/source/ChainingBlockDevice.cpp
-        ${mbed-os_SOURCE_DIR}/storage/blockdevice/source/HeapBlockDevice.cpp
         test_ChainingBlockDevice.cpp
 )
 
 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 7209f6305a7..d5f019b99a4 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 6661f795fb7..f6f1383dbba 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 c6a1e12816b..c965c065262 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
@@ -5,50 +5,6 @@ set(TEST_NAME heap-blockdevice-unittest)
 
 add_executable(${TEST_NAME})
 
-target_compile_definitions(${TEST_NAME} 
-    PRIVATE
-        MBED_CONF_FAT_CHAN_FFS_DBG=0
-        MBED_CONF_FAT_CHAN_FF_FS_READONLY=0
-        MBED_CONF_FAT_CHAN_FF_FS_MINIMIZE=0
-        MBED_CONF_FAT_CHAN_FF_USE_STRFUNC=0
-        MBED_CONF_FAT_CHAN_FF_USE_FIND=0
-        MBED_CONF_FAT_CHAN_FF_USE_MKFS=1
-        MBED_CONF_FAT_CHAN_FF_USE_FASTSEEK=0
-        MBED_CONF_FAT_CHAN_FF_USE_EXPAND=0
-        MBED_CONF_FAT_CHAN_FF_USE_CHMOD=0
-        MBED_CONF_FAT_CHAN_FF_USE_LABEL=0
-        MBED_CONF_FAT_CHAN_FF_USE_FORWARD=0
-        MBED_CONF_FAT_CHAN_FF_CODE_PAGE=437
-        MBED_CONF_FAT_CHAN_FF_USE_LFN=3
-        MBED_CONF_FAT_CHAN_FF_MAX_LFN=255
-        MBED_CONF_FAT_CHAN_FF_LFN_UNICODE=0
-        MBED_CONF_FAT_CHAN_FF_LFN_BUF=255
-        MBED_CONF_FAT_CHAN_FF_SFN_BUF=12
-        MBED_CONF_FAT_CHAN_FF_STRF_ENCODE=3
-        MBED_CONF_FAT_CHAN_FF_FS_RPATH=1
-        MBED_CONF_FAT_CHAN_FF_VOLUMES=4
-        MBED_CONF_FAT_CHAN_FF_STR_VOLUME_ID=0
-        MBED_CONF_FAT_CHAN_FF_VOLUME_STRS=\"RAM\",\"NAND\",\"CF\",\"SD\",\"SD2\",\"USB\",\"USB2\",\"USB3\"
-        MBED_CONF_FAT_CHAN_FF_MULTI_PARTITION=0
-        MBED_CONF_FAT_CHAN_FF_MIN_SS=512
-        MBED_CONF_FAT_CHAN_FF_MAX_SS=4096
-        MBED_CONF_FAT_CHAN_FF_USE_TRIM=1
-        MBED_CONF_FAT_CHAN_FF_FS_NOFSINFO=0
-        MBED_CONF_FAT_CHAN_FF_FS_TINY=1
-        MBED_CONF_FAT_CHAN_FF_FS_EXFAT=0
-        MBED_CONF_FAT_CHAN_FF_FS_HEAPBUF=1
-        MBED_CONF_FAT_CHAN_FF_FS_NORTC=0
-        MBED_CONF_FAT_CHAN_FF_NORTC_MON=1
-        MBED_CONF_FAT_CHAN_FF_NORTC_MDAY=1
-        MBED_CONF_FAT_CHAN_FF_NORTC_YEAR=2017
-        MBED_CONF_FAT_CHAN_FF_FS_LOCK=0
-        MBED_CONF_FAT_CHAN_FF_FS_REENTRANT=0
-        MBED_CONF_FAT_CHAN_FF_FS_TIMEOUT=1000
-        MBED_CONF_FAT_CHAN_FF_SYNC_t=HANDLE
-        MBED_CONF_FAT_CHAN_FLUSH_ON_NEW_CLUSTER=0
-        MBED_CONF_FAT_CHAN_FLUSH_ON_NEW_SECTOR=1
-)
-
 target_sources(${TEST_NAME}
     PRIVATE
         ${mbed-os_SOURCE_DIR}/storage/blockdevice/source/HeapBlockDevice.cpp
@@ -57,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-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 33943640f4e..fdddb9d803c 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 c1a0a4b3a3c..63d3c6f7d2d 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 767c5cae017..93ee6ee497c 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
@@ -8,14 +8,14 @@ add_executable(${TEST_NAME})
 target_sources(${TEST_NAME}
     PRIVATE
         ${mbed-os_SOURCE_DIR}/storage/blockdevice/source/ProfilingBlockDevice.cpp
-        ${mbed-os_SOURCE_DIR}/storage/blockdevice/source/HeapBlockDevice.cpp
         test_ProfilingBlockDevice.cpp
 )
 
 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 d23fcf1e69b..281d2be0ade 100644
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
@@ -8,14 +8,14 @@ add_executable(${TEST_NAME})
 target_sources(${TEST_NAME}
     PRIVATE
         ${mbed-os_SOURCE_DIR}/storage/blockdevice/source/ReadOnlyBlockDevice.cpp
-        ${mbed-os_SOURCE_DIR}/storage/blockdevice/source/HeapBlockDevice.cpp
         test_ReadOnlyBlockDevice.cpp
 )
 
 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 37d8ed9aa50..de7456a0b99 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 a11b9001942..5503b5fd42e 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 46dd748b1f9..92a8597ebfa 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
 )