5 files changed, 17 insertions, 13 deletions
diff --git a/src/soc/amd/common/block/acpi/acpi.c b/src/soc/amd/common/block/acpi/acpi.c
index 6f2f7c5ad7..4d99f7b535 100644
--- a/src/soc/amd/common/block/acpi/acpi.c
+++ b/src/soc/amd/common/block/acpi/acpi.c
@@ -12,15 +12,17 @@
  * GNU General Public License for more details.
  */
 
+#include <amdblocks/acpimmio.h>
+#include <amdblocks/acpi.h>
 #include <arch/acpi.h>
+#include <bootmode.h>
 #include <cbmem.h>
-#include <elog.h>
 #include <console/console.h>
-#include <soc/southbridge.h>
-#include <amdblocks/acpimmio.h>
-#include <amdblocks/acpi.h>
+#include <elog.h>
 #include <halt.h>
 #include <security/vboot/vboot_common.h>
+#include <soc/southbridge.h>
+#include <halt.h>
 
 void poweroff(void)
 {
@@ -136,7 +138,7 @@ int acpi_get_sleep_type(void)
 	return acpi_sleep_from_pm1(acpi_read16(MMIO_ACPI_PM1_CNT_BLK));
 }
 
-int vboot_platform_is_resuming(void)
+int platform_is_resuming(void)
 {
 	if (!(acpi_read16(MMIO_ACPI_PM1_STS) & WAK_STS))
 		return 0;
diff --git a/src/soc/intel/baytrail/pmutil.c b/src/soc/intel/baytrail/pmutil.c
index 9e032cebfb..f0abcee7d8 100644
--- a/src/soc/intel/baytrail/pmutil.c
+++ b/src/soc/intel/baytrail/pmutil.c
@@ -15,6 +15,7 @@
 #include <stdint.h>
 #include <arch/acpi.h>
 #include <arch/io.h>
+#include <bootmode.h>
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
@@ -27,7 +28,6 @@
 #include <soc/pci_devs.h>
 #include <soc/pmc.h>
 #include <security/vboot/vbnv.h>
-#include <security/vboot/vboot_common.h>
 
 #if defined(__SIMPLE_DEVICE__)
 
@@ -387,7 +387,7 @@ int vbnv_cmos_failed(void)
 	return rtc_failure();
 }
 
-int vboot_platform_is_resuming(void)
+int platform_is_resuming(void)
 {
 	if (!(inw(ACPI_BASE_ADDRESS + PM1_STS) & WAK_STS))
 		return 0;
diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c
index 9c5079f8ed..016c45cccc 100644
--- a/src/soc/intel/braswell/pmutil.c
+++ b/src/soc/intel/braswell/pmutil.c
@@ -15,6 +15,7 @@
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <assert.h>
+#include <bootmode.h>
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
@@ -26,7 +27,6 @@
 #include <soc/pm.h>
 #include <stdint.h>
 #include <security/vboot/vbnv.h>
-#include <security/vboot/vboot_common.h>
 
 #if defined(__SIMPLE_DEVICE__)
 
@@ -380,7 +380,7 @@ int vbnv_cmos_failed(void)
 	return rtc_failure();
 }
 
-int vboot_platform_is_resuming(void)
+int platform_is_resuming(void)
 {
 	if (!(inw(ACPI_BASE_ADDRESS + PM1_STS) & WAK_STS))
 		return 0;
diff --git a/src/soc/intel/broadwell/pmutil.c b/src/soc/intel/broadwell/pmutil.c
index 172d8cda20..b170ff27d7 100644
--- a/src/soc/intel/broadwell/pmutil.c
+++ b/src/soc/intel/broadwell/pmutil.c
@@ -19,6 +19,7 @@
 
 #include <arch/acpi.h>
 #include <arch/io.h>
+#include <bootmode.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
@@ -30,7 +31,6 @@
 #include <soc/pm.h>
 #include <soc/gpio.h>
 #include <security/vboot/vbnv.h>
-#include <security/vboot/vboot_common.h>
 
 /* Print status bits with descriptive names */
 static void print_status_bits(u32 status, const char *bit_names[])
@@ -450,7 +450,7 @@ int acpi_sci_irq(void)
 	return sci_irq;
 }
 
-int vboot_platform_is_resuming(void)
+int platform_is_resuming(void)
 {
 	if (!(inw(ACPI_BASE_ADDRESS + PM1_STS) & WAK_STS))
 		return 0;
diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c
index d03348adec..47a4ed9f78 100644
--- a/src/soc/intel/common/block/pmc/pmclib.c
+++ b/src/soc/intel/common/block/pmc/pmclib.c
@@ -13,6 +13,7 @@
  */
 
 #include <arch/io.h>
+#include <bootmode.h>
 #include <device/mmio.h>
 #include <cbmem.h>
 #include <console/console.h>
@@ -21,11 +22,12 @@
 #include <intelblocks/gpio.h>
 #include <intelblocks/tco.h>
 #include <option.h>
+#include <pc80/mc146818rtc.h>
+#include <security/vboot/vboot_common.h>
 #include <soc/pm.h>
 #include <stdint.h>
 #include <string.h>
 #include <timer.h>
-#include <security/vboot/vboot_common.h>
 
 static struct chipset_power_state power_state;
 
@@ -440,7 +442,7 @@ void pmc_global_reset_enable(bool enable)
 }
 #endif // CONFIG_PMC_GLOBAL_RESET_ENABLE_LOCK
 
-int vboot_platform_is_resuming(void)
+int platform_is_resuming(void)
 {
 	if (!(inw(ACPI_BASE_ADDRESS + PM1_STS) & WAK_STS))
 		return 0;