From 2302350d78f0cb5ffedf8996f51337e4cf6681ac Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Sun, 27 Oct 2013 02:42:10 +0200
Subject: [PATCH] Remove <sortix/kernel/platform.h>.

---
 libc/stdlib/abort.cpp                   |  2 +-
 sortix/addralloc.cpp                    |  2 +-
 sortix/alarm.cpp                        |  6 ++--
 sortix/ata.cpp                          | 21 +++++++------
 sortix/bga.cpp                          | 14 ++++-----
 sortix/calltrace.cpp                    |  2 +-
 sortix/clock.cpp                        |  2 +-
 sortix/com.cpp                          | 22 ++++++-------
 sortix/copy.cpp                         |  7 +++--
 sortix/crc32.cpp                        |  2 +-
 sortix/debugger.cpp                     |  2 +-
 sortix/descriptor.cpp                   | 31 ++++++++++--------
 sortix/dispmsg.cpp                      |  4 +--
 sortix/dtable.cpp                       | 16 +++++-----
 sortix/elf.cpp                          |  2 +-
 sortix/end.cpp                          |  2 +-
 sortix/fcache.cpp                       |  2 +-
 sortix/fs/kram.cpp                      |  9 +++---
 sortix/fs/user.cpp                      | 12 +++----
 sortix/fs/util.cpp                      | 19 ++++++-----
 sortix/fsfunc.cpp                       | 13 ++++++--
 sortix/identity.cpp                     |  4 +--
 sortix/include/sortix/kernel/platform.h | 35 ---------------------
 sortix/initrd.cpp                       | 12 +++----
 sortix/inode.cpp                        |  6 ++--
 sortix/interlock.cpp                    |  2 +-
 sortix/interrupt.cpp                    | 12 +++----
 sortix/io.cpp                           | 42 ++++++++++++++-----------
 sortix/ioctx.cpp                        |  4 +--
 sortix/kb/layout/us.cpp                 |  6 ++--
 sortix/kb/ps2.cpp                       | 16 +++++-----
 sortix/kernelinfo.cpp                   |  2 +-
 sortix/kthread.cpp                      |  4 +--
 sortix/lfbtextbuffer.cpp                | 14 ++++-----
 sortix/linebuffer.cpp                   |  4 ++-
 sortix/log.cpp                          |  2 +-
 sortix/logterminal.cpp                  |  2 +-
 sortix/mtable.cpp                       | 11 ++++---
 sortix/net/fs.cpp                       |  8 ++---
 sortix/panic.cpp                        |  2 +-
 sortix/partition.cpp                    |  4 +--
 sortix/pci.cpp                          |  4 +--
 sortix/pipe.cpp                         | 27 ++++++----------
 sortix/poll.cpp                         |  6 ++--
 sortix/process.cpp                      |  2 +-
 sortix/refcount.cpp                     |  5 +--
 sortix/scheduler.cpp                    | 10 +++---
 sortix/serialterminal.cpp               |  6 ++--
 sortix/signal.cpp                       | 16 +++++-----
 sortix/syscall.cpp                      |  6 ++--
 sortix/textbuffer.cpp                   |  5 +--
 sortix/textterminal.cpp                 |  6 ++--
 sortix/thread.cpp                       |  2 +-
 sortix/time.cpp                         |  8 ++---
 sortix/timer.cpp                        |  4 +--
 sortix/uart.cpp                         |  2 +-
 sortix/user-timer.cpp                   |  4 +--
 sortix/utf8.cpp                         |  4 ++-
 sortix/vga.cpp                          | 14 ++++-----
 sortix/vgatextbuffer.cpp                |  6 ++--
 sortix/video.cpp                        | 11 ++++---
 sortix/vnode.cpp                        | 10 +++---
 sortix/worker.cpp                       |  2 +-
 sortix/x64/memorymanagement.cpp         |  8 ++---
 sortix/x64/process.cpp                  |  9 ++++--
 sortix/x64/thread.cpp                   |  2 +-
 sortix/x64/x64.cpp                      |  2 +-
 sortix/x86-family/cmos.cpp              |  2 +-
 sortix/x86-family/float.cpp             |  8 ++---
 sortix/x86-family/memorymanagement.cpp  | 16 +++++-----
 sortix/x86-family/msr.cpp               |  3 +-
 sortix/x86-family/time.cpp              |  2 +-
 sortix/x86-family/x86-family.cpp        |  2 +-
 sortix/x86/memorymanagement.cpp         |  9 ++++--
 sortix/x86/process.cpp                  |  9 ++++--
 sortix/x86/thread.cpp                   |  2 +-
 sortix/x86/x86.cpp                      |  2 +-
 77 files changed, 314 insertions(+), 306 deletions(-)
 delete mode 100644 sortix/include/sortix/kernel/platform.h

diff --git a/libc/stdlib/abort.cpp b/libc/stdlib/abort.cpp
index b08c3d2d..86bc4ea9 100644
--- a/libc/stdlib/abort.cpp
+++ b/libc/stdlib/abort.cpp
@@ -29,7 +29,7 @@
 
 #if defined(__is_sortix_kernel)
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/panic.h>
 
 extern "C" void abort(void)
diff --git a/sortix/addralloc.cpp b/sortix/addralloc.cpp
index 6fa19275..d6724ada 100644
--- a/sortix/addralloc.cpp
+++ b/sortix/addralloc.cpp
@@ -26,8 +26,8 @@
 #include <errno.h>
 #include <stddef.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/addralloc.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/memorymanagement.h>
 
diff --git a/sortix/alarm.cpp b/sortix/alarm.cpp
index b3a1275f..34969da5 100644
--- a/sortix/alarm.cpp
+++ b/sortix/alarm.cpp
@@ -28,12 +28,12 @@
 #include <sortix/itimerspec.h>
 #include <sortix/signal.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/clock.h>
 #include <sortix/kernel/copy.h>
