diff --git a/include/fs/nvs.h b/include/fs/nvs.h
index 722db8ae864..471489c9dd4 100644
--- a/include/fs/nvs.h
+++ b/include/fs/nvs.h
@@ -7,13 +7,14 @@
 #ifndef ZEPHYR_INCLUDE_FS_NVS_H_
 #define ZEPHYR_INCLUDE_FS_NVS_H_
 
+#include <sys/types.h>
+#include <kernel.h>
+#include <device.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <sys/types.h>
-#include <kernel.h>
-#include <device.h>
 /**
  * @brief Non-volatile Storage
  * @defgroup nvs Non-volatile Storage