13 files changed, 5 insertions, 17 deletions
diff --git a/src/soc/intel/broadwell/gma.c b/src/soc/intel/broadwell/gma.c
index dcbd1e3af5..b3e010c65a 100644
--- a/src/soc/intel/broadwell/gma.c
+++ b/src/soc/intel/broadwell/gma.c
@@ -18,7 +18,6 @@
 #include <drivers/intel/gma/libgfxinit.h>
 #include <drivers/intel/gma/opregion.h>
 #include <soc/pm.h>
-#include <soc/ramstage.h>
 #include <soc/systemagent.h>
 #include <soc/intel/broadwell/chip.h>
 #include <security/vboot/vbnv.h>
diff --git a/src/soc/intel/broadwell/include/soc/ramstage.h b/src/soc/intel/broadwell/include/soc/refcode.h
index 3900c7339e..19c2e49bcd 100644
--- a/src/soc/intel/broadwell/include/soc/ramstage.h
+++ b/src/soc/intel/broadwell/include/soc/refcode.h
@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef _BROADWELL_RAMSTAGE_H_
-#define _BROADWELL_RAMSTAGE_H_
-
-#include <device/device.h>
-#include <soc/intel/broadwell/chip.h>
+#ifndef BROADWELL_REFCODE_H
+#define BROADWELL_REFCODE_H
 
 #if CONFIG(HAVE_REFCODE_BLOB)
 void broadwell_run_reference_code(void);
diff --git a/src/soc/intel/broadwell/minihd.c b/src/soc/intel/broadwell/minihd.c
index 6d96eb363d..b73c1b3b57 100644
--- a/src/soc/intel/broadwell/minihd.c
+++ b/src/soc/intel/broadwell/minihd.c
@@ -7,7 +7,6 @@
 #include <device/pci_ops.h>
 #include <device/mmio.h>
 #include <soc/intel/common/hda_verb.h>
-#include <soc/ramstage.h>
 #include <soc/igd.h>
 
 static const u32 minihd_verb_table[] = {
diff --git a/src/soc/intel/broadwell/northbridge.c b/src/soc/intel/broadwell/northbridge.c
index 623ab70887..76ea35f87a 100644
--- a/src/soc/intel/broadwell/northbridge.c
+++ b/src/soc/intel/broadwell/northbridge.c
@@ -12,7 +12,7 @@
 #include <soc/acpi.h>
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
-#include <soc/ramstage.h>
+#include <soc/refcode.h>
 #include <soc/systemagent.h>
 
 u8 systemagent_revision(void)
diff --git a/src/soc/intel/broadwell/pch/adsp.c b/src/soc/intel/broadwell/pch/adsp.c
index b4b0257c11..3cc7e12f2a 100644
--- a/src/soc/intel/broadwell/pch/adsp.c
+++ b/src/soc/intel/broadwell/pch/adsp.c
@@ -8,7 +8,6 @@
 #include <device/mmio.h>
 #include <soc/adsp.h>
 #include <soc/pch.h>
-#include <soc/ramstage.h>
 #include <soc/rcba.h>
 #include <soc/intel/broadwell/pch/chip.h>
 #include <southbridge/intel/lynxpoint/iobp.h>
diff --git a/src/soc/intel/broadwell/pch/hda.c b/src/soc/intel/broadwell/pch/hda.c
index ba7d342fe5..ab348ea7c2 100644
--- a/src/soc/intel/broadwell/pch/hda.c
+++ b/src/soc/intel/broadwell/pch/hda.c
@@ -9,7 +9,6 @@
 #include <device/mmio.h>
 #include <soc/intel/common/hda_verb.h>
 #include <soc/pch.h>
-#include <soc/ramstage.h>
 #include <soc/rcba.h>
 
 static void codecs_init(u8 *base, u32 codec_mask)
diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c
index 10cc9d8c60..13e4fd7e33 100644
--- a/src/soc/intel/broadwell/pch/lpc.c
+++ b/src/soc/intel/broadwell/pch/lpc.c
@@ -16,7 +16,6 @@
 #include <soc/pch.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
-#include <soc/ramstage.h>
 #include <soc/rcba.h>
 #include <soc/intel/broadwell/pch/chip.h>
 #include <acpi/acpigen.h>
diff --git a/src/soc/intel/broadwell/pch/me.c b/src/soc/intel/broadwell/pch/me.c
index 6c01f07026..22db6a72f9 100644
--- a/src/soc/intel/broadwell/pch/me.c
+++ b/src/soc/intel/broadwell/pch/me.c
@@ -24,7 +24,6 @@
 #include <soc/lpc.h>
 #include <soc/pch.h>
 #include <soc/pci_devs.h>
-#include <soc/ramstage.h>
 #include <soc/rcba.h>
 #include <soc/intel/broadwell/pch/chip.h>
 
diff --git a/src/soc/intel/broadwell/pch/pch.c b/src/soc/intel/broadwell/pch/pch.c
index 20e243153a..da13503b90 100644
--- a/src/soc/intel/broadwell/pch/pch.c
+++ b/src/soc/intel/broadwell/pch/pch.c
@@ -7,7 +7,7 @@
 #include <device/pci_def.h>
 #include <soc/pch.h>
 #include <soc/pci_devs.h>
-#include <soc/ramstage.h>
+#include <drivers/intel/gma/gma.h>	/* TODO: for reproducibility purposes only */
 #include <soc/rcba.h>
 #include <soc/serialio.h>
 #include <soc/spi.h>
diff --git a/src/soc/intel/broadwell/pch/sata.c b/src/soc/intel/broadwell/pch/sata.c
index b8ef52714d..8343775888 100644
--- a/src/soc/intel/broadwell/pch/sata.c
+++ b/src/soc/intel/broadwell/pch/sata.c
@@ -7,7 +7,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <delay.h>
-#include <soc/ramstage.h>
 #include <soc/rcba.h>
 #include <soc/sata.h>
 #include <soc/intel/broadwell/pch/chip.h>
diff --git a/src/soc/intel/broadwell/pch/serialio.c b/src/soc/intel/broadwell/pch/serialio.c
index 1d6773880a..601bf97629 100644
--- a/src/soc/intel/broadwell/pch/serialio.c
+++ b/src/soc/intel/broadwell/pch/serialio.c
@@ -8,7 +8,6 @@
 #include <device/pci_ids.h>
 #include <soc/pci_devs.h>
 #include <soc/pch.h>
-#include <soc/ramstage.h>
 #include <soc/rcba.h>
 #include <soc/serialio.h>
 #include <soc/intel/broadwell/pch/chip.h>
diff --git a/src/soc/intel/broadwell/pch/usb_xhci.c b/src/soc/intel/broadwell/pch/usb_xhci.c
index fd36fad4a0..b766425df4 100644
--- a/src/soc/intel/broadwell/pch/usb_xhci.c
+++ b/src/soc/intel/broadwell/pch/usb_xhci.c
@@ -8,7 +8,6 @@
 #include <acpi/acpi.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
-#include <soc/ramstage.h>
 #include <soc/xhci.h>
 
 #ifdef __SIMPLE_DEVICE__
diff --git a/src/soc/intel/broadwell/refcode.c b/src/soc/intel/broadwell/refcode.c
index ae175b0f68..9d4bd2dce0 100644
--- a/src/soc/intel/broadwell/refcode.c
+++ b/src/soc/intel/broadwell/refcode.c
@@ -11,7 +11,7 @@
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
 #include <soc/pm.h>
-#include <soc/ramstage.h>
+#include <soc/refcode.h>
 
 static pei_wrapper_entry_t load_reference_code(void)
 {