diff --git a/Kernel/Makefile b/Kernel/Makefile
index 0447b9434a7..b15ccef7cfc 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -143,8 +143,16 @@ PROGRAM = kernel
 
 SUBPROJECT_CXXFLAGS += -pie -fPIE -ffreestanding -fbuiltin -mno-80387 -mno-mmx -mno-sse -mno-sse2 -fno-asynchronous-unwind-tables
 SUBPROJECT_CXXFLAGS += -nostdlib -nostdinc -nostdinc++ $(SERENITY_KERNEL_CUSTOM_CXXFLAGS)
-SUBPROJECT_CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/9.3.0/
-SUBPROJECT_CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/9.3.0/i686-pc-serenity/
+
+UNAME_S := $(shell uname -s)
+
+ifeq ($(UNAME_S),SerenityOS)
+    SUBPROJECT_CXXFLAGS += -I/usr/local/include/c++/9.3.0/
+    SUBPROJECT_CXXFLAGS += -I/usr/local/include/c++/9.3.0/i686-pc-serenity/
+else
+    SUBPROJECT_CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/9.3.0/
+    SUBPROJECT_CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/9.3.0/i686-pc-serenity/
+endif
 
 LDFLAGS += -Wl,-T linker.ld -nostdlib -lgcc -lstdc++ $(SERENITY_KERNEL_CUSTOM_LDFLAGS)
 
diff --git a/Makefile.common b/Makefile.common
index b5f1b4a1ba5..50b7efd90ee 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -22,8 +22,9 @@ INCLUDE_FLAGS += \
 
 VERBOSE = 0
 
+UNAME_S := $(shell uname -s)
+
 ifneq ($(USE_HOST_CXX),)
-    UNAME_S := $(shell uname -s)
     ifeq ($(UNAME_S),OpenBSD)
         HOST_CXX ?= clang++
     endif
@@ -42,13 +43,19 @@ ifneq ($(USE_HOST_CXX),)
     OBJ_SUFFIX ?= .host
     ARCH = $(shell arch -s)
 else
-    TOOLCHAIN_PATH = $(SERENITY_BASE_DIR)/Toolchain/Local/bin
-    CXX = $(PRE_CXX) $(TOOLCHAIN_PATH)/i686-pc-serenity-g++
-    CC = $(PRE_CC) $(TOOLCHAIN_PATH)/i686-pc-serenity-gcc
-    AS = $(TOOLCHAIN_PATH)/i686-pc-serenity-as
-    LINK = $(TOOLCHAIN_PATH)/i686-pc-serenity-ld
-    RANLIB = $(TOOLCHAIN_PATH)/i686-pc-serenity-ranlib
-    AR = $(TOOLCHAIN_PATH)/i686-pc-serenity-ar
+    ifeq ($(UNAME_S),SerenityOS)
+        TOOLCHAIN_PREFIX =
+    else
+        TOOLCHAIN_PATH = $(SERENITY_BASE_DIR)/Toolchain/Local/bin
+        TOOLCHAIN_PREFIX = $(TOOLCHAIN_PATH)/i686-pc-serenity-
+    endif
+
+    CXX = $(PRE_CXX) $(TOOLCHAIN_PREFIX)g++
+    CC = $(PRE_CC) $(TOOLCHAIN_PREFIX)gcc
+    AS = $(TOOLCHAIN_PREFIX)as
+    LINK = $(TOOLCHAIN_PREFIX)ld
+    RANLIB = $(TOOLCHAIN_PREFIX)ranlib
+    AR = $(TOOLCHAIN_PREFIX)ar
     ARCH = i386
 
     DEFINES += -DDEBUG