diff --git a/.gitignore b/.gitignore
index 6e84b730..16ae6831 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,7 @@
 /config.log
 /autom4te.cache
 /GNUmakefile
-/common/config.h
+/config.h
 /common-bios
 /common-uefi32
 /common-uefi64
diff --git a/GNUmakefile.in b/GNUmakefile.in
index a1d02cd7..6319f259 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -197,7 +197,7 @@ dist:
 
 .PHONY: distclean
 distclean: clean
-	rm -rf toolchain ovmf* config.log config.status GNUmakefile common/config.h
+	rm -rf toolchain ovmf* config.log config.status GNUmakefile config.h
 
 .PHONY: maintainer-clean
 maintainer-clean: distclean
diff --git a/common/GNUmakefile b/common/GNUmakefile
index 14794d62..4441e04a 100644
--- a/common/GNUmakefile
+++ b/common/GNUmakefile
@@ -63,6 +63,7 @@ override INTERNAL_CFLAGS := \
 	-DCOM_OUTPUT=$(COM_OUTPUT) \
 	-DE9_OUTPUT=$(E9_OUTPUT) \
 	-I../freestanding_headers \
+	-I'$(call SHESCAPE,$(BUILDDIR))/..' \
 	-I. \
 	-I../stivale \
 	-I'$(call SHESCAPE,$(BUILDDIR))/tinf'
diff --git a/common/config.h.in b/config.h.in
similarity index 100%
rename from common/config.h.in
rename to config.h.in
diff --git a/configure.ac b/configure.ac
index b67b6454..9e44c983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,5 +237,5 @@ AC_SUBST(LIMINE_COPYRIGHT, [$LIMINE_COPYRIGHT])
 
 AC_PREFIX_DEFAULT(/usr/local)
 
-AC_CONFIG_FILES(GNUmakefile common/config.h)
+AC_CONFIG_FILES(GNUmakefile config.h)
 AC_OUTPUT