diff --git a/ChangeLog b/ChangeLog
index 65387ecf5..74b1d3a32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-13  Pavel Roskin  <proski@gnu.org>
 
+	* loader/i386/pc/multiboot2.c: Add necessary includes for
+	grub_multiboot2_real_boot().
+
 	* fs/iso9660.c (grub_iso9660_iterate_dir): The file mode in the
 	PX record is always little-endian.  We only need the lower 2
 	bytes of the mode.
diff --git a/loader/i386/pc/multiboot2.c b/loader/i386/pc/multiboot2.c
index d5fe8e380..2c14ee254 100644
--- a/loader/i386/pc/multiboot2.c
+++ b/loader/i386/pc/multiboot2.c
@@ -23,6 +23,8 @@
 #include <grub/err.h>
 #include <grub/machine/loader.h>
 #include <grub/mm.h>
+#include <grub/multiboot.h>
+#include <grub/cpu/multiboot.h>
 
 grub_err_t
 grub_mb2_arch_elf32_hook (Elf32_Phdr *phdr, UNUSED grub_addr_t *addr)