diff --git a/autogen.sh b/autogen.sh
index 49cd1fca5..60139cfb3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,44 +4,21 @@ set -e
 
 autogen --version >/dev/null || (echo autogen missing; exit 1)
 
-echo "Creating symlinks..."
-ln -svf ../NEWS grub-core/
-ln -svf ../TODO grub-core/
-ln -svf ../THANKS grub-core/
-ln -svf ../README grub-core/
-ln -svf ../INSTALL grub-core/
-ln -svf ../AUTHORS grub-core/
-ln -svf ../COPYING grub-core/
-ln -svf ../ABOUT-NLS grub-core/
-ln -svf ../ChangeLog grub-core/
-ln -svf ../aclocal.m4 grub-core/
-ln -svf ../acinclude.m4 grub-core/
-ln -svf ../config.rpath grub-core/
-ln -svf ../gentpl.py grub-core/
-ln -svf ../configure.common grub-core/
-
-mkdir -vp grub-core/docs/man
-ln -svf ../../../docs/man/grub-emu.h2m grub-core/docs/man
-
 echo "Creating Makefile.tpl..."
 python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
+
 echo "Running autogen..."
 autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am
-
-echo "Creating grub-core/Makefile.tpl..."
-(cd grub-core && python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl)
-echo "Running autogen..."
-(cd grub-core && autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am)
+autogen -T Makefile.tpl grub-core/modules.def | sed -e '/^$/{N;/^\n$/D;}' > grub-core/modules.am
 
 echo "Importing unicode..."
 python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt grub-core/unidata.c
 
 echo "Importing libgcrypt..."
-(cd grub-core && python import_gcry.py lib/libgcrypt/ .)
+python util/import_gcry.py grub-core/lib/libgcrypt/ grub-core
 
 echo "Saving timestamps..."
 echo timestamp > stamp-h.in
-(cd grub-core && echo timestamp > stamp-h.in)
 
 echo "Running autoreconf..."
 autoreconf -vi
diff --git a/grub-core/conf/any-emu.rmk b/conf/any-emu.rmk
similarity index 100%
rename from grub-core/conf/any-emu.rmk
rename to conf/any-emu.rmk
diff --git a/grub-core/conf/common.rmk b/conf/common.rmk
similarity index 100%
rename from grub-core/conf/common.rmk
rename to conf/common.rmk
diff --git a/grub-core/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
similarity index 100%
rename from grub-core/conf/i386-coreboot.rmk
rename to conf/i386-coreboot.rmk
diff --git a/grub-core/conf/i386-efi.rmk b/conf/i386-efi.rmk
similarity index 100%
rename from grub-core/conf/i386-efi.rmk
rename to conf/i386-efi.rmk
diff --git a/grub-core/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
similarity index 100%
rename from grub-core/conf/i386-ieee1275.rmk
rename to conf/i386-ieee1275.rmk
diff --git a/grub-core/conf/i386-multiboot.rmk b/conf/i386-multiboot.rmk
similarity index 100%
rename from grub-core/conf/i386-multiboot.rmk
rename to conf/i386-multiboot.rmk
diff --git a/grub-core/conf/i386-pc-cygwin-img-ld.sc b/conf/i386-pc-cygwin-img-ld.sc
similarity index 100%
rename from grub-core/conf/i386-pc-cygwin-img-ld.sc
rename to conf/i386-pc-cygwin-img-ld.sc
diff --git a/grub-core/conf/i386-pc.rmk b/conf/i386-pc.rmk
similarity index 100%
rename from grub-core/conf/i386-pc.rmk
rename to conf/i386-pc.rmk
diff --git a/grub-core/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
similarity index 100%
rename from grub-core/conf/i386-qemu.rmk
rename to conf/i386-qemu.rmk
diff --git a/grub-core/conf/i386.rmk b/conf/i386.rmk
similarity index 100%
rename from grub-core/conf/i386.rmk
rename to conf/i386.rmk
diff --git a/grub-core/conf/mips-qemu-mips.rmk b/conf/mips-qemu-mips.rmk
similarity index 100%
rename from grub-core/conf/mips-qemu-mips.rmk
rename to conf/mips-qemu-mips.rmk
diff --git a/grub-core/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
similarity index 100%
rename from grub-core/conf/mips-yeeloong.rmk
rename to conf/mips-yeeloong.rmk
diff --git a/grub-core/conf/mips.rmk b/conf/mips.rmk
similarity index 100%
rename from grub-core/conf/mips.rmk
rename to conf/mips.rmk
diff --git a/grub-core/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
similarity index 100%
rename from grub-core/conf/powerpc-ieee1275.rmk
rename to conf/powerpc-ieee1275.rmk
diff --git a/grub-core/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
similarity index 100%
rename from grub-core/conf/sparc64-ieee1275.rmk
rename to conf/sparc64-ieee1275.rmk
diff --git a/grub-core/conf/tests.rmk b/conf/tests.rmk
similarity index 100%
rename from grub-core/conf/tests.rmk
rename to conf/tests.rmk
diff --git a/grub-core/conf/x86-efi.rmk b/conf/x86-efi.rmk
similarity index 100%
rename from grub-core/conf/x86-efi.rmk
rename to conf/x86-efi.rmk
diff --git a/grub-core/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
similarity index 100%
rename from grub-core/conf/x86_64-efi.rmk
rename to conf/x86_64-efi.rmk
diff --git a/configure.ac b/configure.ac
index 9b9db0ac4..dafea4545 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,13 +33,15 @@ dnl package (in grub-core directory) builds with TARGETCC.
 AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
 AC_CONFIG_AUX_DIR([.])
 
+: ${CFLAGS=""} # We don't want -g -O2
+
 # Checks for host and target systems.
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
 AM_INIT_AUTOMAKE()
 AC_PREREQ(2.60)
-AC_CONFIG_SRCDIR([grub-core/include/grub/dl.h])
+AC_CONFIG_SRCDIR([include/grub/dl.h])
 AC_CONFIG_HEADER([config.h])
 
 grub_coredir='grub-core'
@@ -51,12 +53,31 @@ AC_SUBST(grub_utildir)
 m4_include([configure.common])
 
 # Output files.
+grub_CHECK_LINK_DIR
+if test x"$link_dir" = xyes ; then
+  AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
+  mkdir -p grub-core/lib
+  cp -rp $srcdir/grub-core/lib/$target_cpu grub-core/lib/target_cpu
+  if test "$platform" != emu ; then
+    AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
+  fi
+else
+  mkdir -p include/grub 2>/dev/null
+  rm -rf include/grub/cpu
+  cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
+  cp -rp $srcdir/grub-core/lib/$target_cpu grub-core/lib/target_cpu 2>/dev/null
+  if test "$platform" != emu ; then
+    rm -rf include/grub/machine
+    cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
+  fi
+fi
+
 AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([grub-core/Makefile])
 AC_CONFIG_FILES([po/Makefile])
 AC_CONFIG_FILES([docs/Makefile])
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
 
