7 files changed, 9 insertions, 8 deletions
diff --git a/src/arch/i386/core/relocate.c b/src/arch/i386/core/relocate.c
index e966bbeaa..47450e757 100644
--- a/src/arch/i386/core/relocate.c
+++ b/src/arch/i386/core/relocate.c
@@ -1,6 +1,5 @@
 #include <ipxe/io.h>
 #include <registers.h>
-#include <ipxe/memmap.h>
 
 /*
  * Originally by Eric Biederman
diff --git a/src/arch/i386/firmware/pcbios/hidemem.c b/src/arch/i386/firmware/pcbios/hidemem.c
index 322be9e41..cc5fc28f7 100644
--- a/src/arch/i386/firmware/pcbios/hidemem.c
+++ b/src/arch/i386/firmware/pcbios/hidemem.c
@@ -23,7 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <basemem.h>
 #include <fakee820.h>
 #include <ipxe/init.h>
-#include <ipxe/memmap.h>
+#include <ipxe/io.h>
 #include <ipxe/hidemem.h>
 
 /** Set to true if you want to test a fake E820 map */
diff --git a/src/arch/i386/firmware/pcbios/memmap.c b/src/arch/i386/firmware/pcbios/memmap.c
index 8fa1f4c3d..01080c7b8 100644
--- a/src/arch/i386/firmware/pcbios/memmap.c
+++ b/src/arch/i386/firmware/pcbios/memmap.c
@@ -23,7 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <realmode.h>
 #include <bios.h>
 #include <memsizes.h>
-#include <ipxe/memmap.h>
+#include <ipxe/io.h>
 
 /**
  * @file
@@ -282,7 +282,7 @@ static int meme820 ( struct memory_map *memmap ) {
  *
  * @v memmap		Memory map to fill in
  */
-void get_memmap ( struct memory_map *memmap ) {
+void x86_get_memmap ( struct memory_map *memmap ) {
 	unsigned int basemem, extmem;
 	int rc;
 
@@ -310,3 +310,5 @@ void get_memmap ( struct memory_map *memmap ) {
 	memmap->regions[1].end = 0x100000 + ( extmem * 1024 );
 	memmap->count = 2;
 }
+
+PROVIDE_IOAPI ( x86, get_memmap, x86_get_memmap );
diff --git a/src/arch/i386/image/com32.c b/src/arch/i386/image/com32.c
index 381987ab9..72e679f16 100644
--- a/src/arch/i386/image/com32.c
+++ b/src/arch/i386/image/com32.c
@@ -38,7 +38,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/image.h>
 #include <ipxe/segment.h>
 #include <ipxe/init.h>
-#include <ipxe/memmap.h>
+#include <ipxe/io.h>
 
 struct image_type com32_image_type __image_type ( PROBE_NORMAL );
 
diff --git a/src/arch/i386/image/multiboot.c b/src/arch/i386/image/multiboot.c
index b3c6b8f74..e2075defe 100644
--- a/src/arch/i386/image/multiboot.c
+++ b/src/arch/i386/image/multiboot.c
@@ -33,7 +33,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/uaccess.h>
 #include <ipxe/image.h>
 #include <ipxe/segment.h>
-#include <ipxe/memmap.h>
+#include <ipxe/io.h>
 #include <ipxe/elf.h>
 #include <ipxe/init.h>
 #include <ipxe/features.h>
diff --git a/src/arch/i386/interface/pcbios/int13.c b/src/arch/i386/interface/pcbios/int13.c
index a2cf5e6b9..f72dc5fa9 100644
--- a/src/arch/i386/interface/pcbios/int13.c
+++ b/src/arch/i386/interface/pcbios/int13.c
@@ -25,7 +25,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <assert.h>
 #include <ipxe/list.h>
 #include <ipxe/blockdev.h>
-#include <ipxe/memmap.h>
+#include <ipxe/io.h>
 #include <realmode.h>
 #include <bios.h>
 #include <biosint.h>
diff --git a/src/arch/i386/interface/pcbios/memtop_umalloc.c b/src/arch/i386/interface/pcbios/memtop_umalloc.c
index 51240f2ab..16736e194 100644
--- a/src/arch/i386/interface/pcbios/memtop_umalloc.c
+++ b/src/arch/i386/interface/pcbios/memtop_umalloc.c
@@ -29,7 +29,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <ipxe/uaccess.h>
 #include <ipxe/hidemem.h>
-#include <ipxe/memmap.h>
+#include <ipxe/io.h>
 #include <ipxe/umalloc.h>
 
 /** Alignment of external allocated memory */