diff --git a/src/mainboard/emulation/qemu-i440fx/Makefile.inc b/src/mainboard/emulation/qemu-i440fx/Makefile.inc
index e3ca3002ff..cac74ee435 100644
--- a/src/mainboard/emulation/qemu-i440fx/Makefile.inc
+++ b/src/mainboard/emulation/qemu-i440fx/Makefile.inc
@@ -1,8 +1,10 @@
-ramstage-y += northbridge.c
-ramstage-y += fw_cfg.c
 romstage-y += fw_cfg.c
-romstage-y += memory.c
-ramstage-y += memory.c
-postcar-y += memory.c
+romstage-y += memmap.c
+
 postcar-y += fw_cfg.c
+postcar-y += memmap.c
 postcar-y += exit_car.S
+
+ramstage-y += fw_cfg.c
+ramstage-y += memmap.c
+ramstage-y += northbridge.c
diff --git a/src/mainboard/emulation/qemu-i440fx/memory.c b/src/mainboard/emulation/qemu-i440fx/memmap.c
similarity index 100%
rename from src/mainboard/emulation/qemu-i440fx/memory.c
rename to src/mainboard/emulation/qemu-i440fx/memmap.c
diff --git a/src/mainboard/emulation/qemu-q35/Makefile.inc b/src/mainboard/emulation/qemu-q35/Makefile.inc
index b18d2e4f97..133a213cc6 100644
--- a/src/mainboard/emulation/qemu-q35/Makefile.inc
+++ b/src/mainboard/emulation/qemu-q35/Makefile.inc
@@ -1,11 +1,12 @@
-ramstage-y += ../qemu-i440fx/northbridge.c
-ramstage-y += ../qemu-i440fx/memory.c
-ramstage-y += ../qemu-i440fx/fw_cfg.c
-romstage-y += ../qemu-i440fx/memory.c
-romstage-y += ../qemu-i440fx/fw_cfg.c
-
-postcar-y += ../qemu-i440fx/memory.c
-postcar-y += ../qemu-i440fx/exit_car.S
-postcar-y += ../qemu-i440fx/fw_cfg.c
-
 bootblock-y += bootblock.c
+
+romstage-y += ../qemu-i440fx/fw_cfg.c
+romstage-y += ../qemu-i440fx/memmap.c
+
+postcar-y += ../qemu-i440fx/fw_cfg.c
+postcar-y += ../qemu-i440fx/memmap.c
+postcar-y += ../qemu-i440fx/exit_car.S
+
+ramstage-y += ../qemu-i440fx/fw_cfg.c
+ramstage-y += ../qemu-i440fx/memmap.c
+ramstage-y += ../qemu-i440fx/northbridge.c