diff --git a/Makefile.am b/Makefile.am
index c7f3614d4..51203c00d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,87 @@ AUTOMAKE_OPTIONS = subdir-objects
 SUBDIRS = . grub-core po docs
 EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
 
-include $(top_srcdir)/grub-core/Makefile.vars
+grubconfdir = $(sysconfdir)/grub.d
+platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
+
+# 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
+
+# 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 =
 
 CFLAGS_PROGRAM = $(HOST_CFLAGS) $(CFLAGS_GNULIB)
 LDFLAGS_PROGRAM = $(HOST_LDFLAGS) $(LDFLAGS_GNULIB)
diff --git a/grub-core/Makefile.kernel b/grub-core/Makefile.kernel
deleted file mode 100644
index 69c20a4fc..000000000
--- a/grub-core/Makefile.kernel
+++ /dev/null
@@ -1,204 +0,0 @@
-# -*- makefile -*-
-
-KERNEL_HEADER_FILES =
-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
diff --git a/grub-core/Makefile.vars b/grub-core/Makefile.vars
deleted file mode 100644
index 6dc536139..000000000
--- a/grub-core/Makefile.vars
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- makefile -*-
-
-grubconfdir = $(sysconfdir)/grub.d
-platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
-
-# 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
-
-# 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 =