diff --git a/src/soc/intel/baytrail/emmc.c b/src/soc/intel/baytrail/emmc.c
index e8253e0b2c..e672b58bfe 100644
--- a/src/soc/intel/baytrail/emmc.c
+++ b/src/soc/intel/baytrail/emmc.c
@@ -6,8 +6,8 @@
 #include <device/pci_ids.h>
 #include <reg_script.h>
 
+#include <soc/device_nvs.h>
 #include <soc/iosf.h>
-#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
 #include "chip.h"
diff --git a/src/soc/intel/baytrail/sd.c b/src/soc/intel/baytrail/sd.c
index 34a90317ea..0a015c8667 100644
--- a/src/soc/intel/baytrail/sd.c
+++ b/src/soc/intel/baytrail/sd.c
@@ -6,8 +6,8 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 
+#include <soc/device_nvs.h>
 #include <soc/iosf.h>
-#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
 #include "chip.h"
diff --git a/src/soc/intel/braswell/emmc.c b/src/soc/intel/braswell/emmc.c
index 954b5b4b50..d3c5aa8640 100644
--- a/src/soc/intel/braswell/emmc.c
+++ b/src/soc/intel/braswell/emmc.c
@@ -6,8 +6,8 @@
 #include <device/pci_ids.h>
 #include <reg_script.h>
 
+#include <soc/device_nvs.h>
 #include <soc/iosf.h>
-#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
 #include "chip.h"
diff --git a/src/soc/intel/braswell/sd.c b/src/soc/intel/braswell/sd.c
index 5d88016619..39a44db772 100644
--- a/src/soc/intel/braswell/sd.c
+++ b/src/soc/intel/braswell/sd.c
@@ -6,8 +6,8 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 
+#include <soc/device_nvs.h>
 #include <soc/iosf.h>
-#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
 #include "chip.h"