diff --git a/Kernel/Forward.h b/Kernel/Forward.h
index ad1a2b0f22..0333f97910 100644
--- a/Kernel/Forward.h
+++ b/Kernel/Forward.h
@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include <AK/DistinctNumeric.h>
+
 namespace Kernel {
 
 class BlockDevice;
@@ -91,4 +93,9 @@ class KResultOr;
 struct InodeMetadata;
 struct TrapFrame;
 
+TYPEDEF_DISTINCT_ORDERED_ID(pid_t, ProcessID);
+TYPEDEF_DISTINCT_ORDERED_ID(pid_t, ThreadID);
+TYPEDEF_DISTINCT_ORDERED_ID(pid_t, SessionID);
+TYPEDEF_DISTINCT_ORDERED_ID(pid_t, ProcessGroupID);
+
 }
diff --git a/Kernel/ThreadTracer.h b/Kernel/ThreadTracer.h
index 5cc360ed07..c7a66a1e90 100644
--- a/Kernel/ThreadTracer.h
+++ b/Kernel/ThreadTracer.h
@@ -8,7 +8,7 @@
 
 #include <AK/Optional.h>
 #include <AK/OwnPtr.h>
-#include <Kernel/UnixTypes.h>
+#include <Kernel/Forward.h>
 #include <LibC/sys/arch/i386/regs.h>
 
 namespace Kernel {
diff --git a/Kernel/UnixTypes.h b/Kernel/UnixTypes.h
index 21752df90f..586b3ae0c8 100644
--- a/Kernel/UnixTypes.h
+++ b/Kernel/UnixTypes.h
@@ -6,8 +6,6 @@
 
 #pragma once
 
-#include <AK/DistinctNumeric.h>
-#include <AK/Types.h>
 #include <Kernel/API/POSIX/dirent.h>
 #include <Kernel/API/POSIX/fcntl.h>
 #include <Kernel/API/POSIX/futex.h>
@@ -34,9 +32,3 @@
 #include <Kernel/API/POSIX/termios.h>
 #include <Kernel/API/POSIX/time.h>
 #include <Kernel/API/POSIX/unistd.h>
-
-// Avoid interference with AK/Types.h and LibC/sys/types.h by defining *separate* names:
-TYPEDEF_DISTINCT_ORDERED_ID(pid_t, ProcessID);
-TYPEDEF_DISTINCT_ORDERED_ID(pid_t, ThreadID);
-TYPEDEF_DISTINCT_ORDERED_ID(pid_t, SessionID);
-TYPEDEF_DISTINCT_ORDERED_ID(pid_t, ProcessGroupID);