diff --git a/Kernel/Devices/Device.h b/Kernel/Devices/Device.h
index 3b2256cf64..fbe899b55c 100644
--- a/Kernel/Devices/Device.h
+++ b/Kernel/Devices/Device.h
@@ -9,7 +9,7 @@
 // There are two main subclasses:
 //   - BlockDevice (random access)
 //   - CharacterDevice (sequential)
-#include <Kernel/File.h>
+#include <Kernel/FileSystem/File.h>
 #include <Kernel/UnixTypes.h>
 
 class Device : public File {
diff --git a/Kernel/Devices/IDEDiskDevice.cpp b/Kernel/Devices/IDEDiskDevice.cpp
index e8f967f7e8..68576209c3 100644
--- a/Kernel/Devices/IDEDiskDevice.cpp
+++ b/Kernel/Devices/IDEDiskDevice.cpp
@@ -1,7 +1,7 @@
 #include <Kernel/Devices/IDEDiskDevice.h>
 #include <Kernel/FileSystem/ProcFS.h>
 #include <Kernel/IO.h>
-#include <Kernel/PIC.h>
+#include <Kernel/Arch/i386/PIC.h>
 #include <Kernel/Process.h>
 #include <Kernel/StdLib.h>
 #include <Kernel/VM/MemoryManager.h>
diff --git a/Kernel/Devices/PCSpeaker.cpp b/Kernel/Devices/PCSpeaker.cpp
index 853f53bf77..9975ac9803 100644
--- a/Kernel/Devices/PCSpeaker.cpp
+++ b/Kernel/Devices/PCSpeaker.cpp
@@ -1,7 +1,7 @@
 #include <Kernel/Arch/i386/CPU.h>
+#include <Kernel/Arch/i386/PIT.h>
 #include <Kernel/Devices/PCSpeaker.h>
 #include <Kernel/IO.h>
-#include <Kernel/i8253.h>
 
 void PCSpeaker::tone_on(int frequency)
 {
diff --git a/Kernel/FileSystem/FIFO.h b/Kernel/FileSystem/FIFO.h
index bd844dc9f0..77c5427ba2 100644
--- a/Kernel/FileSystem/FIFO.h
+++ b/Kernel/FileSystem/FIFO.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Kernel/DoubleBuffer.h>
-#include <Kernel/File.h>
+#include <Kernel/FileSystem/File.h>
 #include <Kernel/UnixTypes.h>
 
 class FileDescription;
diff --git a/Kernel/File.cpp b/Kernel/FileSystem/File.cpp
similarity index 92%
rename from Kernel/File.cpp
rename to Kernel/FileSystem/File.cpp
index 693b21ee74..6f12224027 100644
--- a/Kernel/File.cpp
+++ b/Kernel/FileSystem/File.cpp
@@ -1,4 +1,4 @@
-#include <Kernel/File.h>
+#include <Kernel/FileSystem/File.h>
 #include <Kernel/FileSystem/FileDescription.h>
 
 File::File()
diff --git a/Kernel/File.h b/Kernel/FileSystem/File.h
similarity index 100%
rename from Kernel/File.h
rename to Kernel/FileSystem/File.h
diff --git a/Kernel/FileSystem/InodeFile.h b/Kernel/FileSystem/InodeFile.h
index b7101ff753..b2ee30c196 100644
--- a/Kernel/FileSystem/InodeFile.h
+++ b/Kernel/FileSystem/InodeFile.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/File.h>
+#include <Kernel/FileSystem/File.h>
 
 class Inode;
 
diff --git a/Kernel/Makefile b/Kernel/Makefile
index cd4c04c6c5..1f3ba29443 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -54,7 +54,7 @@ KERNEL_OBJS = \
        Devices/PCSpeaker.o \
        FileSystem/InodeFile.o \
        FileSystem/Custody.o \
-       File.o
+       FileSystem/File.o
 
 VFS_OBJS = \
     FileSystem/ProcFS.o \
@@ -97,7 +97,9 @@ OBJS = $(CXX_OBJS) Boot/boot.ao
 
 KERNEL = kernel
 CXXFLAGS += -ffreestanding -mregparm=3 -mno-80387 -mno-mmx -mno-sse -mno-sse2
-CXXFLAGS += -nostdlib
+CXXFLAGS += -nostdlib -nostdinc -nostdinc++
+CXXFLAGS += -I../Root/usr/local/include/c++/8.3.0/
+CXXFLAGS += -I../Root/usr/local/include/c++/8.3.0/i686-pc-serenity/
 DEFINES += -DKERNEL
 LDFLAGS += -Ttext 0x10000 -Wl,-T linker.ld -nostdlib
 
diff --git a/Kernel/Net/Socket.h b/Kernel/Net/Socket.h
index 876424b9ce..2a6a382027 100644
--- a/Kernel/Net/Socket.h
+++ b/Kernel/Net/Socket.h
@@ -4,7 +4,7 @@
 #include <AK/RefPtr.h>
 #include <AK/RefCounted.h>
 #include <AK/Vector.h>
-#include <Kernel/File.h>
+#include <Kernel/FileSystem/File.h>
 #include <Kernel/KResult.h>
 #include <Kernel/Lock.h>
 #include <Kernel/UnixTypes.h>
diff --git a/Kernel/ProcessTracer.h b/Kernel/ProcessTracer.h
index 2a064625f5..cfde92d2f8 100644
--- a/Kernel/ProcessTracer.h
+++ b/Kernel/ProcessTracer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/CircularQueue.h>
-#include <Kernel/File.h>
+#include <Kernel/FileSystem/File.h>
 #include <Kernel/UnixTypes.h>
 
 class ProcessTracer : public File {
diff --git a/Kernel/SharedMemory.h b/Kernel/SharedMemory.h
index ef77bb0c12..81a5860748 100644
--- a/Kernel/SharedMemory.h
+++ b/Kernel/SharedMemory.h
@@ -3,7 +3,7 @@
 #include <AK/AKString.h>
 #include <AK/RefPtr.h>
 #include <AK/RefCounted.h>
-#include <Kernel/File.h>
+#include <Kernel/FileSystem/File.h>
 #include <Kernel/KResult.h>
 #include <Kernel/UnixTypes.h>