-#include <sortix/kernel/timer.h>
-#include <sortix/kernel/syscall.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/process.h>
+#include <sortix/kernel/syscall.h>
+#include <sortix/kernel/timer.h>
 
 namespace Sortix {
 namespace Alarm {
diff --git a/sortix/ata.cpp b/sortix/ata.cpp
index ff56470f..e6c87f92 100644
--- a/sortix/ata.cpp
+++ b/sortix/ata.cpp
@@ -22,18 +22,21 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/interlock.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/inode.h>
-#include <sortix/kernel/ioctx.h>
-#include <sortix/kernel/descriptor.h>
-#include <sortix/kernel/cpu.h>
-#include <sortix/stat.h>
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
+
+#include <sortix/stat.h>
+
+#include <sortix/kernel/cpu.h>
+#include <sortix/kernel/descriptor.h>
+#include <sortix/kernel/inode.h>
+#include <sortix/kernel/interlock.h>
+#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
+#include <sortix/kernel/refcount.h>
+
 #include "ata.h"
 
 // TODO: Use the PCI to detect ATA devices instead of relying on them being on
diff --git a/sortix/bga.cpp b/sortix/bga.cpp
index 50907f51..2ae07eac 100644
--- a/sortix/bga.cpp
+++ b/sortix/bga.cpp
@@ -28,17 +28,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sortix/kernel/platform.h>
+#include <sortix/mman.h>
+
 #include <sortix/kernel/addralloc.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/textbuffer.h>
-#include <sortix/kernel/video.h>
+#include <sortix/kernel/cpu.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/memorymanagement.h>
 #include <sortix/kernel/pci.h>
+#include <sortix/kernel/refcount.h>
 #include <sortix/kernel/string.h>
-#include <sortix/kernel/cpu.h>
-
-#include <sortix/mman.h>
+#include <sortix/kernel/textbuffer.h>
+#include <sortix/kernel/video.h>
 
 #include "x86-family/memorymanagement.h"
 #include "lfbtextbuffer.h"
diff --git a/sortix/calltrace.cpp b/sortix/calltrace.cpp
index d5c91ebd..67615a84 100644
--- a/sortix/calltrace.cpp
+++ b/sortix/calltrace.cpp
@@ -22,8 +22,8 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/calltrace.h>
+#include <sortix/kernel/kernel.h>
 
 namespace Sortix {
 namespace Calltrace {
diff --git a/sortix/clock.cpp b/sortix/clock.cpp
index 461efc8d..5e37a53d 100644
--- a/sortix/clock.cpp
+++ b/sortix/clock.cpp
@@ -25,9 +25,9 @@
 #include <assert.h>
 #include <timespec.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/clock.h>
 #include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/signal.h>
 #include <sortix/kernel/timer.h>
diff --git a/sortix/com.cpp b/sortix/com.cpp
index 25ff963f..104ccade 100644
--- a/sortix/com.cpp
+++ b/sortix/com.cpp
@@ -22,20 +22,20 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/ioctx.h>
-#include <sortix/kernel/inode.h>
-#include <sortix/kernel/descriptor.h>
-#include <sortix/kernel/interlock.h>
-#include <sortix/kernel/interrupt.h>
-#include <sortix/kernel/process.h>
-#include <sortix/kernel/thread.h>
+#include <errno.h>
 
 #include <sortix/stat.h>
 
-#include <errno.h>
+#include <sortix/kernel/descriptor.h>
+#include <sortix/kernel/inode.h>
+#include <sortix/kernel/interlock.h>
+#include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
+#include <sortix/kernel/process.h>
+#include <sortix/kernel/refcount.h>
+#include <sortix/kernel/thread.h>
 
 #include "com.h"
 
diff --git a/sortix/copy.cpp b/sortix/copy.cpp
index 70c8603d..614f0e2a 100644
--- a/sortix/copy.cpp
+++ b/sortix/copy.cpp
@@ -22,11 +22,12 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/copy.h>
-#include <sortix/kernel/string.h>
 #include <string.h>
 
+#include <sortix/kernel/copy.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/string.h>
+
 namespace Sortix {
 
 // TODO: These are currently insecure, please check userspace tables before
diff --git a/sortix/crc32.cpp b/sortix/crc32.cpp
index bff9caed..7214dc19 100644
--- a/sortix/crc32.cpp
+++ b/sortix/crc32.cpp
@@ -25,8 +25,8 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/crc32.h>
+#include <sortix/kernel/kernel.h>
 
 namespace Sortix {
 namespace CRC32 {
diff --git a/sortix/debugger.cpp b/sortix/debugger.cpp
index aeea8451..a3b47e44 100644
--- a/sortix/debugger.cpp
+++ b/sortix/debugger.cpp
@@ -33,10 +33,10 @@
 
 #include <sortix/keycodes.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/cpu.h>
 #include <sortix/kernel/debugger.h>
 #include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/keyboard.h>
 #include <sortix/kernel/memorymanagement.h>
 #include <sortix/kernel/process.h>
diff --git a/sortix/descriptor.cpp b/sortix/descriptor.cpp
index 4ad28b59..3e67c7ac 100644
--- a/sortix/descriptor.cpp
+++ b/sortix/descriptor.cpp
@@ -22,23 +22,28 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/ioctx.h>
-#include <sortix/kernel/inode.h>
-#include <sortix/kernel/vnode.h>
-#include <sortix/kernel/descriptor.h>
-#include <sortix/kernel/fsfunc.h>
-#include <sortix/kernel/string.h>
-#include <sortix/kernel/process.h>
+#include <sys/types.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdint.h>
+#include <string.h>
+
 #include <sortix/dirent.h>
 #include <sortix/fcntl.h>
 #include <sortix/seek.h>
 #include <sortix/stat.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
+
+#include <sortix/kernel/descriptor.h>
+#include <sortix/kernel/fsfunc.h>
+#include <sortix/kernel/inode.h>
+#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
+#include <sortix/kernel/process.h>
+#include <sortix/kernel/refcount.h>
+#include <sortix/kernel/string.h>
+#include <sortix/kernel/vnode.h>
 
 namespace Sortix {
 
diff --git a/sortix/dispmsg.cpp b/sortix/dispmsg.cpp
index ecc17f83..647b93fb 100644
--- a/sortix/dispmsg.cpp
+++ b/sortix/dispmsg.cpp
@@ -31,10 +31,10 @@
 #include <sortix/display.h>
 #include <sortix/syscallnum.h>
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/video.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/string.h>
 #include <sortix/kernel/syscall.h>
+#include <sortix/kernel/video.h>
 
 #include "dispmsg.h"
 
diff --git a/sortix/dtable.cpp b/sortix/dtable.cpp
index 40136d3b..87724fb1 100644
--- a/sortix/dtable.cpp
+++ b/sortix/dtable.cpp
@@ -22,18 +22,20 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/descriptor.h>
-#include <sortix/kernel/dtable.h>
-#include <sortix/kernel/process.h>
-#include <sortix/fcntl.h>
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <string.h>
 
+#include <sortix/fcntl.h>
+
+#include <sortix/kernel/descriptor.h>
+#include <sortix/kernel/dtable.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
+#include <sortix/kernel/process.h>
+#include <sortix/kernel/refcount.h>
+
 namespace Sortix {
 
 DescriptorTable::DescriptorTable()
diff --git a/sortix/elf.cpp b/sortix/elf.cpp
index 81e8733e..51c9ae64 100644
--- a/sortix/elf.cpp
+++ b/sortix/elf.cpp
@@ -33,7 +33,7 @@
 
 #include <sortix/mman.h>
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/memorymanagement.h>
 #include <sortix/kernel/process.h>
 #include <sortix/kernel/segment.h>
diff --git a/sortix/end.cpp b/sortix/end.cpp
index 68adf871..217cd1d1 100644
--- a/sortix/end.cpp
+++ b/sortix/end.cpp
@@ -24,7 +24,7 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
 
 namespace Sortix
 {
diff --git a/sortix/fcache.cpp b/sortix/fcache.cpp
index 82f546bc..4d251454 100644
--- a/sortix/fcache.cpp
+++ b/sortix/fcache.cpp
@@ -33,10 +33,10 @@
 #include <sortix/mman.h>
 #include <sortix/seek.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/addralloc.h>
 #include <sortix/kernel/fcache.h>
 #include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/memorymanagement.h>
 
diff --git a/sortix/fs/kram.cpp b/sortix/fs/kram.cpp
index 85c0c4f1..803b4060 100644
--- a/sortix/fs/kram.cpp
+++ b/sortix/fs/kram.cpp
@@ -24,8 +24,11 @@
 
 #include <sys/types.h>
 
+#include <assert.h>
+#include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <string.h>
 
 #include <sortix/clock.h>
 #include <sortix/dirent.h>
@@ -33,20 +36,16 @@
 #include <sortix/seek.h>
 #include <sortix/stat.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/fsfunc.h>
 #include <sortix/kernel/inode.h>
 #include <sortix/kernel/interlock.h>
 #include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/refcount.h>
 #include <sortix/kernel/string.h>
 #include <sortix/kernel/time.h>
 
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-
 #include "kram.h"
 
 namespace Sortix {
diff --git a/sortix/fs/user.cpp b/sortix/fs/user.cpp
index 41088bf9..c2155f96 100644
--- a/sortix/fs/user.cpp
+++ b/sortix/fs/user.cpp
@@ -41,16 +41,16 @@
 
 #include <fsmarshall-msg.h>
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/refcount.h>
+#include <sortix/kernel/descriptor.h>
 #include <sortix/kernel/inode.h>
 #include <sortix/kernel/ioctx.h>
-#include <sortix/kernel/descriptor.h>
-#include <sortix/kernel/vnode.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
 #include <sortix/kernel/mtable.h>
-#include <sortix/kernel/syscall.h>
 #include <sortix/kernel/process.h>
+#include <sortix/kernel/refcount.h>
+#include <sortix/kernel/syscall.h>
+#include <sortix/kernel/vnode.h>
 
 namespace Sortix {
 
diff --git a/sortix/fs/util.cpp b/sortix/fs/util.cpp
index 756a6a0f..eb52d5de 100644
--- a/sortix/fs/util.cpp
+++ b/sortix/fs/util.cpp
@@ -22,16 +22,19 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/interlock.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/ioctx.h>
-#include <sortix/kernel/inode.h>
-#include <sortix/stat.h>
-#include <sortix/seek.h>
 #include <errno.h>
 #include <string.h>
+
+#include <sortix/stat.h>
+#include <sortix/seek.h>
+
+#include <sortix/kernel/inode.h>
+#include <sortix/kernel/interlock.h>
+#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
+#include <sortix/kernel/refcount.h>
+
 #include "util.h"
 
 namespace Sortix {
diff --git a/sortix/fsfunc.cpp b/sortix/fsfunc.cpp
index 7bb19575..e65807f6 100644
--- a/sortix/fsfunc.cpp
+++ b/sortix/fsfunc.cpp
@@ -22,11 +22,18 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/fsfunc.h>
-#include <sortix/kernel/string.h>
+#include <sys/types.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
 #include <sortix/dirent.h>
 #include <sortix/stat.h>
+
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/fsfunc.h>
+#include <sortix/kernel/string.h>
+
 #include <string.h>
 
 namespace Sortix {
diff --git a/sortix/identity.cpp b/sortix/identity.cpp
index c795009f..ce3346f5 100644
--- a/sortix/identity.cpp
+++ b/sortix/identity.cpp
@@ -24,10 +24,10 @@
 
 #include <sortix/syscallnum.h>
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
-#include <sortix/kernel/syscall.h>
 #include <sortix/kernel/process.h>
+#include <sortix/kernel/syscall.h>
 
 #include "identity.h"
 
diff --git a/sortix/include/sortix/kernel/platform.h b/sortix/include/sortix/kernel/platform.h
deleted file mode 100644
index 92b7e403..00000000
--- a/sortix/include/sortix/kernel/platform.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
-
-    Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
-
-    This file is part of Sortix.
-
-    Sortix is free software: you can redistribute it and/or modify it under the
-    terms of the GNU General Public License as published by the Free Software
-    Foundation, either version 3 of the License, or (at your option) any later
-    version.
-
-    Sortix is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-    details.
-
-    You should have received a copy of the GNU General Public License along with
-    Sortix. If not, see <http://www.gnu.org/licenses/>.
-
-    sortix/kernel/platform.h
-    Defines platform specific stuff.
-
-*******************************************************************************/
-
-// This header is deprecated but was used as a common header to get various
-// generic and useful declarations. That purpose is actually fine and useful,
-// but the name platform.h isn't fitting for that task since it provides
-// generic functionality (though how it is provided depends on the platform).
-
-#ifndef SORTIX_PLATFORM_H
-#define SORTIX_PLATFORM_H
-
-#include <sortix/kernel/kernel.h>
-
-#endif
diff --git a/sortix/initrd.cpp b/sortix/initrd.cpp
index 77c8fbee..c983541d 100644
--- a/sortix/initrd.cpp
+++ b/sortix/initrd.cpp
@@ -36,16 +36,16 @@
 #include <sortix/mman.h>
 #include <sortix/stat.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/addralloc.h>
-#include <sortix/kernel/vnode.h>
-#include <sortix/kernel/descriptor.h>
-#include <sortix/kernel/memorymanagement.h>
 #include <sortix/kernel/crc32.h>
-#include <sortix/kernel/string.h>
-#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/descriptor.h>
 #include <sortix/kernel/fsfunc.h>
+#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/memorymanagement.h>
+#include <sortix/kernel/string.h>
 #include <sortix/kernel/syscall.h>
+#include <sortix/kernel/vnode.h>
 
 #include "initrd.h"
 
diff --git a/sortix/inode.cpp b/sortix/inode.cpp
index 09a85cbf..293f5b04 100644
--- a/sortix/inode.cpp
+++ b/sortix/inode.cpp
@@ -28,12 +28,12 @@
 #include <sortix/clock.h>
 #include <sortix/stat.h>
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/inode.h>
 #include <sortix/kernel/interlock.h>
+#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/refcount.h>
-#include <sortix/kernel/inode.h>
-#include <sortix/kernel/ioctx.h>
 #include <sortix/kernel/time.h>
 
 namespace Sortix {
diff --git a/sortix/interlock.cpp b/sortix/interlock.cpp
index fa88d1c3..dea6930e 100644
--- a/sortix/interlock.cpp
+++ b/sortix/interlock.cpp
@@ -22,8 +22,8 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/interlock.h>
+#include <sortix/kernel/kernel.h>
 
 namespace Sortix {
 
diff --git a/sortix/interrupt.cpp b/sortix/interrupt.cpp
index 34505e3f..0e8c7338 100644
--- a/sortix/interrupt.cpp
+++ b/sortix/interrupt.cpp
@@ -26,16 +26,16 @@
 #include <errno.h>
 #include <string.h>
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/syscall.h>
-#include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/calltrace.h>
 #include <sortix/kernel/cpu.h>
+#include <sortix/kernel/debugger.h>
+#include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/process.h>
 #include <sortix/kernel/scheduler.h>
 #include <sortix/kernel/signal.h>
+#include <sortix/kernel/syscall.h>
 #include <sortix/kernel/thread.h>
-#include <sortix/kernel/process.h>
-#include <sortix/kernel/calltrace.h>
-#include <sortix/kernel/debugger.h>
 
 #include "x86-family/idt.h"
 
diff --git a/sortix/io.cpp b/sortix/io.cpp
index d9a72bdf..69093881 100644
--- a/sortix/io.cpp
+++ b/sortix/io.cpp
@@ -22,28 +22,32 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/ioctx.h>
-#include <sortix/kernel/copy.h>
-#include <sortix/kernel/descriptor.h>
-#include <sortix/kernel/dtable.h>
-#include <sortix/kernel/string.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/syscall.h>
-#include <sortix/kernel/process.h>
-#include <sortix/kernel/thread.h>
-#include <sortix/kernel/vnode.h>
-
-#include <sortix/seek.h>
-#include <sortix/dirent.h>
-#include <sortix/fcntl.h>
-#include <sortix/stat.h>
-#include <sortix/socket.h>
-#include <sortix/uio.h>
+#include <sys/types.h>
 
 #include <assert.h>
 #include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include <sortix/dirent.h>
+#include <sortix/fcntl.h>
+#include <sortix/seek.h>
+#include <sortix/socket.h>
+#include <sortix/stat.h>
+#include <sortix/uio.h>
+
+#include <sortix/kernel/copy.h>
+#include <sortix/kernel/descriptor.h>
+#include <sortix/kernel/dtable.h>
+#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
+#include <sortix/kernel/process.h>
+#include <sortix/kernel/refcount.h>
+#include <sortix/kernel/string.h>
+#include <sortix/kernel/syscall.h>
+#include <sortix/kernel/thread.h>
+#include <sortix/kernel/vnode.h>
 
 #include "io.h"
 #include "partition.h"
diff --git a/sortix/ioctx.cpp b/sortix/ioctx.cpp
index ccb5e866..cfbe4c60 100644
--- a/sortix/ioctx.cpp
+++ b/sortix/ioctx.cpp
@@ -22,9 +22,9 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/ioctx.h>
 #include <sortix/kernel/copy.h>
+#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/process.h>
 
 namespace Sortix {
diff --git a/sortix/kb/layout/us.cpp b/sortix/kb/layout/us.cpp
index 0889fd19..72c2ec63 100644
--- a/sortix/kb/layout/us.cpp
+++ b/sortix/kb/layout/us.cpp
@@ -22,9 +22,11 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/keyboard.h>
 #include <sortix/keycodes.h>
+
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/keyboard.h>
+
 #include "us.h"
 
 namespace Sortix
diff --git a/sortix/kb/ps2.cpp b/sortix/kb/ps2.cpp
index ff5651fa..58ccc7e0 100644
--- a/sortix/kb/ps2.cpp
+++ b/sortix/kb/ps2.cpp
@@ -22,17 +22,17 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/debugger.h>
-#include <sortix/kernel/keyboard.h>
-#include <sortix/kernel/interrupt.h>
-#include <sortix/kernel/thread.h>
-#include <sortix/kernel/cpu.h>
+#include <assert.h>
+#include <string.h>
 
 #include <sortix/keycodes.h>
 
-#include <assert.h>
-#include <string.h>
+#include <sortix/kernel/cpu.h>
+#include <sortix/kernel/debugger.h>
+#include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/keyboard.h>
+#include <sortix/kernel/thread.h>
 
 #include "ps2.h"
 
diff --git a/sortix/kernelinfo.cpp b/sortix/kernelinfo.cpp
index 196a1a42..983fad8a 100644
--- a/sortix/kernelinfo.cpp
+++ b/sortix/kernelinfo.cpp
@@ -24,7 +24,7 @@
 
 #include <errno.h>
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/syscall.h>
 
 #include "kernelinfo.h"
diff --git a/sortix/kthread.cpp b/sortix/kthread.cpp
index 6c824593..4e8a1b16 100644
--- a/sortix/kthread.cpp
+++ b/sortix/kthread.cpp
@@ -24,12 +24,12 @@
 
 #include <sortix/signal.h>
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
-#include <sortix/kernel/worker.h>
 #include <sortix/kernel/scheduler.h>
 #include <sortix/kernel/signal.h>
 #include <sortix/kernel/thread.h>
+#include <sortix/kernel/worker.h>
 
 namespace Sortix {
 
diff --git a/sortix/lfbtextbuffer.cpp b/sortix/lfbtextbuffer.cpp
index 98eacb74..27280696 100644
--- a/sortix/lfbtextbuffer.cpp
+++ b/sortix/lfbtextbuffer.cpp
@@ -22,16 +22,16 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/textbuffer.h>
-#include <sortix/kernel/scheduler.h>
-#include <sortix/kernel/thread.h>
+#include <string.h>
 
 #include <sortix/vga.h>
 
-#include <string.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
+#include <sortix/kernel/refcount.h>
+#include <sortix/kernel/scheduler.h>
+#include <sortix/kernel/textbuffer.h>
+#include <sortix/kernel/thread.h>
 
 #include "vga.h"
 #include "lfbtextbuffer.h"
diff --git a/sortix/linebuffer.cpp b/sortix/linebuffer.cpp
index 9f78ecdd..7feffaec 100644
--- a/sortix/linebuffer.cpp
+++ b/sortix/linebuffer.cpp
@@ -22,8 +22,10 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
 #include <string.h>
+
+#include <sortix/kernel/kernel.h>
+
 #include "linebuffer.h"
 
 namespace Sortix
diff --git a/sortix/log.cpp b/sortix/log.cpp
index eebe2c3a..8adf021e 100644
--- a/sortix/log.cpp
+++ b/sortix/log.cpp
@@ -25,8 +25,8 @@
 #include <stddef.h>
 #include <string.h>
 
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/log.h>
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/syscall.h>
 
 namespace Sortix {
diff --git a/sortix/logterminal.cpp b/sortix/logterminal.cpp
index 99d015a0..5b76df39 100644
--- a/sortix/logterminal.cpp
+++ b/sortix/logterminal.cpp
@@ -37,10 +37,10 @@
 #include <sortix/termios.h>
 #include <sortix/termmode.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/inode.h>
 #include <sortix/kernel/interlock.h>
 #include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/keyboard.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/poll.h>
diff --git a/sortix/mtable.cpp b/sortix/mtable.cpp
index d137651c..4569b9ed 100644
--- a/sortix/mtable.cpp
+++ b/sortix/mtable.cpp
@@ -22,13 +22,14 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/inode.h>
-#include <sortix/kernel/mtable.h>
 #include <string.h>
 
+#include <sortix/kernel/inode.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
+#include <sortix/kernel/mtable.h>
+#include <sortix/kernel/refcount.h>
+
 namespace Sortix {
 
 MountTable::MountTable()
diff --git a/sortix/net/fs.cpp b/sortix/net/fs.cpp
index 212c8b07..252c299e 100644
--- a/sortix/net/fs.cpp
+++ b/sortix/net/fs.cpp
@@ -37,16 +37,16 @@
 #include <sortix/socket.h>
 #include <sortix/stat.h>
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/kthread.h>
 #include <sortix/kernel/descriptor.h>
-#include <sortix/kernel/ioctx.h>
 #include <sortix/kernel/inode.h>
+#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
 #include <sortix/kernel/mtable.h>
 #include <sortix/kernel/pipe.h>
 #include <sortix/kernel/poll.h>
 #include <sortix/kernel/process.h>
+#include <sortix/kernel/refcount.h>
 
 #include "fs.h"
 
diff --git a/sortix/panic.cpp b/sortix/panic.cpp
index f3e7f467..c6e41587 100644
--- a/sortix/panic.cpp
+++ b/sortix/panic.cpp
@@ -24,9 +24,9 @@
 
 #include <string.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/calltrace.h>
 #include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/log.h>
 #include <sortix/kernel/panic.h>
 
diff --git a/sortix/partition.cpp b/sortix/partition.cpp
index 562bf251..598ecbf2 100644
--- a/sortix/partition.cpp
+++ b/sortix/partition.cpp
@@ -28,9 +28,9 @@
 
 #include <sortix/seek.h>
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/refcount.h>
 #include <sortix/kernel/inode.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/refcount.h>
 
 #include "partition.h"
 
diff --git a/sortix/pci.cpp b/sortix/pci.cpp
index 53a892be..68b655a3 100644
--- a/sortix/pci.cpp
+++ b/sortix/pci.cpp
@@ -25,9 +25,9 @@
 #include <assert.h>
 #include <endian.h>
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/pci.h>
 #include <sortix/kernel/cpu.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/pci.h>
 
 namespace Sortix {
 namespace PCI {
diff --git a/sortix/pipe.cpp b/sortix/pipe.cpp
index c143104c..db0cba35 100644
--- a/sortix/pipe.cpp
+++ b/sortix/pipe.cpp
@@ -27,33 +27,26 @@
 #include <string.h>
 
 #include <sortix/fcntl.h>
+#include <sortix/poll.h>
 #include <sortix/signal.h>
 #include <sortix/stat.h>
-#include <sortix/poll.h>
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/interlock.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/ioctx.h>
 #include <sortix/kernel/copy.h>
-#include <sortix/kernel/inode.h>
-#include <sortix/kernel/vnode.h>
 #include <sortix/kernel/descriptor.h>
 #include <sortix/kernel/dtable.h>
-#include <sortix/kernel/syscall.h>
+#include <sortix/kernel/inode.h>
+#include <sortix/kernel/interlock.h>
+#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
 #include <sortix/kernel/pipe.h>
 #include <sortix/kernel/poll.h>
-#include <sortix/kernel/signal.h>
 #include <sortix/kernel/process.h>
+#include <sortix/kernel/refcount.h>
+#include <sortix/kernel/signal.h>
+#include <sortix/kernel/syscall.h>
 #include <sortix/kernel/thread.h>
-
-#include <sortix/signal.h>
-#include <sortix/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
+#include <sortix/kernel/vnode.h>
 
 #include "pipe.h"
 
diff --git a/sortix/poll.cpp b/sortix/poll.cpp
index 08c3234b..ec37ac4a 100644
--- a/sortix/poll.cpp
+++ b/sortix/poll.cpp
@@ -34,14 +34,14 @@
 #include <sortix/syscallnum.h>
 #include <sortix/timespec.h>
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/kthread.h>
 #include <sortix/kernel/copy.h>
 #include <sortix/kernel/descriptor.h>
 #include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
 #include <sortix/kernel/poll.h>
-#include <sortix/kernel/syscall.h>
 #include <sortix/kernel/process.h>
+#include <sortix/kernel/syscall.h>
 
 #include "poll.h"
 
diff --git a/sortix/process.cpp b/sortix/process.cpp
index c545da52..64026dc2 100644
--- a/sortix/process.cpp
+++ b/sortix/process.cpp
@@ -38,11 +38,11 @@
 #include <sortix/unistd.h>
 #include <sortix/wait.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/copy.h>
 #include <sortix/kernel/descriptor.h>
 #include <sortix/kernel/dtable.h>
 #include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/memorymanagement.h>
 #include <sortix/kernel/mtable.h>
diff --git a/sortix/refcount.cpp b/sortix/refcount.cpp
index 87b4c1b6..c49d24cc 100644
--- a/sortix/refcount.cpp
+++ b/sortix/refcount.cpp
@@ -22,10 +22,11 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <assert.h>
+
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/refcount.h>
-#include <assert.h>
 
 namespace Sortix {
 
diff --git a/sortix/scheduler.cpp b/sortix/scheduler.cpp
index 713e1cc2..3b6dcfcf 100644
--- a/sortix/scheduler.cpp
+++ b/sortix/scheduler.cpp
@@ -32,15 +32,15 @@
 #include <sortix/clock.h>
 #include <sortix/timespec.h>
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/memorymanagement.h>
-#include <sortix/kernel/syscall.h>
 #include <sortix/kernel/interrupt.h>
-#include <sortix/kernel/time.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/memorymanagement.h>
+#include <sortix/kernel/process.h>
 #include <sortix/kernel/scheduler.h>
 #include <sortix/kernel/signal.h>
-#include <sortix/kernel/process.h>
+#include <sortix/kernel/syscall.h>
 #include <sortix/kernel/thread.h>
+#include <sortix/kernel/time.h>
 
 #include "x86-family/gdt.h"
 #include "x86-family/float.h"
diff --git a/sortix/serialterminal.cpp b/sortix/serialterminal.cpp
index 9e403978..ca35f686 100644
--- a/sortix/serialterminal.cpp
+++ b/sortix/serialterminal.cpp
@@ -22,12 +22,12 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <string.h>
+
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/keyboard.h>
 #include <sortix/kernel/scheduler.h>
 
-#include <string.h>
-
 #include "vga.h"
 #include "uart.h"
 #include "serialterminal.h"
diff --git a/sortix/signal.cpp b/sortix/signal.cpp
index d9d28791..91f05358 100644
--- a/sortix/signal.cpp
+++ b/sortix/signal.cpp
@@ -22,17 +22,17 @@
 
 *******************************************************************************/
 
-#include <sortix/signal.h>
-
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/panic.h>
-#include <sortix/kernel/interrupt.h>
-#include <sortix/kernel/signal.h>
-#include <sortix/kernel/thread.h>
-
 #include <assert.h>
 #include <string.h>
 
+#include <sortix/signal.h>
+
+#include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/panic.h>
+#include <sortix/kernel/signal.h>
+#include <sortix/kernel/thread.h>
+
 namespace Sortix {
 
 // A per-cpu value whether a signal is pending in the running task.
diff --git a/sortix/syscall.cpp b/sortix/syscall.cpp
index ae2c9508..f1c21c7d 100644
--- a/sortix/syscall.cpp
+++ b/sortix/syscall.cpp
@@ -24,10 +24,10 @@
 
 #include <sortix/syscallnum.h>
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/syscall.h>
-#include <sortix/kernel/scheduler.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/process.h>
+#include <sortix/kernel/scheduler.h>
+#include <sortix/kernel/syscall.h>
 #include <sortix/kernel/thread.h>
 
 namespace Sortix {
diff --git a/sortix/textbuffer.cpp b/sortix/textbuffer.cpp
index 79cd751e..1d668991 100644
--- a/sortix/textbuffer.cpp
+++ b/sortix/textbuffer.cpp
@@ -22,11 +22,12 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <assert.h>
+
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/refcount.h>
 #include <sortix/kernel/textbuffer.h>
-#include <assert.h>
 
 namespace Sortix {
 
diff --git a/sortix/textterminal.cpp b/sortix/textterminal.cpp
index 2a642b5d..1d94256c 100644
--- a/sortix/textterminal.cpp
+++ b/sortix/textterminal.cpp
@@ -22,10 +22,12 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <sortix/vga.h>
+
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/refcount.h>
 #include <sortix/kernel/textbuffer.h>
-#include <sortix/vga.h>
+
 #include "textterminal.h"
 
 namespace Sortix {
diff --git a/sortix/thread.cpp b/sortix/thread.cpp
index 14f64f6c..b7c3ed34 100644
--- a/sortix/thread.cpp
+++ b/sortix/thread.cpp
@@ -29,8 +29,8 @@
 #include <sortix/mman.h>
 #include <sortix/signal.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/memorymanagement.h>
 #include <sortix/kernel/process.h>
diff --git a/sortix/time.cpp b/sortix/time.cpp
index bd8e09e6..b304547d 100644
--- a/sortix/time.cpp
+++ b/sortix/time.cpp
@@ -30,14 +30,14 @@
 
 #include <sortix/clock.h>
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/syscall.h>
+#include <sortix/kernel/clock.h>
 #include <sortix/kernel/copy.h>
 #include <sortix/kernel/interrupt.h>
-#include <sortix/kernel/clock.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/process.h>
-#include <sortix/kernel/time.h>
 #include <sortix/kernel/scheduler.h>
+#include <sortix/kernel/syscall.h>
+#include <sortix/kernel/time.h>
 
 #ifdef PLATFORM_SERIAL
 #include "serialterminal.h"
diff --git a/sortix/timer.cpp b/sortix/timer.cpp
index ff661789..ae160706 100644
--- a/sortix/timer.cpp
+++ b/sortix/timer.cpp
@@ -25,10 +25,10 @@
 #include <assert.h>
 #include <timespec.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/clock.h>
-#include <sortix/kernel/kthread.h>
 #include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
 #include <sortix/kernel/timer.h>
 
 namespace Sortix {
diff --git a/sortix/uart.cpp b/sortix/uart.cpp
index 4bcf4ff6..f3a38c98 100644
--- a/sortix/uart.cpp
+++ b/sortix/uart.cpp
@@ -22,8 +22,8 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/cpu.h>
+#include <sortix/kernel/kernel.h>
 
 #include <string.h>
 #include "vga.h"
diff --git a/sortix/user-timer.cpp b/sortix/user-timer.cpp
index ed14df8a..17f4a348 100644
--- a/sortix/user-timer.cpp
+++ b/sortix/user-timer.cpp
@@ -33,14 +33,14 @@
 #include <sortix/time.h>
 #include <sortix/tmns.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/copy.h>
 #include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
+#include <sortix/kernel/process.h>
 #include <sortix/kernel/syscall.h>
 #include <sortix/kernel/time.h>
 #include <sortix/kernel/user-timer.h>
-#include <sortix/kernel/process.h>
 
 // TODO: Memset all user timers in process constructor.
 
diff --git a/sortix/utf8.cpp b/sortix/utf8.cpp
index f5c6e47e..2d16b96c 100644
--- a/sortix/utf8.cpp
+++ b/sortix/utf8.cpp
@@ -22,8 +22,10 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
 #include <errno.h>
+
+#include <sortix/kernel/kernel.h>
+
 #include "utf8.h"
 
 namespace Sortix
diff --git a/sortix/vga.cpp b/sortix/vga.cpp
index 2379a612..acc95a62 100644
--- a/sortix/vga.cpp
+++ b/sortix/vga.cpp
@@ -22,16 +22,16 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/refcount.h>
-#include <sortix/kernel/ioctx.h>
-#include <sortix/kernel/inode.h>
 #include <sortix/kernel/descriptor.h>
+#include <sortix/kernel/inode.h>
 #include <sortix/kernel/interlock.h>
-#include <sortix/kernel/syscall.h>
-#include <sortix/kernel/scheduler.h>
+#include <sortix/kernel/ioctx.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
 #include <sortix/kernel/process.h>
+#include <sortix/kernel/refcount.h>
+#include <sortix/kernel/scheduler.h>
+#include <sortix/kernel/syscall.h>
 
 #include <errno.h>
 #include <string.h>
diff --git a/sortix/vgatextbuffer.cpp b/sortix/vgatextbuffer.cpp
index c3c99022..7f1e83bd 100644
--- a/sortix/vgatextbuffer.cpp
+++ b/sortix/vgatextbuffer.cpp
@@ -22,11 +22,13 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <sortix/vga.h>
+
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/refcount.h>
 #include <sortix/kernel/textbuffer.h>
-#include <sortix/vga.h>
+
 #include "vga.h"
 #include "vgatextbuffer.h"
 
diff --git a/sortix/video.cpp b/sortix/video.cpp
index 0e37eecf..d2044a91 100644
--- a/sortix/video.cpp
+++ b/sortix/video.cpp
@@ -22,15 +22,16 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/textbuffer.h>
-#include <sortix/kernel/video.h>
-#include <sortix/kernel/string.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <string.h>
 
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
+#include <sortix/kernel/string.h>
+#include <sortix/kernel/textbuffer.h>
+#include <sortix/kernel/video.h>
+
 namespace Sortix {
 
 bool ReadParamString(const char* str, ...)
diff --git a/sortix/vnode.cpp b/sortix/vnode.cpp
index 1f520e99..929ec376 100644
--- a/sortix/vnode.cpp
+++ b/sortix/vnode.cpp
@@ -22,7 +22,12 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <assert.h>
+#include <errno.h>
+
+#include <sortix/mount.h>
+
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/refcount.h>
 #include <sortix/kernel/ioctx.h>
 #include <sortix/kernel/descriptor.h>
@@ -30,9 +35,6 @@
 #include <sortix/kernel/vnode.h>
 #include <sortix/kernel/mtable.h>
 #include <sortix/kernel/process.h>
-#include <sortix/mount.h>
-#include <assert.h>
-#include <errno.h>
 
 namespace Sortix {
 
diff --git a/sortix/worker.cpp b/sortix/worker.cpp
index 6fbf58e8..dfdc2a62 100644
--- a/sortix/worker.cpp
+++ b/sortix/worker.cpp
@@ -22,7 +22,7 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/kthread.h>
 #include <sortix/kernel/worker.h>
 
diff --git a/sortix/x64/memorymanagement.cpp b/sortix/x64/memorymanagement.cpp
index 4b4e2ef2..89dbcd18 100644
--- a/sortix/x64/memorymanagement.cpp
+++ b/sortix/x64/memorymanagement.cpp
@@ -22,12 +22,12 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/memorymanagement.h>
-#include <sortix/kernel/interrupt.h>
-
 #include <string.h>
 
+#include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/memorymanagement.h>
+
 #include "multiboot.h"
 #include "x86-family/memorymanagement.h"
 
diff --git a/sortix/x64/process.cpp b/sortix/x64/process.cpp
index f100e9d7..597f838a 100644
--- a/sortix/x64/process.cpp
+++ b/sortix/x64/process.cpp
@@ -22,11 +22,14 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/process.h>
-#include <sortix/fork.h>
+#include <stdint.h>
 #include <string.h>
 
+#include <sortix/fork.h>
+
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/process.h>
+
 namespace Sortix
 {
 	void Process::ExecuteCPU(int argc, char** argv, int envc, char** envp,
diff --git a/sortix/x64/thread.cpp b/sortix/x64/thread.cpp
index c33482ee..abad6676 100644
--- a/sortix/x64/thread.cpp
+++ b/sortix/x64/thread.cpp
@@ -22,7 +22,7 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/thread.h>
 
 namespace Sortix
diff --git a/sortix/x64/x64.cpp b/sortix/x64/x64.cpp
index aadbcfc7..3be44780 100644
--- a/sortix/x64/x64.cpp
+++ b/sortix/x64/x64.cpp
@@ -22,8 +22,8 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/cpu.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/log.h>
 
 namespace Sortix
diff --git a/sortix/x86-family/cmos.cpp b/sortix/x86-family/cmos.cpp
index 958e7b92..638d7e40 100644
--- a/sortix/x86-family/cmos.cpp
+++ b/sortix/x86-family/cmos.cpp
@@ -30,9 +30,9 @@
 
 #include <sortix/clock.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/clock.h>
 #include <sortix/kernel/cpu.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/time.h>
 
 namespace Sortix {
diff --git a/sortix/x86-family/float.cpp b/sortix/x86-family/float.cpp
index 5852e1b8..cd3a0bcd 100644
--- a/sortix/x86-family/float.cpp
+++ b/sortix/x86-family/float.cpp
@@ -22,12 +22,12 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/interrupt.h>
-#include <sortix/kernel/thread.h>
-
 #include <assert.h>
 
+#include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/thread.h>
+
 #include "float.h"
 
 namespace Sortix {
diff --git a/sortix/x86-family/memorymanagement.cpp b/sortix/x86-family/memorymanagement.cpp
index f4fd8ce6..76f80f08 100644
--- a/sortix/x86-family/memorymanagement.cpp
+++ b/sortix/x86-family/memorymanagement.cpp
@@ -22,18 +22,18 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/panic.h>
-#include <sortix/kernel/kthread.h>
-#include <sortix/kernel/memorymanagement.h>
-#include <sortix/kernel/syscall.h>
-
-#include <sortix/mman.h>
-
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
 
+#include <sortix/mman.h>
+
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/kthread.h>
+#include <sortix/kernel/memorymanagement.h>
+#include <sortix/kernel/panic.h>
+#include <sortix/kernel/syscall.h>
+
 #include "multiboot.h"
 #include "memorymanagement.h"
 #include "msr.h"
diff --git a/sortix/x86-family/msr.cpp b/sortix/x86-family/msr.cpp
index c7ebf66b..7f8ea857 100644
--- a/sortix/x86-family/msr.cpp
+++ b/sortix/x86-family/msr.cpp
@@ -24,7 +24,8 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
+
 #include "memorymanagement.h"
 
 namespace Sortix {
diff --git a/sortix/x86-family/time.cpp b/sortix/x86-family/time.cpp
index 182d77af..5003df1c 100644
--- a/sortix/x86-family/time.cpp
+++ b/sortix/x86-family/time.cpp
@@ -28,10 +28,10 @@
 
 #include <sortix/timespec.h>
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/clock.h>
 #include <sortix/kernel/cpu.h>
 #include <sortix/kernel/interrupt.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/process.h>
 #include <sortix/kernel/scheduler.h>
 #include <sortix/kernel/time.h>
diff --git a/sortix/x86-family/x86-family.cpp b/sortix/x86-family/x86-family.cpp
index a369bf9f..7b40a89e 100644
--- a/sortix/x86-family/x86-family.cpp
+++ b/sortix/x86-family/x86-family.cpp
@@ -22,7 +22,7 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
 
 namespace Sortix
 {
diff --git a/sortix/x86/memorymanagement.cpp b/sortix/x86/memorymanagement.cpp
index a5cf7612..bdc6dc37 100644
--- a/sortix/x86/memorymanagement.cpp
+++ b/sortix/x86/memorymanagement.cpp
@@ -22,13 +22,16 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
 #include <string.h>
-#include "multiboot.h"
-#include <sortix/kernel/panic.h>
+
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/memorymanagement.h>
+#include <sortix/kernel/panic.h>
+
 #include "x86-family/memorymanagement.h"
 
+#include "multiboot.h"
+
 namespace Sortix
 {
 	namespace Page
diff --git a/sortix/x86/process.cpp b/sortix/x86/process.cpp
index 842ea392..2725d488 100644
--- a/sortix/x86/process.cpp
+++ b/sortix/x86/process.cpp
@@ -22,11 +22,14 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
-#include <sortix/kernel/process.h>
-#include <sortix/fork.h>
+#include <stdint.h>
 #include <string.h>
 
+#include <sortix/fork.h>
+
+#include <sortix/kernel/kernel.h>
+#include <sortix/kernel/process.h>
+
 namespace Sortix
 {
 	void Process::ExecuteCPU(int argc, char** argv, int envc, char** envp,
diff --git a/sortix/x86/thread.cpp b/sortix/x86/thread.cpp
index 39ec31bd..55a25fe8 100644
--- a/sortix/x86/thread.cpp
+++ b/sortix/x86/thread.cpp
@@ -22,7 +22,7 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/thread.h>
 
 namespace Sortix
diff --git a/sortix/x86/x86.cpp b/sortix/x86/x86.cpp
index 4cb03e4c..9848175b 100644
--- a/sortix/x86/x86.cpp
+++ b/sortix/x86/x86.cpp
@@ -22,8 +22,8 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/cpu.h>
+#include <sortix/kernel/kernel.h>
 #include <sortix/kernel/log.h>
 
 namespace Sortix