diff --git a/Makefile b/Makefile
index 8ecad08..f0bee80 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,15 @@ export RUST_TARGET_PATH=$(ROOT)/targets
 
 #TODO: Use libssp
 export CFLAGS=-nostartfiles -nostdlib -nodefaultlibs \
-			-undef -imacros $(ROOT)/libc-artifacts/define.h \
-			-isystem $(ROOT)/libc-artifacts/usr/include \
-			-fno-stack-protector -U_FORTIFY_SOURCE
-export CXXFLAGS=$(CFLAGS) -nostdinc++ \
+	-undef -imacros $(ROOT)/libc-artifacts/define.h \
+	-isystem $(ROOT)/libc-artifacts/usr/lib/gcc/x86_64-elf-redox/7.0.0/include \
+	-isystem $(ROOT)/libc-artifacts/usr/lib/gcc/x86_64-elf-redox/7.0.0/include-fixed \
+	-isystem $(ROOT)/libc-artifacts/usr/include \
+	-fno-stack-protector -U_FORTIFY_SOURCE
+export CXXFLAGS=$(CFLAGS) \
 	-isystem $(ROOT)/libc-artifacts/usr/include/c++/7.0.0 \
-	-isystem $(ROOT)/libc-artifacts/usr/include/c++/7.0.0/x86_64-elf-redox
+ 	-isystem $(ROOT)/libc-artifacts/usr/include/c++/7.0.0/x86_64-elf-redox \
+ 	-isystem $(ROOT)/libc-artifacts/usr/include/c++/7.0.0/backward
 
 # Kernel variables
 KTARGET=$(ARCH)-unknown-none
diff --git a/libc-artifacts b/libc-artifacts
index 44e8068..8e0ed0a 160000
--- a/libc-artifacts
+++ b/libc-artifacts
@@ -1 +1 @@
-Subproject commit 44e806831acb32362e0d0fd55fad01e2f7ff443f
+Subproject commit 8e0ed0ac0368be54ca375147b758b669a98c652f