diff --git a/ChangeLog b/ChangeLog
index 99cdede98..74f39bd66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-12  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* stage2/Makefile.am (libgrub_a_CFLAGS): Added
+	-I$(top_srcdir)/lib.
+	* stage2/builtins.c [GRUB_UTIL]: Include device.h.
+	
 2000-07-12  OKUJI Yoshinori  <okuji@gnu.org>
 
 	Segreate OS-specific helper functions from asmstub.c.
diff --git a/stage2/Makefile.am b/stage2/Makefile.am
index cfa69a75e..1be8ecc75 100644
--- a/stage2/Makefile.am
+++ b/stage2/Makefile.am
@@ -16,9 +16,9 @@ noinst_LIBRARIES = libgrub.a
 libgrub_a_SOURCES = boot.c builtins.c common.c char_io.c cmdline.c \
 	disk_io.c gunzip.c fsys_ffs.c fsys_ext2fs.c fsys_fat.c \
 	fsys_minix.c fsys_reiserfs.c stage2.c
-libgrub_a_CFLAGS = $(GRUB_CFLAGS) -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 \
-	-DFSYS_FAT=1 -DFSYS_FFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
-	-fwritable-strings
+libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
+	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
+	-DFSYS_MINIX=1 -DFSYS_REISERFS=1 -fwritable-strings
 
 # Stage 2 and Stage 1.5's.
 pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
diff --git a/stage2/Makefile.in b/stage2/Makefile.in
index afaafc2fd..932ca5206 100644
--- a/stage2/Makefile.in
+++ b/stage2/Makefile.in
@@ -106,9 +106,9 @@ libgrub_a_SOURCES = boot.c builtins.c common.c char_io.c cmdline.c \
 	disk_io.c gunzip.c fsys_ffs.c fsys_ext2fs.c fsys_fat.c \
 	fsys_minix.c fsys_reiserfs.c stage2.c
 
-libgrub_a_CFLAGS = $(GRUB_CFLAGS) -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 \
-	-DFSYS_FAT=1 -DFSYS_FFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
-	-fwritable-strings
+libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
+	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
+	-DFSYS_MINIX=1 -DFSYS_REISERFS=1 -fwritable-strings
 
 
 # Stage 2 and Stage 1.5's.
diff --git a/stage2/builtins.c b/stage2/builtins.c
index 1da6d6cdd..b99506b35 100644
--- a/stage2/builtins.c
+++ b/stage2/builtins.c
@@ -26,10 +26,12 @@
 # include <etherboot.h>
 #endif
 
-#ifndef GRUB_UTIL
-# include "apic.h"
-# include "smp-imps.h"
-#endif
+#ifdef GRUB_UTIL
+# include <device.h>
+#else /* ! GRUB_UTIL */
+# include <apic.h>
+# include <smp-imps.h>
+#endif /* ! GRUB_UTIL */
 
 /* The type of kernel loaded.  */
 kernel_t kernel_type;