4 files changed, 6 insertions, 5 deletions
diff --git a/src/ec/acpi/ec.c b/src/ec/acpi/ec.c
index ad297fb932..d3a6aaf679 100644
--- a/src/ec/acpi/ec.c
+++ b/src/ec/acpi/ec.c
@@ -138,6 +138,8 @@ void ec_set_ports(u16 cmd_reg, u16 data_reg)
 	ec_data_reg = data_reg;
 }
 
+#if !defined(__SMM__) && !defined(__PRE_RAM__)
 struct chip_operations ec_acpi_ops = {
 	CHIP_NAME("ACPI Embedded Controller")
 };
+#endif
diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index cd5471d4a4..5ae0178ebf 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -21,12 +21,9 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <delay.h>
-
-#ifdef __PRE_RAM__
-#include <arch/romcc_io.h>
-#else
 #include <device/device.h>
 #include <device/pnp.h>
+#ifndef __PRE_RAM__
 #include <elog.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c
index 1ef971244f..137aa8108d 100644
--- a/src/ec/quanta/ene_kb3940q/ec.c
+++ b/src/ec/quanta/ene_kb3940q/ec.c
@@ -22,10 +22,10 @@
 #ifndef __PRE_RAM__
 
 #include <console/console.h>
+#include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
 #include <stdlib.h>
-#include <arch/io.h>
 #include <delay.h>
 #include <elog.h>
 #include "ec.h"
diff --git a/src/ec/smsc/mec1308/ec.c b/src/ec/smsc/mec1308/ec.c
index bfd3c14bca..fdae5e4e56 100644
--- a/src/ec/smsc/mec1308/ec.c
+++ b/src/ec/smsc/mec1308/ec.c
@@ -119,6 +119,7 @@ void ec_set_ports(u16 cmd_reg, u16 data_reg)
 	ec_data_reg = data_reg;
 }
 
+#if !defined(__PRE_RAM__) && !defined(__SMM__)
 static void mec1308_enable(device_t dev)
 {
 	struct ec_smsc_mec1308_config *conf = dev->chip_info;
@@ -133,3 +134,4 @@ struct chip_operations ec_smsc_mec1308_ops = {
 	CHIP_NAME("SMSC MEC1308 EC Mailbox Interface")
 	.enable_dev = mec1308_enable
 };
+#endif