diff --git a/Kernel/Makefile b/Kernel/Makefile
index 3fdb35c483..b61b230b76 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -85,6 +85,7 @@ OBJS = $(CXX_OBJS) Boot/boot.ao
 
 KERNEL = kernel
 CXXFLAGS += -ffreestanding -mregparm=3 -mno-80387 -mno-mmx -mno-sse -mno-sse2
+CXXFLAGS += -nostdinc++ -nostdlib -nostdinc
 DEFINES += -DKERNEL
 LDFLAGS += -Ttext 0x10000 -Wl,-T linker.ld -nostdlib
 
diff --git a/Makefile.common b/Makefile.common
index f22f1c1e38..60911ec75e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,5 +1,5 @@
 ARCH_FLAGS =
-STANDARD_FLAGS = -std=c++17 -nostdinc++ -nostdlib -nostdinc -Wno-sized-deallocation -fno-sized-deallocation
+STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation -fno-sized-deallocation
 WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
 FLAVOR_FLAGS = -fno-exceptions -fno-rtti
 OPTIMIZATION_FLAGS = -Os