diff --git a/storage/kvstore/CMakeLists.txt b/storage/kvstore/CMakeLists.txt
index 0660d39bf6..06cded8582 100644
--- a/storage/kvstore/CMakeLists.txt
+++ b/storage/kvstore/CMakeLists.txt
@@ -14,3 +14,8 @@ target_include_directories(mbed-storage-kvstore
         include
         include/kvstore
 )
+
+target_link_libraries(mbed-storage-kvstore
+    INTERFACE
+        mbed-storage-kv-global-api
+)
diff --git a/storage/kvstore/securestore/CMakeLists.txt b/storage/kvstore/securestore/CMakeLists.txt
index 5fc2e7d341..b6664e23a7 100644
--- a/storage/kvstore/securestore/CMakeLists.txt
+++ b/storage/kvstore/securestore/CMakeLists.txt
@@ -17,4 +17,5 @@ target_link_libraries(mbed-storage-securestore
     INTERFACE
         mbed-storage-kvstore
         mbed-device_key
+        mbed-mbedtls
 )