:: commit 97db4ca4cade43fab1e490a704a0e339b2c2b6b1

diff --git a/.gitignore b/.gitignore
index b40afd1d..f89c62b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,7 @@
 /build
 /toolchain-files
 /nyu-efi
-/freestnd-c-hdrs-0bsd
+/freestnd-c-hdrs
 /common/flanterm
 /common/libfdt
 /common/lib/stb_image.h.nopatch
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 56b72dba..915e0bb9 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -304,7 +304,7 @@ dist:
 	cd '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)" && ./bootstrap
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/common/flanterm/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/common/flanterm/.gitignore"
-	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/freestnd-c-hdrs-0bsd/.git"
+	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/freestnd-c-hdrs/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/nyu-efi/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/nyu-efi/.gitignore"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"$(DIST_OUTPUT)/cc-runtime/.git"
@@ -338,7 +338,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 freestnd-c-hdrs-0bsd cc-runtime nyu-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 cc-runtime nyu-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 aec12d01..a804d1a0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -72,7 +72,7 @@ download_by_hash() {
 if ! test -f version; then
     clone_repo_commit \
         https://github.com/osdev0/freestnd-c-hdrs-0bsd.git \
-        freestnd-c-hdrs-0bsd \
+        freestnd-c-hdrs \
         a87c192f3eb66b0806740dc67325f9ad23fc2d0b
 
     clone_repo_commit \
diff --git a/common/common.mk b/common/common.mk
index 6ff3ad6d..bdd64276 100644
--- a/common/common.mk
+++ b/common/common.mk
@@ -44,7 +44,7 @@ override CFLAGS_FOR_TARGET += \
 
 override CPPFLAGS_FOR_TARGET := \
     -I libc-compat \
-    -isystem ../freestnd-c-hdrs-0bsd \
+    -isystem ../freestnd-c-hdrs \
     -I'$(call SHESCAPE,$(BUILDDIR))/..' \
     -I. \
     -I libfdt \
@@ -287,7 +287,7 @@ $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a: ../cc-runtime/*
 		CC="$(CC_FOR_TARGET)" \
 		AR="$(AR_FOR_TARGET)" \
 		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CPPFLAGS='-isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs-0bsd -DCC_RUNTIME_NO_FLOAT'
+		CPPFLAGS='-isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs -DCC_RUNTIME_NO_FLOAT'
 
 ifeq ($(TARGET),bios)
 
@@ -408,7 +408,7 @@ nyu-efi: $(call MKESCAPE,$(BUILDDIR))/nyu-efi
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/nyu-efi/src' -f nyu-efi.mk \
 		CC="$(CC_FOR_TARGET)" \
 		CFLAGS="$(BASE_CFLAGS)" \
-		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs-0bsd' \
+		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs' \
 		ARCH=x86_64
 
 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_x86_64.ld.in
@@ -455,7 +455,7 @@ nyu-efi: $(call MKESCAPE,$(BUILDDIR))/nyu-efi
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/nyu-efi/src' -f nyu-efi.mk \
 		CC="$(CC_FOR_TARGET)" \
 		CFLAGS="$(BASE_CFLAGS)" \
-		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs-0bsd' \
+		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs' \
 		ARCH=aarch64
 
 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_aarch64.ld.in
@@ -501,7 +501,7 @@ nyu-efi: $(call MKESCAPE,$(BUILDDIR))/nyu-efi
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/nyu-efi/src' -f nyu-efi.mk \
 		CC="$(CC_FOR_TARGET)" \
 		CFLAGS="$(BASE_CFLAGS)" \
-		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs-0bsd' \
+		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs' \
 		ARCH=riscv64
 
 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_riscv64.ld.in
@@ -547,7 +547,7 @@ nyu-efi: $(call MKESCAPE,$(BUILDDIR))/nyu-efi
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/nyu-efi/src' -f nyu-efi.mk \
 		CC="$(CC_FOR_TARGET)" \
 		CFLAGS="$(BASE_CFLAGS)" \
-		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs-0bsd' \
+		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs' \
 		ARCH=loongarch64
 
 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_loongarch64.ld.in
@@ -593,7 +593,7 @@ nyu-efi: $(call MKESCAPE,$(BUILDDIR))/nyu-efi
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/nyu-efi/src' -f nyu-efi.mk \
 		CC="$(CC_FOR_TARGET)" \
 		CFLAGS="$(BASE_CFLAGS)" \
-		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs-0bsd' \
+		CPPFLAGS='-nostdinc -isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs' \
 		ARCH=ia32
 
 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_ia32.ld.in
diff --git a/decompressor/decompressor.mk b/decompressor/decompressor.mk
index 35ad45b9..61a96e42 100644
--- a/decompressor/decompressor.mk
+++ b/decompressor/decompressor.mk
@@ -34,7 +34,7 @@ override CFLAGS_FOR_TARGET += \
     -mno-80387
 
 override CPPFLAGS_FOR_TARGET := \
-    -isystem ../freestnd-c-hdrs-0bsd \
+    -isystem ../freestnd-c-hdrs \
     -I./tinf \
     -I. \
     $(CPPFLAGS_FOR_TARGET) \
@@ -72,7 +72,7 @@ $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a: ../cc-runtime/*
 		CC="$(CC_FOR_TARGET)" \
 		AR="$(AR_FOR_TARGET)" \
 		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CPPFLAGS='-isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs-0bsd -DCC_RUNTIME_NO_FLOAT'
+		CPPFLAGS='-isystem $(call SHESCAPE,$(SRCDIR))/../freestnd-c-hdrs -DCC_RUNTIME_NO_FLOAT'
 
 $(call MKESCAPE,$(BUILDDIR))/decompressor.bin: $(OBJ) $(call MKESCAPE,$(BUILDDIR))/cc-runtime/cc-runtime.a
 	$(LD_FOR_TARGET) '$(call OBJESCAPE,$^)' $(LDFLAGS_FOR_TARGET) -o '$(call SHESCAPE,$(BUILDDIR))/decompressor.elf'
diff --git a/test/test.mk b/test/test.mk
index 618888c9..9cdcd9ec 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -58,7 +58,7 @@ override CFLAGS += \
     -fno-stack-check \
     -fno-lto \
     -fPIE \
-    -I../freestnd-c-hdrs-0bsd \
+    -I../freestnd-c-hdrs \
     -I. \
     -D_LIMINE_PROTO \
     -DLIMINE_API_REVISION=3
@@ -104,7 +104,7 @@ override CFLAGS_MB := \
     -m32 \
     -march=i686 \
     -mgeneral-regs-only \
-    -I../freestnd-c-hdrs-0bsd \
+    -I../freestnd-c-hdrs \
     -I. \
     -I../common/protos