diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
index 77182d9c24..35044bb30a 100644
--- a/storage/CMakeLists.txt
+++ b/storage/CMakeLists.txt
@@ -18,6 +18,12 @@ add_library(mbed-storage-littlefs INTERFACE)
 add_library(mbed-storage-fat INTERFACE)
 
 add_library(mbed-storage-kvstore INTERFACE)
+add_library(mbed-storage-tdbstore INTERFACE)
+add_library(mbed-storage-filesystemstore INTERFACE)
+add_library(mbed-storage-securestore INTERFACE)
+add_library(mbed-storage-kv-config INTERFACE)
+add_library(mbed-storage-direct-access-devicekey INTERFACE)
+add_library(mbed-storage-kv-global-api INTERFACE)
 
 
 add_subdirectory(blockdevice)
diff --git a/storage/kvstore/CMakeLists.txt b/storage/kvstore/CMakeLists.txt
index ec4a58e419..89d1c95725 100644
--- a/storage/kvstore/CMakeLists.txt
+++ b/storage/kvstore/CMakeLists.txt
@@ -1,9 +1,12 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(direct_access_devicekey)
-add_subdirectory(kv_config)
+add_subdirectory(tdbstore)
+add_subdirectory(filesystemstore)
 add_subdirectory(securestore)
+add_subdirectory(kv_config)
+add_subdirectory(direct_access_devicekey)
+add_subdirectory(kvstore_global_api)
 
 target_include_directories(mbed-storage-kvstore
     INTERFACE
@@ -11,22 +14,3 @@ target_include_directories(mbed-storage-kvstore
         ./include
         ./include/kvstore
 )
-
-target_sources(mbed-storage-kvstore
-    INTERFACE
-        source/FileSystemStore.cpp
-        source/KVMap.cpp
-        source/TDBStore.cpp
-        source/kvstore_global_api.cpp
-)
-
-target_link_libraries(mbed-storage-kvstore
-    INTERFACE
-        mbed-device_key
-        mbed-storage-blockdevice
-        mbed-storage-filesystem
-        mbed-storage-fat
-        mbed-storage-littlefs
-        mbed-storage-flashiap
-        mbed-storage-sd
-)
diff --git a/storage/kvstore/direct_access_devicekey/CMakeLists.txt b/storage/kvstore/direct_access_devicekey/CMakeLists.txt
index 5f28f1e475..af4c419a2e 100644
--- a/storage/kvstore/direct_access_devicekey/CMakeLists.txt
+++ b/storage/kvstore/direct_access_devicekey/CMakeLists.txt
@@ -1,14 +1,20 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_include_directories(mbed-storage-kvstore
+target_include_directories(mbed-storage-direct-access-devicekey
     INTERFACE
         .
         ./include
         ./include/direct_access_devicekey
 )
 
-target_sources(mbed-storage-kvstore
+target_sources(mbed-storage-direct-access-devicekey
     INTERFACE
         source/DirectAccessDevicekey.cpp
 )
+
+target_link_libraries(mbed-storage-direct-access-devicekey
+    INTERFACE
+        mbed-storage-kvstore
+        mbed-storage-kv-config
+)
diff --git a/storage/kvstore/filesystemstore/CMakeLists.txt b/storage/kvstore/filesystemstore/CMakeLists.txt
new file mode 100644
index 0000000000..4e4514229a
--- /dev/null
+++ b/storage/kvstore/filesystemstore/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-storage-filesystemstore
+    INTERFACE
+        .
+        ./include
+        ./include/filesystemstore
+)
+
+target_sources(mbed-storage-filesystemstore
+    INTERFACE
+        source/FileSystemStore.cpp
+)
+
+target_link_libraries(mbed-storage-filesystemstore
+    INTERFACE
+        mbed-storage-kvstore
+        mbed-storage-filesystem
+        mbed-storage-kv-config
+)
diff --git a/storage/kvstore/kv_config/CMakeLists.txt b/storage/kvstore/kv_config/CMakeLists.txt
index 0cb061f16c..6306fea7ab 100644
--- a/storage/kvstore/kv_config/CMakeLists.txt
+++ b/storage/kvstore/kv_config/CMakeLists.txt
@@ -1,14 +1,27 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_include_directories(mbed-storage-kvstore
+target_include_directories(mbed-storage-kv-config
     INTERFACE
         .
         ./include
         ./include/kv_config
 )
 
-target_sources(mbed-storage-kvstore
+target_sources(mbed-storage-kv-config
     INTERFACE
         source/kv_config.cpp
 )
+
+target_link_libraries(mbed-storage-kv-config
+    INTERFACE
+        mbed-storage-kvstore
+        mbed-storage-blockdevice
+        mbed-storage-tdbstore
+        mbed-storage-filesystemstore
+        mbed-storage-securestore
+        mbed-storage-littlefs
+        mbed-storage-fat
+        mbed-storage-flashiap
+        mbed-storage-sd
+)
diff --git a/storage/kvstore/kvstore_global_api/CMakeLists.txt b/storage/kvstore/kvstore_global_api/CMakeLists.txt
new file mode 100644
index 0000000000..f830f126f6
--- /dev/null
+++ b/storage/kvstore/kvstore_global_api/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-storage-kv-global-api
+    INTERFACE
+        .
+        ./include
+        ./include/kvstore_global_api
+)
+
+target_sources(mbed-storage-kv-global-api
+    INTERFACE
+        source/KVMap.cpp
+        source/kvstore_global_api.cpp
+)
+
+target_link_libraries(mbed-storage-kv-global-api
+    INTERFACE
+        mbed-storage-kvstore
+        mbed-storage-kv-config
+        mbed-storage-blockdevice
+        mbed-storage-filesystem
+)
diff --git a/storage/kvstore/securestore/CMakeLists.txt b/storage/kvstore/securestore/CMakeLists.txt
index 2e33c509c3..3c4a31172a 100644
--- a/storage/kvstore/securestore/CMakeLists.txt
+++ b/storage/kvstore/securestore/CMakeLists.txt
@@ -1,14 +1,20 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_include_directories(mbed-storage-kvstore
+target_include_directories(mbed-storage-securestore
     INTERFACE
         .
         ./include
         ./include/securestore
 )
 
-target_sources(mbed-storage-kvstore
+target_sources(mbed-storage-securestore
     INTERFACE
         source/SecureStore.cpp
 )
+
+target_link_libraries(mbed-storage-securestore
+    INTERFACE
+        mbed-storage-kvstore
+        mbed-device_key
+)
diff --git a/storage/kvstore/tdbstore/CMakeLists.txt b/storage/kvstore/tdbstore/CMakeLists.txt
new file mode 100644
index 0000000000..bd7239b6dc
--- /dev/null
+++ b/storage/kvstore/tdbstore/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-storage-tdbstore
+    INTERFACE
+        .
+        ./include
+        ./include/tdbstore
+)
+
+target_sources(mbed-storage-tdbstore
+    INTERFACE
+        source/TDBStore.cpp
+)
+
+target_link_libraries(mbed-storage-tdbstore
+    INTERFACE
+        mbed-storage-kvstore
+        mbed-storage-blockdevice
+)