diff --git a/drivers/device_key/CMakeLists.txt b/drivers/device_key/CMakeLists.txt
index e39979f35d..f9397a3e2a 100644
--- a/drivers/device_key/CMakeLists.txt
+++ b/drivers/device_key/CMakeLists.txt
@@ -17,4 +17,6 @@ target_sources(mbed-device_key
 target_link_libraries(mbed-device_key
     INTERFACE
         mbed-storage-kvstore
+        mbed-storage-tdbstore
+        mbed-storage-kv-global-api
 )
diff --git a/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/CMakeLists.txt b/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/CMakeLists.txt
index 135ff80def..3fb2d001d6 100644
--- a/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/CMakeLists.txt
+++ b/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/CMakeLists.txt
@@ -24,4 +24,7 @@ target_link_libraries(mbed-psa
     INTERFACE
         mbed-mbedtls
         mbed-storage-kvstore
+        mbed-storage-tdbstore
+        mbed-storage-kv-global-api
+        mbed-device_key
 )