:: commit 91b7ef85abcb39d7bd79b5099ac9d705b8c67611

diff --git a/.gitignore b/.gitignore
index 27ac64c7..2a3a18f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,7 @@
 /build
 /toolchain-files
 /limine-efi
-/freestanding-headers
+/freestnd-c-hdrs
 /common/flanterm
 /common/libfdt
 /common/lib/stb_image.h.nopatch
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2a938375..16996479 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -310,7 +310,7 @@ dist:
 	cd '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" && ./bootstrap
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/common/flanterm/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/common/flanterm/.gitignore"
-	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/freestanding-headers/.git"
+	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/freestnd-c-hdrs/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/limine-efi/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/limine-efi/.gitignore"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/dtc"
@@ -342,7 +342,7 @@ distclean: clean
 
 .PHONY: maintainer-clean
 maintainer-clean: distclean
-	cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf common/flanterm common/libfdt common/lib/stb_image.h.nopatch common/lib/stb_image.h decompressor/tinf tinf dtc freestanding-headers common/cc-runtime.s2.c decompressor/cc-runtime.c limine-efi configure timestamps build-aux *'~' autom4te.cache aclocal.m4 *.tar*
+	cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf common/flanterm common/libfdt common/lib/stb_image.h.nopatch common/lib/stb_image.h decompressor/tinf tinf dtc freestnd-c-hdrs common/cc-runtime.s2.c decompressor/cc-runtime.c limine-efi configure timestamps build-aux *'~' autom4te.cache aclocal.m4 *.tar*
 
 .PHONY: common-uefi-x86-64
 common-uefi-x86-64:
diff --git a/bootstrap b/bootstrap
index a250de98..169684d5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -61,9 +61,9 @@ download_by_hash() {
 
 if ! test -f version; then
     clone_repo_commit \
-        https://github.com/osdev0/freestanding-headers.git \
-        freestanding-headers \
-        4b8b78007533dec6ae3bd8dddcc302f22a21c140
+        https://github.com/osdev0/freestnd-c-hdrs.git \
+        freestnd-c-hdrs \
+        2a75fc37ab374e52bd5862adb785169cc26cdb50
 
     download_by_hash \
         https://github.com/osdev0/cc-runtime/raw/dcdf5d82973e77edee597a047a3ef66300903de9/cc-runtime.c \
diff --git a/common/common.mk b/common/common.mk
index e23507ca..84c14d71 100644
--- a/common/common.mk
+++ b/common/common.mk
@@ -48,8 +48,27 @@ override CFLAGS_FOR_TARGET += \
     -fno-strict-aliasing \
     -fno-lto
 
+ifeq ($(TARGET),bios)
+    override ARCH := i686
+endif
+ifeq ($(TARGET),uefi-ia32)
+    override ARCH := i686
+endif
+ifeq ($(TARGET),uefi-x86-64)
+    override ARCH := x86_64
+endif
+ifeq ($(TARGET),uefi-aarch64)
+    override ARCH := aarch64
+endif
+ifeq ($(TARGET),uefi-riscv64)
+    override ARCH := riscv64
+endif
+ifeq ($(TARGET),uefi-loongarch64)
+    override ARCH := loongarch64
+endif
+
 override CPPFLAGS_FOR_TARGET := \
-    -isystem ../freestanding-headers \
+    -isystem ../freestnd-c-hdrs/$(ARCH)/include \
     -I'$(call SHESCAPE,$(BUILDDIR))/..' \
     -I. \
     $(CPPFLAGS_FOR_TARGET) \
@@ -399,7 +418,7 @@ limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/src' -f limine-efi.mk \
 		CC="$(CC_FOR_TARGET)" \
 		CFLAGS="$(BASE_CFLAGS)" \
-		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestanding-headers' \
+		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs/$(ARCH)/include' \
 		ARCH=x86_64
 
 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_x86_64.ld.in
@@ -446,7 +465,7 @@ limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/src' -f limine-efi.mk \
 		CC="$(CC_FOR_TARGET)" \
 		CFLAGS="$(BASE_CFLAGS)" \
-		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestanding-headers' \
+		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs/$(ARCH)/include' \
 		ARCH=aarch64
 
 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_aarch64.ld.in
@@ -492,7 +511,7 @@ limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/src' -f limine-efi.mk \
 		CC="$(CC_FOR_TARGET)" \
 		CFLAGS="$(BASE_CFLAGS)" \
-		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestanding-headers' \
+		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs/$(ARCH)/include' \
 		ARCH=riscv64
 
 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_riscv64.ld.in
@@ -538,7 +557,7 @@ limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/src' -f limine-efi.mk \
 		CC="$(CC_FOR_TARGET)" \
 		CFLAGS="$(BASE_CFLAGS)" \
-		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestanding-headers' \
+		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs/$(ARCH)/include' \
 		ARCH=loongarch64
 
 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_loongarch64.ld.in
@@ -584,7 +603,7 @@ limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/src' -f limine-efi.mk \
 		CC="$(CC_FOR_TARGET)" \
 		CFLAGS="$(BASE_CFLAGS)" \
-		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestanding-headers' \
+		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs/$(ARCH)/include' \
 		ARCH=ia32
 
 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_ia32.ld.in
diff --git a/decompressor/decompressor.mk b/decompressor/decompressor.mk
index 0aa10ecb..baa5f0ad 100644
--- a/decompressor/decompressor.mk
+++ b/decompressor/decompressor.mk
@@ -43,7 +43,7 @@ override CFLAGS_FOR_TARGET += \
     -mno-80387
 
 override CPPFLAGS_FOR_TARGET := \
-    -isystem ../freestanding-headers \
+    -isystem ../freestnd-c-hdrs/i686/include \
     -I./tinf \
     -I. \
     $(CPPFLAGS_FOR_TARGET) \
diff --git a/test/test.mk b/test/test.mk
index a0247219..8b9e12d2 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -58,12 +58,12 @@ override CFLAGS += \
     -fno-stack-check \
     -fno-lto \
     -fPIE \
-    -I../freestanding-headers \
     -I. \
     -D_LIMINE_PROTO
 
 ifneq ($(findstring x86_64,$(shell $(CC_FOR_TARGET) -dumpmachine)),)
 override CFLAGS += \
+    -I../freestnd-c-hdrs/x86_64/include \
     -m64 \
     -march=x86-64 \
     -mgeneral-regs-only \
@@ -72,11 +72,13 @@ endif
 
 ifneq ($(findstring aarch64,$(shell $(CC_FOR_TARGET) -dumpmachine)),)
 override CFLAGS += \
+    -I../freestnd-c-hdrs/aarch64/include \
     -mgeneral-regs-only
 endif
 
 ifneq ($(findstring riscv64,$(shell $(CC_FOR_TARGET) -dumpmachine)),)
 override CFLAGS += \
+    -I../freestnd-c-hdrs/riscv64/include \
     -march=rv64imac \
     -mabi=lp64 \
     -mno-relax
@@ -86,6 +88,7 @@ endif
 
 ifneq ($(findstring loongarch64,$(shell $(CC_FOR_TARGET) -dumpmachine)),)
 override CFLAGS += \
+    -I../freestnd-c-hdrs/loongarch64/include \
     -march=loongarch64 \
     -mabi=lp64s
 override LDFLAGS += \
@@ -103,7 +106,7 @@ override CFLAGS_MB := \
     -m32 \
     -march=i686 \
     -mgeneral-regs-only \
-    -I../freestanding-headers \
+    -I../freestnd-c-hdrs/i686/include \
     -I. \
     -I../common/protos