diff --git a/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_svm.cpp b/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_svm.cpp
index 75bf35e1d1..ce79524390 100644
--- a/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_svm.cpp
+++ b/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_svm.cpp
@@ -16,6 +16,13 @@
  *
  */
 
+// This file is deprecated so deprecation warnings when building it are silenced
+#if   defined ( __CC_ARM )
+#pragma diag_suppress 1361  // Deprecated declaration
+#elif defined ( __GNUC__ )
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include <stdint.h>
 #include <Driver_Common.h>
 #include "storage_volume_manager.h"
diff --git a/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_test.c b/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_test.c
index e975cc5109..f43dabbfb0 100644
--- a/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_test.c
+++ b/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_test.c
@@ -18,6 +18,13 @@
  * test support code implementation file.
  */
 
+// This file is deprecated so deprecation warnings when building it are silenced
+#if   defined ( __CC_ARM )
+#pragma diag_suppress 1361  // Deprecated declaration
+#elif defined ( __GNUC__ )
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include "cfstore_config.h"
 #include "cfstore_debug.h"
 #include "cfstore_test.h"
diff --git a/features/storage/FEATURE_STORAGE/cfstore/source/configuration_store.c b/features/storage/FEATURE_STORAGE/cfstore/source/configuration_store.c
index c68651a7fe..da1a492faf 100644
--- a/features/storage/FEATURE_STORAGE/cfstore/source/configuration_store.c
+++ b/features/storage/FEATURE_STORAGE/cfstore/source/configuration_store.c
@@ -16,6 +16,13 @@
  * limitations under the License.
  */
 
+// This file is deprecated so deprecation warnings when building it are silenced
+#if   defined ( __CC_ARM )
+#pragma diag_suppress 1361  // Deprecated declaration
+#elif defined ( __GNUC__ )
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include "cfstore_config.h"
 #include "cfstore_debug.h"
 #include "cfstore_list.h"
diff --git a/features/storage/FEATURE_STORAGE/storage-volume-manager/source/storage_volume.cpp b/features/storage/FEATURE_STORAGE/storage-volume-manager/source/storage_volume.cpp
index 8ea34069ee..8d221c77c9 100644
--- a/features/storage/FEATURE_STORAGE/storage-volume-manager/source/storage_volume.cpp
+++ b/features/storage/FEATURE_STORAGE/storage-volume-manager/source/storage_volume.cpp
@@ -15,6 +15,13 @@
  * limitations under the License.
  */
 
+// This file is deprecated so deprecation warnings when building it are silenced
+#if   defined ( __CC_ARM )
+#pragma diag_suppress 1361  // Deprecated declaration
+#elif defined ( __GNUC__ )
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include "storage-volume-manager/storage_volume_manager.h"
 #include <string.h>
 #include <inttypes.h>
diff --git a/features/storage/FEATURE_STORAGE/storage-volume-manager/source/storage_volume_manager.cpp b/features/storage/FEATURE_STORAGE/storage-volume-manager/source/storage_volume_manager.cpp
index e0bc71dba2..97282cda5e 100644
--- a/features/storage/FEATURE_STORAGE/storage-volume-manager/source/storage_volume_manager.cpp
+++ b/features/storage/FEATURE_STORAGE/storage-volume-manager/source/storage_volume_manager.cpp
@@ -15,6 +15,13 @@
  * limitations under the License.
  */
 
+// This file is deprecated so deprecation warnings when building it are silenced
+#if   defined ( __CC_ARM )
+#pragma diag_suppress 1361  // Deprecated declaration
+#elif defined ( __GNUC__ )
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include "storage-volume-manager/storage_volume_manager.h"
 #include <string.h>
 #include <inttypes.h>