diff --git a/ChangeLog b/ChangeLog
index 780b8ab3a..9aa44973d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-21  Robert Millan  <rmh@aybabtu.com>
+
+	* include/grub/i386/pc/kernel.h: Include `<grub/symbol.h>'.
+
+	* include/grub/kernel.h (grub_arch_memdisk_addr,
+	grub_arch_memdisk_size): Moved from here ...
+
+	* include/grub/i386/pc/kernel.h (grub_arch_memdisk_addr,
+	grub_arch_memdisk_size): ... to here.
+
 2008-01-21  Robert Millan  <rmh@aybabtu.com>
 
 	Mostly based on bugfix from Bean.
diff --git a/include/grub/i386/pc/kernel.h b/include/grub/i386/pc/kernel.h
index 34f7ea17d..ca16df788 100644
--- a/include/grub/i386/pc/kernel.h
+++ b/include/grub/i386/pc/kernel.h
@@ -48,6 +48,7 @@
 
 #ifndef ASM_FILE
 
+#include <grub/symbol.h>
 #include <grub/types.h>
 
 /* The size of kernel image.  */
@@ -75,6 +76,9 @@ extern grub_int32_t grub_boot_drive;
 /* The end address of the kernel.  */
 extern grub_addr_t grub_end_addr;
 
+extern grub_addr_t EXPORT_FUNC(grub_arch_memdisk_addr) (void);
+extern grub_off_t EXPORT_FUNC(grub_arch_memdisk_size) (void);
+
 #endif /* ! ASM_FILE */
 
 #endif /* ! KERNEL_MACHINE_HEADER */
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index 7413e19bc..4a4e2cc41 100644
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -45,8 +45,6 @@ struct grub_module_info
 };
 
 extern grub_addr_t grub_arch_modules_addr (void);
-extern grub_addr_t EXPORT_FUNC(grub_arch_memdisk_addr) (void);
-extern grub_off_t EXPORT_FUNC(grub_arch_memdisk_size) (void);
 
 /* The start point of the C code.  */
 void grub_main (void);