Remove <sortix/kernel/platform.h>.

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)

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>
 

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 {

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

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"

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 {

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>

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"
 

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

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 {

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>

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 {
 

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"
 

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()

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>

sortix/end.cpp

@@ -24,7 +24,7 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
 
 namespace Sortix
 {

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>
 

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 {

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 {
 

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 {

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 {

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"
 

sortix/include/sortix/kernel/platform.h

@@ -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

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"
 

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 {

sortix/interlock.cpp

@@ -22,8 +22,8 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
 #include <sortix/kernel/interlock.h>
+#include <sortix/kernel/kernel.h>
 
 namespace Sortix {
 

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"
 

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"

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 {

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

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"
 

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"

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 {
 

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"

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

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 {

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>

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()

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"
 

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>
 

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"
 

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 {

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"
 

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"
 

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>

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 {
 

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"

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"

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.

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 {

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 {
 

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 {

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>

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"

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 {

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"

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.
 

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

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>

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"
 

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, ...)

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 {
 

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>
 

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"
 

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,

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

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

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 {

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 {

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"

sortix/x86-family/msr.cpp

@@ -24,7 +24,8 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
+
 #include "memorymanagement.h"
 
 namespace Sortix {

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>

sortix/x86-family/x86-family.cpp

@@ -22,7 +22,7 @@
 
 *******************************************************************************/
 
-#include <sortix/kernel/platform.h>
+#include <sortix/kernel/kernel.h>
 
 namespace Sortix
 {

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

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,

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

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