include: one folder per subsystem, and includes that name it

Sixty-five headers sat side by side in include/, so `#include "irq.h"` said nothing about where irq.h was or what it belonged to, and errno.h, stat.h and fcntl.h at the top shadowed the system's for any host tool built with -I./include. They are in folders now -- arch/ core/ fs/ dev/ gfx/ net/ uapi/ (and ldls/ for the Linux driver layer) -- and every include names the folder, as Linux's do: "core/proc.h". Done mechanically and checked the hard way: the kernel built from this tree disassembles identically to the one built from the tree before it. The full image boots, and userland is the same set of programs. Paths in docs and comments follow; docs/guides/layout.md has a table of what is where, and tools/fix-includes.py rewrites old-style includes from the folders in the tree, for code written before this. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S1giNvrHTrPMPw7V6x1kQ4
2026-10-23 15:05:12 +02:00 · 2026-10-23 15:05:12 +02:00 · a1c965da1e
commit a1c965da1e
parent 0e39e711f1
267 changed files with 1560 additions and 1440 deletions
--- a/kernel/sys/linux_abi.c
+++ b/kernel/sys/linux_abi.c
@ -11,8 +11,8 @@
 // The map is now generated from kernel/sys/table.inc, which carries the Linux
 // number alongside the native one. There is nothing to hand-edit here.

-#include "types.h"
-#include "syscall.h"
+#include "core/types.h"
+#include "core/syscall.h"

 #define LINUX_NSYSCALL NSYSCALLS

--- a/kernel/sys/sys_compat.c
+++ b/kernel/sys/sys_compat.c
@ -2,19 +2,19 @@
 // These are stubs or thin wrappers that make musl and ksh happy
 // without implementing full semantics.

-#include "types.h"
-#include "defs.h"
-#include "param.h"
-#include "memlayout.h"
-#include "mmu.h"
-#include "traps.h"
-#include "proc.h"
-#include "x86.h"
-#include "syscall.h"
-#include "posix.h"
-#include "uaccess.h"
-#include "errno.h"
-#include "klog.h"   /* KLOG_BYTES, for syslog(2) action 10 */
+#include "core/types.h"
+#include "core/defs.h"
+#include "core/param.h"
+#include "arch/memlayout.h"
+#include "arch/mmu.h"
+#include "arch/traps.h"
+#include "core/proc.h"
+#include "arch/x86.h"
+#include "core/syscall.h"
+#include "uapi/posix.h"
+#include "core/uaccess.h"
+#include "uapi/errno.h"
+#include "core/klog.h"   /* KLOG_BYTES, for syslog(2) action 10 */

 extern int linux_syscall_map[];
 extern int linux_syscall_map_size;
--- a/kernel/sys/sys_fs.c
+++ b/kernel/sys/sys_fs.c
@ -1,26 +1,26 @@
-#include "types.h"
-#include "defs.h"
-#include "param.h"
-#include "stat.h"
-#include "mmu.h"
-#include "memlayout.h"
-#include "proc.h"
-#include "fs.h"
-#include "spinlock.h"
-#include "sleeplock.h"
-#include "file.h"
-#include "fcntl.h"
-#include "posix.h"
-#include "syscall.h"
-#include "uaccess.h"
-#include "errno.h"
-#include "schfs.h"      /* SCHFS_BLKSIZE, SCHFS_NAME_MAX — statfs reports them */
-#include "gfx.h"        /* gfx_cols/gfx_rows — TIOCGWINSZ reports them */
-#include "vt.h"         /* the terminals the TIOC and VT_ ioctls act on */
-#include "pciuser.h"
-#include "keymap.h"    /* KB_*LAYOUT — the keyboard layout catalogue */
-#include "netuser.h"
-#include "fat.h"
+#include "core/types.h"
+#include "core/defs.h"
+#include "core/param.h"
+#include "uapi/stat.h"
+#include "arch/mmu.h"
+#include "arch/memlayout.h"
+#include "core/proc.h"
+#include "fs/fs.h"
+#include "core/spinlock.h"
+#include "core/sleeplock.h"
+#include "fs/file.h"
+#include "uapi/fcntl.h"
+#include "uapi/posix.h"
+#include "core/syscall.h"
+#include "core/uaccess.h"
+#include "uapi/errno.h"
+#include "fs/schfs.h"      /* SCHFS_BLKSIZE, SCHFS_NAME_MAX — statfs reports them */
+#include "gfx/gfx.h"        /* gfx_cols/gfx_rows — TIOCGWINSZ reports them */
+#include "dev/vt.h"         /* the terminals the TIOC and VT_ ioctls act on */
+#include "dev/pciuser.h"
+#include "dev/keymap.h"    /* KB_*LAYOUT — the keyboard layout catalogue */
+#include "net/netuser.h"
+#include "fs/fat.h"

 // -----------------------------------------------------------------------
 // Linux-ABI-compatible struct stat (x86_64 "struct stat" from
