diff --git a/storage/kvstore/CMakeLists.txt b/storage/kvstore/CMakeLists.txt
index 89d1c95725..0660d39bf6 100644
--- a/storage/kvstore/CMakeLists.txt
+++ b/storage/kvstore/CMakeLists.txt
@@ -11,6 +11,6 @@ add_subdirectory(kvstore_global_api)
 target_include_directories(mbed-storage-kvstore
     INTERFACE
         .
-        ./include
-        ./include/kvstore
+        include
+        include/kvstore
 )
diff --git a/storage/kvstore/direct_access_devicekey/CMakeLists.txt b/storage/kvstore/direct_access_devicekey/CMakeLists.txt
index af4c419a2e..3ce9524aa3 100644
--- a/storage/kvstore/direct_access_devicekey/CMakeLists.txt
+++ b/storage/kvstore/direct_access_devicekey/CMakeLists.txt
@@ -4,8 +4,8 @@
 target_include_directories(mbed-storage-direct-access-devicekey
     INTERFACE
         .
-        ./include
-        ./include/direct_access_devicekey
+        include
+        include/direct_access_devicekey
 )
 
 target_sources(mbed-storage-direct-access-devicekey
diff --git a/storage/kvstore/filesystemstore/CMakeLists.txt b/storage/kvstore/filesystemstore/CMakeLists.txt
index 4e4514229a..116a5abf2a 100644
--- a/storage/kvstore/filesystemstore/CMakeLists.txt
+++ b/storage/kvstore/filesystemstore/CMakeLists.txt
@@ -4,8 +4,8 @@
 target_include_directories(mbed-storage-filesystemstore
     INTERFACE
         .
-        ./include
-        ./include/filesystemstore
+        include
+        include/filesystemstore
 )
 
 target_sources(mbed-storage-filesystemstore
diff --git a/storage/kvstore/kv_config/CMakeLists.txt b/storage/kvstore/kv_config/CMakeLists.txt
index 6306fea7ab..131bfea36a 100644
--- a/storage/kvstore/kv_config/CMakeLists.txt
+++ b/storage/kvstore/kv_config/CMakeLists.txt
@@ -4,8 +4,8 @@
 target_include_directories(mbed-storage-kv-config
     INTERFACE
         .
-        ./include
-        ./include/kv_config
+        include
+        include/kv_config
 )
 
 target_sources(mbed-storage-kv-config
diff --git a/storage/kvstore/kvstore_global_api/CMakeLists.txt b/storage/kvstore/kvstore_global_api/CMakeLists.txt
index f830f126f6..3519665673 100644
--- a/storage/kvstore/kvstore_global_api/CMakeLists.txt
+++ b/storage/kvstore/kvstore_global_api/CMakeLists.txt
@@ -4,8 +4,8 @@
 target_include_directories(mbed-storage-kv-global-api
     INTERFACE
         .
-        ./include
-        ./include/kvstore_global_api
+        include
+        include/kvstore_global_api
 )
 
 target_sources(mbed-storage-kv-global-api
diff --git a/storage/kvstore/securestore/CMakeLists.txt b/storage/kvstore/securestore/CMakeLists.txt
index 3c4a31172a..5fc2e7d341 100644
--- a/storage/kvstore/securestore/CMakeLists.txt
+++ b/storage/kvstore/securestore/CMakeLists.txt
@@ -4,8 +4,8 @@
 target_include_directories(mbed-storage-securestore
     INTERFACE
         .
-        ./include
-        ./include/securestore
+        include
+        include/securestore
 )
 
 target_sources(mbed-storage-securestore
diff --git a/storage/kvstore/tdbstore/CMakeLists.txt b/storage/kvstore/tdbstore/CMakeLists.txt
index bd7239b6dc..38a992a488 100644
--- a/storage/kvstore/tdbstore/CMakeLists.txt
+++ b/storage/kvstore/tdbstore/CMakeLists.txt
@@ -4,8 +4,8 @@
 target_include_directories(mbed-storage-tdbstore
     INTERFACE
         .
-        ./include
-        ./include/tdbstore
+        include
+        include/tdbstore
 )
 
 target_sources(mbed-storage-tdbstore