:: commit 16c7c69b4290141e1e6310451a724002f636ac48

diff --git a/bootstrap b/bootstrap
index adf0b907..dc63f82b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -80,7 +80,7 @@ if ! test -f version; then
     clone_repo_commit \
         https://github.com/limine-bootloader/limine-efi.git \
         limine-efi \
-        374eae016cd661960ee0e2efc8d14e784062f778
+        ffd866edaa1c558148a5e02991c75e30e3860da8
 
     clone_repo_commit \
         https://github.com/jibsen/tinf.git \
diff --git a/common/common.mk b/common/common.mk
index a8a2f3cf..621acb52 100644
--- a/common/common.mk
+++ b/common/common.mk
@@ -94,7 +94,6 @@ ifeq ($(TARGET),uefi-x86-64)
         -mno-red-zone
     override CPPFLAGS_FOR_TARGET := \
         -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc' \
-        -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc/x86_64' \
         $(CPPFLAGS_FOR_TARGET) \
         -DUEFI
     override NASMFLAGS_FOR_TARGET += \
@@ -112,7 +111,6 @@ ifeq ($(TARGET),uefi-ia32)
         -mno-80387
     override CPPFLAGS_FOR_TARGET := \
         -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc' \
-        -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc/ia32' \
         $(CPPFLAGS_FOR_TARGET) \
         -DUEFI
     override NASMFLAGS_FOR_TARGET += \
@@ -128,7 +126,6 @@ ifeq ($(TARGET),uefi-aarch64)
         -mgeneral-regs-only
     override CPPFLAGS_FOR_TARGET := \
         -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc' \
-        -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc/aarch64' \
         $(CPPFLAGS_FOR_TARGET) \
         -DUEFI
 endif
@@ -150,7 +147,6 @@ ifeq ($(TARGET),uefi-riscv64)
 
     override CPPFLAGS_FOR_TARGET := \
         -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc' \
-        -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc/riscv64' \
         $(CPPFLAGS_FOR_TARGET) \
         -DUEFI
 endif
@@ -164,7 +160,6 @@ ifeq ($(TARGET),uefi-loongarch64)
 
     override CPPFLAGS_FOR_TARGET := \
         -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc' \
-        -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc/loongarch64' \
         $(CPPFLAGS_FOR_TARGET) \
         -DUEFI
 endif
diff --git a/common/lib/misc.h b/common/lib/misc.h
index 9005b0b7..5f2a7187 100644
--- a/common/lib/misc.h
+++ b/common/lib/misc.h
@@ -11,7 +11,7 @@
 #if defined (UEFI)
 #  include <efi.h>
 #  if defined (__riscv)
-#    include <protocol/riscv/efiboot.h>
+#    include <riscv64/efiboot.h>
 #  endif
 #endif