@ -1548,7 +1548,7 @@ addr_t sys_ioctl(void)
        return 0;
    }
    // Which chord the kernel switches on. SchOS's own ioctl -- see the long
-    // comment in include/kbd.h for why this has to be settable at all.
+    // comment in include/dev/kbd.h for why this has to be settable at all.
    if (request == VT_SETCHORD) {
        struct vt_chord *c = (struct vt_chord*)user_ptr(argp, sizeof(*c));
        if (!c) return -EFAULT;
--- a/kernel/sys/sys_mem.c
+++ b/kernel/sys/sys_mem.c
@ -1,24 +1,24 @@
-#include "types.h"
-#include "defs.h"
-#include "gfx.h"
-#include "param.h"
-#include "stat.h"
-#include "memlayout.h"
-#include "mmu.h"
-#include "spinlock.h"
-#include "sleeplock.h"
-#include "proc.h"
-#include "fs.h"
-#include "file.h"
-#include "syscall.h"
-#include "errno.h"
-#include "uaccess.h"
-#include "posix.h"
-#include "pciuser.h"
+#include "core/types.h"
+#include "core/defs.h"
+#include "gfx/gfx.h"
+#include "core/param.h"
+#include "uapi/stat.h"
+#include "arch/memlayout.h"
+#include "arch/mmu.h"
+#include "core/spinlock.h"
+#include "core/sleeplock.h"
+#include "core/proc.h"
+#include "fs/fs.h"
+#include "fs/file.h"
+#include "core/syscall.h"
+#include "uapi/errno.h"
+#include "core/uaccess.h"
+#include "uapi/posix.h"
+#include "dev/pciuser.h"

 extern int mappages(pml4e_t *pgdir, void *va, uint64 size, uint64 pa, int perm);

-/* MAP_* and PROT_* now live in include/posix.h, so userspace and the kernel
+/* MAP_* and PROT_* now live in include/uapi/posix.h, so userspace and the kernel
   compare the same numbers. */

 // Reject user mapping requests that fall outside user space. Without this,
--- a/kernel/sys/sys_net.c
+++ b/kernel/sys/sys_net.c
@ -11,21 +11,21 @@
 // EAFNOSUPPORT rather than EINVAL, because a program that probes for IPv6 and
 // falls back to IPv4 needs to tell "not here" from "you passed nonsense".

-#include "types.h"
-#include "defs.h"
-#include "param.h"
-#include "mmu.h"
-#include "proc.h"
-#include "fs.h"
-#include "spinlock.h"
-#include "sleeplock.h"
-#include "stat.h"
-#include "file.h"
-#include "posix.h"
-#include "syscall.h"
-#include "uaccess.h"
-#include "errno.h"
-#include "socket.h"
+#include "core/types.h"
+#include "core/defs.h"
+#include "core/param.h"
+#include "arch/mmu.h"
+#include "core/proc.h"
+#include "fs/fs.h"
+#include "core/spinlock.h"
+#include "core/sleeplock.h"
+#include "uapi/stat.h"
+#include "fs/file.h"
+#include "uapi/posix.h"
+#include "core/syscall.h"
+#include "core/uaccess.h"
+#include "uapi/errno.h"
+#include "net/socket.h"

 // Pull the sun_path out of a user `struct sockaddr_un`, NUL-terminated.
 //
--- a/kernel/sys/sys_poll.c
+++ b/kernel/sys/sys_poll.c
@ -9,18 +9,18 @@
 // rescan. A pending unblocked signal or kill interrupts the wait with
 // -EINTR so handlers get a chance to run, matching POSIX.

-#include "types.h"
-#include "defs.h"
-#include "param.h"
-#include "spinlock.h"
-#include "sleeplock.h"
-#include "fs.h"
-#include "file.h"
-#include "proc.h"
-#include "syscall.h"
-#include "posix.h"
-#include "uaccess.h"
-#include "errno.h"
+#include "core/types.h"
+#include "core/defs.h"
+#include "core/param.h"
+#include "core/spinlock.h"
+#include "core/sleeplock.h"
+#include "fs/fs.h"
+#include "fs/file.h"
+#include "core/proc.h"
+#include "core/syscall.h"
+#include "uapi/posix.h"
+#include "core/uaccess.h"
+#include "uapi/errno.h"

 #define POLL_MAX_FDS 64

--- a/kernel/sys/sys_proc.c
+++ b/kernel/sys/sys_proc.c
@ -1,21 +1,21 @@
-#include "types.h"
-#include "defs.h"
-#include "param.h"
-#include "memlayout.h"
-#include "hwinfo.h"
-#include "mmu.h"
-#include "proc.h"
-#include "x86.h"
-#include "syscall.h"
-#include "posix.h"
-#include "uaccess.h"
-#include "errno.h"
-#include "acpi.h"
-#include "fat.h"
-#include "spinlock.h"
-#include "sleeplock.h"
-#include "fs.h"
-#include "buf.h"
+#include "core/types.h"
+#include "core/defs.h"
+#include "core/param.h"
+#include "arch/memlayout.h"
+#include "core/hwinfo.h"
+#include "arch/mmu.h"
+#include "core/proc.h"
+#include "arch/x86.h"
+#include "core/syscall.h"
+#include "uapi/posix.h"
+#include "core/uaccess.h"
+#include "uapi/errno.h"
+#include "dev/acpi.h"
+#include "fs/fat.h"
+#include "core/spinlock.h"
+#include "core/sleeplock.h"
+#include "fs/fs.h"
+#include "fs/buf.h"

 addr_t sys_fork(void)      { return fork(); }
 addr_t sys_wait(void)      { return wait(); }
--- a/kernel/sys/sys_sig.c
+++ b/kernel/sys/sys_sig.c
@ -1,12 +1,12 @@
-#include "types.h"
-#include "defs.h"
-#include "param.h"
-#include "proc.h"
-#include "x86.h"
-#include "syscall.h"
-#include "uaccess.h"
-#include "errno.h"
-#include "posix.h"   /* SIG_BLOCK, SIG_UNBLOCK, SIG_SETMASK, signal numbers */
+#include "core/types.h"
+#include "core/defs.h"
+#include "core/param.h"
+#include "core/proc.h"
+#include "arch/x86.h"
+#include "core/syscall.h"
+#include "core/uaccess.h"
+#include "uapi/errno.h"
+#include "uapi/posix.h"   /* SIG_BLOCK, SIG_UNBLOCK, SIG_SETMASK, signal numbers */

 // Linux sigset_t puts signal N at bit N-1; kernel-internal masks
 // (pending_signals / signal_mask / deliver_signals) put signal N at bit N.
--- a/kernel/sys/sys_time.c
+++ b/kernel/sys/sys_time.c
@ -1,14 +1,14 @@
-#include "types.h"
-#include "defs.h"
-#include "param.h"
-#include "date.h"
-#include "spinlock.h"
-#include "proc.h"
-#include "x86.h"
-#include "syscall.h"
-#include "posix.h"
-#include "uaccess.h"
-#include "errno.h"
+#include "core/types.h"
+#include "core/defs.h"
+#include "core/param.h"
+#include "core/date.h"
+#include "core/spinlock.h"
+#include "core/proc.h"
+#include "arch/x86.h"
+#include "core/syscall.h"
+#include "uapi/posix.h"
+#include "core/uaccess.h"
+#include "uapi/errno.h"

 addr_t
 sys_alarm(void)
--- a/kernel/sys/syscall.c
+++ b/kernel/sys/syscall.c
@ -1,15 +1,15 @@
-#include "types.h"
-#include "defs.h"
-#include "param.h"
-#include "memlayout.h"
-#include "mmu.h"
-#include "traps.h"
-#include "proc.h"
-#include "x86.h"
-#include "syscall.h"
-#include "uaccess.h"
-#include "errno.h"
-#include "posix.h"
+#include "core/types.h"
+#include "core/defs.h"
+#include "core/param.h"
+#include "arch/memlayout.h"
+#include "arch/mmu.h"
+#include "arch/traps.h"
+#include "core/proc.h"
+#include "arch/x86.h"
+#include "core/syscall.h"
+#include "core/uaccess.h"
+#include "uapi/errno.h"
+#include "uapi/posix.h"

 // -----------------------------------------------------------------------
 // Argument helpers — read syscall args from the saved register frame.
--- a/kernel/sys/table.inc
+++ b/kernel/sys/table.inc
@ -10,7 +10,7 @@
 //   2. Write the body with SYSCALL_DEFINE(<name>) in a kernel/sys/sys_*.c.
 //
 // Everything else is generated from this file: the SYS_* constants
-// (include/syscall.h), the dispatch table (kernel/sys/syscall.c), and the
+// (include/core/syscall.h), the dispatch table (kernel/sys/syscall.c), and the
 // Linux ABI translation map (kernel/sys/linux_abi.c). The Linux number used
 // to live in a second hand-maintained table in linux_abi.c; it does not any
 // more, so a syscall can no longer be half-registered.