diff --git a/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_file_system_api.cpp b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_file_system_api.cpp
index c88ca8aaee..d247a5d9c7 100644
--- a/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_file_system_api.cpp
+++ b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_file_system_api.cpp
@@ -18,9 +18,9 @@
 #include <new>
 #include <string.h>
 #include "mbed_error.h"
+#if MBED_CONF_NANOSTACK_HAL_USE_KVSTORE == 1
 #include "kvstore_global_api.h"
 #include "kv_config.h"
-#if MBED_CONF_NANOSTACK_HAL_USE_KVSTORE == 1
 #include "ns_file_system.h"
 #endif