diff --git a/src/arch/arm64/include/arch/pci_ops.h b/src/arch/arm64/include/arch/pci_ops.h
index 0e6f52d79f..7a62d4aa10 100644
--- a/src/arch/arm64/include/arch/pci_ops.h
+++ b/src/arch/arm64/include/arch/pci_ops.h
@@ -16,16 +16,6 @@
 #ifndef ARCH_ARM64_PCI_OPS_H
 #define ARCH_ARM64_PCI_OPS_H
 
-#include <stdint.h>
-#include <device/pci_type.h>
-
-#ifdef __SIMPLE_DEVICE__
-u8 pci_read_config8(pci_devfn_t dev, unsigned int where);
-u16 pci_read_config16(pci_devfn_t dev, unsigned int where);
-u32 pci_read_config32(pci_devfn_t dev, unsigned int where);
-void pci_write_config8(pci_devfn_t dev, unsigned int where, u8 val);
-void pci_write_config16(pci_devfn_t dev, unsigned int where, u16 val);
-void pci_write_config32(pci_devfn_t dev, unsigned int where, u32 val);
-#endif
+#include <device/pci_mmio_cfg.h>
 
 #endif
diff --git a/src/include/rules.h b/src/include/rules.h
index deea50b977..8fef53421d 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -266,11 +266,9 @@
  * For ramstage individual source file may define __SIMPLE_DEVICE__
  * before including any header files to force that particular source
  * be built with simple device model.
- *
- * For now only x86 is supported.
  */
 
-#if ENV_X86 && (defined(__PRE_RAM__) || ENV_SMM || ENV_POSTCAR)
+#if (defined(__PRE_RAM__) || ENV_SMM || ENV_POSTCAR)
 #define __SIMPLE_DEVICE__
 #endif