diff --git a/grub-core/mmap/efi/mmap.c b/grub-core/mmap/efi/mmap.c
index a34a7ac53..c71adad57 100644
--- a/grub-core/mmap/efi/mmap.c
+++ b/grub-core/mmap/efi/mmap.c
@@ -125,7 +125,7 @@ grub_efi_mmap_iterate (grub_memory_hook_t hook, int avoid_efi_boot_services)
 }
 
 grub_err_t
-grub_machine_mmap_iterate (grub_memory_hook_t hook, int avoid_efi_boot_services)
+grub_machine_mmap_iterate (grub_memory_hook_t hook)
 {
   return grub_efi_mmap_iterate (hook, 0);
 }
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
index 811dc3d6c..067e3bdac 100644
--- a/include/grub/efi/efi.h
+++ b/include/grub/efi/efi.h
@@ -85,7 +85,4 @@ extern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle);
 
 extern int EXPORT_VAR(grub_efi_is_finished);
 
-grub_err_t
-grub_efi_mmap_iterate (grub_memory_hook_t hook, int avoid_efi_boot_services);
-
 #endif /* ! GRUB_EFI_EFI_HEADER */
diff --git a/include/grub/memory.h b/include/grub/memory.h
index d98386565..61470d747 100644
--- a/include/grub/memory.h
+++ b/include/grub/memory.h
@@ -42,6 +42,11 @@ typedef int NESTED_FUNC_ATTR (*grub_memory_hook_t) (grub_uint64_t,
 
 grub_err_t grub_mmap_iterate (grub_memory_hook_t hook);
 
+#ifdef GRUB_MACHINE_EFI
+grub_err_t
+grub_efi_mmap_iterate (grub_memory_hook_t hook, int avoid_efi_boot_services);
+#endif
+
 #if !defined (GRUB_MACHINE_EMU) && !defined (GRUB_MACHINE_EFI)
 grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate) (grub_memory_hook_t hook);
 #else