diff --git a/drivers/internal/SFDP.h b/drivers/internal/SFDP.h
index d3bf0dfd7a..28d1aa120d 100644
--- a/drivers/internal/SFDP.h
+++ b/drivers/internal/SFDP.h
@@ -20,7 +20,7 @@
 
 #include <cstddef>
 #include <cstdint>
-#include "features/storage/blockdevice/BlockDevice.h"
+#include "storage/blockdevice/BlockDevice.h"
 #include "platform/Callback.h"
 
 namespace mbed {
diff --git a/features/device_key/source/DeviceKey.cpp b/features/device_key/source/DeviceKey.cpp
index fcb2072421..354b68b41e 100644
--- a/features/device_key/source/DeviceKey.cpp
+++ b/features/device_key/source/DeviceKey.cpp
@@ -19,10 +19,10 @@
 #if DEVICEKEY_ENABLED
 #include "mbedtls/cmac.h"
 #include "mbedtls/platform.h"
-#include "features/storage/kvstore/include/KVStore.h"
-#include "features/storage/kvstore/tdbstore/TDBStore.h"
-#include "features/storage/kvstore/kv_map/KVMap.h"
-#include "features/storage/kvstore/conf/kv_config.h"
+#include "storage/kvstore/include/KVStore.h"
+#include "storage/kvstore/tdbstore/TDBStore.h"
+#include "storage/kvstore/kv_map/KVMap.h"
+#include "storage/kvstore/conf/kv_config.h"
 #include "mbed_wait_api.h"
 #include <stdlib.h>
 #include "platform/mbed_error.h"