-AC_CONFIG_SUBDIRS([grub-core])
 AC_OUTPUT
 [
 echo "*******************************************************"
diff --git a/gentpl.py b/gentpl.py
index 6dd5e84a2..4d7ed0aa3 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -222,8 +222,8 @@ def-[+ name +].lst: [+ name +].module$(EXEEXT)
 und-[+ name +].lst: [+ name +].module$(EXEEXT)
 	$(NM) -u -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@
 
-mod-[+ name +].c: [+ name +].module$(EXEEXT) $(top_builddir)/moddep.lst $(top_srcdir)/genmodsrc.sh
-	sh $(top_srcdir)/genmodsrc.sh [+ name +] $(top_builddir)/moddep.lst > $@ || (rm -f $@; exit 1)
+mod-[+ name +].c: [+ name +].module$(EXEEXT) moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh [+ name +] moddep.lst > $@ || (rm -f $@; exit 1)
 
 mod-[+ name +].o: mod-[+ name +].c
 	$(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS_MODULE) $(CPPFLAGS) $(CFLAGS_MODULE) $(CFLAGS) -c -o $@ $<
@@ -239,26 +239,26 @@ mod-[+ name +].o: mod-[+ name +].c
 	  $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; \
 	fi
 
-command-[+ name +].lst: [+ name +].pp $(top_srcdir)/gencmdlist.sh
-	cat $< | sh $(top_srcdir)/gencmdlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+command-[+ name +].lst: [+ name +].pp $(srcdir)/gencmdlist.sh
+	cat $< | sh $(srcdir)/gencmdlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-fs-[+ name +].lst: [+ name +].pp $(top_srcdir)/genfslist.sh
-	cat $< | sh $(top_srcdir)/genfslist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+fs-[+ name +].lst: [+ name +].pp $(srcdir)/genfslist.sh
+	cat $< | sh $(srcdir)/genfslist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-video-[+ name +].lst: [+ name +].pp $(top_srcdir)/genvideolist.sh
-	cat $< | sh $(top_srcdir)/genvideolist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+video-[+ name +].lst: [+ name +].pp $(srcdir)/genvideolist.sh
+	cat $< | sh $(srcdir)/genvideolist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-partmap-[+ name +].lst: [+ name +].pp $(top_srcdir)/genpartmaplist.sh
-	cat $< | sh $(top_srcdir)/genpartmaplist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+partmap-[+ name +].lst: [+ name +].pp $(srcdir)/genpartmaplist.sh
+	cat $< | sh $(srcdir)/genpartmaplist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-parttool-[+ name +].lst: [+ name +].pp $(top_srcdir)/genparttoollist.sh
-	cat $< | sh $(top_srcdir)/genparttoollist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+parttool-[+ name +].lst: [+ name +].pp $(srcdir)/genparttoollist.sh
+	cat $< | sh $(srcdir)/genparttoollist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-handler-[+ name +].lst: [+ name +].pp $(top_srcdir)/genhandlerlist.sh
-	cat $< | sh $(top_srcdir)/genhandlerlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+handler-[+ name +].lst: [+ name +].pp $(srcdir)/genhandlerlist.sh
+	cat $< | sh $(srcdir)/genhandlerlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-terminal-[+ name +].lst: [+ name +].pp $(top_srcdir)/genterminallist.sh
-	cat $< | sh $(top_srcdir)/genterminallist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+terminal-[+ name +].lst: [+ name +].pp $(srcdir)/genterminallist.sh
+	cat $< | sh $(srcdir)/genterminallist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 """
     return r
 
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 654a7e9a4..437835c83 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -1,6 +1,9 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-SUBDIRS = po
+CC=$(TARGET_CC)
+CPP=$(TARGET_CC)
+CCAS=$(TARGET_CC)
+
 EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk
 EXTRA_DIST += genmodsrc.sh gensymlist.sh genemuinit.sh genemuinitheader.sh
 EXTRA_DIST += genfslist.sh gencmdlist.sh genvideolist.sh genhandlerlist.sh
@@ -8,7 +11,88 @@ EXTRA_DIST += genpartmaplist.sh genparttoollist.sh genterminallist.sh
 EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc
 EXTRA_DIST += $(shell find $(top_srcdir) -name '*.h')
 
-include $(top_srcdir)/Makefile.vars
+grubconfdir = $(sysconfdir)/grub.d
+platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
+
+# to calm down automake
+BUILT_SOURCES =
+CLEANFILES =
+COMMAND_FILES =
+DEF_FILES =
+FS_FILES =
+HANDLER_FILES =
+IMG_FILES =
+MOD_FILES =
+MODULE_FILES =
+PARTMAP_FILES =
+PARTTOOL_FILES =
+TERMINAL_FILES =
+TESTS =
+UND_FILES =
+VIDEO_FILES =
+bin_PROGRAMS =
+bin_SCRIPTS =
+check_PROGRAMS =
+check_SCRIPTS =
+grubconf_DATA =
+grubconf_SCRIPTS =
+man_MANS =
+noinst_DATA =
+noinst_LIBRARIES =
+noinst_PROGRAMS =
+pkglib_SCRIPTS =
+platform_DATA =
+sbin_PROGRAMS =
+sbin_SCRIPTS =
+KERNEL_HEADER_FILES =
+
+# Platform specific options
+if COND_i386_pc
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_efi
+  LDFLAGS_PLATFORM = -melf_i386
+endif
+if COND_x86_64_efi
+  LDFLAGS_PLATFORM = -melf_x86_64
+endif
+if COND_i386_qemu
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_coreboot
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_ieee1275
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_mips_yeeloong
+  CFLAGS_PLATFORM = -march=mips3 -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
+  CCASFLAGS_PLATFORM = -march=mips3
+endif
+if COND_sparc64_ieee1275
+  CFLAGS_PLATFORM = -mno-app-regs
+  LDFLAGS_PLATFORM = -melf64_sparc -mno-relax
+endif
+
+CPPFLAGS_GRUB = -DGRUB_FILE=\"`basename $<`\"
+CPPFLAGS_GRUB += -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
+CPPFLAGS_GRUB += -I$(top_srcdir)/include
+CPPFLAGS_GRUB += -I$(top_builddir)/include
+CCASFLAGS_GRUB = -DASM_FILE=1
+
+CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
+CPPFLAGS_GCRY = -I$(top_srcdir)/$(grub_coredir)/lib/libgcrypt_wrap
+
+CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
+CPPFLAGS_GNULIB = -I$(top_srcdir)/$(grub_coredir)/gnulib
+
+CFLAGS_MKISOFS = -Wno-all -Werror
+CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
+
+CFLAGS_POSIX = -fno-builtin
+CPPFLAGS_POSIX = -I$(top_srcdir)/$(grub_coredir)/lib/posix_wrap
+
+CPPFLAGS_EFIEMU = -I$(top_srcdir)/$(grub_coredir)/efiemu/runtime
 
 LDADD_KERNEL = -lgcc
 CFLAGS_KERNEL = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
@@ -41,30 +125,231 @@ AM_CPPFLAGS = $(CPPFLAGS_GRUB)
 AM_CCASFLAGS = $(CCASFLAGS_GRUB)
 
 # gentrigtables
-gentrigtables: $(top_srcdir)/gentrigtables.c
+gentrigtables: gentrigtables.c
 	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(CPPFLAGS) -lm $<
 CLEANFILES += gentrigtables
 
 # trigtables.c
-trigtables.c: gentrigtables.c configure.ac
+trigtables.c: gentrigtables.c $(top_srcdir)/configure.ac
 	$(MAKE) $(AM_MAKEFLAGS) gentrigtables
-	$(top_builddir)/gentrigtables > $@
+	$(builddir)/gentrigtables > $@
 CLEANFILES += trigtables.c
 
 # XXX Use Automake's LEX & YACC support
-grub_script.tab.h: $(top_srcdir)/script/parser.y
-	$(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/script/parser.y
+grub_script.tab.h: script/parser.y
+	$(YACC) -d -p grub_script_yy -b grub_script $<
 grub_script.tab.c: grub_script.tab.h
 CLEANFILES += grub_script.tab.c grub_script.tab.h
 
 # For the lexer.
-grub_script.yy.h: $(top_srcdir)/script/yylex.l
-	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/script/yylex.l
+grub_script.yy.h: script/yylex.l
+	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $<
 grub_script.yy.c: grub_script.yy.h
 CLEANFILES += grub_script.yy.c grub_script.yy.h
 
 include $(srcdir)/modules.am
-include $(srcdir)/Makefile.kernel
+
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cache.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elf.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elfload.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/file.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/reader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/symbol.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/types.h
+
+if COND_i386_pc
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/biosdisk.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vga.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vbe.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pxe.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+endif
+
+if COND_i386_efi
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+endif
+
+if COND_i386_coreboot
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+endif
+
+if COND_i386_multiboot
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+endif
+
+if COND_i386_qemu
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
+endif
+
+if COND_i386_ieee1275
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
+endif
+
+if COND_x86_64_efi
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+endif
+
+if COND_mips_yeeloong
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap_scale.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cs5536.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pci.h
+endif
+
+if COND_powerpc_ieee1275
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+endif
+
+if COND_sparc64_ieee1275
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h
+endif
+
+if COND_emu
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/time.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/types.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gzio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/menu.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h
+if COND_GRUB_EMU_SDL
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h
+endif
+if COND_GRUB_EMU_USB
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libusb.h
+endif
+if COND_GRUB_EMU_PCI
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libpciaccess.h
+endif
+endif
+
+symlist.h: $(top_builddir)/config.h $(KERNEL_HEADER_FILES)
+	@list='$^'; \
+	for p in $$list; do \
+	  echo "#include <$$p>" >> $@ || (rm -f $@; exit 1); \
+	done
+CLEANFILES += symlist.h
+BUILT_SOURCES += symlist.h
+
+symlist.c: symlist.h gensymlist.sh
+	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
+	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
+	rm -f symlist.p
+CLEANFILES += symlist.c
+BUILT_SOURCES += symlist.c
+
+noinst_DATA += kernel_syms.lst
+kernel_syms.lst: $(KERNEL_HEADER_FILES) $(top_builddir)/config.h
+	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
+	if grep "^#define HAVE_ASM_USCORE" $(top_builddir)/config.h; then u="_"; else u=""; fi; \
+	cat kernel_syms.input | grep -v '^#' | sed -n \
+	  -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
+	  -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
+	  | sort -u >$@
+	rm -f kernel_syms.input
+CLEANFILES += kernel_syms.lst
+
+if COND_emu
+kern/emu/grub_emu-main.$(OBJEXT):grub_emu_init.h
+grub_emu-grub_emu_init.$(OBJEXT):grub_emu_init.h
+kern/emu/grub_emu_dyn-main.$(OBJEXT):grub_emu_init.h
+grub_emu_dyn-grub_emu_init.$(OBJEXT):grub_emu_init.h
+
+grub_emu_init.h: genemuinitheader.sh $(MOD_FILES)
+	rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinitheader.sh $(NM) > $@
+CLEANFILES += grub_emu_init.h
+
+grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MOD_FILES)
+	rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinit.sh $(NM) > $@
+CLEANFILES += grub_emu_init.c
+endif
 
 # .lst files
 platform_DATA += moddep.lst
@@ -77,9 +362,6 @@ platform_DATA += parttool.lst
 platform_DATA += video.lst
 platform_DATA += crypto.lst
 CLEANFILES += moddep.lst
-CLEANFILES += fs.lst
-CLEANFILES += command.lst
-CLEANFILES += partmap.lst
 CLEANFILES += handler.lst
 CLEANFILES += terminal.lst
 CLEANFILES += parttool.lst
@@ -88,27 +370,41 @@ CLEANFILES += crypto.lst
 
 fs.lst: $(FS_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += fs.lst
+
 command.lst: $(COMMAND_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += command.lst
+
 partmap.lst: $(PARTMAP_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += partmap.lst
+
 handler.lst: $(HANDLER_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += handler.lst
+
 terminal.lst: $(TERMINAL_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += terminal.lst
+
 parttool.lst: $(PARTTOOL_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += parttool.lst
+
 video.lst: $(VIDEO_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += video.lst
 
 # but, crypto.lst is simply copied
-crypto.lst: $(top_srcdir)/lib/libgcrypt-grub/cipher/crypto.lst
+crypto.lst: $(srcdir)/lib/libgcrypt-grub/cipher/crypto.lst
 	cp $^ $@
+CLEANFILES += crypto.lst
 
 # generate global module dependencies list
 moddep.lst: kernel_syms.lst genmoddep.awk $(DEF_FILES) $(UND_FILES)
 	cat $(DEF_FILES) kernel_syms.lst /dev/null \
-	  | $(AWK) -f $(top_srcdir)/genmoddep.awk $(UND_FILES) > $@ \
+	  | $(AWK) -f $(srcdir)/genmoddep.awk $(UND_FILES) > $@ \
 	  || (rm -f $@; exit 1)
 
 if COND_i386_pc
diff --git a/grub-core/Makefile.kernel b/grub-core/Makefile.kernel
index b03563676..69c20a4fc 100644
--- a/grub-core/Makefile.kernel
+++ b/grub-core/Makefile.kernel
@@ -1,168 +1,168 @@
 # -*- makefile -*-
 
 KERNEL_HEADER_FILES =
-KERNEL_HEADER_FILES += include/grub/cache.h
-KERNEL_HEADER_FILES += include/grub/command.h
-KERNEL_HEADER_FILES += include/grub/device.h
-KERNEL_HEADER_FILES += include/grub/disk.h
-KERNEL_HEADER_FILES += include/grub/dl.h
-KERNEL_HEADER_FILES += include/grub/elf.h
-KERNEL_HEADER_FILES += include/grub/elfload.h
-KERNEL_HEADER_FILES += include/grub/env.h
-KERNEL_HEADER_FILES += include/grub/env_private.h
-KERNEL_HEADER_FILES += include/grub/err.h
-KERNEL_HEADER_FILES += include/grub/file.h
-KERNEL_HEADER_FILES += include/grub/fs.h
-KERNEL_HEADER_FILES += include/grub/i18n.h
-KERNEL_HEADER_FILES += include/grub/kernel.h
-KERNEL_HEADER_FILES += include/grub/list.h
-KERNEL_HEADER_FILES += include/grub/misc.h
-KERNEL_HEADER_FILES += include/grub/mm.h
-KERNEL_HEADER_FILES += include/grub/net.h
-KERNEL_HEADER_FILES += include/grub/parser.h
-KERNEL_HEADER_FILES += include/grub/partition.h
-KERNEL_HEADER_FILES += include/grub/reader.h
-KERNEL_HEADER_FILES += include/grub/symbol.h
-KERNEL_HEADER_FILES += include/grub/term.h
-KERNEL_HEADER_FILES += include/grub/time.h
-KERNEL_HEADER_FILES += include/grub/types.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cache.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elf.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elfload.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/file.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/reader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/symbol.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/types.h
 
 if COND_i386_pc
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/biosdisk.h
-KERNEL_HEADER_FILES += include/grub/machine/boot.h
-KERNEL_HEADER_FILES += include/grub/machine/console.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
-KERNEL_HEADER_FILES += include/grub/machine/vga.h
-KERNEL_HEADER_FILES += include/grub/machine/vbe.h
-KERNEL_HEADER_FILES += include/grub/machine/kernel.h
-KERNEL_HEADER_FILES += include/grub/machine/pxe.h
-KERNEL_HEADER_FILES += include/grub/i386/pit.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/biosdisk.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vga.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vbe.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pxe.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_i386_efi
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/efi/efi.h
-KERNEL_HEADER_FILES += include/grub/efi/time.h
-KERNEL_HEADER_FILES += include/grub/efi/disk.h
-KERNEL_HEADER_FILES += include/grub/i386/pit.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_i386_coreboot
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/boot.h
-KERNEL_HEADER_FILES += include/grub/machine/console.h
-KERNEL_HEADER_FILES += include/grub/machine/init.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
 endif
 
 if COND_i386_multiboot
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/boot.h
-KERNEL_HEADER_FILES += include/grub/machine/console.h
-KERNEL_HEADER_FILES += include/grub/machine/init.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
 endif
 
 if COND_i386_qemu
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/boot.h
-KERNEL_HEADER_FILES += include/grub/machine/console.h
-KERNEL_HEADER_FILES += include/grub/machine/init.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
-KERNEL_HEADER_FILES += include/grub/pci.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
 endif
 
 if COND_i386_ieee1275
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/terminfo.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
 endif
 
 if COND_x86_64_efi
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/efi/efi.h
-KERNEL_HEADER_FILES += include/grub/efi/time.h
-KERNEL_HEADER_FILES += include/grub/efi/disk.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
-KERNEL_HEADER_FILES += include/grub/i386/pit.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_mips_yeeloong
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/kernel.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/cpu/cache.h
-KERNEL_HEADER_FILES += include/grub/bitmap.h
-KERNEL_HEADER_FILES += include/grub/video.h
-KERNEL_HEADER_FILES += include/grub/gfxterm.h
-KERNEL_HEADER_FILES += include/grub/font.h
-KERNEL_HEADER_FILES += include/grub/bitmap_scale.h
-KERNEL_HEADER_FILES += include/grub/bufio.h
-KERNEL_HEADER_FILES += include/grub/pci.h
-KERNEL_HEADER_FILES += include/grub/libgcc.h
-KERNEL_HEADER_FILES += include/grub/cs5536.h
-KERNEL_HEADER_FILES += include/grub/machine/pci.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap_scale.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cs5536.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pci.h
 endif
 
 if COND_powerpc_ieee1275
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
 endif
 
 if COND_sparc64_ieee1275
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/libgcc.h
-KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += include/grub/machine/kernel.h
-KERNEL_HEADER_FILES += include/grub/sparc64/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h
 endif
 
 if COND_emu
-KERNEL_HEADER_FILES += include/grub/cpu/time.h
-KERNEL_HEADER_FILES += include/grub/cpu/types.h
-KERNEL_HEADER_FILES += include/grub/gzio.h
-KERNEL_HEADER_FILES += include/grub/menu.h
-KERNEL_HEADER_FILES += include/grub/datetime.h
-KERNEL_HEADER_FILES += include/grub/emu/misc.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/time.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/types.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gzio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/menu.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h
 if COND_GRUB_EMU_SDL
-KERNEL_HEADER_FILES += include/grub/sdl.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h
 endif
 if COND_GRUB_EMU_USB
-KERNEL_HEADER_FILES += include/grub/libusb.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libusb.h
 endif
 if COND_GRUB_EMU_PCI
-KERNEL_HEADER_FILES += include/grub/libpciaccess.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libpciaccess.h
 endif
 endif
 
-symlist.h: config.h $(KERNEL_HEADER_FILES)
+symlist.h: $(top_builddir)/config.h $(KERNEL_HEADER_FILES)
 	@list='$^'; \
 	for p in $$list; do \
 	  echo "#include <$$p>" >> $@ || (rm -f $@; exit 1); \
@@ -172,15 +172,15 @@ BUILT_SOURCES += symlist.h
 
 symlist.c: symlist.h gensymlist.sh
 	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
-	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
+	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
 	rm -f symlist.p
 CLEANFILES += symlist.c
 BUILT_SOURCES += symlist.c
 
 noinst_DATA += kernel_syms.lst
-kernel_syms.lst: $(KERNEL_HEADER_FILES) config.h
+kernel_syms.lst: $(KERNEL_HEADER_FILES) $(top_builddir)/config.h
 	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
-	if grep "^#define HAVE_ASM_USCORE" config.h; then u="_"; else u=""; fi; \
+	if grep "^#define HAVE_ASM_USCORE" $(top_builddir)/config.h; then u="_"; else u=""; fi; \
 	cat kernel_syms.input | grep -v '^#' | sed -n \
 	  -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
 	  -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
diff --git a/grub-core/Makefile.vars b/grub-core/Makefile.vars
index db3c2a7db..6dc536139 100644
--- a/grub-core/Makefile.vars
+++ b/grub-core/Makefile.vars
@@ -33,8 +33,8 @@ endif
 
 CPPFLAGS_GRUB = -DGRUB_FILE=\"`basename $<`\"
 CPPFLAGS_GRUB += -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
-CPPFLAGS_GRUB += -I$(top_srcdir)/$(grub_coredir)/include
-CPPFLAGS_GRUB += -I$(top_builddir)/$(grub_coredir)/include
+CPPFLAGS_GRUB += -I$(top_srcdir)/include
+CPPFLAGS_GRUB += -I$(top_builddir)/include
 CCASFLAGS_GRUB = -DASM_FILE=1
 
 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
diff --git a/grub-core/include/grub/acorn_filecore.h b/include/grub/acorn_filecore.h
similarity index 100%
rename from grub-core/include/grub/acorn_filecore.h
rename to include/grub/acorn_filecore.h
diff --git a/grub-core/include/grub/acpi.h b/include/grub/acpi.h
similarity index 100%
rename from grub-core/include/grub/acpi.h
rename to include/grub/acpi.h
diff --git a/grub-core/include/grub/aout.h b/include/grub/aout.h
similarity index 100%
rename from grub-core/include/grub/aout.h
rename to include/grub/aout.h
diff --git a/grub-core/include/grub/at_keyboard.h b/include/grub/at_keyboard.h
similarity index 100%
rename from grub-core/include/grub/at_keyboard.h
rename to include/grub/at_keyboard.h
diff --git a/grub-core/include/grub/ata.h b/include/grub/ata.h
similarity index 100%
rename from grub-core/include/grub/ata.h
rename to include/grub/ata.h
diff --git a/grub-core/include/grub/auth.h b/include/grub/auth.h
similarity index 100%
rename from grub-core/include/grub/auth.h
rename to include/grub/auth.h
diff --git a/grub-core/include/grub/autoefi.h b/include/grub/autoefi.h
similarity index 100%
rename from grub-core/include/grub/autoefi.h
rename to include/grub/autoefi.h
diff --git a/grub-core/include/grub/bitmap.h b/include/grub/bitmap.h
similarity index 100%
rename from grub-core/include/grub/bitmap.h
rename to include/grub/bitmap.h
diff --git a/grub-core/include/grub/bitmap_scale.h b/include/grub/bitmap_scale.h
similarity index 100%
rename from grub-core/include/grub/bitmap_scale.h
rename to include/grub/bitmap_scale.h
diff --git a/grub-core/include/grub/boot.h b/include/grub/boot.h
similarity index 100%
rename from grub-core/include/grub/boot.h
rename to include/grub/boot.h
diff --git a/grub-core/include/grub/bsdlabel.h b/include/grub/bsdlabel.h
similarity index 100%
rename from grub-core/include/grub/bsdlabel.h
rename to include/grub/bsdlabel.h
diff --git a/grub-core/include/grub/bufio.h b/include/grub/bufio.h
similarity index 100%
rename from grub-core/include/grub/bufio.h
rename to include/grub/bufio.h
diff --git a/grub-core/include/grub/cache.h b/include/grub/cache.h
similarity index 100%
rename from grub-core/include/grub/cache.h
rename to include/grub/cache.h
diff --git a/grub-core/include/grub/charset.h b/include/grub/charset.h
similarity index 100%
rename from grub-core/include/grub/charset.h
rename to include/grub/charset.h
diff --git a/grub-core/include/grub/cmos.h b/include/grub/cmos.h
similarity index 100%
rename from grub-core/include/grub/cmos.h
rename to include/grub/cmos.h
diff --git a/grub-core/include/grub/command.h b/include/grub/command.h
similarity index 100%
rename from grub-core/include/grub/command.h
rename to include/grub/command.h
diff --git a/grub-core/include/grub/crypto.h b/include/grub/crypto.h
similarity index 100%
rename from grub-core/include/grub/crypto.h
rename to include/grub/crypto.h
diff --git a/grub-core/include/grub/cs5536.h b/include/grub/cs5536.h
similarity index 100%
rename from grub-core/include/grub/cs5536.h
rename to include/grub/cs5536.h
diff --git a/grub-core/include/grub/datetime.h b/include/grub/datetime.h
similarity index 100%
rename from grub-core/include/grub/datetime.h
rename to include/grub/datetime.h
diff --git a/grub-core/include/grub/device.h b/include/grub/device.h
similarity index 100%
rename from grub-core/include/grub/device.h
rename to include/grub/device.h
diff --git a/grub-core/include/grub/disk.h b/include/grub/disk.h
similarity index 100%
rename from grub-core/include/grub/disk.h
rename to include/grub/disk.h
diff --git a/grub-core/include/grub/dl.h b/include/grub/dl.h
similarity index 100%
rename from grub-core/include/grub/dl.h
rename to include/grub/dl.h
diff --git a/grub-core/include/grub/efi/api.h b/include/grub/efi/api.h
similarity index 100%
rename from grub-core/include/grub/efi/api.h
rename to include/grub/efi/api.h
diff --git a/grub-core/include/grub/efi/console.h b/include/grub/efi/console.h
similarity index 100%
rename from grub-core/include/grub/efi/console.h
rename to include/grub/efi/console.h
diff --git a/grub-core/include/grub/efi/console_control.h b/include/grub/efi/console_control.h
similarity index 100%
rename from grub-core/include/grub/efi/console_control.h
rename to include/grub/efi/console_control.h
diff --git a/grub-core/include/grub/efi/disk.h b/include/grub/efi/disk.h
similarity index 100%
rename from grub-core/include/grub/efi/disk.h
rename to include/grub/efi/disk.h
diff --git a/grub-core/include/grub/efi/efi.h b/include/grub/efi/efi.h
similarity index 100%
rename from grub-core/include/grub/efi/efi.h
rename to include/grub/efi/efi.h
diff --git a/grub-core/include/grub/efi/graphics_output.h b/include/grub/efi/graphics_output.h
similarity index 100%
rename from grub-core/include/grub/efi/graphics_output.h
rename to include/grub/efi/graphics_output.h
diff --git a/grub-core/include/grub/efi/memory.h b/include/grub/efi/memory.h
similarity index 100%
rename from grub-core/include/grub/efi/memory.h
rename to include/grub/efi/memory.h
diff --git a/grub-core/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
similarity index 100%
rename from grub-core/include/grub/efi/pe32.h
rename to include/grub/efi/pe32.h
diff --git a/grub-core/include/grub/efi/time.h b/include/grub/efi/time.h
similarity index 100%
rename from grub-core/include/grub/efi/time.h
rename to include/grub/efi/time.h
diff --git a/grub-core/include/grub/efi/uga_draw.h b/include/grub/efi/uga_draw.h
similarity index 100%
rename from grub-core/include/grub/efi/uga_draw.h
rename to include/grub/efi/uga_draw.h
diff --git a/grub-core/include/grub/efiemu/efiemu.h b/include/grub/efiemu/efiemu.h
similarity index 100%
rename from grub-core/include/grub/efiemu/efiemu.h
rename to include/grub/efiemu/efiemu.h
diff --git a/grub-core/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
similarity index 100%
rename from grub-core/include/grub/efiemu/runtime.h
rename to include/grub/efiemu/runtime.h
diff --git a/grub-core/include/grub/elf.h b/include/grub/elf.h
similarity index 100%
rename from grub-core/include/grub/elf.h
rename to include/grub/elf.h
diff --git a/grub-core/include/grub/elfload.h b/include/grub/elfload.h
similarity index 100%
rename from grub-core/include/grub/elfload.h
rename to include/grub/elfload.h
diff --git a/grub-core/include/grub/emu/console.h b/include/grub/emu/console.h
similarity index 100%
rename from grub-core/include/grub/emu/console.h
rename to include/grub/emu/console.h
diff --git a/grub-core/include/grub/emu/getroot.h b/include/grub/emu/getroot.h
similarity index 100%
rename from grub-core/include/grub/emu/getroot.h
rename to include/grub/emu/getroot.h
diff --git a/grub-core/include/grub/emu/hostdisk.h b/include/grub/emu/hostdisk.h
similarity index 100%
rename from grub-core/include/grub/emu/hostdisk.h
rename to include/grub/emu/hostdisk.h
diff --git a/grub-core/include/grub/emu/misc.h b/include/grub/emu/misc.h
similarity index 100%
rename from grub-core/include/grub/emu/misc.h
rename to include/grub/emu/misc.h
diff --git a/grub-core/include/grub/env.h b/include/grub/env.h
similarity index 100%
rename from grub-core/include/grub/env.h
rename to include/grub/env.h
diff --git a/grub-core/include/grub/env_private.h b/include/grub/env_private.h
similarity index 100%
rename from grub-core/include/grub/env_private.h
rename to include/grub/env_private.h
diff --git a/grub-core/include/grub/err.h b/include/grub/err.h
similarity index 100%
rename from grub-core/include/grub/err.h
rename to include/grub/err.h
diff --git a/grub-core/include/grub/extcmd.h b/include/grub/extcmd.h
similarity index 100%
rename from grub-core/include/grub/extcmd.h
rename to include/grub/extcmd.h
diff --git a/grub-core/include/grub/fbblit.h b/include/grub/fbblit.h
similarity index 100%
rename from grub-core/include/grub/fbblit.h
rename to include/grub/fbblit.h
diff --git a/grub-core/include/grub/fbfill.h b/include/grub/fbfill.h
similarity index 100%
rename from grub-core/include/grub/fbfill.h
rename to include/grub/fbfill.h
diff --git a/grub-core/include/grub/fbutil.h b/include/grub/fbutil.h
similarity index 100%
rename from grub-core/include/grub/fbutil.h
rename to include/grub/fbutil.h
diff --git a/grub-core/include/grub/file.h b/include/grub/file.h
similarity index 100%
rename from grub-core/include/grub/file.h
rename to include/grub/file.h
diff --git a/grub-core/include/grub/font.h b/include/grub/font.h
similarity index 100%
rename from grub-core/include/grub/font.h
rename to include/grub/font.h
diff --git a/grub-core/include/grub/fontformat.h b/include/grub/fontformat.h
similarity index 100%
rename from grub-core/include/grub/fontformat.h
rename to include/grub/fontformat.h
diff --git a/grub-core/include/grub/fs.h b/include/grub/fs.h
similarity index 100%
rename from grub-core/include/grub/fs.h
rename to include/grub/fs.h
diff --git a/grub-core/include/grub/fshelp.h b/include/grub/fshelp.h
similarity index 100%
rename from grub-core/include/grub/fshelp.h
rename to include/grub/fshelp.h
diff --git a/grub-core/include/grub/gfxmenu_model.h b/include/grub/gfxmenu_model.h
similarity index 100%
rename from grub-core/include/grub/gfxmenu_model.h
rename to include/grub/gfxmenu_model.h
diff --git a/grub-core/include/grub/gfxmenu_view.h b/include/grub/gfxmenu_view.h
similarity index 100%
rename from grub-core/include/grub/gfxmenu_view.h
rename to include/grub/gfxmenu_view.h
diff --git a/grub-core/include/grub/gfxterm.h b/include/grub/gfxterm.h
similarity index 100%
rename from grub-core/include/grub/gfxterm.h
rename to include/grub/gfxterm.h
diff --git a/grub-core/include/grub/gfxwidgets.h b/include/grub/gfxwidgets.h
similarity index 100%
rename from grub-core/include/grub/gfxwidgets.h
rename to include/grub/gfxwidgets.h
diff --git a/grub-core/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
similarity index 100%
rename from grub-core/include/grub/gpt_partition.h
rename to include/grub/gpt_partition.h
diff --git a/grub-core/include/grub/gui.h b/include/grub/gui.h
similarity index 100%
rename from grub-core/include/grub/gui.h
rename to include/grub/gui.h
diff --git a/grub-core/include/grub/gui_string_util.h b/include/grub/gui_string_util.h
similarity index 100%
rename from grub-core/include/grub/gui_string_util.h
rename to include/grub/gui_string_util.h
diff --git a/grub-core/include/grub/gzio.h b/include/grub/gzio.h
similarity index 100%
rename from grub-core/include/grub/gzio.h
rename to include/grub/gzio.h
diff --git a/grub-core/include/grub/hfs.h b/include/grub/hfs.h
similarity index 100%
rename from grub-core/include/grub/hfs.h
rename to include/grub/hfs.h
diff --git a/grub-core/include/grub/i18n.h b/include/grub/i18n.h
similarity index 100%
rename from grub-core/include/grub/i18n.h
rename to include/grub/i18n.h
diff --git a/grub-core/include/grub/i386/at_keyboard.h b/include/grub/i386/at_keyboard.h
similarity index 100%
rename from grub-core/include/grub/i386/at_keyboard.h
rename to include/grub/i386/at_keyboard.h
diff --git a/grub-core/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
similarity index 100%
rename from grub-core/include/grub/i386/bsd.h
rename to include/grub/i386/bsd.h
diff --git a/grub-core/include/grub/i386/cmos.h b/include/grub/i386/cmos.h
similarity index 100%
rename from grub-core/include/grub/i386/cmos.h
rename to include/grub/i386/cmos.h
diff --git a/grub-core/include/grub/i386/coreboot/boot.h b/include/grub/i386/coreboot/boot.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/boot.h
rename to include/grub/i386/coreboot/boot.h
diff --git a/grub-core/include/grub/i386/coreboot/console.h b/include/grub/i386/coreboot/console.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/console.h
rename to include/grub/i386/coreboot/console.h
diff --git a/grub-core/include/grub/i386/coreboot/init.h b/include/grub/i386/coreboot/init.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/init.h
rename to include/grub/i386/coreboot/init.h
diff --git a/grub-core/include/grub/i386/coreboot/loader.h b/include/grub/i386/coreboot/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/loader.h
rename to include/grub/i386/coreboot/loader.h
diff --git a/grub-core/include/grub/i386/coreboot/memory.h b/include/grub/i386/coreboot/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/memory.h
rename to include/grub/i386/coreboot/memory.h
diff --git a/grub-core/include/grub/i386/coreboot/serial.h b/include/grub/i386/coreboot/serial.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/serial.h
rename to include/grub/i386/coreboot/serial.h
diff --git a/grub-core/include/grub/i386/coreboot/time.h b/include/grub/i386/coreboot/time.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/time.h
rename to include/grub/i386/coreboot/time.h
diff --git a/grub-core/include/grub/i386/cpuid.h b/include/grub/i386/cpuid.h
similarity index 100%
rename from grub-core/include/grub/i386/cpuid.h
rename to include/grub/i386/cpuid.h
diff --git a/grub-core/include/grub/i386/efi/loader.h b/include/grub/i386/efi/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/efi/loader.h
rename to include/grub/i386/efi/loader.h
diff --git a/grub-core/include/grub/i386/efi/memory.h b/include/grub/i386/efi/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/efi/memory.h
rename to include/grub/i386/efi/memory.h
diff --git a/grub-core/include/grub/i386/efi/serial.h b/include/grub/i386/efi/serial.h
similarity index 100%
rename from grub-core/include/grub/i386/efi/serial.h
rename to include/grub/i386/efi/serial.h
diff --git a/grub-core/include/grub/i386/efi/time.h b/include/grub/i386/efi/time.h
similarity index 100%
rename from grub-core/include/grub/i386/efi/time.h
rename to include/grub/i386/efi/time.h
diff --git a/grub-core/include/grub/i386/efiemu.h b/include/grub/i386/efiemu.h
similarity index 100%
rename from grub-core/include/grub/i386/efiemu.h
rename to include/grub/i386/efiemu.h
diff --git a/grub-core/include/grub/i386/freebsd_linker.h b/include/grub/i386/freebsd_linker.h
similarity index 100%
rename from grub-core/include/grub/i386/freebsd_linker.h
rename to include/grub/i386/freebsd_linker.h
diff --git a/grub-core/include/grub/i386/freebsd_reboot.h b/include/grub/i386/freebsd_reboot.h
similarity index 100%
rename from grub-core/include/grub/i386/freebsd_reboot.h
rename to include/grub/i386/freebsd_reboot.h
diff --git a/grub-core/include/grub/i386/ieee1275/ieee1275.h b/include/grub/i386/ieee1275/ieee1275.h
similarity index 100%
rename from grub-core/include/grub/i386/ieee1275/ieee1275.h
rename to include/grub/i386/ieee1275/ieee1275.h
diff --git a/grub-core/include/grub/i386/ieee1275/loader.h b/include/grub/i386/ieee1275/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/ieee1275/loader.h
rename to include/grub/i386/ieee1275/loader.h
diff --git a/grub-core/include/grub/i386/ieee1275/memory.h b/include/grub/i386/ieee1275/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/ieee1275/memory.h
rename to include/grub/i386/ieee1275/memory.h
diff --git a/grub-core/include/grub/i386/ieee1275/serial.h b/include/grub/i386/ieee1275/serial.h
similarity index 100%
rename from grub-core/include/grub/i386/ieee1275/serial.h
rename to include/grub/i386/ieee1275/serial.h
diff --git a/grub-core/include/grub/i386/ieee1275/time.h b/include/grub/i386/ieee1275/time.h
similarity index 100%
rename from grub-core/include/grub/i386/ieee1275/time.h
rename to include/grub/i386/ieee1275/time.h
diff --git a/grub-core/include/grub/i386/io.h b/include/grub/i386/io.h
similarity index 100%
rename from grub-core/include/grub/i386/io.h
rename to include/grub/i386/io.h
diff --git a/grub-core/include/grub/i386/linux.h b/include/grub/i386/linux.h
similarity index 100%
rename from grub-core/include/grub/i386/linux.h
rename to include/grub/i386/linux.h
diff --git a/grub-core/include/grub/i386/loader.h b/include/grub/i386/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/loader.h
rename to include/grub/i386/loader.h
diff --git a/grub-core/include/grub/i386/macho.h b/include/grub/i386/macho.h
similarity index 100%
rename from grub-core/include/grub/i386/macho.h
rename to include/grub/i386/macho.h
diff --git a/grub-core/include/grub/i386/memory.h b/include/grub/i386/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/memory.h
rename to include/grub/i386/memory.h
diff --git a/grub-core/include/grub/i386/multiboot.h b/include/grub/i386/multiboot.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot.h
rename to include/grub/i386/multiboot.h
diff --git a/grub-core/include/grub/i386/multiboot/boot.h b/include/grub/i386/multiboot/boot.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/boot.h
rename to include/grub/i386/multiboot/boot.h
diff --git a/grub-core/include/grub/i386/multiboot/console.h b/include/grub/i386/multiboot/console.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/console.h
rename to include/grub/i386/multiboot/console.h
diff --git a/grub-core/include/grub/i386/multiboot/init.h b/include/grub/i386/multiboot/init.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/init.h
rename to include/grub/i386/multiboot/init.h
diff --git a/grub-core/include/grub/i386/multiboot/kernel.h b/include/grub/i386/multiboot/kernel.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/kernel.h
rename to include/grub/i386/multiboot/kernel.h
diff --git a/grub-core/include/grub/i386/multiboot/loader.h b/include/grub/i386/multiboot/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/loader.h
rename to include/grub/i386/multiboot/loader.h
diff --git a/grub-core/include/grub/i386/multiboot/memory.h b/include/grub/i386/multiboot/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/memory.h
rename to include/grub/i386/multiboot/memory.h
diff --git a/grub-core/include/grub/i386/multiboot/serial.h b/include/grub/i386/multiboot/serial.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/serial.h
rename to include/grub/i386/multiboot/serial.h
diff --git a/grub-core/include/grub/i386/multiboot/time.h b/include/grub/i386/multiboot/time.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/time.h
rename to include/grub/i386/multiboot/time.h
diff --git a/grub-core/include/grub/i386/netbsd_bootinfo.h b/include/grub/i386/netbsd_bootinfo.h
similarity index 100%
rename from grub-core/include/grub/i386/netbsd_bootinfo.h
rename to include/grub/i386/netbsd_bootinfo.h
diff --git a/grub-core/include/grub/i386/netbsd_reboot.h b/include/grub/i386/netbsd_reboot.h
similarity index 100%
rename from grub-core/include/grub/i386/netbsd_reboot.h
rename to include/grub/i386/netbsd_reboot.h
diff --git a/grub-core/include/grub/i386/openbsd_bootarg.h b/include/grub/i386/openbsd_bootarg.h
similarity index 100%
rename from grub-core/include/grub/i386/openbsd_bootarg.h
rename to include/grub/i386/openbsd_bootarg.h
diff --git a/grub-core/include/grub/i386/openbsd_reboot.h b/include/grub/i386/openbsd_reboot.h
similarity index 100%
rename from grub-core/include/grub/i386/openbsd_reboot.h
rename to include/grub/i386/openbsd_reboot.h
diff --git a/grub-core/include/grub/i386/pc/biosdisk.h b/include/grub/i386/pc/biosdisk.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/biosdisk.h
rename to include/grub/i386/pc/biosdisk.h
diff --git a/grub-core/include/grub/i386/pc/biosnum.h b/include/grub/i386/pc/biosnum.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/biosnum.h
rename to include/grub/i386/pc/biosnum.h
diff --git a/grub-core/include/grub/i386/pc/boot.h b/include/grub/i386/pc/boot.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/boot.h
rename to include/grub/i386/pc/boot.h
diff --git a/grub-core/include/grub/i386/pc/chainloader.h b/include/grub/i386/pc/chainloader.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/chainloader.h
rename to include/grub/i386/pc/chainloader.h
diff --git a/grub-core/include/grub/i386/pc/console.h b/include/grub/i386/pc/console.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/console.h
rename to include/grub/i386/pc/console.h
diff --git a/grub-core/include/grub/i386/pc/efiemu.h b/include/grub/i386/pc/efiemu.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/efiemu.h
rename to include/grub/i386/pc/efiemu.h
diff --git a/grub-core/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/init.h
rename to include/grub/i386/pc/init.h
diff --git a/grub-core/include/grub/i386/pc/kernel.h b/include/grub/i386/pc/kernel.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/kernel.h
rename to include/grub/i386/pc/kernel.h
diff --git a/grub-core/include/grub/i386/pc/loader.h b/include/grub/i386/pc/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/loader.h
rename to include/grub/i386/pc/loader.h
diff --git a/grub-core/include/grub/i386/pc/memory.h b/include/grub/i386/pc/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/memory.h
rename to include/grub/i386/pc/memory.h
diff --git a/grub-core/include/grub/i386/pc/pxe.h b/include/grub/i386/pc/pxe.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/pxe.h
rename to include/grub/i386/pc/pxe.h
diff --git a/grub-core/include/grub/i386/pc/time.h b/include/grub/i386/pc/time.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/time.h
rename to include/grub/i386/pc/time.h
diff --git a/grub-core/include/grub/i386/pc/vbe.h b/include/grub/i386/pc/vbe.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/vbe.h
rename to include/grub/i386/pc/vbe.h
diff --git a/grub-core/include/grub/i386/pc/vga.h b/include/grub/i386/pc/vga.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/vga.h
rename to include/grub/i386/pc/vga.h
diff --git a/grub-core/include/grub/i386/pci.h b/include/grub/i386/pci.h
similarity index 100%
rename from grub-core/include/grub/i386/pci.h
rename to include/grub/i386/pci.h
diff --git a/grub-core/include/grub/i386/pit.h b/include/grub/i386/pit.h
similarity index 100%
rename from grub-core/include/grub/i386/pit.h
rename to include/grub/i386/pit.h
diff --git a/grub-core/include/grub/i386/qemu/boot.h b/include/grub/i386/qemu/boot.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/boot.h
rename to include/grub/i386/qemu/boot.h
diff --git a/grub-core/include/grub/i386/qemu/console.h b/include/grub/i386/qemu/console.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/console.h
rename to include/grub/i386/qemu/console.h
diff --git a/grub-core/include/grub/i386/qemu/init.h b/include/grub/i386/qemu/init.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/init.h
rename to include/grub/i386/qemu/init.h
diff --git a/grub-core/include/grub/i386/qemu/kernel.h b/include/grub/i386/qemu/kernel.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/kernel.h
rename to include/grub/i386/qemu/kernel.h
diff --git a/grub-core/include/grub/i386/qemu/loader.h b/include/grub/i386/qemu/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/loader.h
rename to include/grub/i386/qemu/loader.h
diff --git a/grub-core/include/grub/i386/qemu/memory.h b/include/grub/i386/qemu/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/memory.h
rename to include/grub/i386/qemu/memory.h
diff --git a/grub-core/include/grub/i386/qemu/serial.h b/include/grub/i386/qemu/serial.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/serial.h
rename to include/grub/i386/qemu/serial.h
diff --git a/grub-core/include/grub/i386/qemu/time.h b/include/grub/i386/qemu/time.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/time.h
rename to include/grub/i386/qemu/time.h
diff --git a/grub-core/include/grub/i386/relocator.h b/include/grub/i386/relocator.h
similarity index 100%
rename from grub-core/include/grub/i386/relocator.h
rename to include/grub/i386/relocator.h
diff --git a/grub-core/include/grub/i386/setjmp.h b/include/grub/i386/setjmp.h
similarity index 100%
rename from grub-core/include/grub/i386/setjmp.h
rename to include/grub/i386/setjmp.h
diff --git a/grub-core/include/grub/i386/time.h b/include/grub/i386/time.h
similarity index 100%
rename from grub-core/include/grub/i386/time.h
rename to include/grub/i386/time.h
diff --git a/grub-core/include/grub/i386/tsc.h b/include/grub/i386/tsc.h
similarity index 100%
rename from grub-core/include/grub/i386/tsc.h
rename to include/grub/i386/tsc.h
diff --git a/grub-core/include/grub/i386/types.h b/include/grub/i386/types.h
similarity index 100%
rename from grub-core/include/grub/i386/types.h
rename to include/grub/i386/types.h
diff --git a/grub-core/include/grub/i386/vga_common.h b/include/grub/i386/vga_common.h
similarity index 100%
rename from grub-core/include/grub/i386/vga_common.h
rename to include/grub/i386/vga_common.h
diff --git a/grub-core/include/grub/i386/xnu.h b/include/grub/i386/xnu.h
similarity index 100%
rename from grub-core/include/grub/i386/xnu.h
rename to include/grub/i386/xnu.h
diff --git a/grub-core/include/grub/icon_manager.h b/include/grub/icon_manager.h
similarity index 100%
rename from grub-core/include/grub/icon_manager.h
rename to include/grub/icon_manager.h
diff --git a/grub-core/include/grub/ieee1275/console.h b/include/grub/ieee1275/console.h
similarity index 100%
rename from grub-core/include/grub/ieee1275/console.h
rename to include/grub/ieee1275/console.h
diff --git a/grub-core/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
similarity index 100%
rename from grub-core/include/grub/ieee1275/ieee1275.h
rename to include/grub/ieee1275/ieee1275.h
diff --git a/grub-core/include/grub/ieee1275/ofdisk.h b/include/grub/ieee1275/ofdisk.h
similarity index 100%
rename from grub-core/include/grub/ieee1275/ofdisk.h
rename to include/grub/ieee1275/ofdisk.h
diff --git a/grub-core/include/grub/kernel.h b/include/grub/kernel.h
similarity index 100%
rename from grub-core/include/grub/kernel.h
rename to include/grub/kernel.h
diff --git a/grub-core/include/grub/lib/LzFind.h b/include/grub/lib/LzFind.h
similarity index 100%
rename from grub-core/include/grub/lib/LzFind.h
rename to include/grub/lib/LzFind.h
diff --git a/grub-core/include/grub/lib/LzHash.h b/include/grub/lib/LzHash.h
similarity index 100%
rename from grub-core/include/grub/lib/LzHash.h
rename to include/grub/lib/LzHash.h
diff --git a/grub-core/include/grub/lib/LzmaDec.h b/include/grub/lib/LzmaDec.h
similarity index 100%
rename from grub-core/include/grub/lib/LzmaDec.h
rename to include/grub/lib/LzmaDec.h
diff --git a/grub-core/include/grub/lib/LzmaEnc.h b/include/grub/lib/LzmaEnc.h
similarity index 100%
rename from grub-core/include/grub/lib/LzmaEnc.h
rename to include/grub/lib/LzmaEnc.h
diff --git a/grub-core/include/grub/lib/LzmaTypes.h b/include/grub/lib/LzmaTypes.h
similarity index 100%
rename from grub-core/include/grub/lib/LzmaTypes.h
rename to include/grub/lib/LzmaTypes.h
diff --git a/grub-core/include/grub/lib/arg.h b/include/grub/lib/arg.h
similarity index 100%
rename from grub-core/include/grub/lib/arg.h
rename to include/grub/lib/arg.h
diff --git a/grub-core/include/grub/lib/crc.h b/include/grub/lib/crc.h
similarity index 100%
rename from grub-core/include/grub/lib/crc.h
rename to include/grub/lib/crc.h
diff --git a/grub-core/include/grub/lib/envblk.h b/include/grub/lib/envblk.h
similarity index 100%
rename from grub-core/include/grub/lib/envblk.h
rename to include/grub/lib/envblk.h
diff --git a/grub-core/include/grub/lib/hexdump.h b/include/grub/lib/hexdump.h
similarity index 100%
rename from grub-core/include/grub/lib/hexdump.h
rename to include/grub/lib/hexdump.h
diff --git a/grub-core/include/grub/libgcc.h b/include/grub/libgcc.h
similarity index 100%
rename from grub-core/include/grub/libgcc.h
rename to include/grub/libgcc.h
diff --git a/grub-core/include/grub/libpciaccess.h b/include/grub/libpciaccess.h
similarity index 100%
rename from grub-core/include/grub/libpciaccess.h
rename to include/grub/libpciaccess.h
diff --git a/grub-core/include/grub/libusb.h b/include/grub/libusb.h
similarity index 100%
rename from grub-core/include/grub/libusb.h
rename to include/grub/libusb.h
diff --git a/grub-core/include/grub/list.h b/include/grub/list.h
similarity index 100%
rename from grub-core/include/grub/list.h
rename to include/grub/list.h
diff --git a/grub-core/include/grub/loader.h b/include/grub/loader.h
similarity index 100%
rename from grub-core/include/grub/loader.h
rename to include/grub/loader.h
diff --git a/grub-core/include/grub/lvm.h b/include/grub/lvm.h
similarity index 100%
rename from grub-core/include/grub/lvm.h
rename to include/grub/lvm.h
diff --git a/grub-core/include/grub/macho.h b/include/grub/macho.h
similarity index 100%
rename from grub-core/include/grub/macho.h
rename to include/grub/macho.h
diff --git a/grub-core/include/grub/machoload.h b/include/grub/machoload.h
similarity index 100%
rename from grub-core/include/grub/machoload.h
rename to include/grub/machoload.h
diff --git a/grub-core/include/grub/memory.h b/include/grub/memory.h
similarity index 100%
rename from grub-core/include/grub/memory.h
rename to include/grub/memory.h
diff --git a/grub-core/include/grub/menu.h b/include/grub/menu.h
similarity index 100%
rename from grub-core/include/grub/menu.h
rename to include/grub/menu.h
diff --git a/grub-core/include/grub/menu_viewer.h b/include/grub/menu_viewer.h
similarity index 100%
rename from grub-core/include/grub/menu_viewer.h
rename to include/grub/menu_viewer.h
diff --git a/grub-core/include/grub/mips/at_keyboard.h b/include/grub/mips/at_keyboard.h
similarity index 100%
rename from grub-core/include/grub/mips/at_keyboard.h
rename to include/grub/mips/at_keyboard.h
diff --git a/grub-core/include/grub/mips/cache.h b/include/grub/mips/cache.h
similarity index 100%
rename from grub-core/include/grub/mips/cache.h
rename to include/grub/mips/cache.h
diff --git a/grub-core/include/grub/mips/cmos.h b/include/grub/mips/cmos.h
similarity index 100%
rename from grub-core/include/grub/mips/cmos.h
rename to include/grub/mips/cmos.h
diff --git a/grub-core/include/grub/mips/io.h b/include/grub/mips/io.h
similarity index 100%
rename from grub-core/include/grub/mips/io.h
rename to include/grub/mips/io.h
diff --git a/grub-core/include/grub/mips/loongson.h b/include/grub/mips/loongson.h
similarity index 100%
rename from grub-core/include/grub/mips/loongson.h
rename to include/grub/mips/loongson.h
diff --git a/grub-core/include/grub/mips/multiboot.h b/include/grub/mips/multiboot.h
similarity index 100%
rename from grub-core/include/grub/mips/multiboot.h
rename to include/grub/mips/multiboot.h
diff --git a/grub-core/include/grub/mips/pci.h b/include/grub/mips/pci.h
similarity index 100%
rename from grub-core/include/grub/mips/pci.h
rename to include/grub/mips/pci.h
diff --git a/grub-core/include/grub/mips/qemu-mips/kernel.h b/include/grub/mips/qemu-mips/kernel.h
similarity index 100%
rename from grub-core/include/grub/mips/qemu-mips/kernel.h
rename to include/grub/mips/qemu-mips/kernel.h
diff --git a/grub-core/include/grub/mips/qemu-mips/loader.h b/include/grub/mips/qemu-mips/loader.h
similarity index 100%
rename from grub-core/include/grub/mips/qemu-mips/loader.h
rename to include/grub/mips/qemu-mips/loader.h
diff --git a/grub-core/include/grub/mips/qemu-mips/memory.h b/include/grub/mips/qemu-mips/memory.h
similarity index 100%
rename from grub-core/include/grub/mips/qemu-mips/memory.h
rename to include/grub/mips/qemu-mips/memory.h
diff --git a/grub-core/include/grub/mips/qemu-mips/serial.h b/include/grub/mips/qemu-mips/serial.h
similarity index 100%
rename from grub-core/include/grub/mips/qemu-mips/serial.h
rename to include/grub/mips/qemu-mips/serial.h
diff --git a/grub-core/include/grub/mips/qemu-mips/time.h b/include/grub/mips/qemu-mips/time.h
similarity index 100%
rename from grub-core/include/grub/mips/qemu-mips/time.h
rename to include/grub/mips/qemu-mips/time.h
diff --git a/grub-core/include/grub/mips/relocator.h b/include/grub/mips/relocator.h
similarity index 100%
rename from grub-core/include/grub/mips/relocator.h
rename to include/grub/mips/relocator.h
diff --git a/grub-core/include/grub/mips/setjmp.h b/include/grub/mips/setjmp.h
similarity index 100%
rename from grub-core/include/grub/mips/setjmp.h
rename to include/grub/mips/setjmp.h
diff --git a/grub-core/include/grub/mips/time.h b/include/grub/mips/time.h
similarity index 100%
rename from grub-core/include/grub/mips/time.h
rename to include/grub/mips/time.h
diff --git a/grub-core/include/grub/mips/types.h b/include/grub/mips/types.h
similarity index 100%
rename from grub-core/include/grub/mips/types.h
rename to include/grub/mips/types.h
diff --git a/grub-core/include/grub/mips/yeeloong/at_keyboard.h b/include/grub/mips/yeeloong/at_keyboard.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/at_keyboard.h
rename to include/grub/mips/yeeloong/at_keyboard.h
diff --git a/grub-core/include/grub/mips/yeeloong/cmos.h b/include/grub/mips/yeeloong/cmos.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/cmos.h
rename to include/grub/mips/yeeloong/cmos.h
diff --git a/grub-core/include/grub/mips/yeeloong/ec.h b/include/grub/mips/yeeloong/ec.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/ec.h
rename to include/grub/mips/yeeloong/ec.h
diff --git a/grub-core/include/grub/mips/yeeloong/kernel.h b/include/grub/mips/yeeloong/kernel.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/kernel.h
rename to include/grub/mips/yeeloong/kernel.h
diff --git a/grub-core/include/grub/mips/yeeloong/loader.h b/include/grub/mips/yeeloong/loader.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/loader.h
rename to include/grub/mips/yeeloong/loader.h
diff --git a/grub-core/include/grub/mips/yeeloong/memory.h b/include/grub/mips/yeeloong/memory.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/memory.h
rename to include/grub/mips/yeeloong/memory.h
diff --git a/grub-core/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/pci.h
rename to include/grub/mips/yeeloong/pci.h
diff --git a/grub-core/include/grub/mips/yeeloong/serial.h b/include/grub/mips/yeeloong/serial.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/serial.h
rename to include/grub/mips/yeeloong/serial.h
diff --git a/grub-core/include/grub/mips/yeeloong/time.h b/include/grub/mips/yeeloong/time.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/time.h
rename to include/grub/mips/yeeloong/time.h
diff --git a/grub-core/include/grub/misc.h b/include/grub/misc.h
similarity index 100%
rename from grub-core/include/grub/misc.h
rename to include/grub/misc.h
diff --git a/grub-core/include/grub/mm.h b/include/grub/mm.h
similarity index 100%
rename from grub-core/include/grub/mm.h
rename to include/grub/mm.h
diff --git a/grub-core/include/grub/msdos_partition.h b/include/grub/msdos_partition.h
similarity index 100%
rename from grub-core/include/grub/msdos_partition.h
rename to include/grub/msdos_partition.h
diff --git a/grub-core/include/grub/multiboot.h b/include/grub/multiboot.h
similarity index 100%
rename from grub-core/include/grub/multiboot.h
rename to include/grub/multiboot.h
diff --git a/grub-core/include/grub/multiboot_loader.h b/include/grub/multiboot_loader.h
similarity index 100%
rename from grub-core/include/grub/multiboot_loader.h
rename to include/grub/multiboot_loader.h
diff --git a/grub-core/include/grub/net.h b/include/grub/net.h
similarity index 100%
rename from grub-core/include/grub/net.h
rename to include/grub/net.h
diff --git a/grub-core/include/grub/normal.h b/include/grub/normal.h
similarity index 100%
rename from grub-core/include/grub/normal.h
rename to include/grub/normal.h
diff --git a/grub-core/include/grub/ntfs.h b/include/grub/ntfs.h
similarity index 100%
rename from grub-core/include/grub/ntfs.h
rename to include/grub/ntfs.h
diff --git a/grub-core/include/grub/offsets.h b/include/grub/offsets.h
similarity index 100%
rename from grub-core/include/grub/offsets.h
rename to include/grub/offsets.h
diff --git a/grub-core/include/grub/parser.h b/include/grub/parser.h
similarity index 100%
rename from grub-core/include/grub/parser.h
rename to include/grub/parser.h
diff --git a/grub-core/include/grub/partition.h b/include/grub/partition.h
similarity index 100%
rename from grub-core/include/grub/partition.h
rename to include/grub/partition.h
diff --git a/grub-core/include/grub/parttool.h b/include/grub/parttool.h
similarity index 100%
rename from grub-core/include/grub/parttool.h
rename to include/grub/parttool.h
diff --git a/grub-core/include/grub/pci.h b/include/grub/pci.h
similarity index 100%
rename from grub-core/include/grub/pci.h
rename to include/grub/pci.h
diff --git a/grub-core/include/grub/pciutils.h b/include/grub/pciutils.h
similarity index 100%
rename from grub-core/include/grub/pciutils.h
rename to include/grub/pciutils.h
diff --git a/grub-core/include/grub/powerpc/ieee1275/biosdisk.h b/include/grub/powerpc/ieee1275/biosdisk.h
similarity index 100%
rename from grub-core/include/grub/powerpc/ieee1275/biosdisk.h
rename to include/grub/powerpc/ieee1275/biosdisk.h
diff --git a/grub-core/include/grub/powerpc/ieee1275/ieee1275.h b/include/grub/powerpc/ieee1275/ieee1275.h
similarity index 100%
rename from grub-core/include/grub/powerpc/ieee1275/ieee1275.h
rename to include/grub/powerpc/ieee1275/ieee1275.h
diff --git a/grub-core/include/grub/powerpc/ieee1275/loader.h b/include/grub/powerpc/ieee1275/loader.h
similarity index 100%
rename from grub-core/include/grub/powerpc/ieee1275/loader.h
rename to include/grub/powerpc/ieee1275/loader.h
diff --git a/grub-core/include/grub/powerpc/ieee1275/memory.h b/include/grub/powerpc/ieee1275/memory.h
similarity index 100%
rename from grub-core/include/grub/powerpc/ieee1275/memory.h
rename to include/grub/powerpc/ieee1275/memory.h
diff --git a/grub-core/include/grub/powerpc/ieee1275/time.h b/include/grub/powerpc/ieee1275/time.h
similarity index 100%
rename from grub-core/include/grub/powerpc/ieee1275/time.h
rename to include/grub/powerpc/ieee1275/time.h
diff --git a/grub-core/include/grub/powerpc/ieee1275/util/biosdisk.h b/include/grub/powerpc/ieee1275/util/biosdisk.h
similarity index 100%
rename from grub-core/include/grub/powerpc/ieee1275/util/biosdisk.h
rename to include/grub/powerpc/ieee1275/util/biosdisk.h
diff --git a/grub-core/include/grub/powerpc/kernel.h b/include/grub/powerpc/kernel.h
similarity index 100%
rename from grub-core/include/grub/powerpc/kernel.h
rename to include/grub/powerpc/kernel.h
diff --git a/grub-core/include/grub/powerpc/setjmp.h b/include/grub/powerpc/setjmp.h
similarity index 100%
rename from grub-core/include/grub/powerpc/setjmp.h
rename to include/grub/powerpc/setjmp.h
diff --git a/grub-core/include/grub/powerpc/time.h b/include/grub/powerpc/time.h
similarity index 100%
rename from grub-core/include/grub/powerpc/time.h
rename to include/grub/powerpc/time.h
diff --git a/grub-core/include/grub/powerpc/types.h b/include/grub/powerpc/types.h
similarity index 100%
rename from grub-core/include/grub/powerpc/types.h
rename to include/grub/powerpc/types.h
diff --git a/grub-core/include/grub/raid.h b/include/grub/raid.h
similarity index 100%
rename from grub-core/include/grub/raid.h
rename to include/grub/raid.h
diff --git a/grub-core/include/grub/reader.h b/include/grub/reader.h
similarity index 100%
rename from grub-core/include/grub/reader.h
rename to include/grub/reader.h
diff --git a/grub-core/include/grub/script_sh.h b/include/grub/script_sh.h
similarity index 100%
rename from grub-core/include/grub/script_sh.h
rename to include/grub/script_sh.h
diff --git a/grub-core/include/grub/scsi.h b/include/grub/scsi.h
similarity index 100%
rename from grub-core/include/grub/scsi.h
rename to include/grub/scsi.h
diff --git a/grub-core/include/grub/scsicmd.h b/include/grub/scsicmd.h
similarity index 100%
rename from grub-core/include/grub/scsicmd.h
rename to include/grub/scsicmd.h
diff --git a/grub-core/include/grub/sdl.h b/include/grub/sdl.h
similarity index 100%
rename from grub-core/include/grub/sdl.h
rename to include/grub/sdl.h
diff --git a/grub-core/include/grub/search.h b/include/grub/search.h
similarity index 100%
rename from grub-core/include/grub/search.h
rename to include/grub/search.h
diff --git a/grub-core/include/grub/serial.h b/include/grub/serial.h
similarity index 100%
rename from grub-core/include/grub/serial.h
rename to include/grub/serial.h
diff --git a/grub-core/include/grub/setjmp.h b/include/grub/setjmp.h
similarity index 100%
rename from grub-core/include/grub/setjmp.h
rename to include/grub/setjmp.h
diff --git a/grub-core/include/grub/smbus.h b/include/grub/smbus.h
similarity index 100%
rename from grub-core/include/grub/smbus.h
rename to include/grub/smbus.h
diff --git a/grub-core/include/grub/sparc64/ieee1275/boot.h b/include/grub/sparc64/ieee1275/boot.h
similarity index 100%
rename from grub-core/include/grub/sparc64/ieee1275/boot.h
rename to include/grub/sparc64/ieee1275/boot.h
diff --git a/grub-core/include/grub/sparc64/ieee1275/ieee1275.h b/include/grub/sparc64/ieee1275/ieee1275.h
similarity index 100%
rename from grub-core/include/grub/sparc64/ieee1275/ieee1275.h
rename to include/grub/sparc64/ieee1275/ieee1275.h
diff --git a/grub-core/include/grub/sparc64/ieee1275/kernel.h b/include/grub/sparc64/ieee1275/kernel.h
similarity index 100%
rename from grub-core/include/grub/sparc64/ieee1275/kernel.h
rename to include/grub/sparc64/ieee1275/kernel.h
diff --git a/grub-core/include/grub/sparc64/ieee1275/loader.h b/include/grub/sparc64/ieee1275/loader.h
similarity index 100%
rename from grub-core/include/grub/sparc64/ieee1275/loader.h
rename to include/grub/sparc64/ieee1275/loader.h
diff --git a/grub-core/include/grub/sparc64/ieee1275/memory.h b/include/grub/sparc64/ieee1275/memory.h
similarity index 100%
rename from grub-core/include/grub/sparc64/ieee1275/memory.h
rename to include/grub/sparc64/ieee1275/memory.h
diff --git a/grub-core/include/grub/sparc64/ieee1275/time.h b/include/grub/sparc64/ieee1275/time.h
similarity index 100%
rename from grub-core/include/grub/sparc64/ieee1275/time.h
rename to include/grub/sparc64/ieee1275/time.h
diff --git a/grub-core/include/grub/sparc64/setjmp.h b/include/grub/sparc64/setjmp.h
similarity index 100%
rename from grub-core/include/grub/sparc64/setjmp.h
rename to include/grub/sparc64/setjmp.h
diff --git a/grub-core/include/grub/sparc64/time.h b/include/grub/sparc64/time.h
similarity index 100%
rename from grub-core/include/grub/sparc64/time.h
rename to include/grub/sparc64/time.h
diff --git a/grub-core/include/grub/sparc64/types.h b/include/grub/sparc64/types.h
similarity index 100%
rename from grub-core/include/grub/sparc64/types.h
rename to include/grub/sparc64/types.h
diff --git a/grub-core/include/grub/symbol.h b/include/grub/symbol.h
similarity index 100%
rename from grub-core/include/grub/symbol.h
rename to include/grub/symbol.h
diff --git a/grub-core/include/grub/term.h b/include/grub/term.h
similarity index 100%
rename from grub-core/include/grub/term.h
rename to include/grub/term.h
diff --git a/grub-core/include/grub/terminfo.h b/include/grub/terminfo.h
similarity index 100%
rename from grub-core/include/grub/terminfo.h
rename to include/grub/terminfo.h
diff --git a/grub-core/include/grub/test.h b/include/grub/test.h
similarity index 100%
rename from grub-core/include/grub/test.h
rename to include/grub/test.h
diff --git a/grub-core/include/grub/time.h b/include/grub/time.h
similarity index 100%
rename from grub-core/include/grub/time.h
rename to include/grub/time.h
diff --git a/grub-core/include/grub/tparm.h b/include/grub/tparm.h
similarity index 100%
rename from grub-core/include/grub/tparm.h
rename to include/grub/tparm.h
diff --git a/grub-core/include/grub/trig.h b/include/grub/trig.h
similarity index 100%
rename from grub-core/include/grub/trig.h
rename to include/grub/trig.h
diff --git a/grub-core/include/grub/types.h b/include/grub/types.h
similarity index 100%
rename from grub-core/include/grub/types.h
rename to include/grub/types.h
diff --git a/grub-core/include/grub/unicode.h b/include/grub/unicode.h
similarity index 100%
rename from grub-core/include/grub/unicode.h
rename to include/grub/unicode.h
diff --git a/grub-core/include/grub/usb.h b/include/grub/usb.h
similarity index 100%
rename from grub-core/include/grub/usb.h
rename to include/grub/usb.h
diff --git a/grub-core/include/grub/usbdesc.h b/include/grub/usbdesc.h
similarity index 100%
rename from grub-core/include/grub/usbdesc.h
rename to include/grub/usbdesc.h
diff --git a/grub-core/include/grub/usbtrans.h b/include/grub/usbtrans.h
similarity index 100%
rename from grub-core/include/grub/usbtrans.h
rename to include/grub/usbtrans.h
diff --git a/grub-core/include/grub/util/deviceiter.h b/include/grub/util/deviceiter.h
similarity index 100%
rename from grub-core/include/grub/util/deviceiter.h
rename to include/grub/util/deviceiter.h
diff --git a/grub-core/include/grub/util/lvm.h b/include/grub/util/lvm.h
similarity index 100%
rename from grub-core/include/grub/util/lvm.h
rename to include/grub/util/lvm.h
diff --git a/grub-core/include/grub/util/misc.h b/include/grub/util/misc.h
similarity index 100%
rename from grub-core/include/grub/util/misc.h
rename to include/grub/util/misc.h
diff --git a/grub-core/include/grub/util/ofpath.h b/include/grub/util/ofpath.h
similarity index 100%
rename from grub-core/include/grub/util/ofpath.h
rename to include/grub/util/ofpath.h
diff --git a/grub-core/include/grub/util/raid.h b/include/grub/util/raid.h
similarity index 100%
rename from grub-core/include/grub/util/raid.h
rename to include/grub/util/raid.h
diff --git a/grub-core/include/grub/util/resolve.h b/include/grub/util/resolve.h
similarity index 100%
rename from grub-core/include/grub/util/resolve.h
rename to include/grub/util/resolve.h
diff --git a/grub-core/include/grub/vga.h b/include/grub/vga.h
similarity index 100%
rename from grub-core/include/grub/vga.h
rename to include/grub/vga.h
diff --git a/grub-core/include/grub/video.h b/include/grub/video.h
similarity index 100%
rename from grub-core/include/grub/video.h
rename to include/grub/video.h
diff --git a/grub-core/include/grub/video_fb.h b/include/grub/video_fb.h
similarity index 100%
rename from grub-core/include/grub/video_fb.h
rename to include/grub/video_fb.h
diff --git a/grub-core/include/grub/x86_64/at_keyboard.h b/include/grub/x86_64/at_keyboard.h
similarity index 100%
rename from grub-core/include/grub/x86_64/at_keyboard.h
rename to include/grub/x86_64/at_keyboard.h
diff --git a/grub-core/include/grub/x86_64/efi/boot.h b/include/grub/x86_64/efi/boot.h
similarity index 100%
rename from grub-core/include/grub/x86_64/efi/boot.h
rename to include/grub/x86_64/efi/boot.h
diff --git a/grub-core/include/grub/x86_64/efi/loader.h b/include/grub/x86_64/efi/loader.h
similarity index 100%
rename from grub-core/include/grub/x86_64/efi/loader.h
rename to include/grub/x86_64/efi/loader.h
diff --git a/grub-core/include/grub/x86_64/efi/memory.h b/include/grub/x86_64/efi/memory.h
similarity index 100%
rename from grub-core/include/grub/x86_64/efi/memory.h
rename to include/grub/x86_64/efi/memory.h
diff --git a/grub-core/include/grub/x86_64/efi/serial.h b/include/grub/x86_64/efi/serial.h
similarity index 100%
rename from grub-core/include/grub/x86_64/efi/serial.h
rename to include/grub/x86_64/efi/serial.h
diff --git a/grub-core/include/grub/x86_64/efi/time.h b/include/grub/x86_64/efi/time.h
similarity index 100%
rename from grub-core/include/grub/x86_64/efi/time.h
rename to include/grub/x86_64/efi/time.h
diff --git a/grub-core/include/grub/x86_64/io.h b/include/grub/x86_64/io.h
similarity index 100%
rename from grub-core/include/grub/x86_64/io.h
rename to include/grub/x86_64/io.h
diff --git a/grub-core/include/grub/x86_64/linux.h b/include/grub/x86_64/linux.h
similarity index 100%
rename from grub-core/include/grub/x86_64/linux.h
rename to include/grub/x86_64/linux.h
diff --git a/grub-core/include/grub/x86_64/macho.h b/include/grub/x86_64/macho.h
similarity index 100%
rename from grub-core/include/grub/x86_64/macho.h
rename to include/grub/x86_64/macho.h
diff --git a/grub-core/include/grub/x86_64/multiboot.h b/include/grub/x86_64/multiboot.h
similarity index 100%
rename from grub-core/include/grub/x86_64/multiboot.h
rename to include/grub/x86_64/multiboot.h
diff --git a/grub-core/include/grub/x86_64/pci.h b/include/grub/x86_64/pci.h
similarity index 100%
rename from grub-core/include/grub/x86_64/pci.h
rename to include/grub/x86_64/pci.h
diff --git a/grub-core/include/grub/x86_64/relocator.h b/include/grub/x86_64/relocator.h
similarity index 100%
rename from grub-core/include/grub/x86_64/relocator.h
rename to include/grub/x86_64/relocator.h
diff --git a/grub-core/include/grub/x86_64/setjmp.h b/include/grub/x86_64/setjmp.h
similarity index 100%
rename from grub-core/include/grub/x86_64/setjmp.h
rename to include/grub/x86_64/setjmp.h
diff --git a/grub-core/include/grub/x86_64/time.h b/include/grub/x86_64/time.h
similarity index 100%
rename from grub-core/include/grub/x86_64/time.h
rename to include/grub/x86_64/time.h
diff --git a/grub-core/include/grub/x86_64/types.h b/include/grub/x86_64/types.h
similarity index 100%
rename from grub-core/include/grub/x86_64/types.h
rename to include/grub/x86_64/types.h
diff --git a/grub-core/include/grub/x86_64/xnu.h b/include/grub/x86_64/xnu.h
similarity index 100%
rename from grub-core/include/grub/x86_64/xnu.h
rename to include/grub/x86_64/xnu.h
diff --git a/grub-core/include/grub/xnu.h b/include/grub/xnu.h
similarity index 100%
rename from grub-core/include/grub/xnu.h
rename to include/grub/xnu.h
diff --git a/grub-core/include/multiboot.h b/include/multiboot.h
similarity index 100%
rename from grub-core/include/multiboot.h
rename to include/multiboot.h
diff --git a/grub-core/include/multiboot2.h b/include/multiboot2.h
similarity index 100%
rename from grub-core/include/multiboot2.h
rename to include/multiboot2.h
diff --git a/grub-core/import_gcry.py b/util/import_gcry.py
similarity index 99%
rename from grub-core/import_gcry.py
rename to util/import_gcry.py
index b9c3edcde..b63fb5501 100644
--- a/grub-core/import_gcry.py
+++ b/util/import_gcry.py
@@ -40,7 +40,7 @@ except:
     print ("WARNING: %s already exists" % cipher_dir_out)
 
 cipher_files = os.listdir (cipher_dir_in)
-conf = open (os.path.join (outdir, "conf", "gcry.rmk"), "w")
+conf = open (os.path.join ("conf", "gcry.rmk"), "w")
 conf.write ("# -*- makefile -*-\n\n")
 chlog = ""