:: commit b3af3b998adb2ac6bd7449e182f83bc407c174b3

diff --git a/.gitignore b/.gitignore
index b9d2c5a5..5ab8e676 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 /toolchain
 /toolchain-files
 /limine-efi
-/freestanding_headers
+/freestanding-headers
 /make_toolchain.sh
 /ovmf*
 *.o
diff --git a/GNUmakefile.in b/GNUmakefile.in
index c83a0201..1998d451 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -187,7 +187,7 @@ dist:
 	cp -r '$(call SHESCAPE,$(SRCDIR))'/.git '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)"/
 	cd '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" && git checkout .
 	cd '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" && ./bootstrap
-	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/freestanding_headers/.git"
+	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/freestanding-headers/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/libgcc-binaries/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/libgcc-binaries/.gitignore"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/limine-efi/.git"
@@ -213,7 +213,7 @@ distclean: clean
 
 .PHONY: maintainer-clean
 maintainer-clean: distclean
-	cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf freestanding_headers stivale libgcc-binaries make_toolchain.sh limine-efi configure build-aux *'~' autom4te.cache *.tar.xz *.tar.gz
+	cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf freestanding-headers stivale libgcc-binaries make_toolchain.sh limine-efi configure build-aux *'~' autom4te.cache *.tar.xz *.tar.gz
 	cd '$(call SHESCAPE,$(SRCDIR))'/toolchain-detect && rm -rf configure *'~' autom4te.cache
 
 .PHONY: common-uefi-x86-64
diff --git a/bootstrap b/bootstrap
index 990036ed..858cd27f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 
 cd "$srcdir"
 
-[ -d freestanding_headers ] || git clone https://github.com/mintsuki/freestanding_headers.git
+[ -d freestanding-headers ] || git clone https://github.com/mintsuki/freestanding-headers.git
 [ -d stivale ] || git clone https://github.com/stivale/stivale.git
 [ -d libgcc-binaries ] || git clone https://github.com/mintsuki/libgcc-binaries.git
 [ -d limine-efi ] || git clone https://github.com/limine-bootloader/limine-efi.git
diff --git a/common/GNUmakefile b/common/GNUmakefile
index 21f608e8..d23ae3cb 100644
--- a/common/GNUmakefile
+++ b/common/GNUmakefile
@@ -52,7 +52,7 @@ override INTERNAL_CFLAGS := \
 	-MMD \
 	-DCOM_OUTPUT=$(COM_OUTPUT) \
 	-DE9_OUTPUT=$(E9_OUTPUT) \
-	-I../freestanding_headers \
+	-I../freestanding-headers \
 	-I'$(call SHESCAPE,$(BUILDDIR))/..' \
 	-I. \
 	-I.. \
@@ -293,7 +293,7 @@ limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/gnuefi' \
 		CC="$(LIMINE_CC) -m64 -march=x86-64 -mtune=generic" \
 		CFLAGS='-nostdinc' \
-		INCDIR='-I$(call SHESCAPE,$(SRCDIR))/../freestanding_headers' \
+		INCDIR='-I$(call SHESCAPE,$(SRCDIR))/../freestanding-headers' \
 		ARCH=x86_64
 
 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_x86_64.ld.in
@@ -341,7 +341,7 @@ limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi
 	$(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/gnuefi' \
 		CC="$(LIMINE_CC) -m32 -march=i686 -mtune=generic" \
 		CFLAGS='-nostdinc' \
-		INCDIR='-I$(call SHESCAPE,$(SRCDIR))/../freestanding_headers' \
+		INCDIR='-I$(call SHESCAPE,$(SRCDIR))/../freestanding-headers' \
 		ARCH=ia32
 
 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_ia32.ld.in
diff --git a/decompressor/GNUmakefile b/decompressor/GNUmakefile
index 31b18377..e963aad1 100644
--- a/decompressor/GNUmakefile
+++ b/decompressor/GNUmakefile
@@ -37,7 +37,7 @@ override INTERNAL_CFLAGS := \
 	-mno-sse \
 	-mno-sse2 \
 	-MMD \
-	-I../freestanding_headers \
+	-I../freestanding-headers \
 	-I. \
 	-I'$(call SHESCAPE,$(BUILDDIR))/tinf'