3 files changed, 2 insertions, 15 deletions
diff --git a/src/southbridge/intel/lynxpoint/pch.c b/src/southbridge/intel/lynxpoint/pch.c
index b4f64e1436..cc3718d444 100644
--- a/src/southbridge/intel/lynxpoint/pch.c
+++ b/src/southbridge/intel/lynxpoint/pch.c
@@ -21,14 +21,10 @@
 
 #include <console/console.h>
 #include <delay.h>
-#ifdef __SMM__
 #include <arch/io.h>
-#include <arch/romcc_io.h>
-#include <device/pci_def.h>
-#else /* !__SMM__ */
 #include <device/device.h>
 #include <device/pci.h>
-#endif
+#include <device/pci_def.h>
 #include "pch.h"
 
 static device_t pch_get_lpc_device(void)
diff --git a/src/southbridge/intel/lynxpoint/pmutil.c b/src/southbridge/intel/lynxpoint/pmutil.c
index ec4d473a58..3a0b70b0b3 100644
--- a/src/southbridge/intel/lynxpoint/pmutil.c
+++ b/src/southbridge/intel/lynxpoint/pmutil.c
@@ -25,14 +25,9 @@
  */
 
 #include <arch/io.h>
-#ifdef __SMM__
-#include <arch/romcc_io.h>
-#include <device/pci_def.h>
-#else /* !__SMM__ */
 #include <device/device.h>
 #include <device/pci.h>
-#endif
-
+#include <device/pci_def.h>
 #include <console/console.h>
 #include "pch.h"
 
diff --git a/src/southbridge/intel/lynxpoint/rcba.c b/src/southbridge/intel/lynxpoint/rcba.c
index d41aa8686e..8cc97a9aea 100644
--- a/src/southbridge/intel/lynxpoint/rcba.c
+++ b/src/southbridge/intel/lynxpoint/rcba.c
@@ -20,13 +20,9 @@
 
 #include <console/console.h>
 #include <device/pci_def.h>
-#ifdef __PRE_RAM__
 #include <arch/io.h>
-#include <arch/romcc_io.h>
-#else
 #include <device/device.h>
 #include <device/pci.h>
-#endif
 #include "pch.h"
 
 void pch_config_rcba(const struct rcba_config_instruction *rcba_config)