diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 8f988b0be..ff5bf7a30 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -173,7 +173,7 @@ kernel = {
   emu = disk/host.c;
   emu = gnulib/progname.c;
   emu = gnulib/error.c;
-  emu = kern/emu/cache.S;
+  emu = kern/emu/cache_s.S;
   emu = kern/emu/console.c;
   emu = kern/emu/getroot.c;
   emu = kern/emu/hostdisk.c;
@@ -463,41 +463,6 @@ module = {
   enable = i386_multiboot;
 };
 
-module = {
-  name = lsacpi;
-
-  common = commands/lsacpi.c;
-
-  enable = efi;
-  enable = i386_pc;
-  enable = i386_coreboot;
-  enable = i386_multiboot;
-};
-
-module = {
-  name = lsefisystab;
-
-  common = commands/efi/lsefisystab.c;
-
-  enable = efi;
-};
-
-module = {
-  name = lssal;
-
-  common = commands/efi/lssal.c;
-
-  enable = efi;
-};
-
-module = {
-  name = lsefimmap;
-
-  common = commands/efi/lsefimmap.c;
-
-  enable = efi;
-};
-
 module = {
   name = lsacpi;
 
diff --git a/grub-core/kern/emu/cache.S b/grub-core/kern/emu/cache_s.S
similarity index 100%
rename from grub-core/kern/emu/cache.S
rename to grub-core/kern/emu/cache_s.S