diff --git a/ChangeLog b/ChangeLog
index 86ae086d9..19e3be95c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-10-31  Robert Millan  <rmh@aybabtu.com>
+
+	* include/grub/i386/pc/init.h (grub_lower_mem): Moved from here ...
+	* include/grub/i386/pc/memory.h (grub_lower_mem): ... to here.
+
+	* include/grub/i386/pc/init.h (grub_upper_mem): Moved from here ...
+	* include/grub/i386/pc/memory.h (grub_upper_mem): ... to here.
+
+	* include/grub/i386/pc/memory.h: Include `<grub/symbol.h>' and
+	`<grub/types.h>'.
+
+	* loader/i386/pc/multiboot.c: Include `<grub/machine/memory.h>'.
+
 2007-10-27  Robert Millan  <rmh@aybabtu.com>
 
 	* include/grub/types.h (ULONG_MAX): Define macro.
diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
index 0bbf886e9..9ff593427 100644
--- a/include/grub/i386/pc/init.h
+++ b/include/grub/i386/pc/init.h
@@ -22,10 +22,6 @@
 #include <grub/types.h>
 #include <grub/symbol.h>
 
-/* FIXME: Should these be declared in memory.h?  */
-extern grub_size_t EXPORT_VAR(grub_lower_mem);
-extern grub_size_t EXPORT_VAR(grub_upper_mem);
-
 extern grub_addr_t EXPORT_VAR(grub_os_area_addr);
 extern grub_size_t EXPORT_VAR(grub_os_area_size);
 
diff --git a/include/grub/i386/pc/memory.h b/include/grub/i386/pc/memory.h
index 0de7a0318..b8f985016 100644
--- a/include/grub/i386/pc/memory.h
+++ b/include/grub/i386/pc/memory.h
@@ -20,6 +20,11 @@
 #ifndef GRUB_MEMORY_MACHINE_HEADER
 #define GRUB_MEMORY_MACHINE_HEADER	1
 
+#include <grub/symbol.h>
+#ifndef ASM_FILE
+#include <grub/types.h>
+#endif
+
 /* The scratch buffer used in real mode code.  */
 #define GRUB_MEMORY_MACHINE_SCRATCH_ADDR	0x68000
 #define GRUB_MEMORY_MACHINE_SCRATCH_SEG	(GRUB_MEMORY_MACHINE_SCRATCH_ADDR >> 4)
@@ -64,4 +69,9 @@
 /* The data segment of the pseudo real mode.  */
 #define GRUB_MEMORY_MACHINE_PSEUDO_REAL_DSEG	0x20
 
+#ifndef ASM_FILE
+extern grub_size_t EXPORT_VAR(grub_lower_mem);
+extern grub_size_t EXPORT_VAR(grub_upper_mem);
+#endif
+
 #endif /* ! GRUB_MEMORY_MACHINE_HEADER */
diff --git a/loader/i386/pc/multiboot.c b/loader/i386/pc/multiboot.c
index e5b905c4f..250ef47f9 100644
--- a/loader/i386/pc/multiboot.c
+++ b/loader/i386/pc/multiboot.c
@@ -34,6 +34,7 @@
 #include <grub/machine/loader.h>
 #include <grub/multiboot.h>
 #include <grub/machine/init.h>
+#include <grub/machine/memory.h>
 #include <grub/elf.h>
 #include <grub/file.h>
 #include <grub/err.h>