diff --git a/Makefile b/Makefile
index 46b42d3..8ecad08 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,13 @@ ROOT=$(PWD)
 export RUST_TARGET_PATH=$(ROOT)/targets
 
 #TODO: Use libssp
-export CFLAGS=-ffreestanding -nostartfiles -nostdlib -nodefaultlibs \
+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++ \
+	-isystem $(ROOT)/libc-artifacts/usr/include/c++/7.0.0 \
+	-isystem $(ROOT)/libc-artifacts/usr/include/c++/7.0.0/x86_64-elf-redox
 
 # Kernel variables
 KTARGET=$(ARCH)-unknown-none
diff --git a/libc-artifacts b/libc-artifacts
index 0f3467f..44e8068 160000
--- a/libc-artifacts
+++ b/libc-artifacts
@@ -1 +1 @@
-Subproject commit 0f3467ff1925c0b03b58110aeda924b38ae1c6fc
+Subproject commit 44e806831acb32362e0d0fd55fad01e2f7ff443f