diff --git a/examples/package/build.mk b/examples/package/build.mk
index 0385856f5..fc604b2a2 100644
--- a/examples/package/build.mk
+++ b/examples/package/build.mk
@@ -41,6 +41,7 @@ EXAMPLES_PACKAGE_OBJS =					\
 # Note that linking stubs is always a good idea due to synthetic code.
 EXAMPLES_PACKAGE_DIRECTDEPS =				\
 	EXAMPLES_PACKAGE_LIB				\
+	LIBC_INTRIN					\
 	LIBC_STDIO					\
 	LIBC_STUBS					\
 	LIBC_TINYMATH
diff --git a/examples/package/lib/build.mk b/examples/package/lib/build.mk
index 80edf5f92..463c72dc4 100644
--- a/examples/package/lib/build.mk
+++ b/examples/package/lib/build.mk
@@ -70,6 +70,7 @@ EXAMPLES_PACKAGE_LIB_A_CHECKS =					\
 # Note that linking stubs is always a good idea due to synthetic code.
 EXAMPLES_PACKAGE_LIB_A_DIRECTDEPS =				\
 	LIBC_STDIO						\
+	LIBC_INTRIN						\
 	LIBC_NEXGEN32E						\
 	LIBC_STUBS
 
diff --git a/libc/calls/chdir-nt.c b/libc/calls/chdir-nt.c
index 40869356d..979c715b2 100644
--- a/libc/calls/chdir-nt.c
+++ b/libc/calls/chdir-nt.c
@@ -23,7 +23,7 @@
 #include "libc/nt/synchronization.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int chdir$nt(const char *path) {
+textwindows int sys_chdir_nt(const char *path) {
   int e, ms, len;
   char16_t path16[PATH_MAX];
   if ((len = __mkntpath(path, path16)) == -1) return -1;
diff --git a/libc/calls/chdir.c b/libc/calls/chdir.c
index 4f95461e6..cb441d944 100644
--- a/libc/calls/chdir.c
+++ b/libc/calls/chdir.c
@@ -27,8 +27,8 @@
  */
 int chdir(const char *path) {
   if (!IsWindows()) {
-    return chdir$sysv(path);
+    return sys_chdir(path);
   } else {
-    return chdir$nt(path);
+    return sys_chdir_nt(path);
   }
 }
diff --git a/libc/calls/chmod.c b/libc/calls/chmod.c
index 7df6f93ad..7dba99b96 100644
--- a/libc/calls/chmod.c
+++ b/libc/calls/chmod.c
@@ -45,5 +45,5 @@
  */
 int chmod(const char *pathname, uint32_t mode) {
   if (!pathname) return efault();
-  return fchmodat$sysv(AT_FDCWD, pathname, mode, 0);
+  return sys_fchmodat(AT_FDCWD, pathname, mode, 0);
 }
diff --git a/libc/calls/chown.c b/libc/calls/chown.c
index 090cb6ecc..28703169d 100644
--- a/libc/calls/chown.c
+++ b/libc/calls/chown.c
@@ -34,5 +34,5 @@
  * @asyncsignalsafe
  */
 int chown(const char *pathname, uint32_t uid, uint32_t gid) {
-  return fchownat$sysv(AT_FDCWD, pathname, uid, gid, 0);
+  return sys_fchownat(AT_FDCWD, pathname, uid, gid, 0);
 }
diff --git a/libc/calls/clock_gettime.c b/libc/calls/clock_gettime.c
index 042c6ea39..9d64dab2e 100644
--- a/libc/calls/clock_gettime.c
+++ b/libc/calls/clock_gettime.c
@@ -59,7 +59,7 @@ int clock_gettime(int clockid, struct timespec *out_ts) {
         out_ts->tv_sec = 0;
         out_ts->tv_nsec = 0;
       }
-      return clock_gettime$sysv(clockid, out_ts);
+      return sys_clock_gettime(clockid, out_ts);
     } else {
       int rc;
       _Static_assert(sizeof(struct timeval) == sizeof(struct timespec));
@@ -67,7 +67,7 @@ int clock_gettime(int clockid, struct timespec *out_ts) {
         out_ts->tv_sec = 0;
         out_ts->tv_nsec = 0;
       }
-      rc = gettimeofday$sysv((struct timeval *)out_ts, NULL);
+      rc = sys_gettimeofday((struct timeval *)out_ts, NULL);
       if (out_ts) {
         out_ts->tv_nsec *= 1000;
       }
diff --git a/libc/calls/close-nt.c b/libc/calls/close-nt.c
index 5c500b0b4..dbde6463e 100644
--- a/libc/calls/close-nt.c
+++ b/libc/calls/close-nt.c
@@ -22,7 +22,7 @@
 #include "libc/nt/runtime.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int close$nt(int fd) {
+textwindows int sys_close_nt(int fd) {
   bool32 ok;
   if (g_fds.p[fd].kind == kFdFile &&
       GetFileType(g_fds.p[fd].handle) == kNtFileTypeDisk) {
diff --git a/libc/calls/close.c b/libc/calls/close.c
index b5e83c52a..e242563c5 100644
--- a/libc/calls/close.c
+++ b/libc/calls/close.c
@@ -40,15 +40,15 @@ int close(int fd) {
   if (fd < g_fds.n && g_fds.p[fd].kind == kFdZip) {
     rc = weaken(__zipos_close)(fd);
   } else if (fd < g_fds.n && g_fds.p[fd].kind == kFdEpoll) {
-    rc = weaken(close$epoll)(fd);
+    rc = weaken(sys_close_epoll)(fd);
   } else if (!IsWindows()) {
-    rc = close$sysv(fd);
+    rc = sys_close(fd);
   } else if (fd < g_fds.n && g_fds.p[fd].kind == kFdSocket) {
-    rc = weaken(closesocket$nt)(fd);
+    rc = weaken(sys_closesocket_nt)(fd);
   } else if (fd < g_fds.n &&
              (g_fds.p[fd].kind == kFdFile || g_fds.p[fd].kind == kFdConsole ||
               g_fds.p[fd].kind == kFdProcess)) {
-    rc = close$nt(fd);
+    rc = sys_close_nt(fd);
   } else {
     rc = ebadf();
   }
diff --git a/libc/calls/copyfile.c b/libc/calls/copyfile.c
index d32e1801a..ebf917905 100644
--- a/libc/calls/copyfile.c
+++ b/libc/calls/copyfile.c
@@ -32,7 +32,7 @@
 #include "libc/sysv/consts/o.h"
 #include "libc/time/time.h"
 
-static textwindows int copyfile$nt(const char *src, const char *dst,
+static textwindows int sys_copyfile_nt(const char *src, const char *dst,
                                    int flags) {
   int64_t fhsrc, fhdst;
   struct NtFileTime accessed, modified;
@@ -58,7 +58,7 @@ static textwindows int copyfile$nt(const char *src, const char *dst,
   }
 }
 
-static int copyfile$sysv(const char *src, const char *dst, int flags) {
+static int sys_copyfile(const char *src, const char *dst, int flags) {
   struct stat st;
   size_t remaining;
   ssize_t transferred;
@@ -66,12 +66,12 @@ static int copyfile$sysv(const char *src, const char *dst, int flags) {
   int64_t inoffset, outoffset;
   int rc, srcfd, dstfd, oflags, omode;
   rc = -1;
-  if ((srcfd = openat$sysv(AT_FDCWD, src, O_RDONLY, 0)) != -1) {
-    if (fstat$sysv(srcfd, &st) != -1) {
+  if ((srcfd = sys_openat(AT_FDCWD, src, O_RDONLY, 0)) != -1) {
+    if (sys_fstat(srcfd, &st) != -1) {
       omode = st.st_mode & 0777;
       oflags = O_WRONLY | O_CREAT;
       if (flags & COPYFILE_NOCLOBBER) oflags |= O_EXCL;
-      if ((dstfd = openat$sysv(AT_FDCWD, dst, oflags, omode)) != -1) {
+      if ((dstfd = sys_openat(AT_FDCWD, dst, oflags, omode)) != -1) {
         remaining = st.st_size;
         ftruncate(dstfd, remaining);
         inoffset = 0;
@@ -86,13 +86,13 @@ static int copyfile$sysv(const char *src, const char *dst, int flags) {
           if (flags & COPYFILE_PRESERVE_TIMESTAMPS) {
             amtime[0] = st.st_atim;
             amtime[1] = st.st_mtim;
-            utimensat$sysv(dstfd, NULL, amtime, 0);
+            sys_utimensat(dstfd, NULL, amtime, 0);
           }
         }
-        rc |= close$sysv(dstfd);
+        rc |= sys_close(dstfd);
       }
     }
-    rc |= close$sysv(srcfd);
+    rc |= sys_close(srcfd);
   }
   return rc;
 }
@@ -102,8 +102,8 @@ static int copyfile$sysv(const char *src, const char *dst, int flags) {
  */
 int copyfile(const char *src, const char *dst, int flags) {
   if (!IsWindows()) {
-    return copyfile$sysv(src, dst, flags);
+    return sys_copyfile(src, dst, flags);
   } else {
-    return copyfile$nt(src, dst, flags);
+    return sys_copyfile_nt(src, dst, flags);
   }
 }
diff --git a/libc/calls/dup-nt.c b/libc/calls/dup-nt.c
index 1e8437009..4e8a1a507 100644
--- a/libc/calls/dup-nt.c
+++ b/libc/calls/dup-nt.c
@@ -28,7 +28,7 @@
 /**
  * Implements dup(), dup2(), and dup3() for Windows NT.
  */
-textwindows int dup$nt(int oldfd, int newfd, int flags) {
+textwindows int sys_dup_nt(int oldfd, int newfd, int flags) {
   int64_t proc;
   if (oldfd < 0) return einval();
   if (oldfd >= g_fds.n ||
diff --git a/libc/calls/dup.c b/libc/calls/dup.c
index 998c51754..c23521d47 100644
--- a/libc/calls/dup.c
+++ b/libc/calls/dup.c
@@ -30,8 +30,8 @@
  */
 nodiscard int dup(int fd) {
   if (!IsWindows()) {
-    return dup$sysv(fd);
+    return sys_dup(fd);
   } else {
-    return dup$nt(fd, -1, 0);
+    return sys_dup_nt(fd, -1, 0);
   }
 }
diff --git a/libc/calls/dup2.c b/libc/calls/dup2.c
index 9a21a8bce..1288cb5e2 100644
--- a/libc/calls/dup2.c
+++ b/libc/calls/dup2.c
@@ -33,8 +33,8 @@
 int dup2(int oldfd, int newfd) {
   if (oldfd == newfd) return newfd;
   if (!IsWindows()) {
-    return dup3$sysv(oldfd, newfd, 0);
+    return sys_dup3(oldfd, newfd, 0);
   } else {
-    return dup$nt(oldfd, newfd, 0);
+    return sys_dup_nt(oldfd, newfd, 0);
   }
 }
diff --git a/libc/calls/dup3-sysv.c b/libc/calls/dup3-sysv.c
index f231daf3b..400e7a638 100644
--- a/libc/calls/dup3-sysv.c
+++ b/libc/calls/dup3-sysv.c
@@ -21,12 +21,12 @@
 
 #define __NR_dup3_linux 0x0124 /*RHEL5:CVE-2010-3301*/
 
-int32_t dup3$sysv(int32_t oldfd, int32_t newfd, int flags) {
+int32_t sys_dup3(int32_t oldfd, int32_t newfd, int flags) {
   static bool once, demodernize;
   int olderr, fd;
   if (!once) {
     olderr = errno;
-    fd = __dup3$sysv(oldfd, newfd, flags);
+    fd = __sys_dup3(oldfd, newfd, flags);
     if ((fd == -1 && errno == ENOSYS) || fd == __NR_dup3_linux) {
       demodernize = true;
       once = true;
@@ -36,7 +36,7 @@ int32_t dup3$sysv(int32_t oldfd, int32_t newfd, int flags) {
       return fd;
     }
   } else if (!demodernize) {
-    return __dup3$sysv(oldfd, newfd, flags);
+    return __sys_dup3(oldfd, newfd, flags);
   }
-  return fixupnewfd$sysv(dup2$sysv(oldfd, newfd), flags);
+  return __fixupnewfd(sys_dup2(oldfd, newfd), flags);
 }
diff --git a/libc/calls/dup3.c b/libc/calls/dup3.c
index 920414084..fe437e5db 100644
--- a/libc/calls/dup3.c
+++ b/libc/calls/dup3.c
@@ -36,8 +36,8 @@
  */
 int dup3(int oldfd, int newfd, int flags) {
   if (!IsWindows()) {
-    return dup3$sysv(oldfd, newfd, flags);
+    return sys_dup3(oldfd, newfd, flags);
   } else {
-    return dup$nt(oldfd, newfd, flags);
+    return sys_dup_nt(oldfd, newfd, flags);
   }
 }
diff --git a/libc/calls/execve-nt.c b/libc/calls/execve-nt.c
index c6c5a476e..ceba6b69b 100644
--- a/libc/calls/execve-nt.c
+++ b/libc/calls/execve-nt.c
@@ -29,7 +29,7 @@
 #include "libc/str/str.h"
 #include "libc/sysv/consts/o.h"
 
-textwindows int execve$nt(const char *program, char *const argv[],
+textwindows int sys_execve_nt(const char *program, char *const argv[],
                           char *const envp[]) {
   int rc;
   size_t i;
diff --git a/libc/calls/execve-sysv.c b/libc/calls/execve-sysv.c
index 3814ad813..f687ae637 100644
--- a/libc/calls/execve-sysv.c
+++ b/libc/calls/execve-sysv.c
@@ -24,10 +24,10 @@
 #include "libc/paths.h"
 #include "libc/str/str.h"
 
-int execve$sysv(const char *prog, char *const argv[], char *const envp[]) {
+int sys_execve(const char *prog, char *const argv[], char *const envp[]) {
   size_t i;
   char **shargs;
-  if (__execve$sysv(prog, argv, envp) != -1) return 0;
+  if (__sys_execve(prog, argv, envp) != -1) return 0;
   if (errno != ENOEXEC) return -1;
   for (i = 0; argv[i];) ++i;
   shargs = alloca((i + 2) * sizeof(char *));
@@ -36,5 +36,5 @@ int execve$sysv(const char *prog, char *const argv[], char *const envp[]) {
                            : firstnonnull(commandv("bash", alloca(PATH_MAX)),
                                           _PATH_BSHELL);
   shargs[1] = prog;
-  return __execve$sysv(shargs[0], shargs, envp);
+  return __sys_execve(shargs[0], shargs, envp);
 }
diff --git a/libc/calls/execve.c b/libc/calls/execve.c
index 0b292d4a1..c927279de 100644
--- a/libc/calls/execve.c
+++ b/libc/calls/execve.c
@@ -35,8 +35,8 @@
  */
 int execve(const char *program, char *const argv[], char *const envp[]) {
   if (!IsWindows()) {
-    return execve$sysv(program, argv, envp);
+    return sys_execve(program, argv, envp);
   } else {
-    return execve$nt(program, argv, envp);
+    return sys_execve_nt(program, argv, envp);
   }
 }
diff --git a/libc/calls/faccessat-nt.c b/libc/calls/faccessat-nt.c
index d08ebafd3..94078c8e1 100644
--- a/libc/calls/faccessat-nt.c
+++ b/libc/calls/faccessat-nt.c
@@ -20,7 +20,7 @@
 #include "libc/sysv/consts/at.h"
 #include "libc/sysv/errfuns.h"
 
-int faccessat$nt(int dirfd, const char *path, int mode, uint32_t flags) {
+int sys_faccessat_nt(int dirfd, const char *path, int mode, uint32_t flags) {
   char16_t path16[PATH_MAX];
   if (__mkntpathat(dirfd, path, 0, path16) == -1) return -1;
   return ntaccesscheck(path16, mode);
diff --git a/libc/calls/faccessat.c b/libc/calls/faccessat.c
index 9e9483671..651500676 100644
--- a/libc/calls/faccessat.c
+++ b/libc/calls/faccessat.c
@@ -36,8 +36,8 @@
 int faccessat(int dirfd, const char *path, int mode, uint32_t flags) {
   if (!path) return efault();
   if (!IsWindows()) {
-    return faccessat$sysv(dirfd, path, mode, flags);
+    return sys_faccessat(dirfd, path, mode, flags);
   } else {
-    return faccessat$nt(dirfd, path, mode, flags);
+    return sys_faccessat_nt(dirfd, path, mode, flags);
   }
 }
diff --git a/libc/calls/fadvise-nt.c b/libc/calls/fadvise-nt.c
index 5104f9359..2c2881fde 100644
--- a/libc/calls/fadvise-nt.c
+++ b/libc/calls/fadvise-nt.c
@@ -30,7 +30,7 @@
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int fadvise$nt(int fd, uint64_t offset, uint64_t len, int advice) {
+textwindows int sys_fadvise_nt(int fd, uint64_t offset, uint64_t len, int advice) {
   int64_t h2;
   NtStatus status;
   uint32_t sharemode;
diff --git a/libc/calls/fadvise.c b/libc/calls/fadvise.c
index 959884b6a..f464228be 100644
--- a/libc/calls/fadvise.c
+++ b/libc/calls/fadvise.c
@@ -32,8 +32,8 @@
  */
 int fadvise(int fd, uint64_t offset, uint64_t len, int advice) {
   if (!IsWindows()) {
-    return fadvise$sysv(fd, offset, len, advice); /* linux & freebsd */
+    return sys_fadvise(fd, offset, len, advice); /* linux & freebsd */
   } else {
-    return fadvise$nt(fd, offset, len, advice);
+    return sys_fadvise_nt(fd, offset, len, advice);
   }
 }
diff --git a/libc/calls/fallocate.c b/libc/calls/fallocate.c
index e3c983c1b..fb1ff43f1 100644
--- a/libc/calls/fallocate.c
+++ b/libc/calls/fallocate.c
@@ -45,11 +45,11 @@ int fallocate(int fd, int32_t mode, int64_t offset, int64_t length) {
   if (mode == -1 /* our sysvconsts definition */) return eopnotsupp();
   if (!mode && !length) return ftruncate(fd, offset);
   if (IsLinux()) {
-    rc = fallocate$sysv(fd, mode, offset, length);
+    rc = sys_fallocate(fd, mode, offset, length);
     if (rc == 0x011d) rc = enosys(); /*RHEL5:CVE-2010-3301*/
     return rc;
   } else if (!IsWindows()) {
-    return posix_fallocate$sysv(fd, offset, length);
+    return sys_posix_fallocate(fd, offset, length);
   } else if (IsWindows()) {
     if (!__isfdkind(fd, kFdFile)) return ebadf();
     if (mode == FALLOC_FL_ZERO_RANGE) {
@@ -66,7 +66,7 @@ int fallocate(int fd, int32_t mode, int64_t offset, int64_t length) {
        * this should commit physical space
        * but not guaranteed zero'd like linux
        */
-      return ftruncate$nt(fd, length);
+      return sys_ftruncate_nt(fd, length);
     } else {
       return enosys();
     }
diff --git a/libc/calls/fchdir-nt.c b/libc/calls/fchdir-nt.c
index 740dfbcbd..ab8db742c 100644
--- a/libc/calls/fchdir-nt.c
+++ b/libc/calls/fchdir-nt.c
@@ -22,7 +22,7 @@
 #include "libc/nt/files.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int fchdir$nt(int dirfd) {
+textwindows int sys_fchdir_nt(int dirfd) {
   uint32_t len;
   char16_t dir[PATH_MAX];
   if (!__isfdkind(dirfd, kFdFile)) return ebadf();
diff --git a/libc/calls/fchdir.c b/libc/calls/fchdir.c
index d44aab121..a9e9b0987 100644
--- a/libc/calls/fchdir.c
+++ b/libc/calls/fchdir.c
@@ -28,8 +28,8 @@
  */
 int fchdir(int dirfd) {
   if (!IsWindows()) {
-    return fchdir$sysv(dirfd);
+    return sys_fchdir(dirfd);
   } else {
-    return fchdir$nt(dirfd);
+    return sys_fchdir_nt(dirfd);
   }
 }
diff --git a/libc/calls/fchmod.c b/libc/calls/fchmod.c
index 7c32f492f..509f9ecef 100644
--- a/libc/calls/fchmod.c
+++ b/libc/calls/fchmod.c
@@ -43,5 +43,5 @@
  */
 int fchmod(int fd, uint32_t mode) {
   /* TODO(jart): Windows */
-  return fchmod$sysv(fd, mode);
+  return sys_fchmod(fd, mode);
 }
diff --git a/libc/calls/fchown.c b/libc/calls/fchown.c
index 92e821868..0baa409df 100644
--- a/libc/calls/fchown.c
+++ b/libc/calls/fchown.c
@@ -31,5 +31,5 @@
  */
 int fchown(int fd, uint32_t uid, uint32_t gid) {
   /* TODO(jart): Windows? */
-  return fchown$sysv(fd, uid, gid);
+  return sys_fchown(fd, uid, gid);
 }
diff --git a/libc/calls/fchownat.c b/libc/calls/fchownat.c
index 2a4fa4c99..ae3664220 100644
--- a/libc/calls/fchownat.c
+++ b/libc/calls/fchownat.c
@@ -34,5 +34,5 @@
  */
 int fchownat(int dirfd, const char *pathname, uint32_t uid, uint32_t gid,
              uint32_t flags) {
-  return fchownat$sysv(dirfd, pathname, uid, gid, flags);
+  return sys_fchownat(dirfd, pathname, uid, gid, flags);
 }
diff --git a/libc/calls/fcntl-nt.c b/libc/calls/fcntl-nt.c
index e67b855d5..7dce493b9 100644
--- a/libc/calls/fcntl-nt.c
+++ b/libc/calls/fcntl-nt.c
@@ -27,7 +27,7 @@
 #include "libc/sysv/consts/o.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int fcntl$nt(int fd, int cmd, unsigned arg) {
+textwindows int sys_fcntl_nt(int fd, int cmd, unsigned arg) {
   uint32_t flags;
   if (__isfdkind(fd, kFdFile) || __isfdkind(fd, kFdSocket)) {
     switch (cmd) {
diff --git a/libc/calls/fcntl.c b/libc/calls/fcntl.c
index 954daff77..665a2acd1 100644
--- a/libc/calls/fcntl.c
+++ b/libc/calls/fcntl.c
@@ -37,8 +37,8 @@ int fcntl(int fd, int cmd, ...) {
   arg = va_arg(va, unsigned);
   va_end(va);
   if (!IsWindows()) {
-    return fcntl$sysv(fd, cmd, arg);
+    return sys_fcntl(fd, cmd, arg);
   } else {
-    return fcntl$nt(fd, cmd, arg);
+    return sys_fcntl_nt(fd, cmd, arg);
   }
 }
diff --git a/libc/calls/fdatasync-nt.c b/libc/calls/fdatasync-nt.c
index d2dff480a..43c5323ba 100644
--- a/libc/calls/fdatasync-nt.c
+++ b/libc/calls/fdatasync-nt.c
@@ -20,7 +20,7 @@
 #include "libc/nt/files.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int fdatasync$nt(int fd) {
+textwindows int sys_fdatasync_nt(int fd) {
   if (!__isfdkind(fd, kFdFile)) return ebadf();
   /*
    * XXX: On Windows NT this might be more analagous to fflush() and
diff --git a/libc/calls/fdatasync.c b/libc/calls/fdatasync.c
index 9eacbbff3..7da2a6f30 100644
--- a/libc/calls/fdatasync.c
+++ b/libc/calls/fdatasync.c
@@ -29,8 +29,8 @@
  */
 int fdatasync(int fd) {
   if (!IsWindows()) {
-    return fdatasync$sysv(fd);
+    return sys_fdatasync(fd);
   } else {
-    return fdatasync$nt(fd);
+    return sys_fdatasync_nt(fd);
   }
 }
diff --git a/libc/calls/fixupnewfd.c b/libc/calls/fixupnewfd.c
index 579a5cf0b..893601ba2 100644
--- a/libc/calls/fixupnewfd.c
+++ b/libc/calls/fixupnewfd.c
@@ -23,12 +23,12 @@
 
 /**
  * Applies file descriptor fixups on XNU or old Linux.
- * @see fixupnewsockfd$sysv() for socket file descriptors
+ * @see __fixupnewsockfd() for socket file descriptors
  */
-int fixupnewfd$sysv(int fd, int flags) {
+int __fixupnewfd(int fd, int flags) {
   if (fd != -1) {
     if (flags & O_CLOEXEC) {
-      fcntl$sysv(fd, F_SETFD, FD_CLOEXEC);
+      sys_fcntl(fd, F_SETFD, FD_CLOEXEC);
     }
   }
   return fd;
diff --git a/libc/calls/flock-nt.c b/libc/calls/flock-nt.c
index 781c4f656..9d22f08a7 100644
--- a/libc/calls/flock-nt.c
+++ b/libc/calls/flock-nt.c
@@ -25,7 +25,7 @@
 #include "libc/sysv/consts/lock.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int flock$nt(int fd, int op) {
+textwindows int sys_flock_nt(int fd, int op) {
   struct NtOverlapped ov;
   struct NtByHandleFileInformation info;
   if (!__isfdkind(fd, kFdFile)) return ebadf();
diff --git a/libc/calls/flock.c b/libc/calls/flock.c
index 5657cf285..1fbdae7ba 100644
--- a/libc/calls/flock.c
+++ b/libc/calls/flock.c
@@ -29,8 +29,8 @@
  */
 int flock(int fd, int op) {
   if (!IsWindows()) {
-    return flock$sysv(fd, op);
+    return sys_flock(fd, op);
   } else {
-    return flock$nt(fd, op);
+    return sys_flock_nt(fd, op);
   }
 }
diff --git a/libc/calls/fprot2nt.c b/libc/calls/fprot2nt.c
deleted file mode 100644
index 25a54ce58..000000000
--- a/libc/calls/fprot2nt.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/internal.h"
-#include "libc/nt/enum/filemapflags.h"
-#include "libc/nt/enum/pageflags.h"
-#include "libc/nt/memory.h"
-#include "libc/sysv/consts/map.h"
-#include "libc/sysv/consts/prot.h"
-
-#define HAS(X, BITS) (((X) & (BITS)) == (BITS))
-
-/**
- * Converts System Five memory protection flags to Windows NT, Part 2.
- * @see libc/sysv/consts.sh
- */
-uint32_t fprot2nt(int prot, int flags) {
-  return (HAS(prot, PROT_READ) ? kNtFileMapRead : 0) |
-         (HAS(prot, PROT_WRITE) ? kNtFileMapWrite : 0) |
-         (HAS(prot, PROT_EXEC) ? kNtFileMapExecute : 0) |
-         (HAS(flags, kNtSecLargePages) ? kNtFileMapLargePages : 0) |
-         (HAS(flags, kNtSecReserve) ? kNtFileMapReserve : 0) |
-         ((HAS(flags, MAP_PRIVATE) && HAS(prot, PROT_READ) &&
-           HAS(prot, PROT_WRITE))
-              ? kNtFileMapCopy
-              : 0);
-}
diff --git a/libc/calls/fstat-nt.c b/libc/calls/fstat-nt.c
index 179b93cbd..82228d054 100644
--- a/libc/calls/fstat-nt.c
+++ b/libc/calls/fstat-nt.c
@@ -30,7 +30,7 @@
 #include "libc/str/str.h"
 #include "libc/sysv/consts/s.h"
 
-textwindows int fstat$nt(int64_t handle, struct stat *st) {
+textwindows int sys_fstat_nt(int64_t handle, struct stat *st) {
   int filetype;
   uint64_t actualsize;
   struct NtFileCompressionInfo fci;
diff --git a/libc/calls/fstat-sysv.c b/libc/calls/fstat-sysv.c
index 253c46e24..341cb8051 100644
--- a/libc/calls/fstat-sysv.c
+++ b/libc/calls/fstat-sysv.c
@@ -22,10 +22,10 @@
  * Supports fstat(), etc. implementations.
  * @asyncsignalsafe
  */
-textstartup int32_t fstat$sysv(int32_t fd, struct stat *st) {
+textstartup int32_t sys_fstat(int32_t fd, struct stat *st) {
   int res;
-  if ((res = __fstat$sysv(fd, st)) != -1) {
-    stat2linux(st);
+  if ((res = __sys_fstat(fd, st)) != -1) {
+    __stat2linux(st);
   }
   return res;
 }
diff --git a/libc/calls/fstat.c b/libc/calls/fstat.c
index c82c128e6..7e0bff932 100644
--- a/libc/calls/fstat.c
+++ b/libc/calls/fstat.c
@@ -33,12 +33,12 @@ int fstat(int fd, struct stat *st) {
         (struct ZiposHandle *)(intptr_t)g_fds.p[fd].handle, st);
   } else if (!IsWindows()) {
     if (!IsMetal()) {
-      return fstat$sysv(fd, st);
+      return sys_fstat(fd, st);
     } else {
       return fstat$metal(fd, st);
     }
   } else {
     if (!__isfdkind(fd, kFdFile)) return ebadf();
-    return fstat$nt(g_fds.p[fd].handle, st);
+    return sys_fstat_nt(g_fds.p[fd].handle, st);
   }
 }
diff --git a/libc/calls/fstatat-nt.c b/libc/calls/fstatat-nt.c
index 4aa6717f6..fcdec0b4b 100644
--- a/libc/calls/fstatat-nt.c
+++ b/libc/calls/fstatat-nt.c
@@ -26,7 +26,7 @@
 #include "libc/nt/runtime.h"
 #include "libc/runtime/runtime.h"
 
-textwindows int fstatat$nt(int dirfd, const char *path, struct stat *st,
+textwindows int sys_fstatat_nt(int dirfd, const char *path, struct stat *st,
                            uint32_t flags) {
   int rc;
   int64_t fh;
@@ -37,7 +37,7 @@ textwindows int fstatat$nt(int dirfd, const char *path, struct stat *st,
            kNtFileShareRead | kNtFileShareWrite | kNtFileShareDelete, NULL,
            kNtOpenExisting, kNtFileAttributeNormal | kNtFileFlagBackupSemantics,
            0)) != -1) {
-    rc = fstat$nt(fh, st);
+    rc = sys_fstat_nt(fh, st);
     CloseHandle(fh);
     return rc;
   } else {
diff --git a/libc/calls/fstatat-sysv.c b/libc/calls/fstatat-sysv.c
index 148eb083d..4ce4c878e 100644
--- a/libc/calls/fstatat-sysv.c
+++ b/libc/calls/fstatat-sysv.c
@@ -22,11 +22,11 @@
  * Supports stat(), lstat(), fstatat(), etc. implementations.
  * @asyncsignalsafe
  */
-int32_t fstatat$sysv(int32_t dirfd, const char *pathname, struct stat *st,
-                     int32_t flags) {
+int32_t sys_fstatat(int32_t dirfd, const char *pathname, struct stat *st,
+                    int32_t flags) {
   int32_t rc;
-  if ((rc = __fstatat$sysv(dirfd, pathname, st, flags)) != -1) {
-    stat2linux(st);
+  if ((rc = __sys_fstatat(dirfd, pathname, st, flags)) != -1) {
+    __stat2linux(st);
   }
   return rc;
 }
diff --git a/libc/calls/fstatat.c b/libc/calls/fstatat.c
index 9bd871e79..cb6c4a55e 100644
--- a/libc/calls/fstatat.c
+++ b/libc/calls/fstatat.c
@@ -39,8 +39,8 @@ int fstatat(int dirfd, const char *path, struct stat *st, uint32_t flags) {
   if (weaken(__zipos_stat) && weaken(__zipos_parseuri)(path, &zipname) != -1) {
     return weaken(__zipos_stat)(&zipname, st);
   } else if (!IsWindows()) {
-    return fstatat$sysv(dirfd, path, st, flags);
+    return sys_fstatat(dirfd, path, st, flags);
   } else {
-    return fstatat$nt(dirfd, path, st, flags);
+    return sys_fstatat_nt(dirfd, path, st, flags);
   }
 }
diff --git a/libc/calls/fsync.c b/libc/calls/fsync.c
index c33285c81..39a8b4476 100644
--- a/libc/calls/fsync.c
+++ b/libc/calls/fsync.c
@@ -29,8 +29,8 @@
  */
 int fsync(int fd) {
   if (!IsWindows()) {
-    return fsync$sysv(fd);
+    return sys_fsync(fd);
   } else {
-    return fdatasync$nt(fd);
+    return sys_fdatasync_nt(fd);
   }
 }
diff --git a/libc/calls/ftruncate-nt.c b/libc/calls/ftruncate-nt.c
index f22c6456c..a3f21ba03 100644
--- a/libc/calls/ftruncate-nt.c
+++ b/libc/calls/ftruncate-nt.c
@@ -21,7 +21,7 @@
 #include "libc/nt/files.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int ftruncate$nt(int fd, uint64_t length) {
+textwindows int sys_ftruncate_nt(int fd, uint64_t length) {
   bool32 ok;
   int64_t tell;
   if (!__isfdkind(fd, kFdFile)) return ebadf();
diff --git a/libc/calls/ftruncate.c b/libc/calls/ftruncate.c
index fcbc67fa8..0fe03ff90 100644
--- a/libc/calls/ftruncate.c
+++ b/libc/calls/ftruncate.c
@@ -33,8 +33,8 @@
  */
 int ftruncate(int fd, int64_t length) {
   if (!IsWindows()) {
-    return ftruncate$sysv(fd, length);
+    return sys_ftruncate(fd, length);
   } else {
-    return ftruncate$nt(fd, length);
+    return sys_ftruncate_nt(fd, length);
   }
 }
diff --git a/libc/calls/g_ntstartupinfo.c b/libc/calls/g_ntstartupinfo.c
index d1d1973a4..5193f47b7 100644
--- a/libc/calls/g_ntstartupinfo.c
+++ b/libc/calls/g_ntstartupinfo.c
@@ -20,6 +20,6 @@
 #include "libc/nt/startupinfo.h"
 #include "libc/nt/struct/startupinfo.h"
 
-hidden struct NtStartupInfo g_ntstartupinfo;
+hidden struct NtStartupInfo __nt_startupinfo;
 
-STATIC_YOINK("_init_g_ntstartupinfo");
+STATIC_YOINK("_init___nt_startupinfo");
diff --git a/libc/calls/g_ntstartupinfo_init.S b/libc/calls/g_ntstartupinfo_init.S
index aae03ba7b..5e248ec27 100644
--- a/libc/calls/g_ntstartupinfo_init.S
+++ b/libc/calls/g_ntstartupinfo_init.S
@@ -19,8 +19,8 @@
 #include "libc/macros.h"
 .source	__FILE__
 
-	.init.start 400,_init_g_ntstartupinfo
-	ezlea	g_ntstartupinfo,cx
+	.init.start 400,_init___nt_startupinfo
+	ezlea	__nt_startupinfo,cx
 	mov	%rsp,%rbp
 	ntcall	__imp_GetStartupInfoW
-	.init.end 400,_init_g_ntstartupinfo,globl,hidden
+	.init.end 400,_init___nt_startupinfo,globl,hidden
diff --git a/libc/calls/g_ntsysteminfo.c b/libc/calls/g_ntsysteminfo.c
index 4b6766b42..50ed77428 100644
--- a/libc/calls/g_ntsysteminfo.c
+++ b/libc/calls/g_ntsysteminfo.c
@@ -20,6 +20,6 @@
 #include "libc/nt/struct/systeminfo.h"
 #include "libc/nt/systeminfo.h"
 
-hidden struct NtSystemInfo g_ntsysteminfo;
+hidden struct NtSystemInfo __nt_systeminfo;
 
-STATIC_YOINK("_init_g_ntsysteminfo");
+STATIC_YOINK("_init___nt_systeminfo");
diff --git a/libc/calls/g_ntsysteminfo_init.S b/libc/calls/g_ntsysteminfo_init.S
index fef43f424..2e7629895 100644
--- a/libc/calls/g_ntsysteminfo_init.S
+++ b/libc/calls/g_ntsysteminfo_init.S
@@ -19,8 +19,8 @@
 #include "libc/macros.h"
 .source	__FILE__
 
-	.init.start 400,_init_g_ntsysteminfo
-	ezlea	g_ntsysteminfo,cx
+	.init.start 400,_init___nt_systeminfo
+	ezlea	__nt_systeminfo,cx
 	mov	%rsp,%rbp
 	ntcall	__imp_GetSystemInfo
-	.init.end 400,_init_g_ntsysteminfo,globl,hidden
+	.init.end 400,_init___nt_systeminfo,globl,hidden
diff --git a/libc/calls/getcwd-nt.c b/libc/calls/getcwd-nt.c
index 5a2fcaa2e..4c4a8550d 100644
--- a/libc/calls/getcwd-nt.c
+++ b/libc/calls/getcwd-nt.c
@@ -22,7 +22,7 @@
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows char *getcwd$nt(char *buf, size_t size) {
+textwindows char *sys_getcwd_nt(char *buf, size_t size) {
   uint16_t name16[PATH_MAX];
   if (GetCurrentDirectory(ARRAYLEN(name16), name16)) {
     tprecode16to8(buf, size, name16);
diff --git a/libc/calls/getcwd-xnu.c b/libc/calls/getcwd-xnu.c
index c0029e65e..4da7837f0 100644
--- a/libc/calls/getcwd-xnu.c
+++ b/libc/calls/getcwd-xnu.c
@@ -27,15 +27,15 @@
 #define XNU_F_GETPATH  50
 #define XNU_MAXPATHLEN 1024
 
-char *getcwd$xnu(char *res, size_t size) {
+char *sys_getcwd_xnu(char *res, size_t size) {
   int fd;
   struct stat st[2];
   char buf[XNU_MAXPATHLEN], *ret = NULL;
-  if ((fd = openat$sysv(AT_FDCWD, ".", O_RDONLY | O_DIRECTORY)) != -1) {
-    if (fstat$sysv(fd, &st[0]) != -1) {
+  if ((fd = sys_openat(AT_FDCWD, ".", O_RDONLY | O_DIRECTORY)) != -1) {
+    if (sys_fstat(fd, &st[0]) != -1) {
       if (st[0].st_dev && st[0].st_ino) {
-        if (fcntl$sysv(fd, XNU_F_GETPATH, buf) != -1) {
-          if (fstatat$sysv(AT_FDCWD, buf, &st[1], 0) != -1) {
+        if (sys_fcntl(fd, XNU_F_GETPATH, buf) != -1) {
+          if (sys_fstatat(AT_FDCWD, buf, &st[1], 0) != -1) {
             if (st[0].st_dev == st[1].st_dev && st[0].st_ino == st[1].st_ino) {
               if (memccpy(res, buf, '\0', size)) {
                 ret = res;
diff --git a/libc/calls/getcwd.c b/libc/calls/getcwd.c
index 43f3c1a1e..17353ebeb 100644
--- a/libc/calls/getcwd.c
+++ b/libc/calls/getcwd.c
@@ -35,13 +35,13 @@ char *(getcwd)(char *buf, size_t size) {
   if (buf && size) buf[0] = '\0';
   if (!IsWindows()) {
     if (IsXnu()) {
-      return getcwd$xnu(buf, size);
-    } else if (getcwd$sysv(buf, size) != (void *)-1) {
+      return sys_getcwd_xnu(buf, size);
+    } else if (sys_getcwd(buf, size) != (void *)-1) {
       return buf;
     } else {
       return NULL;
     }
   } else {
-    return getcwd$nt(buf, size);
+    return sys_getcwd_nt(buf, size);
   }
 }
diff --git a/libc/calls/getitimer.c b/libc/calls/getitimer.c
index ed2524677..3f17e0914 100644
--- a/libc/calls/getitimer.c
+++ b/libc/calls/getitimer.c
@@ -29,8 +29,8 @@
  */
 int getitimer(int which, struct itimerval *curvalue) {
   if (!IsWindows()) {
-    return getitimer$sysv(which, curvalue);
+    return sys_getitimer(which, curvalue);
   } else {
-    return setitimer$nt(which, NULL, curvalue);
+    return sys_setitimer_nt(which, NULL, curvalue);
   }
 }
diff --git a/libc/calls/getpid.c b/libc/calls/getpid.c
index ce9ad3689..bb25e57ab 100644
--- a/libc/calls/getpid.c
+++ b/libc/calls/getpid.c
@@ -28,7 +28,7 @@ static int __pid;
 
 static int __getpid(void) {
   if (!IsWindows()) {
-    return getpid$sysv();
+    return sys_getpid();
   } else {
     return GetCurrentProcessId();
   }
@@ -46,7 +46,7 @@ static void __updatepid(void) {
 int getpid(void) {
   static bool once;
   if (__vforked) {
-    return getpid$sysv();
+    return sys_getpid();
   }
   if (!once) {
     __updatepid();
diff --git a/libc/calls/getppid-nt.c b/libc/calls/getppid-nt.c
index c95cd61eb..b6f7c0d5a 100644
--- a/libc/calls/getppid-nt.c
+++ b/libc/calls/getppid-nt.c
@@ -24,7 +24,7 @@
 #include "libc/nt/runtime.h"
 #include "libc/nt/struct/processbasicinformation.h"
 
-textwindows int getppid$nt(void) {
+textwindows int sys_getppid_nt(void) {
   struct NtProcessBasicInformation ProcessInformation;
   uint32_t gotsize = 0;
   if (!NtError(
diff --git a/libc/calls/getppid.c b/libc/calls/getppid.c
index 5801ec599..1f93a3924 100644
--- a/libc/calls/getppid.c
+++ b/libc/calls/getppid.c
@@ -24,8 +24,8 @@
  */
 int32_t getppid(void) {
   if (!IsWindows()) {
-    return getppid$sysv();
+    return sys_getppid();
   } else {
-    return getppid$nt();
+    return sys_getppid_nt();
   }
 }
diff --git a/libc/calls/getpriority-nt.c b/libc/calls/getpriority-nt.c
index 4132be760..3f89a9401 100644
--- a/libc/calls/getpriority-nt.c
+++ b/libc/calls/getpriority-nt.c
@@ -31,7 +31,7 @@
 #include "libc/sysv/consts/prio.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int getpriority$nt(int ignored) {
+textwindows int sys_getpriority_nt(int ignored) {
   size_t i;
   uint32_t tier, lg2tier, wut;
   if ((tier = GetPriorityClass(GetCurrentProcess())) != 0 &&
diff --git a/libc/calls/getpriority.c b/libc/calls/getpriority.c
index 6ce38a9e5..31a8df634 100644
--- a/libc/calls/getpriority.c
+++ b/libc/calls/getpriority.c
@@ -29,8 +29,8 @@
  */
 int getpriority(int which, unsigned who) {
   if (!IsWindows()) {
-    return getpriority$sysv(which, who) - 20;
+    return sys_getpriority(which, who) - 20;
   } else {
-    return getsetpriority$nt(which, who, 0, getpriority$nt);
+    return sys_getsetpriority_nt(which, who, 0, sys_getpriority_nt);
   }
 }
diff --git a/libc/calls/getrlimit.c b/libc/calls/getrlimit.c
index 6c0c6c11d..fd7685b99 100644
--- a/libc/calls/getrlimit.c
+++ b/libc/calls/getrlimit.c
@@ -31,5 +31,5 @@
  */
 int getrlimit(int resource, struct rlimit *rlim) {
   if (resource == -1) return einval();
-  return getrlimit$sysv(resource, rlim);
+  return sys_getrlimit(resource, rlim);
 }
diff --git a/libc/calls/getrusage-nt.c b/libc/calls/getrusage-nt.c
index bef32e6c9..fe8d22df9 100644
--- a/libc/calls/getrusage-nt.c
+++ b/libc/calls/getrusage-nt.c
@@ -26,7 +26,7 @@
 #include "libc/str/str.h"
 #include "libc/sysv/consts/rusage.h"
 
-textwindows int getrusage$nt(int who, struct rusage *usage) {
+textwindows int sys_getrusage_nt(int who, struct rusage *usage) {
   struct NtFileTime CreationFileTime;
   struct NtFileTime ExitFileTime;
   struct NtFileTime KernelFileTime;
diff --git a/libc/calls/getrusage.c b/libc/calls/getrusage.c
index f15f4ccc2..aa9b63915 100644
--- a/libc/calls/getrusage.c
+++ b/libc/calls/getrusage.c
@@ -30,8 +30,8 @@ int getrusage(int who, struct rusage *usage) {
   if (who == 99) return enosys(); /* @see libc/sysv/consts.sh */
   if (!usage) return efault();
   if (!IsWindows()) {
-    return getrusage$sysv(who, usage);
+    return sys_getrusage(who, usage);
   } else {
-    return getrusage$nt(who, usage);
+    return sys_getrusage_nt(who, usage);
   }
 }
diff --git a/libc/calls/getsetpriority-nt.c b/libc/calls/getsetpriority-nt.c
index a190d6a03..a318aac65 100644
--- a/libc/calls/getsetpriority-nt.c
+++ b/libc/calls/getsetpriority-nt.c
@@ -21,7 +21,7 @@
 #include "libc/sysv/consts/prio.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int getsetpriority$nt(int which, unsigned who, int value,
+textwindows int sys_getsetpriority_nt(int which, unsigned who, int value,
                                   int (*impl)(int)) {
   if (which != PRIO_PROCESS && which != PRIO_PGRP) return einval();
   if (who && abs(who) != getpid() && abs(who) != gettid()) return eopnotsupp();
diff --git a/libc/calls/getsid.c b/libc/calls/getsid.c
index 8cc0123c2..a2f057528 100644
--- a/libc/calls/getsid.c
+++ b/libc/calls/getsid.c
@@ -23,5 +23,5 @@
  * Creates session and sets the process group id.
  */
 uint32_t getsid(int pid) {
-  return getsid$sysv(pid);
+  return sys_getsid(pid);
 }
diff --git a/libc/calls/gettid.c b/libc/calls/gettid.c
index 9ce70c89c..001718807 100644
--- a/libc/calls/gettid.c
+++ b/libc/calls/gettid.c
@@ -28,7 +28,7 @@
 uint32_t gettid(void) {
   uint32_t res;
   if (!IsWindows()) {
-    res = gettid$sysv();
+    res = sys_gettid();
     if (res <= 0) {
       res = getpid();
     }
diff --git a/libc/calls/gettimeofday-nt.c b/libc/calls/gettimeofday-nt.c
index fa246836b..52ca8380e 100644
--- a/libc/calls/gettimeofday-nt.c
+++ b/libc/calls/gettimeofday-nt.c
@@ -25,7 +25,7 @@
 #include "libc/str/str.h"
 #include "libc/time/struct/timezone.h"
 
-int gettimeofday$nt(struct timeval *tv, struct timezone *tz) {
+int sys_gettimeofday_nt(struct timeval *tv, struct timezone *tz) {
   struct NtFileTime ft;
   GetSystemTimeAsFileTime(&ft);
   FileTimeToTimeVal(tv, ft);
diff --git a/libc/calls/gettimeofday-sysv.S b/libc/calls/gettimeofday-sysv.S
index 344938ec7..f713c38f5 100644
--- a/libc/calls/gettimeofday-sysv.S
+++ b/libc/calls/gettimeofday-sysv.S
@@ -26,7 +26,7 @@
 /	@return	always zero
 /	@see	clock_gettime() for nanosecond precision
 /	@see	strftime() for string formatting
-gettimeofday$sysv:
+sys_gettimeofday:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
@@ -36,7 +36,7 @@ gettimeofday$sysv:
 	pop	(%rsi)
 1:	xor	%esi,%esi			# no one zones this way.
 	xor	%edx,%edx			# i64*mach_absolute_time
-	call	__gettimeofday$sysv
+	call	__sys_gettimeofday
 #if SupportsXnu()
 	testb	IsXnu()				# XNU might do %rax:%rdx
 	jz	1f
@@ -50,4 +50,4 @@ gettimeofday$sysv:
 1:	xor	%eax,%eax			# nevar fail
 	pop	%rbp
 	ret
-	.endfn	gettimeofday$sysv,globl,hidden
+	.endfn	sys_gettimeofday,globl,hidden
diff --git a/libc/calls/gettimeofday.c b/libc/calls/gettimeofday.c
index eda652152..457581d83 100644
--- a/libc/calls/gettimeofday.c
+++ b/libc/calls/gettimeofday.c
@@ -33,8 +33,8 @@
  */
 int gettimeofday(struct timeval *tv, struct timezone *tz) {
   if (!IsWindows()) {
-    return gettimeofday$sysv(tv, tz);
+    return sys_gettimeofday(tv, tz);
   } else {
-    return gettimeofday$nt(tv, tz);
+    return sys_gettimeofday_nt(tv, tz);
   }
 }
diff --git a/libc/calls/getuid.c b/libc/calls/getuid.c
index 6a07e5788..3dd15f487 100644
--- a/libc/calls/getuid.c
+++ b/libc/calls/getuid.c
@@ -63,7 +63,7 @@ static uint32_t getuidgid(int at, uint32_t impl(void)) {
  * @asyncsignalsafe
  */
 uint32_t getuid(void) {
-  return getuidgid(AT_UID, getuid$sysv);
+  return getuidgid(AT_UID, sys_getuid);
 }
 
 /**
@@ -76,5 +76,5 @@ uint32_t getuid(void) {
  * @asyncsignalsafe
  */
 uint32_t getgid(void) {
-  return getuidgid(AT_GID, getgid$sysv);
+  return getuidgid(AT_GID, sys_getgid);
 }
diff --git a/libc/calls/internal.h b/libc/calls/internal.h
index da2cf2ded..eb8a59586 100644
--- a/libc/calls/internal.h
+++ b/libc/calls/internal.h
@@ -64,8 +64,8 @@ hidden extern volatile bool __interrupted;
 hidden extern int __vforked;
 hidden extern unsigned __sighandrvas[NSIG];
 hidden extern struct Fds g_fds;
-hidden extern struct NtSystemInfo g_ntsysteminfo;
-hidden extern struct NtStartupInfo g_ntstartupinfo;
+hidden extern struct NtSystemInfo __nt_systeminfo;
+hidden extern struct NtStartupInfo __nt_startupinfo;
 hidden extern const struct NtSecurityAttributes kNtIsInheritable;
 
 int __reservefd(void) hidden;
@@ -99,108 +99,108 @@ forceinline size_t clampio(size_t size) {
 │ cosmopolitan § syscalls » system five » synthetic jump slots             ─╬─│┼
 ╚────────────────────────────────────────────────────────────────────────────│*/
 
-char *getcwd$sysv(char *, u64) hidden;
-char *getcwd$xnu(char *, u64) hidden;
-i32 __dup3$sysv(i32, i32, i32) hidden;
-i32 __execve$sysv(const char *, char *const[], char *const[]) hidden;
-i32 __fstat$sysv(i32, struct stat *) hidden;
-i32 __fstatat$sysv(i32, const char *, struct stat *, i32) hidden;
-i32 __pipe2$sysv(i32[hasatleast 2], u32) hidden;
-i32 __utimensat$sysv(i32, const char *, const struct timespec *, i32) hidden;
-i32 chdir$sysv(const char *) hidden;
-i32 clock_gettime$sysv(i32, struct timespec *) hidden;
-i32 close$sysv(i32) hidden;
-i32 dup$sysv(i32) hidden;
-i32 dup2$sysv(i32, i32) hidden;
-i32 dup3$sysv(i32, i32, i32) hidden;
-i32 execve$sysv(const char *, char *const[], char *const[]) hidden;
-i32 faccessat$sysv(i32, const char *, i32, u32) hidden;
-i32 fadvise$sysv(i32, i64, i64, i32) hidden;
-i32 fallocate$sysv(i64, i32, i64, i64) hidden;
-i32 fchdir$sysv(i32) hidden;
-i32 fchmod$sysv(i32, u32) hidden;
-i32 fchmodat$sysv(i32, const char *, u32, u32) hidden;
-i32 fchown$sysv(i64, u32, u32) hidden;
-i32 fchownat$sysv(i32, const char *, u32, u32, u32) hidden;
-i32 fcntl$sysv(i32, i32, ...) hidden;
-i32 fdatasync$sysv(i32) hidden;
-i32 flock$sysv(i32, i32) hidden;
-i32 fork$sysv(void) hidden;
-i32 fstat$sysv(i32, struct stat *) hidden;
-i32 fstatat$sysv(i32, const char *, struct stat *, i32) hidden;
-i32 fsync$sysv(i32) hidden;
-i32 ftruncate$sysv(i32, i64) hidden;
-i32 futimes$sysv(i32, const struct timeval *) hidden;
-i32 futimesat$sysv(i32, const char *, const struct timeval *) hidden;
+char *sys_getcwd(char *, u64) hidden;
+char *sys_getcwd_xnu(char *, u64) hidden;
+i32 __sys_dup3(i32, i32, i32) hidden;
+i32 __sys_execve(const char *, char *const[], char *const[]) hidden;
+i32 __sys_fstat(i32, struct stat *) hidden;
+i32 __sys_fstatat(i32, const char *, struct stat *, i32) hidden;
+i32 __sys_pipe2(i32[hasatleast 2], u32) hidden;
+i32 __sys_utimensat(i32, const char *, const struct timespec *, i32) hidden;
 i32 getdents(i32, char *, u32, i64 *) hidden;
-i32 getitimer$sysv(i32, struct itimerval *) hidden;
-i32 getppid$sysv(void) hidden;
-i32 getpriority$sysv(i32, u32) hidden;
-i32 getrlimit$sysv(i32, struct rlimit *) hidden;
-i32 getrusage$sysv(i32, struct rusage *) hidden;
-i32 gettimeofday$sysv(struct timeval *, struct timezone *) hidden;
-i32 ioctl$sysv(i32, u64, void *) hidden;
-i32 kill$sysv(i32, i32, i32) hidden;
-i32 linkat$sysv(i32, const char *, i32, const char *, i32) hidden;
-i32 lseek$sysv(i32, i64, i32) hidden;
-i32 lutimes$sysv(const char *, const struct timeval *) hidden;
-i32 madvise$sysv(void *, size_t, i32) hidden;
-i32 memfd_create$sysv(const char *, u32) hidden;
-i32 mkdirat$sysv(i32, const char *, u32) hidden;
-i32 mkfifo$sysv(const char *, u32) hidden;
-i32 mknod$sysv(const char *, u32, u64) hidden;
-i32 mprotect$sysv(void *, u64, i32) hidden;
-i32 msync$sysv(void *, u64, i32) hidden;
-i32 munmap$sysv(void *, u64) hidden;
-i32 nanosleep$sysv(const struct timespec *, struct timespec *) hidden;
-i32 openat$sysv(i32, const char *, i32, ...) hidden;
-i32 pause$sysv(void) hidden;
-i32 pipe$sysv(i32[hasatleast 2]) hidden;
-i32 pipe2$sysv(i32[hasatleast 2], u32) hidden;
-i32 posix_fallocate$sysv(i64, i64, i64) hidden;
-i32 posix_openpt$sysv(i32) hidden;
-i32 renameat$sysv(i32, const char *, i32, const char *) hidden;
-i32 sched_setaffinity$sysv(i32, u64, const void *) hidden;
-i32 sched_yield$sysv(void) hidden;
-i32 setitimer$sysv(i32, const struct itimerval *, struct itimerval *) hidden;
-i32 setpriority$sysv(i32, u32, i32) hidden;
-i32 setresgid$sysv(uint32_t, uint32_t, uint32_t) hidden;
-i32 setresuid$sysv(uint32_t, uint32_t, uint32_t) hidden;
-i32 setrlimit$sysv(i32, const struct rlimit *) hidden;
-i32 setsid$sysv(void) hidden;
-i32 sigaction$sysv(i32, const void *, void *, i64) hidden;
-i32 sigprocmask$sysv(i32, const sigset *, sigset *, u64) hidden;
-i32 sigsuspend$sysv(const sigset *, u64) hidden;
-i32 symlinkat$sysv(const char *, i32, const char *) hidden;
-i32 sync$sysv(void) hidden;
-i32 sync_file_range$sysv(i32, i64, i64, u32) hidden;
-i32 sysinfo$sysv(struct sysinfo *) hidden;
-i32 truncate$sysv(const char *, u64) hidden;
-i32 uname$sysv(char *) hidden;
-i32 unlinkat$sysv(i32, const char *, i32) hidden;
-i32 utime$sysv(const char *, const struct utimbuf *) hidden;
-i32 utimensat$sysv(i32, const char *, const struct timespec *, i32) hidden;
-i32 utimes$sysv(const char *, const struct timeval *) hidden;
-i32 wait4$sysv(i32, i32 *, i32, struct rusage *) hidden;
-i64 copy_file_range$sysv(i32, long *, i32, long *, u64, u32) hidden;
-i64 getrandom$sysv(void *, u64, u32) hidden;
-i64 pread$sysv(i32, void *, u64, i64) hidden;
-i64 preadv$sysv(i32, struct iovec *, i32, i64) hidden;
-i64 ptrace$sysv(int, i32, void *, void *) hidden;
-i64 pwrite$sysv(i32, const void *, u64, i64) hidden;
-i64 pwritev$sysv(i32, const struct iovec *, i32, i64) hidden;
-i64 read$sysv(i32, void *, u64) hidden;
-i64 sendfile$sysv(i32, i32, i64 *, u64) hidden;
-i64 splice$sysv(i32, i64 *, i32, i64 *, u64, u32) hidden;
-i64 vmsplice$sysv(i32, const struct iovec *, i64, u32) hidden;
-i64 write$sysv(i32, const void *, u64) hidden;
-u32 getgid$sysv(void) hidden;
-u32 getpid$sysv(void) hidden;
-u32 getsid$sysv(int) hidden;
-u32 gettid$sysv(void) hidden;
-u32 getuid$sysv(void) hidden;
-void *mmap$sysv(void *, u64, u32, u32, i64, i64) hidden;
-void *mremap$sysv(void *, u64, u64, i32, void *) hidden;
+i32 sys_chdir(const char *) hidden;
+i32 sys_clock_gettime(i32, struct timespec *) hidden;
+i32 sys_close(i32) hidden;
+i32 sys_dup(i32) hidden;
+i32 sys_dup2(i32, i32) hidden;
+i32 sys_dup3(i32, i32, i32) hidden;
+i32 sys_execve(const char *, char *const[], char *const[]) hidden;
+i32 sys_faccessat(i32, const char *, i32, u32) hidden;
+i32 sys_fadvise(i32, i64, i64, i32) hidden;
+i32 sys_fallocate(i64, i32, i64, i64) hidden;
+i32 sys_fchdir(i32) hidden;
+i32 sys_fchmod(i32, u32) hidden;
+i32 sys_fchmodat(i32, const char *, u32, u32) hidden;
+i32 sys_fchown(i64, u32, u32) hidden;
+i32 sys_fchownat(i32, const char *, u32, u32, u32) hidden;
+i32 sys_fcntl(i32, i32, ...) hidden;
+i32 sys_fdatasync(i32) hidden;
+i32 sys_flock(i32, i32) hidden;
+i32 sys_fork(void) hidden;
+i32 sys_fstat(i32, struct stat *) hidden;
+i32 sys_fstatat(i32, const char *, struct stat *, i32) hidden;
+i32 sys_fsync(i32) hidden;
+i32 sys_ftruncate(i32, i64) hidden;
+i32 sys_futimes(i32, const struct timeval *) hidden;
+i32 sys_futimesat(i32, const char *, const struct timeval *) hidden;
+i32 sys_getitimer(i32, struct itimerval *) hidden;
+i32 sys_getppid(void) hidden;
+i32 sys_getpriority(i32, u32) hidden;
+i32 sys_getrlimit(i32, struct rlimit *) hidden;
+i32 sys_getrusage(i32, struct rusage *) hidden;
+i32 sys_gettimeofday(struct timeval *, struct timezone *) hidden;
+i32 sys_ioctl(i32, u64, void *) hidden;
+i32 sys_kill(i32, i32, i32) hidden;
+i32 sys_linkat(i32, const char *, i32, const char *, i32) hidden;
+i32 sys_lseek(i32, i64, i32) hidden;
+i32 sys_lutimes(const char *, const struct timeval *) hidden;
+i32 sys_madvise(void *, size_t, i32) hidden;
+i32 sys_memfd_create(const char *, u32) hidden;
+i32 sys_mkdirat(i32, const char *, u32) hidden;
+i32 sys_mkfifo(const char *, u32) hidden;
+i32 sys_mknod(const char *, u32, u64) hidden;
+i32 sys_mprotect(void *, u64, i32) hidden;
+i32 sys_msync(void *, u64, i32) hidden;
+i32 sys_munmap(void *, u64) hidden;
+i32 sys_nanosleep(const struct timespec *, struct timespec *) hidden;
+i32 sys_openat(i32, const char *, i32, ...) hidden;
+i32 sys_pause(void) hidden;
+i32 sys_pipe(i32[hasatleast 2]) hidden;
+i32 sys_pipe2(i32[hasatleast 2], u32) hidden;
+i32 sys_posix_fallocate(i64, i64, i64) hidden;
+i32 sys_posix_openpt(i32) hidden;
+i32 sys_renameat(i32, const char *, i32, const char *) hidden;
+i32 sys_sched_setaffinity(i32, u64, const void *) hidden;
+i32 sys_sched_yield(void) hidden;
+i32 sys_setitimer(i32, const struct itimerval *, struct itimerval *) hidden;
+i32 sys_setpriority(i32, u32, i32) hidden;
+i32 sys_setresgid(uint32_t, uint32_t, uint32_t) hidden;
+i32 sys_setresuid(uint32_t, uint32_t, uint32_t) hidden;
+i32 sys_setrlimit(i32, const struct rlimit *) hidden;
+i32 sys_setsid(void) hidden;
+i32 sys_sigaction(i32, const void *, void *, i64) hidden;
+i32 sys_sigprocmask(i32, const sigset *, sigset *, u64) hidden;
+i32 sys_sigsuspend(const sigset *, u64) hidden;
+i32 sys_symlinkat(const char *, i32, const char *) hidden;
+i32 sys_sync(void) hidden;
+i32 sys_sync_file_range(i32, i64, i64, u32) hidden;
+i32 sys_sysinfo(struct sysinfo *) hidden;
+i32 sys_truncate(const char *, u64) hidden;
+i32 sys_uname(char *) hidden;
+i32 sys_unlinkat(i32, const char *, i32) hidden;
+i32 sys_utime(const char *, const struct utimbuf *) hidden;
+i32 sys_utimensat(i32, const char *, const struct timespec *, i32) hidden;
+i32 sys_utimes(const char *, const struct timeval *) hidden;
+i32 sys_wait4(i32, i32 *, i32, struct rusage *) hidden;
+i64 sys_copy_file_range(i32, long *, i32, long *, u64, u32) hidden;
+i64 sys_getrandom(void *, u64, u32) hidden;
+i64 sys_pread(i32, void *, u64, i64) hidden;
+i64 sys_preadv(i32, struct iovec *, i32, i64) hidden;
+i64 sys_ptrace(int, i32, void *, void *) hidden;
+i64 sys_pwrite(i32, const void *, u64, i64) hidden;
+i64 sys_pwritev(i32, const struct iovec *, i32, i64) hidden;
+i64 sys_read(i32, void *, u64) hidden;
+i64 sys_sendfile(i32, i32, i64 *, u64) hidden;
+i64 sys_splice(i32, i64 *, i32, i64 *, u64, u32) hidden;
+i64 sys_vmsplice(i32, const struct iovec *, i64, u32) hidden;
+i64 sys_write(i32, const void *, u64) hidden;
+u32 sys_getgid(void) hidden;
+u32 sys_getpid(void) hidden;
+u32 sys_getsid(int) hidden;
+u32 sys_gettid(void) hidden;
+u32 sys_getuid(void) hidden;
+void *sys_mmap(void *, u64, u32, u32, i64, i64) hidden;
+void *sys_mremap(void *, u64, u64, i32, void *) hidden;
 
 /*───────────────────────────────────────────────────────────────────────────│─╗
 │ cosmopolitan § syscalls » system five » support                          ─╬─│┼
@@ -208,64 +208,62 @@ void *mremap$sysv(void *, u64, u64, i32, void *) hidden;
 
 void __onfork(void) hidden;
 bool32 __sigenter(i32, struct siginfo *, struct ucontext *) hidden;
-i32 fixupnewfd$sysv(i32, i32) hidden;
-i32 tunefd$sysv(i32, i32, i32, i32) hidden;
-u32 fprot2nt(i32, i32) hidden;
-u32 prot2nt(i32, i32) privileged;
+i32 __fixupnewfd(i32, i32) hidden;
+u32 __prot2nt(i32, i32) privileged;
 void __restore_rt() hidden;
-void __sigenter$xnu(void *, i32, i32, void *, void *) hidden wontreturn;
-int utimensat$xnu(int, const char *, const struct timespec *, int) hidden;
-int nanosleep$xnu(const struct timespec *, struct timespec *) hidden;
-void stat2linux(void *) hidden;
-void xnutrampoline(void *, i32, i32, const struct __darwin_siginfo *,
-                   const struct __darwin_ucontext *) hidden wontreturn;
+void __sigenter_xnu(void *, i32, i32, void *, void *) hidden wontreturn;
+int sys_utimensat_xnu(int, const char *, const struct timespec *, int) hidden;
+int sys_nanosleep_xnu(const struct timespec *, struct timespec *) hidden;
+void __stat2linux(void *) hidden;
+void __xnutrampoline(void *, i32, i32, const struct __darwin_siginfo *,
+                     const struct __darwin_ucontext *) hidden wontreturn;
 
 /*───────────────────────────────────────────────────────────────────────────│─╗
 │ cosmopolitan § syscalls » windows nt » veneers                           ─╬─│┼
 ╚────────────────────────────────────────────────────────────────────────────│*/
 
-bool32 isatty$nt(int) hidden;
-char *getcwd$nt(char *, size_t) hidden;
-i64 lseek$nt(int, i64, int) hidden;
-int chdir$nt(const char *) hidden;
-int close$nt(int) hidden;
-int dup$nt(int, int, int) hidden;
-int execve$nt(const char *, char *const[], char *const[]) hidden;
-int faccessat$nt(int, const char *, int, uint32_t) hidden;
-int fadvise$nt(int, u64, u64, int) hidden;
-int fchdir$nt(int) hidden;
-int fcntl$nt(int, int, unsigned) hidden;
-int fdatasync$nt(int) hidden;
-int flock$nt(int, int) hidden;
-int fork$nt(void) hidden;
-int fstat$nt(i64, struct stat *) hidden;
-int fstatat$nt(int, const char *, struct stat *, uint32_t) hidden;
-int ftruncate$nt(int, u64) hidden;
-int getppid$nt(void) hidden;
-int getpriority$nt(int) hidden;
-int getrusage$nt(int, struct rusage *) hidden;
-int gettimeofday$nt(struct timeval *, struct timezone *) hidden;
-int kill$nt(int, int) hidden;
-int link$nt(const char *, const char *) hidden;
-int lstat$nt(const char *, struct stat *) hidden;
-int madvise$nt(void *, size_t, int) hidden;
-int mkdirat$nt(int, const char *, uint32_t) hidden;
-int msync$nt(void *, size_t, int) hidden;
-int nanosleep$nt(const struct timespec *, struct timespec *) hidden;
-int pipe$nt(int[hasatleast 2], unsigned) hidden;
-int renameat$nt(int, const char *, int, const char *) hidden;
-int sched_yield$nt(void) hidden;
-int setitimer$nt(int, const struct itimerval *, struct itimerval *) hidden;
-int setpriority$nt(int) hidden;
-int symlinkat$nt(const char *, int, const char *) hidden;
-int sync$nt(void) hidden;
-int sysinfo$nt(struct sysinfo *) hidden;
-int truncate$nt(const char *, u64) hidden;
-int unlinkat$nt(int, const char *, int) hidden;
-int utimensat$nt(int, const char *, const struct timespec *, int) hidden;
-ssize_t open$nt(int, const char *, u32, i32) nodiscard hidden;
-ssize_t read$nt(struct Fd *, const struct iovec *, size_t, ssize_t) hidden;
-ssize_t write$nt(struct Fd *, const struct iovec *, size_t, ssize_t) hidden;
+bool32 sys_isatty_nt(int) hidden;
+char *sys_getcwd_nt(char *, size_t) hidden;
+i64 sys_lseek_nt(int, i64, int) hidden;
+int sys_chdir_nt(const char *) hidden;
+int sys_close_nt(int) hidden;
+int sys_dup_nt(int, int, int) hidden;
+int sys_execve_nt(const char *, char *const[], char *const[]) hidden;
+int sys_faccessat_nt(int, const char *, int, uint32_t) hidden;
+int sys_fadvise_nt(int, u64, u64, int) hidden;
+int sys_fchdir_nt(int) hidden;
+int sys_fcntl_nt(int, int, unsigned) hidden;
+int sys_fdatasync_nt(int) hidden;
+int sys_flock_nt(int, int) hidden;
+int sys_fork_nt(void) hidden;
+int sys_fstat_nt(i64, struct stat *) hidden;
+int sys_fstatat_nt(int, const char *, struct stat *, uint32_t) hidden;
+int sys_ftruncate_nt(int, u64) hidden;
+int sys_getppid_nt(void) hidden;
+int sys_getpriority_nt(int) hidden;
+int sys_getrusage_nt(int, struct rusage *) hidden;
+int sys_gettimeofday_nt(struct timeval *, struct timezone *) hidden;
+int sys_kill_nt(int, int) hidden;
+int sys_link_nt(const char *, const char *) hidden;
+int sys_lstat_nt(const char *, struct stat *) hidden;
+int sys_madvise_nt(void *, size_t, int) hidden;
+int sys_mkdirat_nt(int, const char *, uint32_t) hidden;
+int sys_msync_nt(void *, size_t, int) hidden;
+int sys_nanosleep_nt(const struct timespec *, struct timespec *) hidden;
+int sys_pipe_nt(int[hasatleast 2], unsigned) hidden;
+int sys_renameat_nt(int, const char *, int, const char *) hidden;
+int sys_sched_yield_nt(void) hidden;
+int sys_setitimer_nt(int, const struct itimerval *, struct itimerval *) hidden;
+int sys_setpriority_nt(int) hidden;
+int sys_symlinkat_nt(const char *, int, const char *) hidden;
+int sys_sync_nt(void) hidden;
+int sys_sysinfo_nt(struct sysinfo *) hidden;
+int sys_truncate_nt(const char *, u64) hidden;
+int sys_unlinkat_nt(int, const char *, int) hidden;
+int sys_utimensat_nt(int, const char *, const struct timespec *, int) hidden;
+ssize_t sys_open_nt(int, const char *, u32, i32) nodiscard hidden;
+ssize_t sys_read_nt(struct Fd *, const struct iovec *, size_t, ssize_t) hidden;
+ssize_t sys_write_nt(struct Fd *, const struct iovec *, size_t, ssize_t) hidden;
 
 /*───────────────────────────────────────────────────────────────────────────│─╗
 │ cosmopolitan § syscalls » windows nt » support                           ─╬─│┼
@@ -274,7 +272,7 @@ ssize_t write$nt(struct Fd *, const struct iovec *, size_t, ssize_t) hidden;
 int64_t ntreturn(uint32_t);
 void WinMainForked(void) hidden;
 void *GetProcAddressModule(const char *, const char *) hidden;
-int getsetpriority$nt(int, unsigned, int, int (*)(int));
+int sys_getsetpriority_nt(int, unsigned, int, int (*)(int));
 void ntcontext2linux(struct ucontext *, const struct NtContext *) hidden;
 struct NtOverlapped *offset2overlap(int64_t, struct NtOverlapped *) hidden;
 bool32 ntsetprivilege(i64, const char16_t *, u32) hidden;
@@ -284,7 +282,7 @@ int64_t __winerr(void) nocallback privileged;
 int __mkntpath(const char *, char16_t[hasatleast PATH_MAX - 16]) hidden;
 int __mkntpath2(const char *, char16_t[hasatleast PATH_MAX - 16], int) hidden;
 int __mkntpathat(int, const char *, int, char16_t[PATH_MAX]) hidden;
-unsigned __wincrash$nt(struct NtExceptionPointers *);
+unsigned __wincrash_nt(struct NtExceptionPointers *);
 
 /*───────────────────────────────────────────────────────────────────────────│─╗
 │ cosmopolitan § syscalls » metal                                          ─╬─│┼
diff --git a/libc/calls/ioctl-default.c b/libc/calls/ioctl-default.c
index 5079cad06..9cb782aac 100644
--- a/libc/calls/ioctl-default.c
+++ b/libc/calls/ioctl-default.c
@@ -27,11 +27,11 @@ int ioctl$default(int fd, uint64_t request, void *memory) {
   int rc;
   int64_t handle;
   if (!IsWindows()) {
-    return ioctl$sysv(fd, request, memory);
+    return sys_ioctl(fd, request, memory);
   } else if (__isfdopen(fd)) {
     if (g_fds.p[fd].kind == kFdSocket) {
       handle = g_fds.p[fd].handle;
-      if ((rc = weaken(__ioctlsocket$nt)(handle, request, memory)) != -1) {
+      if ((rc = weaken(__sys_ioctlsocket_nt)(handle, request, memory)) != -1) {
         return rc;
       } else {
         return weaken(__winsockerr)();
diff --git a/libc/calls/ioctl-tcgets-nt.c b/libc/calls/ioctl-tcgets-nt.c
index 7bf6f4aa4..7c5828542 100644
--- a/libc/calls/ioctl-tcgets-nt.c
+++ b/libc/calls/ioctl-tcgets-nt.c
@@ -27,7 +27,7 @@
 #include "libc/sysv/consts/termios.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int ioctl$tcgets$nt(int ignored, struct termios *tio) {
+textwindows int ioctl$sys_tcgets_nt(int ignored, struct termios *tio) {
   int64_t in, out;
   bool32 inok, outok;
   uint32_t inmode, outmode;
diff --git a/libc/calls/ioctl-tcgets.c b/libc/calls/ioctl-tcgets.c
index 705cbe70c..1a168fed4 100644
--- a/libc/calls/ioctl-tcgets.c
+++ b/libc/calls/ioctl-tcgets.c
@@ -21,12 +21,12 @@
 #include "libc/calls/termios.internal.h"
 #include "libc/sysv/consts/termios.h"
 
-int ioctl$tcgets$nt(int, struct termios *);
+int ioctl$sys_tcgets_nt(int, struct termios *);
 
-static int ioctl$tcgets$sysv(int fd, struct termios *tio) {
+static int ioctl$sys_tcgets(int fd, struct termios *tio) {
   int rc;
   union metatermios t;
-  if ((rc = ioctl$sysv(fd, TCGETS, &t)) != -1) {
+  if ((rc = sys_ioctl(fd, TCGETS, &t)) != -1) {
     termios2linux(tio, &t);
   }
   return rc;
@@ -41,8 +41,8 @@ static int ioctl$tcgets$sysv(int fd, struct termios *tio) {
  */
 int ioctl$tcgets(int fd, struct termios *tio) {
   if (!IsWindows()) {
-    return ioctl$tcgets$sysv(fd, tio);
+    return ioctl$sys_tcgets(fd, tio);
   } else {
-    return ioctl$tcgets$nt(fd, tio);
+    return ioctl$sys_tcgets_nt(fd, tio);
   }
 }
diff --git a/libc/calls/ioctl-tcsets-nt.c b/libc/calls/ioctl-tcsets-nt.c
index abe4052c0..51bccad9d 100644
--- a/libc/calls/ioctl-tcsets-nt.c
+++ b/libc/calls/ioctl-tcsets-nt.c
@@ -26,7 +26,7 @@
 #include "libc/sysv/consts/termios.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int ioctl$tcsets$nt(int ignored, uint64_t request,
+textwindows int ioctl$sys_tcsets_nt(int ignored, uint64_t request,
                                 const struct termios *tio) {
   int64_t in, out;
   bool32 inok, outok;
diff --git a/libc/calls/ioctl-tcsets.c b/libc/calls/ioctl-tcsets.c
index 4f293a420..ff347efa7 100644
--- a/libc/calls/ioctl-tcsets.c
+++ b/libc/calls/ioctl-tcsets.c
@@ -22,12 +22,12 @@
 #include "libc/dce.h"
 #include "libc/sysv/consts/termios.h"
 
-int ioctl$tcsets$nt(int, uint64_t, const struct termios *);
+int ioctl$sys_tcsets_nt(int, uint64_t, const struct termios *);
 
-static int ioctl$tcsets$sysv(int fd, uint64_t request,
+static int ioctl$sys_tcsets(int fd, uint64_t request,
                              const struct termios *tio) {
   union metatermios t;
-  return ioctl$sysv(fd, request, termios2host(&t, tio));
+  return sys_ioctl(fd, request, termios2host(&t, tio));
 }
 
 /**
@@ -39,8 +39,8 @@ static int ioctl$tcsets$sysv(int fd, uint64_t request,
  */
 int ioctl$tcsets(int fd, uint64_t request, const struct termios *tio) {
   if (!IsWindows()) {
-    return ioctl$tcsets$sysv(fd, request, tio);
+    return ioctl$sys_tcsets(fd, request, tio);
   } else {
-    return ioctl$tcsets$nt(fd, request, tio);
+    return ioctl$sys_tcsets_nt(fd, request, tio);
   }
 }
diff --git a/libc/calls/ioctl-tiocgwinsz-nt.c b/libc/calls/ioctl-tiocgwinsz-nt.c
index ce45c4197..fab5c541b 100644
--- a/libc/calls/ioctl-tiocgwinsz-nt.c
+++ b/libc/calls/ioctl-tiocgwinsz-nt.c
@@ -26,7 +26,7 @@
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int ioctl$tiocgwinsz$nt(int fd, struct winsize *ws) {
+textwindows int ioctl$sys_tiocgwinsz_nt(int fd, struct winsize *ws) {
   int i, fds[3];
   uint32_t mode;
   struct NtConsoleScreenBufferInfoEx sbinfo;
@@ -42,9 +42,9 @@ textwindows int ioctl$tiocgwinsz$nt(int fd, struct winsize *ws) {
           ws->ws_xpixel = 0;
           ws->ws_ypixel = 0;
           return 0;
-        } else if (g_ntstartupinfo.dwFlags & kNtStartfUsecountchars) {
-          ws->ws_col = g_ntstartupinfo.dwXCountChars;
-          ws->ws_row = g_ntstartupinfo.dwYCountChars;
+        } else if (__nt_startupinfo.dwFlags & kNtStartfUsecountchars) {
+          ws->ws_col = __nt_startupinfo.dwXCountChars;
+          ws->ws_row = __nt_startupinfo.dwYCountChars;
           ws->ws_xpixel = 0;
           ws->ws_ypixel = 0;
           return 0;
diff --git a/libc/calls/ioctl-tiocgwinsz.c b/libc/calls/ioctl-tiocgwinsz.c
index 671f68084..f76204df9 100644
--- a/libc/calls/ioctl-tiocgwinsz.c
+++ b/libc/calls/ioctl-tiocgwinsz.c
@@ -21,7 +21,7 @@
 #include "libc/dce.h"
 #include "libc/sysv/consts/termios.h"
 
-int ioctl$tiocgwinsz$nt(int, struct winsize *);
+int ioctl$sys_tiocgwinsz_nt(int, struct winsize *);
 
 /**
  * Returns width and height of terminal.
@@ -30,8 +30,8 @@ int ioctl$tiocgwinsz$nt(int, struct winsize *);
  */
 int ioctl$tiocgwinsz(int fd, struct winsize *ws) {
   if (!IsWindows()) {
-    return ioctl$sysv(fd, TIOCGWINSZ, ws);
+    return sys_ioctl(fd, TIOCGWINSZ, ws);
   } else {
-    return ioctl$tiocgwinsz$nt(fd, ws);
+    return ioctl$sys_tiocgwinsz_nt(fd, ws);
   }
 }
diff --git a/libc/calls/ioctl-tiocswinsz-nt.c b/libc/calls/ioctl-tiocswinsz-nt.c
index 93d3321aa..0d7a87957 100644
--- a/libc/calls/ioctl-tiocswinsz-nt.c
+++ b/libc/calls/ioctl-tiocswinsz-nt.c
@@ -24,7 +24,7 @@
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int ioctl$tiocswinsz$nt(int fd, const struct winsize *ws) {
+textwindows int ioctl$sys_tiocswinsz_nt(int fd, const struct winsize *ws) {
   uint32_t mode;
   struct NtCoord coord;
   if (!ws) return efault();
diff --git a/libc/calls/ioctl-tiocswinsz.c b/libc/calls/ioctl-tiocswinsz.c
index bd77aba25..922a1cfd7 100644
--- a/libc/calls/ioctl-tiocswinsz.c
+++ b/libc/calls/ioctl-tiocswinsz.c
@@ -21,7 +21,7 @@
 #include "libc/dce.h"
 #include "libc/sysv/consts/termios.h"
 
-int ioctl$tiocswinsz$nt(int, const struct winsize *);
+int ioctl$sys_tiocswinsz_nt(int, const struct winsize *);
 
 /**
  * Returns width and height of terminal.
@@ -30,8 +30,8 @@ int ioctl$tiocswinsz$nt(int, const struct winsize *);
  */
 int ioctl$tiocswinsz(int fd, const struct winsize *ws) {
   if (!IsWindows()) {
-    return ioctl$sysv(fd, TIOCSWINSZ, ws);
+    return sys_ioctl(fd, TIOCSWINSZ, ws);
   } else {
-    return ioctl$tiocswinsz$nt(fd, ws);
+    return ioctl$sys_tiocswinsz_nt(fd, ws);
   }
 }
diff --git a/libc/calls/ioctl.h b/libc/calls/ioctl.h
index fb6a7f938..d04132a04 100644
--- a/libc/calls/ioctl.h
+++ b/libc/calls/ioctl.h
@@ -29,13 +29,13 @@ int ioctl(int, uint64_t, void *);
   } while (0)
 
 int ioctl$tcgets(int, void *);
-int ioctl$tcgets$nt(int, void *);
+int ioctl$sys_tcgets_nt(int, void *);
 int ioctl$tcsets(int, uint64_t, void *);
-int ioctl$tcsets$nt(int, uint64_t, void *);
+int ioctl$sys_tcsets_nt(int, uint64_t, void *);
 int ioctl$tiocgwinsz(int, void *);
-int ioctl$tiocgwinsz$nt(int, void *);
+int ioctl$sys_tiocgwinsz_nt(int, void *);
 int ioctl$tiocswinsz(int, void *);
-int ioctl$tiocswinsz$nt(int, void *);
+int ioctl$sys_tiocswinsz_nt(int, void *);
 int ioctl$default(int, uint64_t, void *);
 
 forceinline int ioctl$dispatch(int fd, uint64_t request, void *memory) {
diff --git a/libc/calls/isatty-nt.c b/libc/calls/isatty-nt.c
index d4d367d5d..d6e3726aa 100644
--- a/libc/calls/isatty-nt.c
+++ b/libc/calls/isatty-nt.c
@@ -21,7 +21,7 @@
 #include "libc/nt/files.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows bool32 isatty$nt(int fd) {
+textwindows bool32 sys_isatty_nt(int fd) {
   if (!__isfdkind(fd, kFdFile)) return ebadf();
   return GetFileType(g_fds.p[fd].handle) == kNtFileTypeChar;
 }
diff --git a/libc/calls/isatty.c b/libc/calls/isatty.c
index ae607fda6..3d7b6aeec 100644
--- a/libc/calls/isatty.c
+++ b/libc/calls/isatty.c
@@ -28,8 +28,8 @@
 bool32 isatty(int fd) {
   _Alignas(short) char buf[sizeof(uint16_t) * 4];
   if (!IsWindows()) {
-    return ioctl$sysv(fd, TIOCGWINSZ, &buf) != -1;
+    return sys_ioctl(fd, TIOCGWINSZ, &buf) != -1;
   } else {
-    return isatty$nt(fd);
+    return sys_isatty_nt(fd);
   }
 }
diff --git a/libc/calls/isdebuggerpresent.c b/libc/calls/isdebuggerpresent.c
index 844d128b1..d4096575e 100644
--- a/libc/calls/isdebuggerpresent.c
+++ b/libc/calls/isdebuggerpresent.c
@@ -54,12 +54,12 @@ int IsDebuggerPresent(bool force) {
   if (IsWindows()) {
     res = NtBeingDebugged();
   } else if (IsLinux()) {
-    if ((fd = openat$sysv(AT_FDCWD, kProcStatus, O_RDONLY, 0)) != -1) {
-      if ((got = read$sysv(fd, buf, sizeof(buf) - sizeof(kPid))) != -1) {
+    if ((fd = sys_openat(AT_FDCWD, kProcStatus, O_RDONLY, 0)) != -1) {
+      if ((got = sys_read(fd, buf, sizeof(buf) - sizeof(kPid))) != -1) {
         buf[got] = '\0';
         res = atoi(firstnonnull(strstr(buf, kPid), kPid) + strlen(kPid));
       }
-      close$sysv(fd);
+      sys_close(fd);
     }
   }
   return res;
diff --git a/libc/calls/kill-nt.c b/libc/calls/kill-nt.c
index d09f908cb..077d97479 100644
--- a/libc/calls/kill-nt.c
+++ b/libc/calls/kill-nt.c
@@ -24,7 +24,7 @@
 #include "libc/nt/process.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int kill$nt(int pid, int sig) {
+textwindows int sys_kill_nt(int pid, int sig) {
   int target;
   uint32_t event;
   if (!pid) return raise(sig);
diff --git a/libc/calls/kill.c b/libc/calls/kill.c
index 60fbd1627..f72bab6e4 100644
--- a/libc/calls/kill.c
+++ b/libc/calls/kill.c
@@ -39,8 +39,8 @@
  */
 int kill(int pid, int sig) {
   if (!IsWindows()) {
-    return kill$sysv(pid, sig, 1);
+    return sys_kill(pid, sig, 1);
   } else {
-    return kill$nt(pid, sig);
+    return sys_kill_nt(pid, sig);
   }
 }
diff --git a/libc/calls/lchown.c b/libc/calls/lchown.c
index 61a98b82e..ed5ff5f33 100644
--- a/libc/calls/lchown.c
+++ b/libc/calls/lchown.c
@@ -31,5 +31,5 @@
  * @see /etc/group for group ids
  */
 int lchown(const char *pathname, uint32_t uid, uint32_t gid) {
-  return fchownat$sysv(AT_FDCWD, pathname, uid, gid, AT_SYMLINK_NOFOLLOW);
+  return sys_fchownat(AT_FDCWD, pathname, uid, gid, AT_SYMLINK_NOFOLLOW);
 }
diff --git a/libc/calls/link-nt.c b/libc/calls/link-nt.c
index e359ac53a..a1f2000c1 100644
--- a/libc/calls/link-nt.c
+++ b/libc/calls/link-nt.c
@@ -21,7 +21,7 @@
 #include "libc/nt/files.h"
 #include "libc/nt/runtime.h"
 
-textwindows int link$nt(const char *existingpath, const char *newpath) {
+textwindows int sys_link_nt(const char *existingpath, const char *newpath) {
   char16_t newpath16[PATH_MAX];
   char16_t existingpath16[PATH_MAX];
   if (__mkntpath(existingpath, existingpath16) != -1 &&
diff --git a/libc/calls/link.c b/libc/calls/link.c
index 9634308f4..69a975c12 100644
--- a/libc/calls/link.c
+++ b/libc/calls/link.c
@@ -34,8 +34,8 @@
 int link(const char *existingpath, const char *newpath) {
   if (!existingpath || !newpath) return efault();
   if (!IsWindows()) {
-    return linkat$sysv(AT_FDCWD, existingpath, AT_FDCWD, newpath, 0);
+    return sys_linkat(AT_FDCWD, existingpath, AT_FDCWD, newpath, 0);
   } else {
-    return link$nt(existingpath, newpath);
+    return sys_link_nt(existingpath, newpath);
   }
 }
diff --git a/libc/calls/lseek-nt.c b/libc/calls/lseek-nt.c
index 5ce0e9f14..dc1954787 100644
--- a/libc/calls/lseek-nt.c
+++ b/libc/calls/lseek-nt.c
@@ -20,7 +20,7 @@
 #include "libc/nt/files.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int64_t lseek$nt(int fd, int64_t offset, int whence) {
+textwindows int64_t sys_lseek_nt(int fd, int64_t offset, int whence) {
   int64_t res;
   if (!__isfdkind(fd, kFdFile)) return ebadf();
   if (SetFilePointerEx(g_fds.p[fd].handle, offset, &res, whence)) {
diff --git a/libc/calls/lseek.c b/libc/calls/lseek.c
index f9eab0efe..d63daec35 100644
--- a/libc/calls/lseek.c
+++ b/libc/calls/lseek.c
@@ -31,8 +31,8 @@
  */
 int64_t lseek(int fd, int64_t offset, int whence) {
   if (!IsWindows()) {
-    return lseek$sysv(fd, offset, whence);
+    return sys_lseek(fd, offset, whence);
   } else {
-    return lseek$nt(fd, offset, whence);
+    return sys_lseek_nt(fd, offset, whence);
   }
 }
diff --git a/libc/calls/madvise-nt.c b/libc/calls/madvise-nt.c
index 780e57b8c..a1c1aef0b 100644
--- a/libc/calls/madvise-nt.c
+++ b/libc/calls/madvise-nt.c
@@ -47,7 +47,7 @@ forceinline typeof(OfferVirtualMemory) *GetOfferVirtualMemory(void) {
   return OfferVirtualMemory_;
 }
 
-textwindows int madvise$nt(void *addr, size_t length, int advice) {
+textwindows int sys_madvise_nt(void *addr, size_t length, int advice) {
   uint32_t rangecount;
   struct NtMemoryRangeEntry ranges[1];
   if ((advice & (int)MADV_WILLNEED) == (int)MADV_WILLNEED ||
diff --git a/libc/calls/madvise.c b/libc/calls/madvise.c
index 1bf6fdcdf..3825d063d 100644
--- a/libc/calls/madvise.c
+++ b/libc/calls/madvise.c
@@ -30,8 +30,8 @@
  */
 int madvise(void *addr, size_t length, int advice) {
   if (!IsWindows()) {
-    return madvise$sysv(addr, length, advice);
+    return sys_madvise(addr, length, advice);
   } else {
-    return madvise$nt(addr, length, advice);
+    return sys_madvise_nt(addr, length, advice);
   }
 }
diff --git a/libc/calls/mkdirat-nt.c b/libc/calls/mkdirat-nt.c
index 03b25ffbb..c269daa4d 100644
--- a/libc/calls/mkdirat-nt.c
+++ b/libc/calls/mkdirat-nt.c
@@ -36,7 +36,7 @@ static textwindows bool SubpathExistsThatsNotDirectory(char16_t *path) {
   return false;
 }
 
-textwindows int mkdirat$nt(int dirfd, const char *path, uint32_t mode) {
+textwindows int sys_mkdirat_nt(int dirfd, const char *path, uint32_t mode) {
   int e;
   char16_t *p, path16[PATH_MAX];
   if (__mkntpathat(dirfd, path, 0, path16) == -1) return -1;
diff --git a/libc/calls/mkdirat.c b/libc/calls/mkdirat.c
index 403495c08..9e3623cf5 100644
--- a/libc/calls/mkdirat.c
+++ b/libc/calls/mkdirat.c
@@ -35,8 +35,8 @@
  */
 int mkdirat(int dirfd, const char *path, unsigned mode) {
   if (!IsWindows()) {
-    return mkdirat$sysv(dirfd, path, mode);
+    return sys_mkdirat(dirfd, path, mode);
   } else {
-    return mkdirat$nt(dirfd, path, mode);
+    return sys_mkdirat_nt(dirfd, path, mode);
   }
 }
diff --git a/libc/calls/mkfifo.c b/libc/calls/mkfifo.c
index fe4b8782f..ae37d9398 100644
--- a/libc/calls/mkfifo.c
+++ b/libc/calls/mkfifo.c
@@ -34,8 +34,8 @@
 int mkfifo(const char *pathname, unsigned mode) {
   /* TODO(jart): Windows? */
   if (IsLinux()) {
-    return mknod$sysv(pathname, mode | S_IFIFO, 0);
+    return sys_mknod(pathname, mode | S_IFIFO, 0);
   } else {
-    return mkfifo$sysv(pathname, mode);
+    return sys_mkfifo(pathname, mode);
   }
 }
diff --git a/libc/calls/mknod.c b/libc/calls/mknod.c
index b32de29ee..c84803674 100644
--- a/libc/calls/mknod.c
+++ b/libc/calls/mknod.c
@@ -42,7 +42,7 @@ int mknod(const char *path, uint32_t mode, uint64_t dev) {
   if (mode & S_IFIFO) return mkfifo(path, mode & ~S_IFIFO);
   if (!IsWindows()) {
     /* TODO(jart): Whys there code out there w/ S_xxx passed via dev? */
-    return mknod$sysv(path, mode, dev);
+    return sys_mknod(path, mode, dev);
   } else {
     return enosys();
   }
diff --git a/libc/calls/mprotect.greg.c b/libc/calls/mprotect.greg.c
index 8c6558afc..c2a755d90 100644
--- a/libc/calls/mprotect.greg.c
+++ b/libc/calls/mprotect.greg.c
@@ -52,7 +52,7 @@ textsyscall int mprotect(void *addr, uint64_t len, int prot) {
     }
     return rc;
   } else {
-    if (__imp_VirtualProtect(addr, len, prot2nt(prot, 0), &oldprot)) {
+    if (__imp_VirtualProtect(addr, len, __prot2nt(prot, 0), &oldprot)) {
       return 0;
     } else {
       return __winerr();
diff --git a/libc/calls/nanosleep-nt.c b/libc/calls/nanosleep-nt.c
index 9af2be68f..53810c01d 100644
--- a/libc/calls/nanosleep-nt.c
+++ b/libc/calls/nanosleep-nt.c
@@ -25,7 +25,7 @@
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int nanosleep$nt(const struct timespec *req, struct timespec *rem) {
+textwindows int sys_nanosleep_nt(const struct timespec *req, struct timespec *rem) {
   int64_t millis, hectonanos, relasleep;
   if (rem) memcpy(rem, req, sizeof(*rem));
   hectonanos = req->tv_sec * 10000000ull + div100int64(req->tv_nsec);
diff --git a/libc/calls/nanosleep-xnu.c b/libc/calls/nanosleep-xnu.c
index f9e4eb793..3c5d84bda 100644
--- a/libc/calls/nanosleep-xnu.c
+++ b/libc/calls/nanosleep-xnu.c
@@ -22,9 +22,9 @@
 #include "libc/nexgen32e/nexgen32e.h"
 #include "libc/sock/internal.h"
 
-int nanosleep$xnu(const struct timespec *req, struct timespec *rem) {
+int sys_nanosleep_xnu(const struct timespec *req, struct timespec *rem) {
   long millis;
   millis = div1000int64(req->tv_nsec);
   millis = MAX(1, millis);
-  return select$sysv(0, 0, 0, 0, &(struct timeval){req->tv_sec, millis});
+  return sys_select(0, 0, 0, 0, &(struct timeval){req->tv_sec, millis});
 }
diff --git a/libc/calls/nanosleep.c b/libc/calls/nanosleep.c
index 9232381e2..58581590f 100644
--- a/libc/calls/nanosleep.c
+++ b/libc/calls/nanosleep.c
@@ -29,14 +29,14 @@ int nanosleep(const struct timespec *req, struct timespec *rem) {
   if (!IsWindows()) {
     if (!IsMetal()) {
       if (!IsXnu()) {
-        return nanosleep$sysv(req, rem);
+        return sys_nanosleep(req, rem);
       } else {
-        return nanosleep$xnu(req, rem);
+        return sys_nanosleep_xnu(req, rem);
       }
     } else {
       return enosys(); /* TODO: Sleep on Metal */
     }
   } else {
-    return nanosleep$nt(req, rem);
+    return sys_nanosleep_nt(req, rem);
   }
 }
diff --git a/libc/calls/onntconsoleevent_init.S b/libc/calls/onntconsoleevent_init.S
index 024c04b5a..deb6a748d 100644
--- a/libc/calls/onntconsoleevent_init.S
+++ b/libc/calls/onntconsoleevent_init.S
@@ -20,7 +20,7 @@
 .source	__FILE__
 
 	.init.start 300,_init_onntconsoleevent
-	ezlea	__onntconsoleevent$nt,cx
+	ezlea	__onntconsoleevent_nt,cx
 	pushpop	1,%rdx
 	ntcall	__imp_SetConsoleCtrlHandler
 	.init.end 300,_init_onntconsoleevent,globl,hidden
diff --git a/libc/calls/open-nt.c b/libc/calls/open-nt.c
index 1a381b0c0..167dad94f 100644
--- a/libc/calls/open-nt.c
+++ b/libc/calls/open-nt.c
@@ -35,7 +35,7 @@
 #include "libc/sysv/consts/o.h"
 #include "libc/sysv/errfuns.h"
 
-static textwindows int64_t open$nt$impl(int dirfd, const char *path,
+static textwindows int64_t sys_open_nt$impl(int dirfd, const char *path,
                                         uint32_t flags, int32_t mode) {
   uint32_t br;
   int64_t handle;
@@ -76,7 +76,7 @@ static textwindows int64_t open$nt$impl(int dirfd, const char *path,
   }
 }
 
-static textwindows ssize_t open$nt$console(int dirfd,
+static textwindows ssize_t sys_open_nt$console(int dirfd,
                                            const struct NtMagicPaths *mp,
                                            uint32_t flags, int32_t mode,
                                            size_t fd) {
@@ -84,11 +84,11 @@ static textwindows ssize_t open$nt$console(int dirfd,
       GetFileType(g_fds.p[STDOUT_FILENO].handle) == kNtFileTypeChar) {
     g_fds.p[fd].handle = g_fds.p[STDIN_FILENO].handle;
     g_fds.p[fd].extra = g_fds.p[STDOUT_FILENO].handle;
-  } else if ((g_fds.p[fd].handle = open$nt$impl(
+  } else if ((g_fds.p[fd].handle = sys_open_nt$impl(
                   dirfd, mp->conin, (flags & ~O_ACCMODE) | O_RDONLY, mode)) !=
              -1) {
     g_fds.p[fd].extra =
-        open$nt$impl(dirfd, mp->conout, (flags & ~O_ACCMODE) | O_WRONLY, mode);
+        sys_open_nt$impl(dirfd, mp->conout, (flags & ~O_ACCMODE) | O_WRONLY, mode);
     assert(g_fds.p[fd].extra != -1);
   } else {
     return -1;
@@ -98,10 +98,10 @@ static textwindows ssize_t open$nt$console(int dirfd,
   return fd;
 }
 
-static textwindows ssize_t open$nt$file(int dirfd, const char *file,
+static textwindows ssize_t sys_open_nt$file(int dirfd, const char *file,
                                         uint32_t flags, int32_t mode,
                                         size_t fd) {
-  if ((g_fds.p[fd].handle = open$nt$impl(dirfd, file, flags, mode)) != -1) {
+  if ((g_fds.p[fd].handle = sys_open_nt$impl(dirfd, file, flags, mode)) != -1) {
     g_fds.p[fd].kind = kFdFile;
     g_fds.p[fd].flags = flags;
     return fd;
@@ -110,15 +110,15 @@ static textwindows ssize_t open$nt$file(int dirfd, const char *file,
   }
 }
 
-textwindows ssize_t open$nt(int dirfd, const char *file, uint32_t flags,
+textwindows ssize_t sys_open_nt(int dirfd, const char *file, uint32_t flags,
                             int32_t mode) {
   int fd;
   ssize_t rc;
   if ((fd = __reservefd()) == -1) return -1;
   if ((flags & O_ACCMODE) == O_RDWR && !strcmp(file, kNtMagicPaths.devtty)) {
-    rc = open$nt$console(dirfd, &kNtMagicPaths, flags, mode, fd);
+    rc = sys_open_nt$console(dirfd, &kNtMagicPaths, flags, mode, fd);
   } else {
-    rc = open$nt$file(dirfd, file, flags, mode, fd);
+    rc = sys_open_nt$file(dirfd, file, flags, mode, fd);
   }
   if (rc == -1) {
     __releasefd(fd);
diff --git a/libc/calls/openanon.c b/libc/calls/openanon.c
index f86061501..aff3a67a8 100644
--- a/libc/calls/openanon.c
+++ b/libc/calls/openanon.c
@@ -62,7 +62,7 @@ static int openanon$impl(const char *name, unsigned flags,
   openanon$genpath(name, state, pathbuf);
   flags |= O_RDWR | O_CREAT | O_EXCL | O_TRUNC;
   if (!IsWindows()) {
-    if ((fd = openat$sysv(AT_FDCWD, pathbuf, flags, 0600)) != -1) {
+    if ((fd = sys_openat(AT_FDCWD, pathbuf, flags, 0600)) != -1) {
       unlink(pathbuf);
     }
     return fd;
diff --git a/libc/calls/openat.c b/libc/calls/openat.c
index 5955a85cb..79820ae97 100644
--- a/libc/calls/openat.c
+++ b/libc/calls/openat.c
@@ -52,8 +52,8 @@ nodiscard int openat(int dirfd, const char *file, int flags, ...) {
     if (dirfd != AT_FDCWD) return einval();
     return weaken(__zipos_open)(&zipname, flags, mode);
   } else if (!IsWindows()) {
-    return openat$sysv(dirfd, file, flags, mode);
+    return sys_openat(dirfd, file, flags, mode);
   } else {
-    return open$nt(dirfd, file, flags, mode);
+    return sys_open_nt(dirfd, file, flags, mode);
   }
 }
diff --git a/libc/calls/pause.c b/libc/calls/pause.c
index 0a721dad1..1ce657307 100644
--- a/libc/calls/pause.c
+++ b/libc/calls/pause.c
@@ -36,7 +36,7 @@ int pause(void) {
   int rc, olderr;
   sigset_t oldmask;
   olderr = errno;
-  if ((rc = pause$sysv()) == -1 && errno == ENOSYS) {
+  if ((rc = sys_pause()) == -1 && errno == ENOSYS) {
     errno = olderr;
     if (sigprocmask(SIG_BLOCK, NULL, &oldmask) == -1) return -1;
     rc = sigsuspend(&oldmask);
diff --git a/libc/calls/pipe-nt.c b/libc/calls/pipe-nt.c
index fad391c1e..79782dedd 100644
--- a/libc/calls/pipe-nt.c
+++ b/libc/calls/pipe-nt.c
@@ -53,7 +53,7 @@ static char16_t *CreatePipeName(char16_t *a) {
   return a;
 }
 
-textwindows int pipe$nt(int pipefd[2], unsigned flags) {
+textwindows int sys_pipe_nt(int pipefd[2], unsigned flags) {
   int64_t hin, hout;
   int reader, writer;
   char16_t pipename[64];
diff --git a/libc/calls/pipe-sysv.S b/libc/calls/pipe-sysv.S
index a435f4107..5ec2f82f6 100644
--- a/libc/calls/pipe-sysv.S
+++ b/libc/calls/pipe-sysv.S
@@ -27,13 +27,13 @@
 /	@asyncsignalsafe
 /	@see	libc/sysv/syscalls.sh
 /	@see	pipe2()
-pipe$sysv:
+sys_pipe:
 	push	%rbp
 	mov	%rsp,%rbp
 #if SupportsFreebsd()
 	xor	%esi,%esi
 #endif
-	call	__pipe$sysv
+	call	__sys_pipe
 #if SupportsXnu()
 	testb	IsXnu()
 	jz	1f
@@ -45,4 +45,4 @@ pipe$sysv:
 #endif
 1:	pop	%rbp
 	ret
-	.endfn	pipe$sysv,globl,hidden
+	.endfn	sys_pipe,globl,hidden
diff --git a/libc/calls/pipe.c b/libc/calls/pipe.c
index 0fe2ca1a4..0d27bd2da 100644
--- a/libc/calls/pipe.c
+++ b/libc/calls/pipe.c
@@ -32,8 +32,8 @@
 int pipe(int pipefd[hasatleast 2]) {
   if (!pipefd) return efault();
   if (!IsWindows()) {
-    return pipe$sysv(pipefd);
+    return sys_pipe(pipefd);
   } else {
-    return pipe$nt(pipefd, 0);
+    return sys_pipe_nt(pipefd, 0);
   }
 }
diff --git a/libc/calls/pipe2-sysv.c b/libc/calls/pipe2-sysv.c
index 2e5433b6b..ab75113a1 100644
--- a/libc/calls/pipe2-sysv.c
+++ b/libc/calls/pipe2-sysv.c
@@ -22,18 +22,18 @@
 
 #define __NR_pipe2_linux 0x0125 /*RHEL5:CVE-2010-3301*/
 
-int32_t pipe2$sysv(int pipefd[hasatleast 2], unsigned flags) {
+int32_t sys_pipe2(int pipefd[hasatleast 2], unsigned flags) {
   int rc, olderr;
   if (!flags) goto OldSkool;
   olderr = errno;
-  rc = __pipe2$sysv(pipefd, flags);
+  rc = __sys_pipe2(pipefd, flags);
   if ((rc == -1 && errno == ENOSYS) ||
       (SupportsLinux() && rc == __NR_pipe2_linux)) {
     errno = olderr;
   OldSkool:
-    if ((rc = pipe$sysv(pipefd)) != -1) {
-      fixupnewfd$sysv(pipefd[0], flags);
-      fixupnewfd$sysv(pipefd[1], flags);
+    if ((rc = sys_pipe(pipefd)) != -1) {
+      __fixupnewfd(pipefd[0], flags);
+      __fixupnewfd(pipefd[1], flags);
     }
   }
   return rc;
diff --git a/libc/calls/pipe2.c b/libc/calls/pipe2.c
index e111775f7..638ffa85e 100644
--- a/libc/calls/pipe2.c
+++ b/libc/calls/pipe2.c
@@ -31,8 +31,8 @@
 int pipe2(int pipefd[hasatleast 2], int flags) {
   if (!pipefd) return efault();
   if (!IsWindows()) {
-    return pipe2$sysv(pipefd, flags);
+    return sys_pipe2(pipefd, flags);
   } else {
-    return pipe$nt(pipefd, flags);
+    return sys_pipe_nt(pipefd, flags);
   }
 }
diff --git a/libc/calls/posix_openpt.c b/libc/calls/posix_openpt.c
index ed9423fe5..13fedf2f2 100644
--- a/libc/calls/posix_openpt.c
+++ b/libc/calls/posix_openpt.c
@@ -36,7 +36,7 @@ int posix_openpt(int flags) {
   struct IoctlPtmGet ptm;
   if ((flags & O_ACCMODE) != O_RDWR) return einval();
   if (SupportsFreebsd() &&
-      ((fd = posix_openpt$sysv(flags)) != -1 || errno != ENOSYS)) {
+      ((fd = sys_posix_openpt(flags)) != -1 || errno != ENOSYS)) {
     return fd;
   } else if ((fd = open("/dev/ptmx", flags)) != -1 || errno != ENOENT) {
     return fd;
diff --git a/libc/calls/pread.c b/libc/calls/pread.c
index 786adefbc..68c2406a0 100644
--- a/libc/calls/pread.c
+++ b/libc/calls/pread.c
@@ -47,9 +47,9 @@ ssize_t pread(int fd, void *buf, size_t size, int64_t offset) {
     rc = weaken(__zipos_read)(
         (struct ZiposHandle *)(intptr_t)g_fds.p[fd].handle, buf, size, offset);
   } else if (!IsWindows()) {
-    rc = pread$sysv(fd, buf, size, offset);
+    rc = sys_pread(fd, buf, size, offset);
   } else if (__isfdkind(fd, kFdFile)) {
-    rc = read$nt(&g_fds.p[fd], (struct iovec[]){{buf, size}}, 1, offset);
+    rc = sys_read_nt(&g_fds.p[fd], (struct iovec[]){{buf, size}}, 1, offset);
   } else {
     rc = ebadf();
   }
diff --git a/libc/calls/preadv.c b/libc/calls/preadv.c
index 5a95e808d..076dfe516 100644
--- a/libc/calls/preadv.c
+++ b/libc/calls/preadv.c
@@ -58,7 +58,7 @@ ssize_t preadv(int fd, struct iovec *iovec, int count, int64_t off) {
       demodernize = true;
     } else {
       olderr = errno;
-      rc = preadv$sysv(fd, iovec, count, off);
+      rc = sys_preadv(fd, iovec, count, off);
       if (rc == -1 && errno == ENOSYS) {
         errno = olderr;
         demodernize = true;
@@ -71,7 +71,7 @@ ssize_t preadv(int fd, struct iovec *iovec, int count, int64_t off) {
   }
 
   if (!demodernize) {
-    return preadv$sysv(fd, iovec, count, off);
+    return sys_preadv(fd, iovec, count, off);
   } else {
     return pread(fd, iovec[0].iov_base, iovec[0].iov_len, off);
   }
diff --git a/libc/calls/prot2nt.greg.c b/libc/calls/prot2nt.greg.c
index 0df895c14..ab53d9663 100644
--- a/libc/calls/prot2nt.greg.c
+++ b/libc/calls/prot2nt.greg.c
@@ -28,7 +28,7 @@
  * Converts System Five memory protection flags to Windows NT, Part 1.
  * @see libc/sysv/consts.sh
  */
-privileged uint32_t prot2nt(int prot, int flags) {
+privileged uint32_t __prot2nt(int prot, int flags) {
   return (HAS(prot, PROT_READ | PROT_WRITE | PROT_EXEC)
               ? (HAS(flags, MAP_SHARED) || HAS(flags, MAP_ANONYMOUS))
                     ? kNtPageExecuteReadwrite
diff --git a/libc/calls/ptrace.c b/libc/calls/ptrace.c
index 6b801da62..8866ca608 100644
--- a/libc/calls/ptrace.c
+++ b/libc/calls/ptrace.c
@@ -28,5 +28,5 @@
 long ptrace(int request, int pid, void *addr, void *data) {
   /* TODO(jart): FreeBSD addr and data args are different */
   if (request == -1) return einval(); /* see consts.sh */
-  return ptrace$sysv(request, pid, addr, data);
+  return sys_ptrace(request, pid, addr, data);
 }
diff --git a/libc/calls/pwrite.c b/libc/calls/pwrite.c
index 53c355cd6..8c78108cc 100644
--- a/libc/calls/pwrite.c
+++ b/libc/calls/pwrite.c
@@ -43,9 +43,9 @@ ssize_t pwrite(int fd, const void *buf, size_t size, int64_t offset) {
   if (fd == -1 || offset < 0) return einval();
   size = MIN(size, 0x7ffff000);
   if (!IsWindows()) {
-    rc = pwrite$sysv(fd, buf, size, offset);
+    rc = sys_pwrite(fd, buf, size, offset);
   } else if (__isfdkind(fd, kFdFile)) {
-    rc = write$nt(&g_fds.p[fd], (struct iovec[]){{buf, size}}, 1, offset);
+    rc = sys_write_nt(&g_fds.p[fd], (struct iovec[]){{buf, size}}, 1, offset);
   } else {
     return ebadf();
   }
diff --git a/libc/calls/pwritev.c b/libc/calls/pwritev.c
index d7068fdf5..e3f1e9b72 100644
--- a/libc/calls/pwritev.c
+++ b/libc/calls/pwritev.c
@@ -63,7 +63,7 @@ ssize_t pwritev(int fd, const struct iovec *iovec, int count, int64_t off) {
       demodernize = true;
     } else {
       olderr = errno;
-      rc = pwritev$sysv(fd, iovec, count, off);
+      rc = sys_pwritev(fd, iovec, count, off);
       if (rc == -1 && errno == ENOSYS) {
         errno = olderr;
         demodernize = true;
@@ -77,7 +77,7 @@ ssize_t pwritev(int fd, const struct iovec *iovec, int count, int64_t off) {
   }
 
   if (!demodernize) {
-    return pwritev$sysv(fd, iovec, count, off);
+    return sys_pwritev(fd, iovec, count, off);
   } else {
     return pwrite(fd, iovec[0].iov_base, iovec[0].iov_len, off);
   }
diff --git a/libc/calls/raise.c b/libc/calls/raise.c
index 2236518da..d547c6d4d 100644
--- a/libc/calls/raise.c
+++ b/libc/calls/raise.c
@@ -54,7 +54,7 @@ int raise(int sig) {
     return 0;
   }
   if (!IsWindows()) {
-    return kill$sysv(getpid(), sig, 1);
+    return sys_kill(getpid(), sig, 1);
   } else {
     if (GenerateConsoleCtrlEvent(GetCtrlEvent(sig), 0)) {
       return 0;
diff --git a/libc/calls/read-nt.c b/libc/calls/read-nt.c
index e21494442..e9b92f138 100644
--- a/libc/calls/read-nt.c
+++ b/libc/calls/read-nt.c
@@ -27,7 +27,7 @@
 #include "libc/nt/struct/teb.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows ssize_t read$nt(struct Fd *fd, const struct iovec *iov,
+textwindows ssize_t sys_read_nt(struct Fd *fd, const struct iovec *iov,
                             size_t iovlen, ssize_t opt_offset) {
   uint32_t got;
   struct NtOverlapped overlap;
diff --git a/libc/calls/readv.c b/libc/calls/readv.c
index ba728f5d7..6fc7d21f7 100644
--- a/libc/calls/readv.c
+++ b/libc/calls/readv.c
@@ -39,12 +39,12 @@ ssize_t readv(int fd, const struct iovec *iov, int iovlen) {
   } else if (fd < g_fds.n && g_fds.p[fd].kind == kFdSerial) {
     return readv$serial(&g_fds.p[fd], iov, iovlen);
   } else if (!IsWindows()) {
-    return readv$sysv(fd, iov, iovlen);
+    return sys_readv(fd, iov, iovlen);
   } else if (fd < g_fds.n &&
              (g_fds.p[fd].kind == kFdFile || g_fds.p[fd].kind == kFdConsole)) {
-    return read$nt(&g_fds.p[fd], iov, iovlen, -1);
+    return sys_read_nt(&g_fds.p[fd], iov, iovlen, -1);
   } else if (fd < g_fds.n && (g_fds.p[fd].kind == kFdSocket)) {
-    return weaken(recvfrom$nt)(&g_fds.p[fd], iov, iovlen, 0, NULL, 0);
+    return weaken(sys_recvfrom_nt)(&g_fds.p[fd], iov, iovlen, 0, NULL, 0);
   } else {
     return ebadf();
   }
diff --git a/libc/calls/renameat-nt.c b/libc/calls/renameat-nt.c
index 31e670c39..5f0940d83 100644
--- a/libc/calls/renameat-nt.c
+++ b/libc/calls/renameat-nt.c
@@ -23,7 +23,7 @@
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int renameat$nt(int olddirfd, const char *oldpath, int newdirfd,
+textwindows int sys_renameat_nt(int olddirfd, const char *oldpath, int newdirfd,
                             const char *newpath) {
   char16_t oldpath16[PATH_MAX];
   char16_t newpath16[PATH_MAX];
diff --git a/libc/calls/renameat.c b/libc/calls/renameat.c
index 2285f62d6..ad4ff00a4 100644
--- a/libc/calls/renameat.c
+++ b/libc/calls/renameat.c
@@ -34,8 +34,8 @@ int renameat(int olddirfd, const char *oldpath, int newdirfd,
              const char *newpath) {
   if (!oldpath || !newpath) return efault();
   if (!IsWindows()) {
-    return renameat$sysv(olddirfd, oldpath, newdirfd, newpath);
+    return sys_renameat(olddirfd, oldpath, newdirfd, newpath);
   } else {
-    return renameat$nt(olddirfd, oldpath, newdirfd, newpath);
+    return sys_renameat_nt(olddirfd, oldpath, newdirfd, newpath);
   }
 }
diff --git a/libc/calls/sched_setaffinity.c b/libc/calls/sched_setaffinity.c
index 4677069df..8aaecf9af 100644
--- a/libc/calls/sched_setaffinity.c
+++ b/libc/calls/sched_setaffinity.c
@@ -28,7 +28,7 @@
 #include "libc/nt/thread.h"
 #include "libc/str/str.h"
 
-static textwindows noinline int sched_setaffinity$nt(int pid,
+static textwindows noinline int sys_sched_setaffinity_nt(int pid,
                                                      uint64_t bitsetsize,
                                                      const void *bitset) {
   int rc;
@@ -69,8 +69,8 @@ static textwindows noinline int sched_setaffinity$nt(int pid,
  */
 int sched_setaffinity(int pid, uint64_t bitsetsize, const void *bitset) {
   if (!IsWindows()) {
-    return sched_setaffinity$sysv(pid, bitsetsize, bitset);
+    return sys_sched_setaffinity(pid, bitsetsize, bitset);
   } else {
-    return sched_setaffinity$nt(pid, bitsetsize, bitset);
+    return sys_sched_setaffinity_nt(pid, bitsetsize, bitset);
   }
 }
diff --git a/libc/calls/sched_yield-nt.c b/libc/calls/sched_yield-nt.c
index cab2520ff..47a9fec3d 100644
--- a/libc/calls/sched_yield-nt.c
+++ b/libc/calls/sched_yield-nt.c
@@ -20,7 +20,7 @@
 #include "libc/nt/enum/status.h"
 #include "libc/nt/ntdll.h"
 
-textwindows int sched_yield$nt(void) {
+textwindows int sys_sched_yield_nt(void) {
   size_t i;
   if (NtYieldExecution() == kNtStatusDllNotFound) {
     for (i = 0; i < 16; ++i) asm("pause");
diff --git a/libc/calls/sched_yield.c b/libc/calls/sched_yield.c
index 09c50e205..c268fa279 100644
--- a/libc/calls/sched_yield.c
+++ b/libc/calls/sched_yield.c
@@ -25,8 +25,8 @@
  */
 int sched_yield(void) {
   if (!IsWindows()) {
-    return sched_yield$sysv();
+    return sys_sched_yield();
   } else {
-    return sched_yield$nt();
+    return sys_sched_yield_nt();
   }
 }
diff --git a/libc/calls/setitimer-nt.c b/libc/calls/setitimer-nt.c
index 3008b7c58..dc19d0381 100644
--- a/libc/calls/setitimer-nt.c
+++ b/libc/calls/setitimer-nt.c
@@ -60,7 +60,7 @@ static uint32_t ItimerWorker(void *arg) {
   return 0;
 }
 
-textwindows int setitimer$nt(int which, const struct itimerval *newvalue,
+textwindows int sys_setitimer_nt(int which, const struct itimerval *newvalue,
                              struct itimerval *out_opt_oldvalue) {
   int32_t period;
   int64_t ith, duetime;
diff --git a/libc/calls/setitimer.c b/libc/calls/setitimer.c
index cdf0a7e2f..205ca9acc 100644
--- a/libc/calls/setitimer.c
+++ b/libc/calls/setitimer.c
@@ -63,11 +63,11 @@ int setitimer(int which, const struct itimerval *newvalue,
               struct itimerval *out_opt_oldvalue) {
   if (!IsWindows()) {
     if (newvalue) {
-      return setitimer$sysv(which, newvalue, out_opt_oldvalue);
+      return sys_setitimer(which, newvalue, out_opt_oldvalue);
     } else {
-      return getitimer$sysv(which, out_opt_oldvalue);
+      return sys_getitimer(which, out_opt_oldvalue);
     }
   } else {
-    return setitimer$nt(which, newvalue, out_opt_oldvalue);
+    return sys_setitimer_nt(which, newvalue, out_opt_oldvalue);
   }
 }
diff --git a/libc/calls/setpriority-nt.c b/libc/calls/setpriority-nt.c
index fc9881254..162f378e9 100644
--- a/libc/calls/setpriority-nt.c
+++ b/libc/calls/setpriority-nt.c
@@ -38,7 +38,7 @@ static textwindows struct NtPriorityCombo findntprio(int nice) {
   return kNtPriorityCombos[max(0, l - 1)];
 }
 
-textwindows int setpriority$nt(int nice) {
+textwindows int sys_setpriority_nt(int nice) {
   uint32_t tier;
   struct NtPriorityCombo p;
   p = findntprio(nice);
diff --git a/libc/calls/setpriority.c b/libc/calls/setpriority.c
index 765198f35..682e62e54 100644
--- a/libc/calls/setpriority.c
+++ b/libc/calls/setpriority.c
@@ -30,8 +30,8 @@
  */
 int setpriority(int which, unsigned who, int value) {
   if (!IsWindows()) {
-    return setpriority$sysv(which, who, value); /* TODO(jart): -20 */
+    return sys_setpriority(which, who, value); /* TODO(jart): -20 */
   } else {
-    return getsetpriority$nt(which, who, value, setpriority$nt);
+    return sys_getsetpriority_nt(which, who, value, sys_setpriority_nt);
   }
 }
diff --git a/libc/calls/setresgid.c b/libc/calls/setresgid.c
index e69b1ebe0..b1af4e79d 100644
--- a/libc/calls/setresgid.c
+++ b/libc/calls/setresgid.c
@@ -29,5 +29,5 @@
  */
 int setresgid(uint32_t real, uint32_t effective, uint32_t saved) {
   if (saved == -1) return setregid(real, effective);
-  return setresgid$sysv(real, effective, saved);
+  return sys_setresgid(real, effective, saved);
 }
diff --git a/libc/calls/setresuid.c b/libc/calls/setresuid.c
index 62869c4ee..c4bc134de 100644
--- a/libc/calls/setresuid.c
+++ b/libc/calls/setresuid.c
@@ -29,5 +29,5 @@
  */
 int setresuid(uint32_t real, uint32_t effective, uint32_t saved) {
   if (saved == -1) return setreuid(real, effective);
-  return setresuid$sysv(real, effective, saved);
+  return sys_setresuid(real, effective, saved);
 }
diff --git a/libc/calls/setrlimit.c b/libc/calls/setrlimit.c
index a5a6b4e67..4a7671325 100644
--- a/libc/calls/setrlimit.c
+++ b/libc/calls/setrlimit.c
@@ -32,7 +32,7 @@
 int setrlimit(int resource, const struct rlimit *rlim) {
   if (resource == -1) return einval();
   if (!IsWindows()) {
-    return setrlimit$sysv(resource, rlim);
+    return sys_setrlimit(resource, rlim);
   } else {
     return enosys(); /* TODO(jart): Implement me! */
   }
diff --git a/libc/calls/setsid.c b/libc/calls/setsid.c
index d728238fa..e4cde3710 100644
--- a/libc/calls/setsid.c
+++ b/libc/calls/setsid.c
@@ -23,5 +23,5 @@
  * Creates session and sets the process group id.
  */
 int setsid(void) {
-  return setsid$sysv();
+  return sys_setsid();
 }
diff --git a/libc/calls/sigaction.c b/libc/calls/sigaction.c
index f23c7532e..4aba36a04 100644
--- a/libc/calls/sigaction.c
+++ b/libc/calls/sigaction.c
@@ -39,11 +39,11 @@
 
 union metasigaction {
   struct sigaction cosmo;
-  struct sigaction$linux linux;
-  struct sigaction$freebsd freebsd;
-  struct sigaction$openbsd openbsd;
-  struct sigaction$xnu_in xnu_in;
-  struct sigaction$xnu_out xnu_out;
+  struct sigaction_linux linux;
+  struct sigaction_freebsd freebsd;
+  struct sigaction_openbsd openbsd;
+  struct sigaction_xnu_in xnu_in;
+  struct sigaction_xnu_out xnu_out;
 };
 
 #define SWITCHEROO(S1, S2, A, B, C, D)                     \
@@ -122,11 +122,11 @@ static void sigaction$native2cosmo(union metasigaction *sa) {
  * @vforksafe
  */
 int(sigaction)(int sig, const struct sigaction *act, struct sigaction *oldact) {
-  _Static_assert(sizeof(struct sigaction) > sizeof(struct sigaction$linux) &&
-                 sizeof(struct sigaction) > sizeof(struct sigaction$xnu_in) &&
-                 sizeof(struct sigaction) > sizeof(struct sigaction$xnu_out) &&
-                 sizeof(struct sigaction) > sizeof(struct sigaction$freebsd) &&
-                 sizeof(struct sigaction) > sizeof(struct sigaction$openbsd));
+  _Static_assert(sizeof(struct sigaction) > sizeof(struct sigaction_linux) &&
+                 sizeof(struct sigaction) > sizeof(struct sigaction_xnu_in) &&
+                 sizeof(struct sigaction) > sizeof(struct sigaction_xnu_out) &&
+                 sizeof(struct sigaction) > sizeof(struct sigaction_freebsd) &&
+                 sizeof(struct sigaction) > sizeof(struct sigaction_openbsd));
   int rc, rva, oldrva;
   struct sigaction *ap, copy;
   if (!(0 < sig && sig < NSIG)) return einval();
@@ -150,8 +150,8 @@ int(sigaction)(int sig, const struct sigaction *act, struct sigaction *oldact) {
         memcpy(&copy, act, sizeof(copy));
         ap = &copy;
         if (IsXnu()) {
-          ap->sa_restorer = (void *)&xnutrampoline;
-          ap->sa_handler = (void *)&xnutrampoline;
+          ap->sa_restorer = (void *)&__xnutrampoline;
+          ap->sa_handler = (void *)&__xnutrampoline;
         } else if (IsLinux()) {
           if (!(ap->sa_flags & SA_RESTORER)) {
             ap->sa_flags |= SA_RESTORER;
@@ -164,7 +164,7 @@ int(sigaction)(int sig, const struct sigaction *act, struct sigaction *oldact) {
       } else {
         ap = NULL;
       }
-      rc = sigaction$sysv(
+      rc = sys_sigaction(
           sig, ap, oldact,
           (!IsXnu() ? 8 /* or linux whines */
                     : (int64_t)(intptr_t)oldact /* from go code */));
diff --git a/libc/calls/sigprocmask.c b/libc/calls/sigprocmask.c
index 02185798f..94cb7c188 100644
--- a/libc/calls/sigprocmask.c
+++ b/libc/calls/sigprocmask.c
@@ -38,7 +38,7 @@
  */
 int sigprocmask(int how, const sigset_t *opt_set, sigset_t *opt_out_oldset) {
   if (!IsWindows()) {
-    return sigprocmask$sysv(how, opt_set, opt_out_oldset, 8);
+    return sys_sigprocmask(how, opt_set, opt_out_oldset, 8);
   } else {
     return 0; /* TODO(jart): Implement me! */
   }
diff --git a/libc/calls/sigsuspend.c b/libc/calls/sigsuspend.c
index 96b526f29..6f91a49d3 100644
--- a/libc/calls/sigsuspend.c
+++ b/libc/calls/sigsuspend.c
@@ -32,7 +32,7 @@
 int sigsuspend(const sigset_t *ignore) {
   if (!ignore) return efault();
   if (!IsWindows()) {
-    return sigsuspend$sysv(ignore, 8);
+    return sys_sigsuspend(ignore, 8);
   } else {
     return enosys(); /* TODO(jart): Implement me! */
   }
diff --git a/libc/calls/splice.c b/libc/calls/splice.c
index a29d98194..bfe272af7 100644
--- a/libc/calls/splice.c
+++ b/libc/calls/splice.c
@@ -52,7 +52,7 @@ static ssize_t splicer(int infd, int64_t *inoffset, int outfd,
 ssize_t splice(int infd, int64_t *inopt_out_inoffset, int outfd,
                int64_t *inopt_out_outoffset, size_t uptobytes, uint32_t flags) {
   return splicer(infd, inopt_out_inoffset, outfd, inopt_out_outoffset,
-                 uptobytes, flags, splice$sysv);
+                 uptobytes, flags, sys_splice);
 }
 
 /**
@@ -68,5 +68,5 @@ ssize_t copy_file_range(int infd, int64_t *inopt_out_inoffset, int outfd,
                         int64_t *inopt_out_outoffset, size_t uptobytes,
                         uint32_t flags) {
   return splicer(infd, inopt_out_inoffset, outfd, inopt_out_outoffset,
-                 uptobytes, flags, copy_file_range$sysv);
+                 uptobytes, flags, sys_copy_file_range);
 }
diff --git a/libc/calls/stat2linux.c b/libc/calls/stat2linux.c
index 76f20eb94..1a3b11304 100644
--- a/libc/calls/stat2linux.c
+++ b/libc/calls/stat2linux.c
@@ -50,19 +50,19 @@
     (S2).M = m;                                                   \
   } while (0);
 
-forceinline void stat2linux_xnu(union metastat *ms) {
+static textstartup void __stat2linux_xnu(union metastat *ms) {
   SWITCHEROO(ms->xnu, ms->linux, st_dev, st_ino, st_nlink, st_mode, st_uid,
              st_gid, st_rdev, st_size, st_blksize, st_blocks, st_atim, st_mtim,
              st_ctim);
 }
 
-forceinline void stat2linux_freebsd(union metastat *ms) {
+static textstartup void __stat2linux_freebsd(union metastat *ms) {
   SWITCHEROO(ms->freebsd, ms->linux, st_dev, st_ino, st_nlink, st_mode, st_uid,
              st_gid, st_rdev, st_size, st_blksize, st_blocks, st_atim, st_mtim,
              st_ctim);
 }
 
-forceinline void stat2linux_openbsd(union metastat *ms) {
+static textstartup void __stat2linux_openbsd(union metastat *ms) {
   SWITCHEROO(ms->openbsd, ms->linux, st_dev, st_ino, st_nlink, st_mode, st_uid,
              st_gid, st_rdev, st_size, st_blksize, st_blocks, st_atim, st_mtim,
              st_ctim);
@@ -72,14 +72,14 @@ forceinline void stat2linux_openbsd(union metastat *ms) {
  * Transcodes “The Dismal Data Structure” from BSD→Linux ABI.
  * @asyncsignalsafe
  */
-textstartup void stat2linux(void *ms) {
+textstartup void __stat2linux(void *ms) {
   if (ms) {
     if (SupportsXnu() && IsXnu()) {
-      stat2linux_xnu((union metastat *)ms);
+      __stat2linux_xnu((union metastat *)ms);
     } else if (SupportsFreebsd() && IsFreebsd()) {
-      stat2linux_freebsd((union metastat *)ms);
+      __stat2linux_freebsd((union metastat *)ms);
     } else if (SupportsOpenbsd() && IsOpenbsd()) {
-      stat2linux_openbsd((union metastat *)ms);
+      __stat2linux_openbsd((union metastat *)ms);
     }
   }
 }
diff --git a/libc/calls/struct/metastat.internal.h b/libc/calls/struct/metastat.internal.h
index 9bcc4607e..3e3dca72a 100644
--- a/libc/calls/struct/metastat.internal.h
+++ b/libc/calls/struct/metastat.internal.h
@@ -5,50 +5,53 @@
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
+struct stat_xnu {
+  int32_t st_dev;
+  uint16_t st_mode, st_nlink;
+  uint64_t st_ino;
+  uint32_t st_uid, st_gid;
+  int32_t st_rdev;
+  struct timespec st_atim, st_mtim, st_ctim, st_birthtim;
+  int64_t st_size, st_blocks;
+  int32_t st_blksize;
+  uint32_t st_flags, st_gen;
+  int32_t st_lspare;
+  int64_t st_qspare[2];
+};
+
+struct stat_freebsd {
+  uint64_t st_dev, st_ino, st_nlink;
+  uint16_t st_mode;
+  int16_t st_padding0;
+  uint32_t st_uid, st_gid;
+  int32_t st_padding1;
+  uint64_t st_rdev;
+  struct timespec st_atim, st_mtim, st_ctim, st_birthtim;
+  int64_t st_size, st_blocks;
+  int32_t st_blksize;
+  uint32_t st_flags;
+  uint64_t st_gen;
+  unsigned long st_spare[10];
+};
+
+struct stat_openbsd {
+  uint32_t st_mode;
+  int32_t st_dev;
+  uint64_t st_ino;
+  uint32_t st_nlink, st_uid, st_gid;
+  int32_t st_rdev;
+  struct timespec st_atim, st_mtim, st_ctim;
+  int64_t st_size, st_blocks;
+  int32_t st_blksize;
+  uint32_t st_flags, st_gen;
+  struct timespec __st_birthtim;
+};
+
 union metastat {
   struct stat linux;
-
-  struct stat$xnu {
-    int32_t st_dev;
-    uint16_t st_mode, st_nlink;
-    uint64_t st_ino;
-    uint32_t st_uid, st_gid;
-    int32_t st_rdev;
-    struct timespec st_atim, st_mtim, st_ctim, st_birthtim;
-    int64_t st_size, st_blocks;
-    int32_t st_blksize;
-    uint32_t st_flags, st_gen;
-    int32_t st_lspare;
-    int64_t st_qspare[2];
-  } xnu;
-
-  struct stat$freebsd {
-    uint64_t st_dev, st_ino, st_nlink;
-    uint16_t st_mode;
-    int16_t st_padding0;
-    uint32_t st_uid, st_gid;
-    int32_t st_padding1;
-    uint64_t st_rdev;
-    struct timespec st_atim, st_mtim, st_ctim, st_birthtim;
-    int64_t st_size, st_blocks;
-    int32_t st_blksize;
-    uint32_t st_flags;
-    uint64_t st_gen;
-    unsigned long st_spare[10];
-  } freebsd;
-
-  struct stat$openbsd {
-    uint32_t st_mode;
-    int32_t st_dev;
-    uint64_t st_ino;
-    uint32_t st_nlink, st_uid, st_gid;
-    int32_t st_rdev;
-    struct timespec st_atim, st_mtim, st_ctim;
-    int64_t st_size, st_blocks;
-    int32_t st_blksize;
-    uint32_t st_flags, st_gen;
-    struct timespec __st_birthtim;
-  } openbsd;
+  struct stat_xnu xnu;
+  struct stat_freebsd freebsd;
+  struct stat_openbsd openbsd;
 };
 
 COSMOPOLITAN_C_END_
diff --git a/libc/calls/struct/metatermios.internal.h b/libc/calls/struct/metatermios.internal.h
index f78b52b56..02b31cd0e 100644
--- a/libc/calls/struct/metatermios.internal.h
+++ b/libc/calls/struct/metatermios.internal.h
@@ -5,7 +5,7 @@
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
-struct termios$xnu {
+struct termios_xnu {
   uint64_t c_iflag;
   uint64_t c_oflag;
   uint64_t c_cflag;
@@ -15,7 +15,7 @@ struct termios$xnu {
   uint64_t c_ospeed;
 };
 
-struct termios$bsd {
+struct termios_bsd {
   uint32_t c_iflag;
   uint32_t c_oflag;
   uint32_t c_cflag;
@@ -27,8 +27,8 @@ struct termios$bsd {
 
 union metatermios {
   struct termios linux;
-  struct termios$xnu xnu;
-  struct termios$bsd bsd;
+  struct termios_xnu xnu;
+  struct termios_bsd bsd;
 };
 
 COSMOPOLITAN_C_END_
diff --git a/libc/calls/struct/sigaction-freebsd.internal.h b/libc/calls/struct/sigaction-freebsd.internal.h
index aac23d131..ee111086a 100644
--- a/libc/calls/struct/sigaction-freebsd.internal.h
+++ b/libc/calls/struct/sigaction-freebsd.internal.h
@@ -2,12 +2,14 @@
 #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGACTION_FREEBSD_H_
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
-struct sigaction$freebsd {
+struct sigset_freebsd {
+  uint32_t sig[4];
+};
+
+struct sigaction_freebsd {
   intptr_t sa_handler;
   uint32_t sa_flags;
-  struct sigset$freebsd {
-    uint32_t sig[4];
-  } sa_mask;
+  struct sigset_freebsd sa_mask;
 };
 
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
diff --git a/libc/calls/struct/sigaction-linux.internal.h b/libc/calls/struct/sigaction-linux.internal.h
index 5a4e3f93b..b5f09de6a 100644
--- a/libc/calls/struct/sigaction-linux.internal.h
+++ b/libc/calls/struct/sigaction-linux.internal.h
@@ -2,13 +2,15 @@
 #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGACTION_LINUX_H_
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
-struct sigaction$linux {
+struct sigset_linux {
+  uint32_t sig[2];
+};
+
+struct sigaction_linux {
   intptr_t sa_handler;
   uint64_t sa_flags;
   void (*sa_restorer)(void);
-  struct sigset$linux {
-    uint32_t sig[2];
-  } sa_mask;
+  struct sigset_linux sa_mask;
 };
 
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
diff --git a/libc/calls/struct/sigaction-openbsd.internal.h b/libc/calls/struct/sigaction-openbsd.internal.h
index 47c629ea5..226883f5a 100644
--- a/libc/calls/struct/sigaction-openbsd.internal.h
+++ b/libc/calls/struct/sigaction-openbsd.internal.h
@@ -2,11 +2,13 @@
 #define COSMOPOLITAN_LIBC_CALLS_STRUCT_SIGACTION_OPENBSD_H_
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
-struct sigaction$openbsd {
+struct sigset_openbsd {
+  uint32_t sig[1];
+};
+
+struct sigaction_openbsd {
   intptr_t sa_handler;
-  struct sigset$openbsd {
-    uint32_t sig[1];
-  } sa_mask;
+  struct sigset_openbsd sa_mask;
   int32_t sa_flags;
 };
 
diff --git a/libc/calls/struct/sigaction-xnu.internal.h b/libc/calls/struct/sigaction-xnu.internal.h
index e69329591..24ab6ffc7 100644
--- a/libc/calls/struct/sigaction-xnu.internal.h
+++ b/libc/calls/struct/sigaction-xnu.internal.h
@@ -5,21 +5,21 @@
 struct __darwin_ucontext;
 struct __darwin_siginfo;
 
-struct sigset$xnu {
+struct sigset_xnu {
   uint32_t sig[1];
 };
 
-struct sigaction$xnu_in {
+struct sigaction_xnu_in {
   intptr_t sa_handler;
   void (*sa_restorer)(void *, int, int, const struct __darwin_siginfo *,
                       const struct __darwin_ucontext *);
-  struct sigset$xnu sa_mask;
+  struct sigset_xnu sa_mask;
   int32_t sa_flags;
 };
 
-struct sigaction$xnu_out {
+struct sigaction_xnu_out {
   intptr_t sa_handler;
-  struct sigset$xnu sa_mask;
+  struct sigset_xnu sa_mask;
   int32_t sa_flags;
 };
 
diff --git a/libc/calls/struct/user_regs_struct.h b/libc/calls/struct/user_regs_struct.h
index 32a7cf762..7caad2a7a 100644
--- a/libc/calls/struct/user_regs_struct.h
+++ b/libc/calls/struct/user_regs_struct.h
@@ -39,7 +39,7 @@ struct user_regs_struct {
   uint64_t gs;
 };
 
-struct useregs_struct$freebsd {
+struct useregs_struct_freebsd {
   int64_t r15;
   int64_t r14;
   int64_t r13;
diff --git a/libc/calls/symlinkat-nt.c b/libc/calls/symlinkat-nt.c
index 509a17736..c34ff9cc2 100644
--- a/libc/calls/symlinkat-nt.c
+++ b/libc/calls/symlinkat-nt.c
@@ -20,7 +20,7 @@
 #include "libc/calls/internal.h"
 #include "libc/nt/files.h"
 
-textwindows int symlinkat$nt(const char *target, int newdirfd,
+textwindows int sys_symlinkat_nt(const char *target, int newdirfd,
                              const char *linkpath) {
   uint32_t flags;
   char16_t target16[PATH_MAX];
diff --git a/libc/calls/symlinkat.c b/libc/calls/symlinkat.c
index d1ebaf26b..2c08c469b 100644
--- a/libc/calls/symlinkat.c
+++ b/libc/calls/symlinkat.c
@@ -36,8 +36,8 @@
  */
 int symlinkat(const char *target, int newdirfd, const char *linkpath) {
   if (!IsWindows()) {
-    return symlinkat$sysv(target, newdirfd, linkpath);
+    return sys_symlinkat(target, newdirfd, linkpath);
   } else {
-    return symlinkat$nt(target, newdirfd, linkpath);
+    return sys_symlinkat_nt(target, newdirfd, linkpath);
   }
 }
diff --git a/libc/calls/sync-nt.c b/libc/calls/sync-nt.c
index e3597cbb9..5188199f0 100644
--- a/libc/calls/sync-nt.c
+++ b/libc/calls/sync-nt.c
@@ -29,7 +29,7 @@
 /**
  * Flushes all open file handles and, if possible, all disk drives.
  */
-int sync$nt(void) {
+int sys_sync_nt(void) {
   unsigned i;
   int64_t volume;
   uint32_t drives;
diff --git a/libc/calls/sync.c b/libc/calls/sync.c
index 219b2548c..c6f80f994 100644
--- a/libc/calls/sync.c
+++ b/libc/calls/sync.c
@@ -25,8 +25,8 @@
  */
 void sync(void) {
   if (!IsWindows()) {
-    sync$sysv();
+    sys_sync();
   } else {
-    sync$nt();
+    sys_sync_nt();
   }
 }
diff --git a/libc/calls/sync_file_range.c b/libc/calls/sync_file_range.c
index 78e1de969..54110b570 100644
--- a/libc/calls/sync_file_range.c
+++ b/libc/calls/sync_file_range.c
@@ -34,7 +34,7 @@
 int sync_file_range(int fd, int64_t offset, int64_t bytes, unsigned flags) {
   int rc, olderr;
   olderr = errno;
-  if ((rc = sync_file_range$sysv(fd, offset, bytes, flags)) != -1 ||
+  if ((rc = sys_sync_file_range(fd, offset, bytes, flags)) != -1 ||
       errno != ENOSYS) {
     return rc;
   } else {
diff --git a/libc/calls/sysinfo-nt.c b/libc/calls/sysinfo-nt.c
index de1947415..8b7317e10 100644
--- a/libc/calls/sysinfo-nt.c
+++ b/libc/calls/sysinfo-nt.c
@@ -23,13 +23,13 @@
 #include "libc/nt/struct/systeminfo.h"
 #include "libc/nt/systeminfo.h"
 
-textwindows int sysinfo$nt(struct sysinfo *info) {
+textwindows int sys_sysinfo_nt(struct sysinfo *info) {
   struct NtMemoryStatusEx memstat;
   memstat.dwLength = sizeof(struct NtMemoryStatusEx);
   if (GlobalMemoryStatusEx(&memstat)) {
     info->totalram = memstat.ullTotalPhys;
     info->freeram = memstat.ullAvailPhys;
-    info->procs = g_ntsysteminfo.dwNumberOfProcessors;
+    info->procs = __nt_systeminfo.dwNumberOfProcessors;
     info->mem_unit = 1;
     return 0;
   } else {
diff --git a/libc/calls/sysinfo.c b/libc/calls/sysinfo.c
index 0c7db1889..752d5b54b 100644
--- a/libc/calls/sysinfo.c
+++ b/libc/calls/sysinfo.c
@@ -37,9 +37,9 @@ int sysinfo(struct sysinfo *info) {
   int rc;
   memset(info, 0, sizeof(*info));
   if (!IsWindows()) {
-    rc = sysinfo$sysv(info);
+    rc = sys_sysinfo(info);
   } else {
-    rc = sysinfo$nt(info);
+    rc = sys_sysinfo_nt(info);
   }
   info->procs = max(1, info->procs);
   info->mem_unit = max(1, info->mem_unit);
diff --git a/libc/calls/thunks/fork-sysv.S b/libc/calls/thunks/fork-sysv.S
index ee5d150b4..55f2cb11d 100644
--- a/libc/calls/thunks/fork-sysv.S
+++ b/libc/calls/thunks/fork-sysv.S
@@ -22,11 +22,11 @@
 /	Makes fork() kernel ABI consistent across UNIX systems.
 /
 /	@return	0 if parent, pid if child, or -1 on error
-fork$sysv:
+sys_fork:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
-	call	__fork$sysv
+	call	__sys_fork
 #if SupportsXnu()
 	testb	IsXnu()
 	jz	1f
@@ -38,4 +38,4 @@ fork$sysv:
 #endif
 1:	pop	%rbp
 	ret
-	.endfn	fork$sysv,globl,hidden
+	.endfn	sys_fork,globl,hidden
diff --git a/libc/calls/thunks/ftruncate-sysv.S b/libc/calls/thunks/ftruncate-sysv.S
index 050fa168f..e07623f84 100644
--- a/libc/calls/thunks/ftruncate-sysv.S
+++ b/libc/calls/thunks/ftruncate-sysv.S
@@ -20,7 +20,7 @@
 .source	__FILE__
 
 /	Directly calls ftruncate() impl on host o/s if available.
-ftruncate$sysv:
+sys_ftruncate:
 	mov	%rsi,%rdx			# openbsd:pad
-	jmp	__ftruncate$sysv
-	.endfn	ftruncate$sysv,globl,hidden
+	jmp	__sys_ftruncate
+	.endfn	sys_ftruncate,globl,hidden
diff --git a/libc/calls/thunks/lseek-sysv.S b/libc/calls/thunks/lseek-sysv.S
index 7eece2cfb..03965beb1 100644
--- a/libc/calls/thunks/lseek-sysv.S
+++ b/libc/calls/thunks/lseek-sysv.S
@@ -21,15 +21,15 @@
 .source	__FILE__
 
 /	Directly calls lseek() impl on host o/s if available.
-lseek$sysv:
+sys_lseek:
 #if SupportsOpenbsd()
 	testb	IsOpenbsd()			# openbsd:evilpad
 	cmovnz	%rdx,%rcx
 	cmovnz	%rsi,%rdx
 	cmovnz	.Lzero(%rip),%rsi
 #endif
-	jmp	__lseek$sysv
-	.endfn	lseek$sysv,globl,hidden
+	jmp	__sys_lseek
+	.endfn	sys_lseek,globl,hidden
 
 	.rodata.cst8
 .Lzero:	.quad	0
diff --git a/libc/calls/thunks/mmap-sysv.S b/libc/calls/thunks/mmap-sysv.S
index 34574efe0..93647faa7 100644
--- a/libc/calls/thunks/mmap-sysv.S
+++ b/libc/calls/thunks/mmap-sysv.S
@@ -20,11 +20,11 @@
 .source	__FILE__
 
 /	Directly calls mmap() on system five host o/s.
-mmap$sysv:
+sys_mmap:
 	push	%rbp
 	mov	%rsp,%rbp
 	push	%r9				# openbsd:pad
-	call	__mmap$sysv
+	call	__sys_mmap
 	leave
 	ret
-	.endfn	mmap$sysv,globl,hidden
+	.endfn	sys_mmap,globl,hidden
diff --git a/libc/calls/thunks/onntconsoleevent.S b/libc/calls/thunks/onntconsoleevent.S
index 1126da796..264158940 100644
--- a/libc/calls/thunks/onntconsoleevent.S
+++ b/libc/calls/thunks/onntconsoleevent.S
@@ -20,7 +20,7 @@
 .text.windows
 .source	__FILE__
 
-__onntconsoleevent$nt:
+__onntconsoleevent_nt:
 	ezlea	__onntconsoleevent,ax
 	jmp	__nt2sysv
-	.endfn	__onntconsoleevent$nt,globl,hidden
+	.endfn	__onntconsoleevent_nt,globl,hidden
diff --git a/libc/calls/thunks/onwincrash.S b/libc/calls/thunks/onwincrash.S
index 8f74e9f38..187c1606d 100644
--- a/libc/calls/thunks/onwincrash.S
+++ b/libc/calls/thunks/onwincrash.S
@@ -20,7 +20,7 @@
 .text.windows
 .source	__FILE__
 
-__wincrash$nt:
+__wincrash_nt:
 	ezlea	__wincrash,ax
 	jmp	__nt2sysv
-	.endfn	__wincrash$nt,globl,hidden
+	.endfn	__wincrash_nt,globl,hidden
diff --git a/libc/calls/thunks/pread-sysv.S b/libc/calls/thunks/pread-sysv.S
index ca544e247..805cd3c01 100644
--- a/libc/calls/thunks/pread-sysv.S
+++ b/libc/calls/thunks/pread-sysv.S
@@ -20,7 +20,7 @@
 .source	__FILE__
 
 /	Directly calls pread() impl on host o/s if available.
-pread$sysv:
+sys_pread:
 	mov	%rcx,%r8			# openbsd:pad
-	jmp	__pread$sysv
-	.endfn	pread$sysv,globl,hidden
+	jmp	__sys_pread
+	.endfn	sys_pread,globl,hidden
diff --git a/libc/calls/thunks/preadv-sysv.S b/libc/calls/thunks/preadv-sysv.S
index 717695b01..bf3bc3e2b 100644
--- a/libc/calls/thunks/preadv-sysv.S
+++ b/libc/calls/thunks/preadv-sysv.S
@@ -20,7 +20,7 @@
 .source	__FILE__
 
 /	Directly calls preadv() impl on host o/s if available.
-preadv$sysv:
+sys_preadv:
 	mov	%rcx,%r8			# openbsd:pad
-	jmp	__preadv$sysv
-	.endfn	preadv$sysv,globl,hidden
+	jmp	__sys_preadv
+	.endfn	sys_preadv,globl,hidden
diff --git a/libc/calls/thunks/pwrite-sysv.S b/libc/calls/thunks/pwrite-sysv.S
index 2cea4f805..1f3c8e4ef 100644
--- a/libc/calls/thunks/pwrite-sysv.S
+++ b/libc/calls/thunks/pwrite-sysv.S
@@ -20,7 +20,7 @@
 .source	__FILE__
 
 /	Directly calls pwrite() impl on host o/s if available.
-pwrite$sysv:
+sys_pwrite:
 	mov	%rcx,%r8			# openbsd:pad
-	jmp	__pwrite$sysv
-	.endfn	pwrite$sysv,globl,hidden
+	jmp	__sys_pwrite
+	.endfn	sys_pwrite,globl,hidden
diff --git a/libc/calls/thunks/pwritev-sysv.S b/libc/calls/thunks/pwritev-sysv.S
index 832174437..831f2e1a6 100644
--- a/libc/calls/thunks/pwritev-sysv.S
+++ b/libc/calls/thunks/pwritev-sysv.S
@@ -20,7 +20,7 @@
 .source	__FILE__
 
 /	Directly calls pwritev() impl on host o/s if available.
-pwritev$sysv:
+sys_pwritev:
 	mov	%rcx,%r8			# openbsd:pad
-	jmp	__pwritev$sysv
-	.endfn	pwritev$sysv,globl,hidden
+	jmp	__sys_pwritev
+	.endfn	sys_pwritev,globl,hidden
diff --git a/libc/calls/thunks/truncate-sysv.S b/libc/calls/thunks/truncate-sysv.S
index bac70ef04..80a52ae0d 100644
--- a/libc/calls/thunks/truncate-sysv.S
+++ b/libc/calls/thunks/truncate-sysv.S
@@ -20,7 +20,7 @@
 .source	__FILE__
 
 /	Directly calls truncate() impl on host o/s if available.
-truncate$sysv:
+sys_truncate:
 	mov	%rsi,%rdx			# openbsd:pad
-	jmp	__truncate$sysv
-	.endfn	truncate$sysv,globl,hidden
+	jmp	__sys_truncate
+	.endfn	sys_truncate,globl,hidden
diff --git a/libc/calls/thunks/winalarm.S b/libc/calls/thunks/winalarm.S
index 3025404bd..292758094 100644
--- a/libc/calls/thunks/winalarm.S
+++ b/libc/calls/thunks/winalarm.S
@@ -20,7 +20,7 @@
 .text.windows
 .source	__FILE__
 
-__winalarm$nt:
+__winalarm_nt:
 	ezlea	__winalarm,ax
 	jmp	__nt2sysv
-	.endfn	__winalarm$nt,globl,hidden
+	.endfn	__winalarm_nt,globl,hidden
diff --git a/libc/calls/truncate-nt.c b/libc/calls/truncate-nt.c
index 18a1407d5..01d82ec37 100644
--- a/libc/calls/truncate-nt.c
+++ b/libc/calls/truncate-nt.c
@@ -24,14 +24,14 @@
 #include "libc/nt/enum/filesharemode.h"
 #include "libc/nt/runtime.h"
 
-textwindows int truncate$nt(const char *path, uint64_t length) {
+textwindows int sys_truncate_nt(const char *path, uint64_t length) {
   bool32 ok;
   int64_t fh;
   uint16_t path16[PATH_MAX];
   if (__mkntpath(path, path16) == -1) return -1;
   if ((fh = CreateFile(path16, kNtGenericWrite, kNtFileShareRead, NULL,
                        kNtOpenExisting, kNtFileAttributeNormal, 0)) != -1) {
-    ok = ftruncate$nt(fh, length);
+    ok = sys_ftruncate_nt(fh, length);
     CloseHandle(fh);
     if (ok) return 0;
   }
diff --git a/libc/calls/truncate.c b/libc/calls/truncate.c
index 7588281a4..bc4f8c295 100644
--- a/libc/calls/truncate.c
+++ b/libc/calls/truncate.c
@@ -34,8 +34,8 @@
 int truncate(const char *path, uint64_t length) {
   if (!path) return efault();
   if (!IsWindows()) {
-    return truncate$sysv(path, length);
+    return sys_truncate(path, length);
   } else {
-    return truncate$nt(path, length);
+    return sys_truncate_nt(path, length);
   }
 }
diff --git a/libc/calls/ttyname_r.c b/libc/calls/ttyname_r.c
index 272b56de4..ee60dba64 100644
--- a/libc/calls/ttyname_r.c
+++ b/libc/calls/ttyname_r.c
@@ -27,7 +27,7 @@
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
-static textwindows noinline int ttyname$nt(int fd, char *buf, size_t size) {
+static textwindows noinline int sys_ttyname_nt(int fd, char *buf, size_t size) {
   uint32_t mode;
   if (GetConsoleMode(g_fds.p[fd].handle, &mode)) {
     if (mode & kNtEnableVirtualTerminalInput) {
@@ -42,7 +42,7 @@ static textwindows noinline int ttyname$nt(int fd, char *buf, size_t size) {
   }
 }
 
-static int ttyname$freebsd(int fd, char *buf, size_t size) {
+static int ttyname_freebsd(int fd, char *buf, size_t size) {
   const unsigned FIODGNAME = 2148558456;
   struct fiodgname_arg {
     int len;
@@ -50,11 +50,11 @@ static int ttyname$freebsd(int fd, char *buf, size_t size) {
   } fg;
   fg.buf = buf;
   fg.len = size;
-  if (ioctl$sysv(fd, FIODGNAME, &fg) != -1) return 0;
+  if (sys_ioctl(fd, FIODGNAME, &fg) != -1) return 0;
   return enotty();
 }
 
-static int ttyname$linux(int fd, char *buf, size_t size) {
+static int ttyname_linux(int fd, char *buf, size_t size) {
   struct stat st1, st2;
   if (!isatty(fd)) return errno;
   char name[PATH_MAX];
@@ -71,12 +71,12 @@ static int ttyname$linux(int fd, char *buf, size_t size) {
 
 int ttyname_r(int fd, char *buf, size_t size) {
   if (IsLinux()) {
-    return ttyname$linux(fd, buf, size);
+    return ttyname_linux(fd, buf, size);
   } else if (IsFreebsd()) {
-    return ttyname$freebsd(fd, buf, size);
+    return ttyname_freebsd(fd, buf, size);
   } else if (IsWindows()) {
     if (__isfdkind(fd, kFdFile)) {
-      return ttyname$nt(fd, buf, size);
+      return sys_ttyname_nt(fd, buf, size);
     } else {
       return ebadf();
     }
diff --git a/libc/calls/tunefd.c b/libc/calls/tunefd.c
deleted file mode 100644
index 1bd20263a..000000000
--- a/libc/calls/tunefd.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/internal.h"
-
-/**
- * Modifies characteristics of open file descriptor.
- */
-int tunefd$sysv(int fd, int getcmd, int setcmd, int addflags) {
-  int current;
-  if (fd != -1 && addflags) {
-    if ((current = fcntl$sysv(fd, getcmd, 0)) == -1 ||
-        fcntl$sysv(fd, setcmd, current | addflags) == -1) {
-      close$sysv(fd);
-      return -1;
-    }
-  }
-  return fd;
-}
diff --git a/libc/calls/uname.c b/libc/calls/uname.c
index 2929090fd..888e2920c 100644
--- a/libc/calls/uname.c
+++ b/libc/calls/uname.c
@@ -30,7 +30,7 @@ int uname(struct utsname *lool) {
   size_t i, j, len;
   char tmp[sizeof(struct utsname)];
   memset(tmp, 0, sizeof(tmp));
-  if (uname$sysv(tmp) != -1) {
+  if (sys_uname(tmp) != -1) {
     out = (char *)lool;
     i = 0;
     j = 0;
diff --git a/libc/calls/unlinkat-nt.c b/libc/calls/unlinkat-nt.c
index b6066b3f8..c690109d3 100644
--- a/libc/calls/unlinkat-nt.c
+++ b/libc/calls/unlinkat-nt.c
@@ -24,7 +24,7 @@
 #include "libc/nt/synchronization.h"
 #include "libc/sysv/consts/at.h"
 
-static textwindows int unlink$nt(const char16_t *path) {
+static textwindows int sys_unlink_nt(const char16_t *path) {
   if (DeleteFile(path)) {
     return 0;
   } else {
@@ -32,7 +32,7 @@ static textwindows int unlink$nt(const char16_t *path) {
   }
 }
 
-static textwindows int rmdir$nt(const char16_t *path) {
+static textwindows int sys_rmdir_nt(const char16_t *path) {
   int e, ms;
   for (ms = 1;; ms *= 2) {
     if (RemoveDirectory(path)) return 0;
@@ -54,12 +54,12 @@ static textwindows int rmdir$nt(const char16_t *path) {
   return -1;
 }
 
-textwindows int unlinkat$nt(int dirfd, const char *path, int flags) {
+textwindows int sys_unlinkat_nt(int dirfd, const char *path, int flags) {
   uint16_t path16[PATH_MAX];
   if (__mkntpathat(dirfd, path, 0, path16) == -1) return -1;
   if (flags & AT_REMOVEDIR) {
-    return rmdir$nt(path16);
+    return sys_rmdir_nt(path16);
   } else {
-    return unlink$nt(path16);
+    return sys_unlink_nt(path16);
   }
 }
diff --git a/libc/calls/unlinkat.c b/libc/calls/unlinkat.c
index 0c682db90..5097fdc29 100644
--- a/libc/calls/unlinkat.c
+++ b/libc/calls/unlinkat.c
@@ -32,8 +32,8 @@
  */
 int unlinkat(int dirfd, const char *path, int flags) {
   if (!IsWindows()) {
-    return unlinkat$sysv(dirfd, path, flags);
+    return sys_unlinkat(dirfd, path, flags);
   } else {
-    return unlinkat$nt(dirfd, path, flags);
+    return sys_unlinkat_nt(dirfd, path, flags);
   }
 }
diff --git a/libc/calls/utimensat-nt.c b/libc/calls/utimensat-nt.c
index fbe249901..1ba55e415 100644
--- a/libc/calls/utimensat-nt.c
+++ b/libc/calls/utimensat-nt.c
@@ -31,7 +31,7 @@
 #include "libc/sysv/errfuns.h"
 #include "libc/time/time.h"
 
-textwindows int utimensat$nt(int dirfd, const char *path,
+textwindows int sys_utimensat_nt(int dirfd, const char *path,
                              const struct timespec ts[2], int flags) {
   int i, rc;
   int64_t fh;
diff --git a/libc/calls/utimensat-sysv.c b/libc/calls/utimensat-sysv.c
index 803328051..7df8fbdeb 100644
--- a/libc/calls/utimensat-sysv.c
+++ b/libc/calls/utimensat-sysv.c
@@ -19,11 +19,11 @@
 #include "libc/calls/internal.h"
 #include "libc/time/time.h"
 
-int utimensat$sysv(int dirfd, const char *path, const struct timespec ts[2],
-                   int flags) {
+int sys_utimensat(int dirfd, const char *path, const struct timespec ts[2],
+                  int flags) {
   if (!IsXnu()) {
-    return __utimensat$sysv(dirfd, path, ts, flags);
+    return __sys_utimensat(dirfd, path, ts, flags);
   } else {
-    return utimensat$xnu(dirfd, path, ts, flags);
+    return sys_utimensat_xnu(dirfd, path, ts, flags);
   }
 }
diff --git a/libc/calls/utimensat-xnu.c b/libc/calls/utimensat-xnu.c
index e4c783a4a..e7ebb91ec 100644
--- a/libc/calls/utimensat-xnu.c
+++ b/libc/calls/utimensat-xnu.c
@@ -23,8 +23,8 @@
 #include "libc/sysv/errfuns.h"
 #include "libc/time/time.h"
 
-int utimensat$xnu(int dirfd, const char *path, const struct timespec ts[2],
-                  int flags) {
+int sys_utimensat_xnu(int dirfd, const char *path, const struct timespec ts[2],
+                      int flags) {
   int i;
   struct timeval now, tv[2];
   if (flags) return einval();
@@ -48,13 +48,13 @@ int utimensat$xnu(int dirfd, const char *path, const struct timespec ts[2],
   }
   if (path) {
     if (dirfd == AT_FDCWD) {
-      return utimes$sysv(path, tv);
+      return sys_utimes(path, tv);
     } else {
       return enosys();
     }
   } else {
     if (dirfd != AT_FDCWD) {
-      return futimes$sysv(dirfd, tv);
+      return sys_futimes(dirfd, tv);
     } else {
       return einval();
     }
diff --git a/libc/calls/utimensat.c b/libc/calls/utimensat.c
index 0d8a1ca22..2b33be08f 100644
--- a/libc/calls/utimensat.c
+++ b/libc/calls/utimensat.c
@@ -29,8 +29,8 @@
 int utimensat(int dirfd, const char *path,
               const struct timespec ts[hasatleast 2], int flags) {
   if (!IsWindows()) {
-    return utimensat$sysv(dirfd, path, ts, flags);
+    return sys_utimensat(dirfd, path, ts, flags);
   } else {
-    return utimensat$nt(dirfd, path, ts, flags);
+    return sys_utimensat_nt(dirfd, path, ts, flags);
   }
 }
diff --git a/libc/calls/vmsplice.c b/libc/calls/vmsplice.c
index 0196f2bd4..1f07e1797 100644
--- a/libc/calls/vmsplice.c
+++ b/libc/calls/vmsplice.c
@@ -32,7 +32,7 @@ ssize_t vmsplice(int fd, const struct iovec *chunks, int64_t count,
   int olderr;
   ssize_t wrote;
   olderr = errno;
-  if ((wrote = vmsplice$sysv(fd, chunks, count, flags)) == -1) {
+  if ((wrote = sys_vmsplice(fd, chunks, count, flags)) == -1) {
     errno = olderr;
     if (count) {
       wrote = write(fd, chunks[0].iov_base, chunks[0].iov_len);
diff --git a/libc/calls/wait3.c b/libc/calls/wait3.c
index 5e73975de..952b568cb 100644
--- a/libc/calls/wait3.c
+++ b/libc/calls/wait3.c
@@ -33,7 +33,7 @@
  */
 int wait3(int *opt_out_wstatus, int options, struct rusage *opt_out_rusage) {
   if (!IsWindows()) {
-    return wait4$sysv(-1, opt_out_wstatus, options, opt_out_rusage);
+    return sys_wait4(-1, opt_out_wstatus, options, opt_out_rusage);
   } else {
     return enosys(); /* TODO(jart) */
   }
diff --git a/libc/calls/wait4-nt.c b/libc/calls/wait4-nt.c
index ffe3eb8c9..0c1f8094e 100644
--- a/libc/calls/wait4-nt.c
+++ b/libc/calls/wait4-nt.c
@@ -32,7 +32,7 @@
 #include "libc/sysv/consts/w.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int wait4$nt(int pid, int *opt_out_wstatus, int options,
+textwindows int sys_wait4_nt(int pid, int *opt_out_wstatus, int options,
                          struct rusage *opt_out_rusage) {
   int pids[64];
   int64_t handles[64];
diff --git a/libc/calls/wait4.c b/libc/calls/wait4.c
index bae7e0385..564a64848 100644
--- a/libc/calls/wait4.c
+++ b/libc/calls/wait4.c
@@ -36,8 +36,8 @@
 int wait4(int pid, int *opt_out_wstatus, int options,
           struct rusage *opt_out_rusage) {
   if (!IsWindows()) {
-    return wait4$sysv(pid, opt_out_wstatus, options, opt_out_rusage);
+    return sys_wait4(pid, opt_out_wstatus, options, opt_out_rusage);
   } else {
-    return wait4$nt(pid, opt_out_wstatus, options, opt_out_rusage);
+    return sys_wait4_nt(pid, opt_out_wstatus, options, opt_out_rusage);
   }
 }
diff --git a/libc/calls/wait4.h b/libc/calls/wait4.h
index 03ea3ba20..51507989d 100644
--- a/libc/calls/wait4.h
+++ b/libc/calls/wait4.h
@@ -4,7 +4,7 @@
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
-int wait4$nt(int, int *, int, struct rusage *) hidden;
+int sys_wait4_nt(int, int *, int, struct rusage *) hidden;
 
 COSMOPOLITAN_C_END_
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
diff --git a/libc/calls/wincrash_init.S b/libc/calls/wincrash_init.S
index 62b839b38..093ddf653 100644
--- a/libc/calls/wincrash_init.S
+++ b/libc/calls/wincrash_init.S
@@ -21,6 +21,6 @@
 
 	.init.start 300,_init_wincrash
 	pushpop	1,%rcx
-	ezlea	__wincrash$nt,dx
+	ezlea	__wincrash_nt,dx
 	ntcall	__imp_AddVectoredExceptionHandler
 	.init.end 300,_init_wincrash,globl,hidden
diff --git a/libc/calls/write-nt.c b/libc/calls/write-nt.c
index bc414cd08..c508a5725 100644
--- a/libc/calls/write-nt.c
+++ b/libc/calls/write-nt.c
@@ -33,7 +33,7 @@ static size_t SumIovecLen(const struct iovec *v, size_t n) {
   return sum;
 }
 
-textwindows ssize_t write$nt(struct Fd *fd, const struct iovec *iov,
+textwindows ssize_t sys_write_nt(struct Fd *fd, const struct iovec *iov,
                              size_t iovlen, ssize_t opt_offset) {
   uint32_t wrote;
   struct NtOverlapped overlap;
diff --git a/libc/calls/writev.c b/libc/calls/writev.c
index 0bc9e9e65..9bbc68fae 100644
--- a/libc/calls/writev.c
+++ b/libc/calls/writev.c
@@ -42,12 +42,12 @@ ssize_t writev(int fd, const struct iovec *iov, int iovlen) {
   } else if (fd < g_fds.n && g_fds.p[fd].kind == kFdSerial) {
     return writev$serial(&g_fds.p[fd], iov, iovlen);
   } else if (!IsWindows()) {
-    return writev$sysv(fd, iov, iovlen);
+    return sys_writev(fd, iov, iovlen);
   } else if (fd < g_fds.n &&
              (g_fds.p[fd].kind == kFdFile || g_fds.p[fd].kind == kFdConsole)) {
-    return write$nt(&g_fds.p[fd], iov, iovlen, -1);
+    return sys_write_nt(&g_fds.p[fd], iov, iovlen, -1);
   } else if (fd < g_fds.n && g_fds.p[fd].kind == kFdSocket) {
-    return weaken(sendto$nt)(&g_fds.p[fd], iov, iovlen, 0, NULL, 0);
+    return weaken(sys_sendto_nt)(&g_fds.p[fd], iov, iovlen, 0, NULL, 0);
   } else {
     return ebadf();
   }
diff --git a/libc/calls/xnutrampoline.c b/libc/calls/xnutrampoline.c
index ee0b7eb20..2e8a9a676 100644
--- a/libc/calls/xnutrampoline.c
+++ b/libc/calls/xnutrampoline.c
@@ -424,9 +424,9 @@ static void xnussefpustate2linux(struct FpuState *fs,
   memcpy(fs->st, &xnufs->__fpu_stmm0, (8 + 16) * sizeof(uint128_t));
 }
 
-wontreturn void xnutrampoline(void *fn, int infostyle, int sig,
-                              const struct __darwin_siginfo *xnuinfo,
-                              const struct __darwin_ucontext *xnuctx) {
+wontreturn void __xnutrampoline(void *fn, int infostyle, int sig,
+                                const struct __darwin_siginfo *xnuinfo,
+                                const struct __darwin_ucontext *xnuctx) {
   /* note: this function impl can't access static memory */
   intptr_t ax;
   struct Goodies {
diff --git a/libc/log/gdb.h b/libc/log/gdb.h
index 09dcf87ac..0eccb440e 100644
--- a/libc/log/gdb.h
+++ b/libc/log/gdb.h
@@ -51,7 +51,7 @@ int attachdebugger(intptr_t);
                      "d"(OPTIONS), "g"(OPT_OUT_RUSAGE)                \
                    : "rcx", "r10", "r11", "cc", "memory");            \
     } else {                                                          \
-      WaAx = wait4$nt(PID, OPT_OUT_WSTATUS, OPTIONS, OPT_OUT_RUSAGE); \
+      WaAx = sys_wait4_nt(PID, OPT_OUT_WSTATUS, OPTIONS, OPT_OUT_RUSAGE); \
     }                                                                 \
     WaAx;                                                             \
   })
diff --git a/libc/nt/KernelBase/time.s b/libc/nt/KernelBase/time.s
deleted file mode 100644
index 9eef0252b..000000000
--- a/libc/nt/KernelBase/time.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_time,time,1865
diff --git a/libc/nt/KernelBase/wprintf.s b/libc/nt/KernelBase/wprintf.s
deleted file mode 100644
index 3a0966d4c..000000000
--- a/libc/nt/KernelBase/wprintf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_wprintf,wprintf,1866
diff --git a/libc/nt/gdi32/vSetPldc.s b/libc/nt/gdi32/vSetPldc.s
deleted file mode 100644
index b246449e7..000000000
--- a/libc/nt/gdi32/vSetPldc.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	gdi32,__imp_vSetPldc,vSetPldc,1966
diff --git a/libc/nt/kernel32/lstrcatA.s b/libc/nt/kernel32/lstrcatA.s
deleted file mode 100644
index 69039a38d..000000000
--- a/libc/nt/kernel32/lstrcatA.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_lstrcatA,lstrcatA,1592
diff --git a/libc/nt/kernel32/lstrcatW.s b/libc/nt/kernel32/lstrcatW.s
deleted file mode 100644
index 5a541e075..000000000
--- a/libc/nt/kernel32/lstrcatW.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_lstrcatW,lstrcatW,1593
diff --git a/libc/nt/kernel32/lstrcmpA.s b/libc/nt/kernel32/lstrcmpA.s
deleted file mode 100644
index 00c9584e5..000000000
--- a/libc/nt/kernel32/lstrcmpA.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_lstrcmpA,lstrcmpA,0
diff --git a/libc/nt/kernel32/lstrcmpW.s b/libc/nt/kernel32/lstrcmpW.s
deleted file mode 100644
index e99ec473a..000000000
--- a/libc/nt/kernel32/lstrcmpW.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_lstrcmpW,lstrcmpW,0
diff --git a/libc/nt/kernel32/lstrcmpiA.s b/libc/nt/kernel32/lstrcmpiA.s
deleted file mode 100644
index e26758124..000000000
--- a/libc/nt/kernel32/lstrcmpiA.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_lstrcmpiA,lstrcmpiA,0
diff --git a/libc/nt/kernel32/lstrcmpiW.s b/libc/nt/kernel32/lstrcmpiW.s
deleted file mode 100644
index 54d49e9b2..000000000
--- a/libc/nt/kernel32/lstrcmpiW.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_lstrcmpiW,lstrcmpiW,0
diff --git a/libc/nt/kernel32/lstrcpyA.s b/libc/nt/kernel32/lstrcpyA.s
deleted file mode 100644
index 61e877d2c..000000000
--- a/libc/nt/kernel32/lstrcpyA.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_lstrcpyA,lstrcpyA,1601
diff --git a/libc/nt/kernel32/lstrcpyW.s b/libc/nt/kernel32/lstrcpyW.s
deleted file mode 100644
index 0a1f0d751..000000000
--- a/libc/nt/kernel32/lstrcpyW.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_lstrcpyW,lstrcpyW,1602
diff --git a/libc/nt/kernel32/lstrcpynA.s b/libc/nt/kernel32/lstrcpynA.s
deleted file mode 100644
index 8eb89acee..000000000
--- a/libc/nt/kernel32/lstrcpynA.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_lstrcpynA,lstrcpynA,0
diff --git a/libc/nt/kernel32/lstrcpynW.s b/libc/nt/kernel32/lstrcpynW.s
deleted file mode 100644
index 7d068e41c..000000000
--- a/libc/nt/kernel32/lstrcpynW.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_lstrcpynW,lstrcpynW,0
diff --git a/libc/nt/kernel32/lstrlenA.s b/libc/nt/kernel32/lstrlenA.s
deleted file mode 100644
index 7e48aab7e..000000000
--- a/libc/nt/kernel32/lstrlenA.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_lstrlenA,lstrlenA,0
diff --git a/libc/nt/kernel32/lstrlenW.s b/libc/nt/kernel32/lstrlenW.s
deleted file mode 100644
index a7ab48262..000000000
--- a/libc/nt/kernel32/lstrlenW.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_lstrlenW,lstrlenW,0
diff --git a/libc/nt/kernel32/uaw_lstrcmpW.s b/libc/nt/kernel32/uaw_lstrcmpW.s
deleted file mode 100644
index 807501a42..000000000
--- a/libc/nt/kernel32/uaw_lstrcmpW.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_uaw_lstrcmpW,uaw_lstrcmpW,1614
diff --git a/libc/nt/kernel32/uaw_lstrcmpiW.s b/libc/nt/kernel32/uaw_lstrcmpiW.s
deleted file mode 100644
index 5a894917e..000000000
--- a/libc/nt/kernel32/uaw_lstrcmpiW.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_uaw_lstrcmpiW,uaw_lstrcmpiW,1615
diff --git a/libc/nt/kernel32/uaw_lstrlenW.s b/libc/nt/kernel32/uaw_lstrlenW.s
deleted file mode 100644
index da7f470dd..000000000
--- a/libc/nt/kernel32/uaw_lstrlenW.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_uaw_lstrlenW,uaw_lstrlenW,1616
diff --git a/libc/nt/kernel32/uaw_wcschr.s b/libc/nt/kernel32/uaw_wcschr.s
deleted file mode 100644
index 888a7421d..000000000
--- a/libc/nt/kernel32/uaw_wcschr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_uaw_wcschr,uaw_wcschr,1617
diff --git a/libc/nt/kernel32/uaw_wcscpy.s b/libc/nt/kernel32/uaw_wcscpy.s
deleted file mode 100644
index 4eae5f314..000000000
--- a/libc/nt/kernel32/uaw_wcscpy.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_uaw_wcscpy,uaw_wcscpy,1618
diff --git a/libc/nt/kernel32/uaw_wcsicmp.s b/libc/nt/kernel32/uaw_wcsicmp.s
deleted file mode 100644
index e58af7050..000000000
--- a/libc/nt/kernel32/uaw_wcsicmp.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_uaw_wcsicmp,uaw_wcsicmp,1619
diff --git a/libc/nt/kernel32/uaw_wcslen.s b/libc/nt/kernel32/uaw_wcslen.s
deleted file mode 100644
index daca04a43..000000000
--- a/libc/nt/kernel32/uaw_wcslen.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_uaw_wcslen,uaw_wcslen,1620
diff --git a/libc/nt/kernel32/uaw_wcsrchr.s b/libc/nt/kernel32/uaw_wcsrchr.s
deleted file mode 100644
index e42fbf951..000000000
--- a/libc/nt/kernel32/uaw_wcsrchr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	kernel32,__imp_uaw_wcsrchr,uaw_wcsrchr,1621
diff --git a/libc/nt/master.sh b/libc/nt/master.sh
index eab157802..e98dc6f03 100755
--- a/libc/nt/master.sh
+++ b/libc/nt/master.sh
@@ -22,9 +22,6 @@
 # » so many sections
 #
 #	Name							Actual							DLL		Hint	Arity
-imp	'A_SHAInit'						A_SHAInit						ntdll		10
-imp	'A_SHAUpdate'						A_SHAUpdate						ntdll		11
-imp	'A_SHAFinal'						A_SHAFinal						ntdll		9
 imp	'AbortDoc'						AbortDoc						gdi32		1011
 imp	'AbortPath'						AbortPath						gdi32		1012
 imp	'AbortSystemShutdownA'					AbortSystemShutdownA					advapi32	1005
@@ -2973,7 +2970,7 @@ imp	'IsChild'						IsChild							user32		2059	2
 imp	'IsClipboardFormatAvailable'				IsClipboardFormatAvailable				user32		2060
 imp	'IsDBCSLeadByte'					IsDBCSLeadByte						kernel32	0		# KernelBase
 imp	'IsDBCSLeadByteEx'					IsDBCSLeadByteEx					kernel32	0		# KernelBase
-imp	'IsDebuggerPresent$nt'					IsDebuggerPresent					KernelBase	903
+imp	'sys_IsDebuggerPresent_nt'					IsDebuggerPresent					KernelBase	903
 imp	'IsDesktopExplorerProcess'				IsDesktopExplorerProcess				shell32		942
 imp	'IsDeveloperModeEnabled'				IsDeveloperModeEnabled					KernelBase	904
 imp	'IsDeveloperModePolicyApplied'				IsDeveloperModePolicyApplied				KernelBase	905
@@ -3340,9 +3337,6 @@ imp	'MB_GetString'						MB_GetString						user32		2127
 imp	'MD4Final'						MD4Final						ntdll		188
 imp	'MD4Init'						MD4Init							ntdll		189
 imp	'MD4Update'						MD4Update						ntdll		190
-imp	'MD5Final$nt'						MD5Final						ntdll		191
-imp	'MD5Init$nt'						MD5Init							ntdll		192
-imp	'MD5Update$nt'						MD5Update						ntdll		193
 imp	'MIDL_user_free_Ext'					MIDL_user_free_Ext					advapi32	1507
 imp	'MIMEAssociationDialogA'				MIMEAssociationDialogA					url		107
 imp	'MIMEAssociationDialog'					MIMEAssociationDialogW					url		108
@@ -7684,21 +7678,13 @@ imp	'_atoi64'						_atoi64							ntdll		2180
 imp	'_c_exit'						_c_exit							KernelBase	1839
 imp	'_cexit'						_cexit							KernelBase	1840
 imp	'_errno'						_errno							ntdll		2181
-imp	'_exit$nt'						_exit							KernelBase	1841
+imp	'sys__exit_nt'						_exit							KernelBase	1841
 imp	'_fltused'						_fltused						ntdll		2182
 imp	'_hread'						_hread							kernel32	1582
 imp	'_hwrite'						_hwrite							kernel32	1583
-imp	'_i64toa'						_i64toa							ntdll		2183
-imp	'_i64toa_s'						_i64toa_s						ntdll		2184
-imp	'_i64tow'						_i64tow							ntdll		2185
-imp	'_i64tow_s'						_i64tow_s						ntdll		2186
 imp	'_initterm'						_initterm						KernelBase	1842
 imp	'_initterm_e'						_initterm_e						KernelBase	1843
 imp	'_invalid_parameter'					_invalid_parameter					KernelBase	1844
-imp	'_itoa'							_itoa							ntdll		2187
-imp	'_itoa_s'						_itoa_s							ntdll		2188
-imp	'_itow'							_itow							ntdll		2189
-imp	'_itow_s'						_itow_s							ntdll		2190
 imp	'_lclose'						_lclose							kernel32	1584
 imp	'_lcreat'						_lcreat							kernel32	1585
 imp	'_lfind'						_lfind							ntdll		2191
@@ -7706,269 +7692,95 @@ imp	'_llseek'						_llseek							kernel32	1586
 imp	'_local_unwind'						_local_unwind						ntdll		2192
 imp	'_lopen'						_lopen							kernel32	1588
 imp	'_lread'						_lread							kernel32	1589
-imp	'_ltoa'							_ltoa							ntdll		2193
-imp	'_ltoa_s'						_ltoa_s							ntdll		2194
-imp	'_ltow'							_ltow							ntdll		2195
-imp	'_ltow_s'						_ltow_s							ntdll		2196
 imp	'_lwrite'						_lwrite							kernel32	1590
 imp	'_makepath_s'						_makepath_s						ntdll		2197
 imp	'_memccpy'						_memccpy						ntdll		2198
 imp	'_memicmp'						_memicmp						ntdll		2199
 imp	'_onexit'						_onexit							KernelBase	1846
 imp	'_purecall'						_purecall						KernelBase	1847
-imp	'_setjmp$nt'						_setjmp							ntdll		2200
+imp	'sys__setjmp_nt'						_setjmp							ntdll		2200
 imp	'_setjmpex'						_setjmpex						ntdll		2201
-imp	'_snprintf'						_snprintf						ntdll		2202
-imp	'_snprintf_s'						_snprintf_s						ntdll		2203
-imp	'_snscanf_s'						_snscanf_s						ntdll		2204
-imp	'_snwprintf'						_snwprintf						ntdll		2205
-imp	'_snwprintf_s'						_snwprintf_s						ntdll		2206
-imp	'_snwscanf_s'						_snwscanf_s						ntdll		2207
-imp	'_splitpath'						_splitpath						ntdll		2208
-imp	'_splitpath_s'						_splitpath_s						ntdll		2209
-imp	'_strcmpi'						_strcmpi						ntdll		2210
-imp	'_stricmp'						_stricmp						ntdll		2211
-imp	'_strlwr'						_strlwr							ntdll		2212
-imp	'_strlwr_s'						_strlwr_s						ntdll		2213
-imp	'_strnicmp'						_strnicmp						ntdll		2214
-imp	'_strnset_s'						_strnset_s						ntdll		2215
-imp	'_strset_s'						_strset_s						ntdll		2216
-imp	'_strupr'						_strupr							ntdll		2217
-imp	'_strupr_s'						_strupr_s						ntdll		2218
-imp	'_swprintf'						_swprintf						ntdll		2219
 imp	'_time64'						_time64							KernelBase	1848
-imp	'_ui64toa'						_ui64toa						ntdll		2220
-imp	'_ui64toa_s'						_ui64toa_s						ntdll		2221
-imp	'_ui64tow'						_ui64tow						ntdll		2222
-imp	'_ui64tow_s'						_ui64tow_s						ntdll		2223
-imp	'_ultoa'						_ultoa							ntdll		2224
-imp	'_ultoa_s'						_ultoa_s						ntdll		2225
-imp	'_ultow'						_ultow							ntdll		2226
-imp	'_ultow_s'						_ultow_s						ntdll		2227
-imp	'_vscprintf'						_vscprintf						ntdll		2228
-imp	'_vscwprintf'						_vscwprintf						ntdll		2229
-imp	'_vsnprintf'						_vsnprintf						ntdll		2230
-imp	'_vsnprintf_s'						_vsnprintf_s						ntdll		2231
-imp	'_vsnwprintf'						_vsnwprintf						ntdll		2232
-imp	'_vsnwprintf_s'						_vsnwprintf_s						ntdll		2233
-imp	'_vswprintf'						_vswprintf						ntdll		2234
-imp	'_wcsicmp'						_wcsicmp						ntdll		2235
-imp	'_wcslwr'						_wcslwr							ntdll		2236
-imp	'_wcslwr_s'						_wcslwr_s						ntdll		2237
-imp	'_wcsnicmp'						_wcsnicmp						ntdll		2238
-imp	'_wcsnset_s'						_wcsnset_s						ntdll		2239
-imp	'_wcsset_s'						_wcsset_s						ntdll		2240
-imp	'_wcstoi64'						_wcstoi64						ntdll		2241
-imp	'_wcstoui64'						_wcstoui64						ntdll		2242
-imp	'_wcsupr'						_wcsupr							ntdll		2243
-imp	'_wcsupr_s'						_wcsupr_s						ntdll		2244
 imp	'_wmakepath_s'						_wmakepath_s						ntdll		2245
 imp	'_wsplitpath_s'						_wsplitpath_s						ntdll		2246
 imp	'_wtoi'							_wtoi							ntdll		2247
 imp	'_wtoi64'						_wtoi64							ntdll		2248
 imp	'_wtol'							_wtol							ntdll		2249
-imp	'abs$nt'						abs							ntdll		2250
-imp	'__accept$nt'						accept							ws2_32		1
-imp	'atan$nt'						atan							ntdll		2251
-imp	'atan2$nt'						atan2							ntdll		2252
-imp	'atexit$nt'						atexit							KernelBase	1849
-imp	'atoi$nt'						atoi							ntdll		2253
-imp	'atol$nt'						atol							ntdll		2254
+imp	'sys_abs_nt'						abs							ntdll		2250
+imp	'__sys_accept_nt'						accept							ws2_32		1
+imp	'sys_atan_nt'						atan							ntdll		2251
+imp	'sys_atan2_nt'						atan2							ntdll		2252
+imp	'sys_atexit_nt'						atexit							KernelBase	1849
+imp	'sys_atoi_nt'						atoi							ntdll		2253
+imp	'sys_atol_nt'						atol							ntdll		2254
 imp	'bCreateDCW'						bCreateDCW						gdi32		1948
 imp	'bDeleteLDC'						bDeleteLDC						gdi32		1949
 imp	'bInitSystemAndFontsDirectories'			bInitSystemAndFontsDirectoriesW				gdi32		1950
 imp	'bMakePathName'						bMakePathNameW						gdi32		1951
-imp	'__bind$nt'						bind							ws2_32		2	3
-imp	'bsearch$nt'						bsearch							ntdll		2255
+imp	'__sys_bind_nt'						bind							ws2_32		2	3
+imp	'sys_bsearch_nt'						bsearch							ntdll		2255
 imp	'bsearch_s'						bsearch_s						ntdll		2256
 imp	'cGetTTFFromFOT'					cGetTTFFromFOT						gdi32		1952
-imp	'ceil$nt'						ceil							ntdll		2257
-imp	'__closesocket$nt'					closesocket						ws2_32		3	1
-imp	'__connect$nt'						connect							ws2_32		4
-imp	'cos$nt'						cos							ntdll		2258
+imp	'sys_ceil_nt'						ceil							ntdll		2257
+imp	'__sys_closesocket_nt'					closesocket						ws2_32		3	1
+imp	'__sys_connect_nt'						connect							ws2_32		4
+imp	'sys_cos_nt'						cos							ntdll		2258
 imp	'dwLBSubclass'						dwLBSubclass						comdlg32	128
 imp	'dwOKSubclass'						dwOKSubclass						comdlg32	129
-imp	'exit$nt'						exit							KernelBase	1850
-imp	'fabs$nt'						fabs							ntdll		2259
-imp	'floor$nt'						floor							ntdll		2260
+imp	'sys_exit_nt'						exit							KernelBase	1850
+imp	'sys_fabs_nt'						fabs							ntdll		2259
+imp	'sys_floor_nt'						floor							ntdll		2260
 imp	'fpClosePrinter'					fpClosePrinter						gdi32		1953
-imp	'freeaddrinfo$nt'					freeaddrinfo						ws2_32		190
+imp	'sys_freeaddrinfo_nt'					freeaddrinfo						ws2_32		190
 imp	'gMaxGdiHandleCount'					gMaxGdiHandleCount					gdi32		1955
 imp	'gSharedInfo'						gSharedInfo						user32		2547
 imp	'gW32PID'						gW32PID							gdi32		1956
 imp	'g_systemCallFilterId'					g_systemCallFilterId					gdi32		1957
 imp	'gapfnScSendMessage'					gapfnScSendMessage					user32		2562
 imp	'gdiPlaySpoolStream'					gdiPlaySpoolStream					gdi32		1958
-imp	'getaddrinfo$nt'					getaddrinfo						ws2_32		191
-imp	'gethostbyaddr$nt'					gethostbyaddr						ws2_32		51
-imp	'gethostbyname$nt'					gethostbyname						ws2_32		52
-imp	'gethostname$nt'					gethostname						ws2_32		57
-imp	'getnameinfo$nt'					getnameinfo						ws2_32		192
-imp	'__getpeername$nt'					getpeername						ws2_32		5	3
-imp	'getprotobyname$nt'					getprotobyname						ws2_32		53
-imp	'getprotobynumber$nt'					getprotobynumber					ws2_32		54
-imp	'getservbyname$nt'					getservbyname						ws2_32		55
-imp	'getservbyport$nt'					getservbyport						ws2_32		56
-imp	'__getsockname$nt'					getsockname						ws2_32		6	3
-imp	'__getsockopt$nt'					getsockopt						ws2_32		7	5
+imp	'sys_getaddrinfo_nt'					getaddrinfo						ws2_32		191
+imp	'sys_gethostbyaddr_nt'					gethostbyaddr						ws2_32		51
+imp	'sys_gethostbyname_nt'					gethostbyname						ws2_32		52
+imp	'sys_gethostname_nt'					gethostname						ws2_32		57
+imp	'sys_getnameinfo_nt'					getnameinfo						ws2_32		192
+imp	'__sys_getpeername_nt'					getpeername						ws2_32		5	3
+imp	'sys_getprotobyname_nt'					getprotobyname						ws2_32		53
+imp	'sys_getprotobynumber_nt'					getprotobynumber					ws2_32		54
+imp	'sys_getservbyname_nt'					getservbyname						ws2_32		55
+imp	'sys_getservbyport_nt'					getservbyport						ws2_32		56
+imp	'__sys_getsockname_nt'					getsockname						ws2_32		6	3
+imp	'__sys_getsockopt_nt'					getsockopt						ws2_32		7	5
 imp	'ghICM'							ghICM							gdi32		1959
 imp	'hGetPEBHandle'						hGetPEBHandle						gdi32		1960
 imp	'hgets'							hgets							KernelBase	1851
-imp	'htonl$nt'						htonl							ws2_32		8
-imp	'htons$nt'						htons							ws2_32		9
 imp	'hwprintf'						hwprintf						KernelBase	1852
-imp	'inet_addr$nt'						inet_addr						ws2_32		11
-imp	'inet_ntoa$nt'						inet_ntoa						ws2_32		12
-imp	'inet_ntop$nt'						inet_ntop						ws2_32		193
-imp	'inet_pton$nt'						inet_pton						ws2_32		194
-imp	'__ioctlsocket$nt'					ioctlsocket						ws2_32		10	3
-imp	'isalnum$nt'						isalnum							ntdll		2261
-imp	'isalpha$nt'						isalpha							ntdll		2262
-imp	'iscntrl$nt'						iscntrl							ntdll		2263
-imp	'isdigit$nt'						isdigit							ntdll		2264
-imp	'isgraph$nt'						isgraph							ntdll		2265
-imp	'islower$nt'						islower							ntdll		2266
-imp	'isprint$nt'						isprint							ntdll		2267
-imp	'ispunct$nt'						ispunct							ntdll		2268
-imp	'isspace$nt'						isspace							ntdll		2269
-imp	'isupper$nt'						isupper							ntdll		2270
-imp	'iswalnum$nt'						iswalnum						ntdll		2271
-imp	'iswalpha$nt'						iswalpha						ntdll		2272
+imp	'__sys_ioctlsocket_nt'					ioctlsocket						ws2_32		10	3
 imp	'iswascii'						iswascii						ntdll		2273
-imp	'iswctype$nt'						iswctype						ntdll		2274
-imp	'iswdigit$nt'						iswdigit						ntdll		2275
-imp	'iswgraph$nt'						iswgraph						ntdll		2276
-imp	'iswlower$nt'						iswlower						ntdll		2277
-imp	'iswprint$nt'						iswprint						ntdll		2278
-imp	'iswspace$nt'						iswspace						ntdll		2279
-imp	'iswxdigit$nt'						iswxdigit						ntdll		2280
-imp	'isxdigit$nt'						isxdigit						ntdll		2281
 imp	'keybd_event'						keybd_event						user32		2580
-imp	'labs$nt'						labs							ntdll		2282
-imp	'__listen$nt'						listen							ws2_32		13	2
-imp	'log$nt'						log							ntdll		2283
-imp	'longjmp$nt'						longjmp							ntdll		2284
-imp	'lstrcatA'						lstrcatA						kernel32	1592
-imp	'lstrcat'						lstrcatW						kernel32	1593
-imp	'lstrcmpA'						lstrcmpA						kernel32	0		# KernelBase
-imp	'lstrcmp'						lstrcmpW						kernel32	0		# KernelBase
-imp	'lstrcmpiA'						lstrcmpiA						kernel32	0		# KernelBase
-imp	'lstrcmpi'						lstrcmpiW						kernel32	0		# KernelBase
-imp	'lstrcpyA'						lstrcpyA						kernel32	1601
-imp	'lstrcpy'						lstrcpyW						kernel32	1602
-imp	'lstrcpynA'						lstrcpynA						kernel32	0		# KernelBase
-imp	'lstrcpyn'						lstrcpynW						kernel32	0		# KernelBase
-imp	'lstrlenA'						lstrlenA						kernel32	0		# KernelBase
-imp	'lstrlen'						lstrlenW						kernel32	0		# KernelBase
-imp	'mbstowcs$nt'						mbstowcs						ntdll		2285
-imp	'memchr$nt'						memchr							ntdll		2286
-imp	'memcmp$nt'						memcmp							ntdll		2287
-imp	'memcpy$nt'						memcpy							ntdll		2288
-imp	'memcpy_s'						memcpy_s						ntdll		2289
-imp	'memmove$nt'						memmove							ntdll		2290
-imp	'memmove_s'						memmove_s						ntdll		2291
-imp	'memset$nt'						memset							ntdll		2292
+imp	'sys_labs_nt'						labs							ntdll		2282
+imp	'__sys_listen_nt'						listen							ws2_32		13	2
+imp	'sys_log_nt'						log							ntdll		2283
+imp	'sys_longjmp_nt'						longjmp							ntdll		2284
 imp	'mouse_event'						mouse_event						user32		2583
-imp	'ntohl$nt'						ntohl							ws2_32		14
-imp	'ntohs$nt'						ntohs							ws2_32		15
 imp	'pGdiDevCaps'						pGdiDevCaps						gdi32		1961
 imp	'pGdiSharedHandleTable'					pGdiSharedHandleTable					gdi32		1962
 imp	'pGdiSharedMemory'					pGdiSharedMemory					gdi32		1963
 imp	'pldcGet'						pldcGet							gdi32		1964
-imp	'pow$nt'						pow							ntdll		2293
-imp	'qsort$nt'						qsort							ntdll		2294
-imp	'qsort_s$nt'						qsort_s							ntdll		2295
-imp	'recv$nt'						recv							ws2_32		16
-imp	'__recvfrom$nt'						recvfrom						ws2_32		17
-imp	'__select$nt'						select							ws2_32		18	5
+imp	'sys_recv_nt'						recv							ws2_32		16
+imp	'__sys_recvfrom_nt'						recvfrom						ws2_32		17
+imp	'__sys_select_nt'						select							ws2_32		18	5
 imp	'semDxTrimNotification'					semDxTrimNotification					gdi32		1965
-imp	'send$nt'						send							ws2_32		19
-imp	'__sendto$nt'						sendto							ws2_32		20
-imp	'__setsockopt$nt'					setsockopt						ws2_32		21	5
-imp	'__shutdown$nt'						shutdown						ws2_32		22	2
-imp	'sin$nt'						sin							ntdll		2296
-imp	'__socket$nt'						socket							ws2_32		23
-imp	'sprintf$nt'						sprintf							ntdll		2297
-imp	'sprintf_s$nt'						sprintf_s						ntdll		2298
-imp	'sqrt$nt'						sqrt							ntdll		2299
-imp	'sscanf$nt'						sscanf							ntdll		2300
-imp	'sscanf_s$nt'						sscanf_s						ntdll		2301
-imp	'strcat$nt'						strcat							ntdll		2302
-imp	'strcat_s$nt'						strcat_s						ntdll		2303
-imp	'strchr$nt'						strchr							ntdll		2304
-imp	'strcmp$nt'						strcmp							ntdll		2305
-imp	'strcpy$nt'						strcpy							ntdll		2306
-imp	'strcpy_s$nt'						strcpy_s						ntdll		2307
-imp	'strcspn$nt'						strcspn							ntdll		2308
-imp	'strlen$nt'						strlen							ntdll		2309
-imp	'strncat$nt'						strncat							ntdll		2310
-imp	'strncat_s$nt'						strncat_s						ntdll		2311
-imp	'strncmp$nt'						strncmp							ntdll		2312
-imp	'strncpy$nt'						strncpy							ntdll		2313
-imp	'strncpy_s$nt'						strncpy_s						ntdll		2314
-imp	'strnlen$nt'						strnlen							ntdll		2315
-imp	'strpbrk$nt'						strpbrk							ntdll		2316
-imp	'strrchr$nt'						strrchr							ntdll		2317
-imp	'strspn$nt'						strspn							ntdll		2318
-imp	'strstr$nt'						strstr							ntdll		2319
-imp	'strtok_s$nt'						strtok_s						ntdll		2320
-imp	'strtol$nt'						strtol							ntdll		2321
-imp	'strtoul$nt'						strtoul							ntdll		2322
-imp	'swprintf$nt'						swprintf						ntdll		2323
-imp	'swprintf_s'						swprintf_s						ntdll		2324
-imp	'swscanf_s'						swscanf_s						ntdll		2325
-imp	'tan$nt'						tan							ntdll		2326
-imp	'time$nt'						time							KernelBase	1865
+imp	'sys_send_nt'						send							ws2_32		19
+imp	'__sys_sendto_nt'						sendto							ws2_32		20
+imp	'__sys_setsockopt_nt'					setsockopt						ws2_32		21	5
+imp	'__sys_shutdown_nt'						shutdown						ws2_32		22	2
+imp	'sys_sin_nt'						sin							ntdll		2296
+imp	'__sys_socket_nt'						socket							ws2_32		23
 imp	'timeBeginPeriod'					timeBeginPeriod						kernel32	1609
 imp	'timeEndPeriod'						timeEndPeriod						kernel32	1610
 imp	'timeGetDevCaps'					timeGetDevCaps						kernel32	1611
 imp	'timeGetSystemTime'					timeGetSystemTime					kernel32	1612
 imp	'timeGetTime'						timeGetTime						kernel32	1613
-imp	'tolower$nt'						tolower							ntdll		2327
-imp	'toupper$nt'						toupper							ntdll		2328
-imp	'towlower$nt'						towlower						ntdll		2329
-imp	'towupper$nt'						towupper						ntdll		2330
-imp	'uaw_lstrcmp'						uaw_lstrcmpW						kernel32	1614
-imp	'uaw_lstrcmpi'						uaw_lstrcmpiW						kernel32	1615
-imp	'uaw_lstrlen'						uaw_lstrlenW						kernel32	1616
-imp	'uaw_wcschr'						uaw_wcschr						kernel32	1617
-imp	'uaw_wcscpy'						uaw_wcscpy						kernel32	1618
-imp	'uaw_wcsicmp'						uaw_wcsicmp						kernel32	1619
-imp	'uaw_wcslen'						uaw_wcslen						kernel32	1620
-imp	'uaw_wcsrchr'						uaw_wcsrchr						kernel32	1621
-imp	'vDbgPrintEx'						vDbgPrintEx						ntdll		2331
-imp	'vDbgPrintExWithPrefix'					vDbgPrintExWithPrefix					ntdll		2332
-imp	'vSetPldc'						vSetPldc						gdi32		1966
-imp	'vsprintf$nt'						vsprintf						ntdll		2333
-imp	'vsprintf_s'						vsprintf_s						ntdll		2334
-imp	'vswprintf_s'						vswprintf_s						ntdll		2335
-imp	'wcscat$nt'						wcscat							ntdll		2336
-imp	'wcscat_s'						wcscat_s						ntdll		2337
-imp	'wcschr$nt'						wcschr							ntdll		2338
-imp	'wcscmp$nt'						wcscmp							ntdll		2339
-imp	'wcscpy$nt'						wcscpy							ntdll		2340
-imp	'wcscpy_s'						wcscpy_s						ntdll		2341
-imp	'wcscspn$nt'						wcscspn							ntdll		2342
-imp	'wcslen$nt'						wcslen							ntdll		2343
-imp	'wcsncat$nt'						wcsncat							ntdll		2344
-imp	'wcsncat_s'						wcsncat_s						ntdll		2345
-imp	'wcsncmp$nt'						wcsncmp							ntdll		2346
-imp	'wcsncpy$nt'						wcsncpy							ntdll		2347
-imp	'wcsncpy_s'						wcsncpy_s						ntdll		2348
-imp	'wcsnlen$nt'						wcsnlen							ntdll		2349
-imp	'wcspbrk$nt'						wcspbrk							ntdll		2350
-imp	'wcsrchr$nt'						wcsrchr							ntdll		2351
-imp	'wcsspn$nt'						wcsspn							ntdll		2352
-imp	'wcsstr$nt'						wcsstr							ntdll		2353
-imp	'wcstok_s'						wcstok_s						ntdll		2354
-imp	'wcstol$nt'						wcstol							ntdll		2355
-imp	'wcstombs$nt'						wcstombs						ntdll		2356
-imp	'wcstoul$nt'						wcstoul							ntdll		2357
-imp	'wprintf$nt'						wprintf							KernelBase	1866
-imp	'wsprintfA'						wsprintfA						user32		2596
-imp	'wsprintf'						wsprintfW						user32		2601
-imp	'wvsprintfA'						wvsprintfA						user32		2602
-imp	'wvsprintf'						wvsprintfW						user32		2603
 
 imp	'InitializeCriticalSection'				InitializeCriticalSection				kernel32	0	1	# KernelBase
 imp	'EnterCriticalSection'					EnterCriticalSection					kernel32	0	1	# KernelBase
diff --git a/libc/nt/ntdll.h b/libc/nt/ntdll.h
index 829500632..e111c5b10 100644
--- a/libc/nt/ntdll.h
+++ b/libc/nt/ntdll.h
@@ -41,7 +41,7 @@ COSMOPOLITAN_C_START_
      Windows to the next, and possibly even between service packs for
      each release.” ──Quoth MSDN */
 
-#define g_nt_system_call_dispatcher (wambda *)0x7ffe0308
+#define __nt_system_call_dispatcher (wambda *)0x7ffe0308
 
 extern const struct NtUnicodeString *const RtlNtdllName;
 
diff --git a/libc/nt/ntdll/A_SHAFinal.s b/libc/nt/ntdll/A_SHAFinal.s
deleted file mode 100644
index be95a48d4..000000000
--- a/libc/nt/ntdll/A_SHAFinal.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	A_SHAFinal
diff --git a/libc/nt/ntdll/A_SHAInit.s b/libc/nt/ntdll/A_SHAInit.s
deleted file mode 100644
index 16290c4e5..000000000
--- a/libc/nt/ntdll/A_SHAInit.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	A_SHAInit
diff --git a/libc/nt/ntdll/A_SHAUpdate.s b/libc/nt/ntdll/A_SHAUpdate.s
deleted file mode 100644
index ea0c3283d..000000000
--- a/libc/nt/ntdll/A_SHAUpdate.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	A_SHAUpdate
diff --git a/libc/nt/ntdll/MD5Final.s b/libc/nt/ntdll/MD5Final.s
deleted file mode 100644
index d800a5ee2..000000000
--- a/libc/nt/ntdll/MD5Final.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	MD5Final
diff --git a/libc/nt/ntdll/MD5Init.s b/libc/nt/ntdll/MD5Init.s
deleted file mode 100644
index 5103d62ce..000000000
--- a/libc/nt/ntdll/MD5Init.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	MD5Init
diff --git a/libc/nt/ntdll/MD5Update.s b/libc/nt/ntdll/MD5Update.s
deleted file mode 100644
index d5965eb86..000000000
--- a/libc/nt/ntdll/MD5Update.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	MD5Update
diff --git a/libc/nt/ntdll/_i64toa.s b/libc/nt/ntdll/_i64toa.s
deleted file mode 100644
index cd9c82778..000000000
--- a/libc/nt/ntdll/_i64toa.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_i64toa
diff --git a/libc/nt/ntdll/_i64toa_s.s b/libc/nt/ntdll/_i64toa_s.s
deleted file mode 100644
index 3e160227a..000000000
--- a/libc/nt/ntdll/_i64toa_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_i64toa_s
diff --git a/libc/nt/ntdll/_i64tow.s b/libc/nt/ntdll/_i64tow.s
deleted file mode 100644
index af09db1ba..000000000
--- a/libc/nt/ntdll/_i64tow.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_i64tow
diff --git a/libc/nt/ntdll/_i64tow_s.s b/libc/nt/ntdll/_i64tow_s.s
deleted file mode 100644
index 8436028af..000000000
--- a/libc/nt/ntdll/_i64tow_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_i64tow_s
diff --git a/libc/nt/ntdll/_itoa.s b/libc/nt/ntdll/_itoa.s
deleted file mode 100644
index d5acc31d8..000000000
--- a/libc/nt/ntdll/_itoa.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_itoa
diff --git a/libc/nt/ntdll/_itoa_s.s b/libc/nt/ntdll/_itoa_s.s
deleted file mode 100644
index f8147967c..000000000
--- a/libc/nt/ntdll/_itoa_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_itoa_s
diff --git a/libc/nt/ntdll/_itow.s b/libc/nt/ntdll/_itow.s
deleted file mode 100644
index b03576f21..000000000
--- a/libc/nt/ntdll/_itow.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_itow
diff --git a/libc/nt/ntdll/_itow_s.s b/libc/nt/ntdll/_itow_s.s
deleted file mode 100644
index 1d497c0c2..000000000
--- a/libc/nt/ntdll/_itow_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_itow_s
diff --git a/libc/nt/ntdll/_ltoa.s b/libc/nt/ntdll/_ltoa.s
deleted file mode 100644
index 5e4720fff..000000000
--- a/libc/nt/ntdll/_ltoa.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_ltoa
diff --git a/libc/nt/ntdll/_ltoa_s.s b/libc/nt/ntdll/_ltoa_s.s
deleted file mode 100644
index 4e8d6e155..000000000
--- a/libc/nt/ntdll/_ltoa_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_ltoa_s
diff --git a/libc/nt/ntdll/_ltow.s b/libc/nt/ntdll/_ltow.s
deleted file mode 100644
index c652c26fc..000000000
--- a/libc/nt/ntdll/_ltow.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_ltow
diff --git a/libc/nt/ntdll/_ltow_s.s b/libc/nt/ntdll/_ltow_s.s
deleted file mode 100644
index bf077f47e..000000000
--- a/libc/nt/ntdll/_ltow_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_ltow_s
diff --git a/libc/nt/ntdll/_snprintf.s b/libc/nt/ntdll/_snprintf.s
deleted file mode 100644
index 9c4f2e0e3..000000000
--- a/libc/nt/ntdll/_snprintf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_snprintf
diff --git a/libc/nt/ntdll/_snprintf_s.s b/libc/nt/ntdll/_snprintf_s.s
deleted file mode 100644
index e0db57926..000000000
--- a/libc/nt/ntdll/_snprintf_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_snprintf_s
diff --git a/libc/nt/ntdll/_snscanf_s.s b/libc/nt/ntdll/_snscanf_s.s
deleted file mode 100644
index 0dc68773a..000000000
--- a/libc/nt/ntdll/_snscanf_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_snscanf_s
diff --git a/libc/nt/ntdll/_snwprintf.s b/libc/nt/ntdll/_snwprintf.s
deleted file mode 100644
index 6d250cceb..000000000
--- a/libc/nt/ntdll/_snwprintf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_snwprintf
diff --git a/libc/nt/ntdll/_snwprintf_s.s b/libc/nt/ntdll/_snwprintf_s.s
deleted file mode 100644
index 8b0c7be7c..000000000
--- a/libc/nt/ntdll/_snwprintf_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_snwprintf_s
diff --git a/libc/nt/ntdll/_snwscanf_s.s b/libc/nt/ntdll/_snwscanf_s.s
deleted file mode 100644
index 805bbbf39..000000000
--- a/libc/nt/ntdll/_snwscanf_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_snwscanf_s
diff --git a/libc/nt/ntdll/_splitpath.s b/libc/nt/ntdll/_splitpath.s
deleted file mode 100644
index f353e3ac3..000000000
--- a/libc/nt/ntdll/_splitpath.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_splitpath
diff --git a/libc/nt/ntdll/_splitpath_s.s b/libc/nt/ntdll/_splitpath_s.s
deleted file mode 100644
index eddcea76d..000000000
--- a/libc/nt/ntdll/_splitpath_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_splitpath_s
diff --git a/libc/nt/ntdll/_strcmpi.s b/libc/nt/ntdll/_strcmpi.s
deleted file mode 100644
index 9c11325b0..000000000
--- a/libc/nt/ntdll/_strcmpi.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_strcmpi
diff --git a/libc/nt/ntdll/_stricmp.s b/libc/nt/ntdll/_stricmp.s
deleted file mode 100644
index e32e57ccd..000000000
--- a/libc/nt/ntdll/_stricmp.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_stricmp
diff --git a/libc/nt/ntdll/_strlwr.s b/libc/nt/ntdll/_strlwr.s
deleted file mode 100644
index 55b948b05..000000000
--- a/libc/nt/ntdll/_strlwr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_strlwr
diff --git a/libc/nt/ntdll/_strlwr_s.s b/libc/nt/ntdll/_strlwr_s.s
deleted file mode 100644
index e5a58c1fc..000000000
--- a/libc/nt/ntdll/_strlwr_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_strlwr_s
diff --git a/libc/nt/ntdll/_strnicmp.s b/libc/nt/ntdll/_strnicmp.s
deleted file mode 100644
index 739a724fd..000000000
--- a/libc/nt/ntdll/_strnicmp.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_strnicmp
diff --git a/libc/nt/ntdll/_strnset_s.s b/libc/nt/ntdll/_strnset_s.s
deleted file mode 100644
index c3425d0f7..000000000
--- a/libc/nt/ntdll/_strnset_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_strnset_s
diff --git a/libc/nt/ntdll/_strset_s.s b/libc/nt/ntdll/_strset_s.s
deleted file mode 100644
index 27478a759..000000000
--- a/libc/nt/ntdll/_strset_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_strset_s
diff --git a/libc/nt/ntdll/_strupr.s b/libc/nt/ntdll/_strupr.s
deleted file mode 100644
index 618424b73..000000000
--- a/libc/nt/ntdll/_strupr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_strupr
diff --git a/libc/nt/ntdll/_strupr_s.s b/libc/nt/ntdll/_strupr_s.s
deleted file mode 100644
index e3f3b110b..000000000
--- a/libc/nt/ntdll/_strupr_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_strupr_s
diff --git a/libc/nt/ntdll/_swprintf.s b/libc/nt/ntdll/_swprintf.s
deleted file mode 100644
index c4e629b5a..000000000
--- a/libc/nt/ntdll/_swprintf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_swprintf
diff --git a/libc/nt/ntdll/_ui64toa.s b/libc/nt/ntdll/_ui64toa.s
deleted file mode 100644
index 2f3a46f2c..000000000
--- a/libc/nt/ntdll/_ui64toa.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_ui64toa
diff --git a/libc/nt/ntdll/_ui64toa_s.s b/libc/nt/ntdll/_ui64toa_s.s
deleted file mode 100644
index 4125819b5..000000000
--- a/libc/nt/ntdll/_ui64toa_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_ui64toa_s
diff --git a/libc/nt/ntdll/_ui64tow.s b/libc/nt/ntdll/_ui64tow.s
deleted file mode 100644
index fb18658eb..000000000
--- a/libc/nt/ntdll/_ui64tow.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_ui64tow
diff --git a/libc/nt/ntdll/_ui64tow_s.s b/libc/nt/ntdll/_ui64tow_s.s
deleted file mode 100644
index d287e98bd..000000000
--- a/libc/nt/ntdll/_ui64tow_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_ui64tow_s
diff --git a/libc/nt/ntdll/_ultoa.s b/libc/nt/ntdll/_ultoa.s
deleted file mode 100644
index 55bae46d9..000000000
--- a/libc/nt/ntdll/_ultoa.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_ultoa
diff --git a/libc/nt/ntdll/_ultoa_s.s b/libc/nt/ntdll/_ultoa_s.s
deleted file mode 100644
index c2206e602..000000000
--- a/libc/nt/ntdll/_ultoa_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_ultoa_s
diff --git a/libc/nt/ntdll/_ultow.s b/libc/nt/ntdll/_ultow.s
deleted file mode 100644
index 9299dffc2..000000000
--- a/libc/nt/ntdll/_ultow.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_ultow
diff --git a/libc/nt/ntdll/_ultow_s.s b/libc/nt/ntdll/_ultow_s.s
deleted file mode 100644
index 8092cf55c..000000000
--- a/libc/nt/ntdll/_ultow_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_ultow_s
diff --git a/libc/nt/ntdll/_vscprintf.s b/libc/nt/ntdll/_vscprintf.s
deleted file mode 100644
index 6c8643c7b..000000000
--- a/libc/nt/ntdll/_vscprintf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_vscprintf
diff --git a/libc/nt/ntdll/_vscwprintf.s b/libc/nt/ntdll/_vscwprintf.s
deleted file mode 100644
index c55d727fa..000000000
--- a/libc/nt/ntdll/_vscwprintf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_vscwprintf
diff --git a/libc/nt/ntdll/_vsnprintf.s b/libc/nt/ntdll/_vsnprintf.s
deleted file mode 100644
index f4ef3825e..000000000
--- a/libc/nt/ntdll/_vsnprintf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_vsnprintf
diff --git a/libc/nt/ntdll/_vsnprintf_s.s b/libc/nt/ntdll/_vsnprintf_s.s
deleted file mode 100644
index 921ff5988..000000000
--- a/libc/nt/ntdll/_vsnprintf_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_vsnprintf_s
diff --git a/libc/nt/ntdll/_vsnwprintf.s b/libc/nt/ntdll/_vsnwprintf.s
deleted file mode 100644
index ae82c6a4e..000000000
--- a/libc/nt/ntdll/_vsnwprintf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_vsnwprintf
diff --git a/libc/nt/ntdll/_vsnwprintf_s.s b/libc/nt/ntdll/_vsnwprintf_s.s
deleted file mode 100644
index 5024b7de8..000000000
--- a/libc/nt/ntdll/_vsnwprintf_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_vsnwprintf_s
diff --git a/libc/nt/ntdll/_vswprintf.s b/libc/nt/ntdll/_vswprintf.s
deleted file mode 100644
index 3dc1c8ede..000000000
--- a/libc/nt/ntdll/_vswprintf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_vswprintf
diff --git a/libc/nt/ntdll/_wcsicmp.s b/libc/nt/ntdll/_wcsicmp.s
deleted file mode 100644
index b9187e0d1..000000000
--- a/libc/nt/ntdll/_wcsicmp.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_wcsicmp
diff --git a/libc/nt/ntdll/_wcslwr.s b/libc/nt/ntdll/_wcslwr.s
deleted file mode 100644
index 5446d978c..000000000
--- a/libc/nt/ntdll/_wcslwr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_wcslwr
diff --git a/libc/nt/ntdll/_wcslwr_s.s b/libc/nt/ntdll/_wcslwr_s.s
deleted file mode 100644
index b7171b0f8..000000000
--- a/libc/nt/ntdll/_wcslwr_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_wcslwr_s
diff --git a/libc/nt/ntdll/_wcsnicmp.s b/libc/nt/ntdll/_wcsnicmp.s
deleted file mode 100644
index f65f0e4cc..000000000
--- a/libc/nt/ntdll/_wcsnicmp.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_wcsnicmp
diff --git a/libc/nt/ntdll/_wcsnset_s.s b/libc/nt/ntdll/_wcsnset_s.s
deleted file mode 100644
index f564b2db6..000000000
--- a/libc/nt/ntdll/_wcsnset_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_wcsnset_s
diff --git a/libc/nt/ntdll/_wcsset_s.s b/libc/nt/ntdll/_wcsset_s.s
deleted file mode 100644
index e8da96d4b..000000000
--- a/libc/nt/ntdll/_wcsset_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_wcsset_s
diff --git a/libc/nt/ntdll/_wcstoi64.s b/libc/nt/ntdll/_wcstoi64.s
deleted file mode 100644
index 52f9f7a42..000000000
--- a/libc/nt/ntdll/_wcstoi64.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_wcstoi64
diff --git a/libc/nt/ntdll/_wcstoui64.s b/libc/nt/ntdll/_wcstoui64.s
deleted file mode 100644
index 16e682775..000000000
--- a/libc/nt/ntdll/_wcstoui64.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_wcstoui64
diff --git a/libc/nt/ntdll/_wcsupr.s b/libc/nt/ntdll/_wcsupr.s
deleted file mode 100644
index 84e916e98..000000000
--- a/libc/nt/ntdll/_wcsupr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_wcsupr
diff --git a/libc/nt/ntdll/_wcsupr_s.s b/libc/nt/ntdll/_wcsupr_s.s
deleted file mode 100644
index a334fd7f0..000000000
--- a/libc/nt/ntdll/_wcsupr_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	_wcsupr_s
diff --git a/libc/nt/ntdll/isalnum.s b/libc/nt/ntdll/isalnum.s
deleted file mode 100644
index 04d202cac..000000000
--- a/libc/nt/ntdll/isalnum.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	isalnum
diff --git a/libc/nt/ntdll/isalpha.s b/libc/nt/ntdll/isalpha.s
deleted file mode 100644
index afc7608e3..000000000
--- a/libc/nt/ntdll/isalpha.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	isalpha
diff --git a/libc/nt/ntdll/iscntrl.s b/libc/nt/ntdll/iscntrl.s
deleted file mode 100644
index 72f4a3dae..000000000
--- a/libc/nt/ntdll/iscntrl.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	iscntrl
diff --git a/libc/nt/ntdll/isdigit.s b/libc/nt/ntdll/isdigit.s
deleted file mode 100644
index 0eab8659c..000000000
--- a/libc/nt/ntdll/isdigit.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	isdigit
diff --git a/libc/nt/ntdll/isgraph.s b/libc/nt/ntdll/isgraph.s
deleted file mode 100644
index 57fcd7b58..000000000
--- a/libc/nt/ntdll/isgraph.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	isgraph
diff --git a/libc/nt/ntdll/islower.s b/libc/nt/ntdll/islower.s
deleted file mode 100644
index bf1a77452..000000000
--- a/libc/nt/ntdll/islower.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	islower
diff --git a/libc/nt/ntdll/isprint.s b/libc/nt/ntdll/isprint.s
deleted file mode 100644
index bc6eaee3b..000000000
--- a/libc/nt/ntdll/isprint.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	isprint
diff --git a/libc/nt/ntdll/ispunct.s b/libc/nt/ntdll/ispunct.s
deleted file mode 100644
index a772c0acd..000000000
--- a/libc/nt/ntdll/ispunct.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	ispunct
diff --git a/libc/nt/ntdll/isspace.s b/libc/nt/ntdll/isspace.s
deleted file mode 100644
index 0668588d3..000000000
--- a/libc/nt/ntdll/isspace.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	isspace
diff --git a/libc/nt/ntdll/isupper.s b/libc/nt/ntdll/isupper.s
deleted file mode 100644
index 98b5b1abf..000000000
--- a/libc/nt/ntdll/isupper.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	isupper
diff --git a/libc/nt/ntdll/iswalnum.s b/libc/nt/ntdll/iswalnum.s
deleted file mode 100644
index 30416e3fb..000000000
--- a/libc/nt/ntdll/iswalnum.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	iswalnum
diff --git a/libc/nt/ntdll/iswalpha.s b/libc/nt/ntdll/iswalpha.s
deleted file mode 100644
index 4303e716e..000000000
--- a/libc/nt/ntdll/iswalpha.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	iswalpha
diff --git a/libc/nt/ntdll/iswctype.s b/libc/nt/ntdll/iswctype.s
deleted file mode 100644
index 96d43c62c..000000000
--- a/libc/nt/ntdll/iswctype.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	iswctype
diff --git a/libc/nt/ntdll/iswdigit.s b/libc/nt/ntdll/iswdigit.s
deleted file mode 100644
index 8333385e4..000000000
--- a/libc/nt/ntdll/iswdigit.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	iswdigit
diff --git a/libc/nt/ntdll/iswgraph.s b/libc/nt/ntdll/iswgraph.s
deleted file mode 100644
index a9ef4d9c0..000000000
--- a/libc/nt/ntdll/iswgraph.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	iswgraph
diff --git a/libc/nt/ntdll/iswlower.s b/libc/nt/ntdll/iswlower.s
deleted file mode 100644
index 11b333e73..000000000
--- a/libc/nt/ntdll/iswlower.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	iswlower
diff --git a/libc/nt/ntdll/iswprint.s b/libc/nt/ntdll/iswprint.s
deleted file mode 100644
index 254cd09a6..000000000
--- a/libc/nt/ntdll/iswprint.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	iswprint
diff --git a/libc/nt/ntdll/iswspace.s b/libc/nt/ntdll/iswspace.s
deleted file mode 100644
index cd424bb9b..000000000
--- a/libc/nt/ntdll/iswspace.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	iswspace
diff --git a/libc/nt/ntdll/iswxdigit.s b/libc/nt/ntdll/iswxdigit.s
deleted file mode 100644
index 96409f8a7..000000000
--- a/libc/nt/ntdll/iswxdigit.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	iswxdigit
diff --git a/libc/nt/ntdll/isxdigit.s b/libc/nt/ntdll/isxdigit.s
deleted file mode 100644
index 955b96256..000000000
--- a/libc/nt/ntdll/isxdigit.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	isxdigit
diff --git a/libc/nt/ntdll/mbstowcs.s b/libc/nt/ntdll/mbstowcs.s
deleted file mode 100644
index 7e6f30ab7..000000000
--- a/libc/nt/ntdll/mbstowcs.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	mbstowcs
diff --git a/libc/nt/ntdll/memchr.s b/libc/nt/ntdll/memchr.s
deleted file mode 100644
index ce56543cc..000000000
--- a/libc/nt/ntdll/memchr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	memchr
diff --git a/libc/nt/ntdll/memcmp.s b/libc/nt/ntdll/memcmp.s
deleted file mode 100644
index 0d655958c..000000000
--- a/libc/nt/ntdll/memcmp.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	memcmp
diff --git a/libc/nt/ntdll/memcpy.s b/libc/nt/ntdll/memcpy.s
deleted file mode 100644
index 42542b3e9..000000000
--- a/libc/nt/ntdll/memcpy.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	memcpy
diff --git a/libc/nt/ntdll/memcpy_s.s b/libc/nt/ntdll/memcpy_s.s
deleted file mode 100644
index 35f1ea680..000000000
--- a/libc/nt/ntdll/memcpy_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	memcpy_s
diff --git a/libc/nt/ntdll/memmove.s b/libc/nt/ntdll/memmove.s
deleted file mode 100644
index 3b9da6930..000000000
--- a/libc/nt/ntdll/memmove.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	memmove
diff --git a/libc/nt/ntdll/memmove_s.s b/libc/nt/ntdll/memmove_s.s
deleted file mode 100644
index 6492335af..000000000
--- a/libc/nt/ntdll/memmove_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	memmove_s
diff --git a/libc/nt/ntdll/memset.s b/libc/nt/ntdll/memset.s
deleted file mode 100644
index 0bd1ea332..000000000
--- a/libc/nt/ntdll/memset.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	memset
diff --git a/libc/nt/ntdll/pow.s b/libc/nt/ntdll/pow.s
deleted file mode 100644
index 386f2ec74..000000000
--- a/libc/nt/ntdll/pow.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	pow
diff --git a/libc/nt/ntdll/qsort.s b/libc/nt/ntdll/qsort.s
deleted file mode 100644
index 9fe292cf5..000000000
--- a/libc/nt/ntdll/qsort.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	qsort
diff --git a/libc/nt/ntdll/qsort_s.s b/libc/nt/ntdll/qsort_s.s
deleted file mode 100644
index b43952269..000000000
--- a/libc/nt/ntdll/qsort_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	qsort_s
diff --git a/libc/nt/ntdll/sprintf.s b/libc/nt/ntdll/sprintf.s
deleted file mode 100644
index ec2ac1cd8..000000000
--- a/libc/nt/ntdll/sprintf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	sprintf
diff --git a/libc/nt/ntdll/sprintf_s.s b/libc/nt/ntdll/sprintf_s.s
deleted file mode 100644
index b500799e2..000000000
--- a/libc/nt/ntdll/sprintf_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	sprintf_s
diff --git a/libc/nt/ntdll/sqrt.s b/libc/nt/ntdll/sqrt.s
deleted file mode 100644
index ab0cabd5f..000000000
--- a/libc/nt/ntdll/sqrt.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	sqrt
diff --git a/libc/nt/ntdll/sscanf.s b/libc/nt/ntdll/sscanf.s
deleted file mode 100644
index 31e921f65..000000000
--- a/libc/nt/ntdll/sscanf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	sscanf
diff --git a/libc/nt/ntdll/sscanf_s.s b/libc/nt/ntdll/sscanf_s.s
deleted file mode 100644
index 5ccd0c879..000000000
--- a/libc/nt/ntdll/sscanf_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	sscanf_s
diff --git a/libc/nt/ntdll/strcat.s b/libc/nt/ntdll/strcat.s
deleted file mode 100644
index 9030d1547..000000000
--- a/libc/nt/ntdll/strcat.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strcat
diff --git a/libc/nt/ntdll/strcat_s.s b/libc/nt/ntdll/strcat_s.s
deleted file mode 100644
index 519507596..000000000
--- a/libc/nt/ntdll/strcat_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strcat_s
diff --git a/libc/nt/ntdll/strchr.s b/libc/nt/ntdll/strchr.s
deleted file mode 100644
index 148957c20..000000000
--- a/libc/nt/ntdll/strchr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strchr
diff --git a/libc/nt/ntdll/strcmp.s b/libc/nt/ntdll/strcmp.s
deleted file mode 100644
index 8c9c12403..000000000
--- a/libc/nt/ntdll/strcmp.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strcmp
diff --git a/libc/nt/ntdll/strcpy.s b/libc/nt/ntdll/strcpy.s
deleted file mode 100644
index 2b15bf99a..000000000
--- a/libc/nt/ntdll/strcpy.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strcpy
diff --git a/libc/nt/ntdll/strcpy_s.s b/libc/nt/ntdll/strcpy_s.s
deleted file mode 100644
index ee06532cf..000000000
--- a/libc/nt/ntdll/strcpy_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strcpy_s
diff --git a/libc/nt/ntdll/strcspn.s b/libc/nt/ntdll/strcspn.s
deleted file mode 100644
index 1e50f15b1..000000000
--- a/libc/nt/ntdll/strcspn.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strcspn
diff --git a/libc/nt/ntdll/strlen.s b/libc/nt/ntdll/strlen.s
deleted file mode 100644
index 935529289..000000000
--- a/libc/nt/ntdll/strlen.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strlen
diff --git a/libc/nt/ntdll/strncat.s b/libc/nt/ntdll/strncat.s
deleted file mode 100644
index acc90be95..000000000
--- a/libc/nt/ntdll/strncat.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strncat
diff --git a/libc/nt/ntdll/strncat_s.s b/libc/nt/ntdll/strncat_s.s
deleted file mode 100644
index 8407a9665..000000000
--- a/libc/nt/ntdll/strncat_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strncat_s
diff --git a/libc/nt/ntdll/strncmp.s b/libc/nt/ntdll/strncmp.s
deleted file mode 100644
index 220f11958..000000000
--- a/libc/nt/ntdll/strncmp.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strncmp
diff --git a/libc/nt/ntdll/strncpy.s b/libc/nt/ntdll/strncpy.s
deleted file mode 100644
index b8ebdc033..000000000
--- a/libc/nt/ntdll/strncpy.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strncpy
diff --git a/libc/nt/ntdll/strncpy_s.s b/libc/nt/ntdll/strncpy_s.s
deleted file mode 100644
index 33fa1d17e..000000000
--- a/libc/nt/ntdll/strncpy_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strncpy_s
diff --git a/libc/nt/ntdll/strnlen.s b/libc/nt/ntdll/strnlen.s
deleted file mode 100644
index a6ea8ef64..000000000
--- a/libc/nt/ntdll/strnlen.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strnlen
diff --git a/libc/nt/ntdll/strpbrk.s b/libc/nt/ntdll/strpbrk.s
deleted file mode 100644
index 28f7cd02c..000000000
--- a/libc/nt/ntdll/strpbrk.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strpbrk
diff --git a/libc/nt/ntdll/strrchr.s b/libc/nt/ntdll/strrchr.s
deleted file mode 100644
index 3c407175c..000000000
--- a/libc/nt/ntdll/strrchr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strrchr
diff --git a/libc/nt/ntdll/strspn.s b/libc/nt/ntdll/strspn.s
deleted file mode 100644
index 893c01122..000000000
--- a/libc/nt/ntdll/strspn.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strspn
diff --git a/libc/nt/ntdll/strstr.s b/libc/nt/ntdll/strstr.s
deleted file mode 100644
index 32696bace..000000000
--- a/libc/nt/ntdll/strstr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strstr
diff --git a/libc/nt/ntdll/strtok_s.s b/libc/nt/ntdll/strtok_s.s
deleted file mode 100644
index f8a8b9e41..000000000
--- a/libc/nt/ntdll/strtok_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strtok_s
diff --git a/libc/nt/ntdll/strtol.s b/libc/nt/ntdll/strtol.s
deleted file mode 100644
index 70e5b8628..000000000
--- a/libc/nt/ntdll/strtol.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strtol
diff --git a/libc/nt/ntdll/strtoul.s b/libc/nt/ntdll/strtoul.s
deleted file mode 100644
index 0e4ae1ec4..000000000
--- a/libc/nt/ntdll/strtoul.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	strtoul
diff --git a/libc/nt/ntdll/swprintf.s b/libc/nt/ntdll/swprintf.s
deleted file mode 100644
index a80315eb1..000000000
--- a/libc/nt/ntdll/swprintf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	swprintf
diff --git a/libc/nt/ntdll/swprintf_s.s b/libc/nt/ntdll/swprintf_s.s
deleted file mode 100644
index 095ad94f8..000000000
--- a/libc/nt/ntdll/swprintf_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	swprintf_s
diff --git a/libc/nt/ntdll/swscanf_s.s b/libc/nt/ntdll/swscanf_s.s
deleted file mode 100644
index 78e3e9a08..000000000
--- a/libc/nt/ntdll/swscanf_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	swscanf_s
diff --git a/libc/nt/ntdll/tan.s b/libc/nt/ntdll/tan.s
deleted file mode 100644
index 8441ce1a4..000000000
--- a/libc/nt/ntdll/tan.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	tan
diff --git a/libc/nt/ntdll/tolower.s b/libc/nt/ntdll/tolower.s
deleted file mode 100644
index 745a39a39..000000000
--- a/libc/nt/ntdll/tolower.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	tolower
diff --git a/libc/nt/ntdll/toupper.s b/libc/nt/ntdll/toupper.s
deleted file mode 100644
index b7f2f1456..000000000
--- a/libc/nt/ntdll/toupper.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	toupper
diff --git a/libc/nt/ntdll/towlower.s b/libc/nt/ntdll/towlower.s
deleted file mode 100644
index ba462a67d..000000000
--- a/libc/nt/ntdll/towlower.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	towlower
diff --git a/libc/nt/ntdll/towupper.s b/libc/nt/ntdll/towupper.s
deleted file mode 100644
index 8c066c6e1..000000000
--- a/libc/nt/ntdll/towupper.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	towupper
diff --git a/libc/nt/ntdll/vDbgPrintEx.s b/libc/nt/ntdll/vDbgPrintEx.s
deleted file mode 100644
index 60b395445..000000000
--- a/libc/nt/ntdll/vDbgPrintEx.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	vDbgPrintEx
diff --git a/libc/nt/ntdll/vDbgPrintExWithPrefix.s b/libc/nt/ntdll/vDbgPrintExWithPrefix.s
deleted file mode 100644
index 1222cbd20..000000000
--- a/libc/nt/ntdll/vDbgPrintExWithPrefix.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	vDbgPrintExWithPrefix
diff --git a/libc/nt/ntdll/vsprintf.s b/libc/nt/ntdll/vsprintf.s
deleted file mode 100644
index 514c99096..000000000
--- a/libc/nt/ntdll/vsprintf.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	vsprintf
diff --git a/libc/nt/ntdll/vsprintf_s.s b/libc/nt/ntdll/vsprintf_s.s
deleted file mode 100644
index d29daf33a..000000000
--- a/libc/nt/ntdll/vsprintf_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	vsprintf_s
diff --git a/libc/nt/ntdll/vswprintf_s.s b/libc/nt/ntdll/vswprintf_s.s
deleted file mode 100644
index 2a1f9b33b..000000000
--- a/libc/nt/ntdll/vswprintf_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	vswprintf_s
diff --git a/libc/nt/ntdll/wcscat.s b/libc/nt/ntdll/wcscat.s
deleted file mode 100644
index 47b7e318a..000000000
--- a/libc/nt/ntdll/wcscat.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcscat
diff --git a/libc/nt/ntdll/wcscat_s.s b/libc/nt/ntdll/wcscat_s.s
deleted file mode 100644
index 0774f6377..000000000
--- a/libc/nt/ntdll/wcscat_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcscat_s
diff --git a/libc/nt/ntdll/wcschr.s b/libc/nt/ntdll/wcschr.s
deleted file mode 100644
index 65441f192..000000000
--- a/libc/nt/ntdll/wcschr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcschr
diff --git a/libc/nt/ntdll/wcscmp.s b/libc/nt/ntdll/wcscmp.s
deleted file mode 100644
index 24947caa2..000000000
--- a/libc/nt/ntdll/wcscmp.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcscmp
diff --git a/libc/nt/ntdll/wcscpy.s b/libc/nt/ntdll/wcscpy.s
deleted file mode 100644
index 232e55e75..000000000
--- a/libc/nt/ntdll/wcscpy.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcscpy
diff --git a/libc/nt/ntdll/wcscpy_s.s b/libc/nt/ntdll/wcscpy_s.s
deleted file mode 100644
index f8743bacc..000000000
--- a/libc/nt/ntdll/wcscpy_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcscpy_s
diff --git a/libc/nt/ntdll/wcscspn.s b/libc/nt/ntdll/wcscspn.s
deleted file mode 100644
index f8fa5adca..000000000
--- a/libc/nt/ntdll/wcscspn.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcscspn
diff --git a/libc/nt/ntdll/wcslen.s b/libc/nt/ntdll/wcslen.s
deleted file mode 100644
index 853b44281..000000000
--- a/libc/nt/ntdll/wcslen.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcslen
diff --git a/libc/nt/ntdll/wcsncat.s b/libc/nt/ntdll/wcsncat.s
deleted file mode 100644
index e727952c2..000000000
--- a/libc/nt/ntdll/wcsncat.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcsncat
diff --git a/libc/nt/ntdll/wcsncat_s.s b/libc/nt/ntdll/wcsncat_s.s
deleted file mode 100644
index 358c3a591..000000000
--- a/libc/nt/ntdll/wcsncat_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcsncat_s
diff --git a/libc/nt/ntdll/wcsncmp.s b/libc/nt/ntdll/wcsncmp.s
deleted file mode 100644
index 8bb3fff45..000000000
--- a/libc/nt/ntdll/wcsncmp.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcsncmp
diff --git a/libc/nt/ntdll/wcsncpy.s b/libc/nt/ntdll/wcsncpy.s
deleted file mode 100644
index ce4275659..000000000
--- a/libc/nt/ntdll/wcsncpy.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcsncpy
diff --git a/libc/nt/ntdll/wcsncpy_s.s b/libc/nt/ntdll/wcsncpy_s.s
deleted file mode 100644
index 395fd0150..000000000
--- a/libc/nt/ntdll/wcsncpy_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcsncpy_s
diff --git a/libc/nt/ntdll/wcsnlen.s b/libc/nt/ntdll/wcsnlen.s
deleted file mode 100644
index 72f4a19dd..000000000
--- a/libc/nt/ntdll/wcsnlen.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcsnlen
diff --git a/libc/nt/ntdll/wcspbrk.s b/libc/nt/ntdll/wcspbrk.s
deleted file mode 100644
index 725ee657e..000000000
--- a/libc/nt/ntdll/wcspbrk.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcspbrk
diff --git a/libc/nt/ntdll/wcsrchr.s b/libc/nt/ntdll/wcsrchr.s
deleted file mode 100644
index ddc9ded20..000000000
--- a/libc/nt/ntdll/wcsrchr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcsrchr
diff --git a/libc/nt/ntdll/wcsspn.s b/libc/nt/ntdll/wcsspn.s
deleted file mode 100644
index a5d579d62..000000000
--- a/libc/nt/ntdll/wcsspn.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcsspn
diff --git a/libc/nt/ntdll/wcsstr.s b/libc/nt/ntdll/wcsstr.s
deleted file mode 100644
index c8593e336..000000000
--- a/libc/nt/ntdll/wcsstr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcsstr
diff --git a/libc/nt/ntdll/wcstok_s.s b/libc/nt/ntdll/wcstok_s.s
deleted file mode 100644
index ef7843e51..000000000
--- a/libc/nt/ntdll/wcstok_s.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcstok_s
diff --git a/libc/nt/ntdll/wcstol.s b/libc/nt/ntdll/wcstol.s
deleted file mode 100644
index 9f39db066..000000000
--- a/libc/nt/ntdll/wcstol.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcstol
diff --git a/libc/nt/ntdll/wcstombs.s b/libc/nt/ntdll/wcstombs.s
deleted file mode 100644
index a8a678880..000000000
--- a/libc/nt/ntdll/wcstombs.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcstombs
diff --git a/libc/nt/ntdll/wcstoul.s b/libc/nt/ntdll/wcstoul.s
deleted file mode 100644
index 2af779ac1..000000000
--- a/libc/nt/ntdll/wcstoul.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/ntdllimport.inc"
-.ntimp	wcstoul
diff --git a/libc/nt/ntdllimport.S b/libc/nt/ntdllimport.S
index 5d8fceb62..d30bdf933 100644
--- a/libc/nt/ntdllimport.S
+++ b/libc/nt/ntdllimport.S
@@ -25,18 +25,18 @@
 /	that ensures executables won't fail to load in the future,
 /	should Microsoft ever choose to delete these APIs.
 
-	.initro 202,_init_ntdll.1
+	.initro 202,sys__init_ntdll.1
 	.type	kNtdllProcRvas,@object
 kNtdllProcRvas:
 	.previous/*
 	...
 	decentralized content
 	...
-	*/.initro 202,_init_ntdll.3
+	*/.initro 202,sys__init_ntdll.3
 	.quad	0
 	.previous
 
-	.init.start 202,_init_ntdll
+	.init.start 202,sys__init_ntdll
 	push	%r12
 	push	%r13
 	lea	ntdllmissingno(%rip),%r13
@@ -57,7 +57,7 @@ kNtdllProcRvas:
 1:	add	$32,%rsp
 	pop	%r13
 	pop	%r12
-	.init.end 202,_init_ntdll,globl,hidden
+	.init.end 202,sys__init_ntdll,globl,hidden
 
 	.text.windows
 ntdllmissingno:
diff --git a/libc/nt/ntdllimport.h b/libc/nt/ntdllimport.h
index d4248788a..675685458 100644
--- a/libc/nt/ntdllimport.h
+++ b/libc/nt/ntdllimport.h
@@ -6,13 +6,13 @@
 /* clang-format off */
 
 .macro	.ntimp	fn:req
-	yoink	_init_ntdll
-	.initbss 202,_init_ntdll.\fn
+	yoink	sys__init_ntdll
+	.initbss 202,sys__init_ntdll.\fn
 __imp_\fn:
 	.quad	0
 	.endobj	__imp_\fn,globl,hidden
 	.previous
-	.initro 202,_init_ntdll.2.\fn
+	.initro 202,sys__init_ntdll.2.\fn
 	.quad	RVA(.L\fn)
 	.previous
 	.section .rodata.str1.1,"aSM",@progbits,1
diff --git a/libc/nt/struct/pollfd.h b/libc/nt/struct/pollfd.h
index b8fc63234..5e71997cf 100644
--- a/libc/nt/struct/pollfd.h
+++ b/libc/nt/struct/pollfd.h
@@ -2,7 +2,7 @@
 #define COSMOPOLITAN_LIBC_NT_STRUCT_POLLFD_H_
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
-struct pollfd$nt {
+struct sys_pollfd_nt {
   int64_t handle;
   int16_t events;
   int16_t revents;
diff --git a/libc/nt/user32/wsprintfA.s b/libc/nt/user32/wsprintfA.s
deleted file mode 100644
index 59fc8b677..000000000
--- a/libc/nt/user32/wsprintfA.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	user32,__imp_wsprintfA,wsprintfA,2596
diff --git a/libc/nt/user32/wsprintfW.s b/libc/nt/user32/wsprintfW.s
deleted file mode 100644
index fb207c7a1..000000000
--- a/libc/nt/user32/wsprintfW.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	user32,__imp_wsprintfW,wsprintfW,2601
diff --git a/libc/nt/user32/wvsprintfA.s b/libc/nt/user32/wvsprintfA.s
deleted file mode 100644
index 28aeda0cf..000000000
--- a/libc/nt/user32/wvsprintfA.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	user32,__imp_wvsprintfA,wvsprintfA,2602
diff --git a/libc/nt/user32/wvsprintfW.s b/libc/nt/user32/wvsprintfW.s
deleted file mode 100644
index 9fa280dc2..000000000
--- a/libc/nt/user32/wvsprintfW.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	user32,__imp_wvsprintfW,wvsprintfW,2603
diff --git a/libc/nt/winsock.h b/libc/nt/winsock.h
index 5cad3bc92..9be8aac38 100644
--- a/libc/nt/winsock.h
+++ b/libc/nt/winsock.h
@@ -326,16 +326,16 @@ int WSACleanup(void);
 int WSAGetLastError(void);
 void WSASetLastError(int);
 
-int __bind$nt(uint64_t, const void *, int);
-int __closesocket$nt(uint64_t);
-int __getpeername$nt(uint64_t, void *, uint32_t *);
-int __getsockname$nt(uint64_t, void *, uint32_t *);
-int __getsockopt$nt(uint64_t, int, int, void *, uint32_t *);
-int __ioctlsocket$nt(uint64_t, int32_t, uint32_t *);
-int __listen$nt(uint64_t, int);
-int __setsockopt$nt(uint64_t, int, int, const void *, int);
-int __shutdown$nt(uint64_t, int);
-int __select$nt(int, struct NtFdSet *, struct NtFdSet *, struct NtFdSet *,
+int __sys_bind_nt(uint64_t, const void *, int);
+int __sys_closesocket_nt(uint64_t);
+int __sys_getpeername_nt(uint64_t, void *, uint32_t *);
+int __sys_getsockname_nt(uint64_t, void *, uint32_t *);
+int __sys_getsockopt_nt(uint64_t, int, int, void *, uint32_t *);
+int __sys_ioctlsocket_nt(uint64_t, int32_t, uint32_t *);
+int __sys_listen_nt(uint64_t, int);
+int __sys_setsockopt_nt(uint64_t, int, int, const void *, int);
+int __sys_shutdown_nt(uint64_t, int);
+int __sys_select_nt(int, struct NtFdSet *, struct NtFdSet *, struct NtFdSet *,
                 struct NtTimeval *);
 
 uint64_t WSASocket(int af, int type, int protocol,
@@ -393,7 +393,7 @@ int WSASendTo(uint64_t s, const struct NtIovec *lpBuffers,
               const NtWsaOverlappedCompletionRoutine opt_lpCompletionRoutine)
     paramsnonnull((2));
 
-int WSAPoll(struct pollfd$nt *inout_fdArray, uint32_t nfds, signed timeout_ms)
+int WSAPoll(struct sys_pollfd_nt *inout_fdArray, uint32_t nfds, signed timeout_ms)
     paramsnonnull();
 
 int WSARecv(uint64_t s, const struct NtIovec *out_lpBuffers,
diff --git a/libc/nt/ws2_32/bind.s b/libc/nt/ws2_32/bind.s
index f41c85c0b..61b2d996c 100644
--- a/libc/nt/ws2_32/bind.s
+++ b/libc/nt/ws2_32/bind.s
@@ -2,11 +2,11 @@
 .imp	ws2_32,__imp_bind,bind,2
 
 	.text.windows
-__bind$nt:
+__sys_bind_nt:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
 	mov	__imp_bind(%rip),%rax
 	jmp	__sysv2nt
-	.endfn	__bind$nt,globl
+	.endfn	__sys_bind_nt,globl
 	.previous
diff --git a/libc/nt/ws2_32/closesocket.s b/libc/nt/ws2_32/closesocket.s
index dd3331384..9bd7862c2 100644
--- a/libc/nt/ws2_32/closesocket.s
+++ b/libc/nt/ws2_32/closesocket.s
@@ -2,7 +2,7 @@
 .imp	ws2_32,__imp_closesocket,closesocket,3
 
 	.text.windows
-__closesocket$nt:
+__sys_closesocket_nt:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
@@ -11,5 +11,5 @@ __closesocket$nt:
 	call	*__imp_closesocket(%rip)
 	leave
 	ret
-	.endfn	__closesocket$nt,globl
+	.endfn	__sys_closesocket_nt,globl
 	.previous
diff --git a/libc/nt/ws2_32/getpeername.s b/libc/nt/ws2_32/getpeername.s
index 3bcc0b0c1..612b7389e 100644
--- a/libc/nt/ws2_32/getpeername.s
+++ b/libc/nt/ws2_32/getpeername.s
@@ -2,11 +2,11 @@
 .imp	ws2_32,__imp_getpeername,getpeername,5
 
 	.text.windows
-__getpeername$nt:
+__sys_getpeername_nt:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
 	mov	__imp_getpeername(%rip),%rax
 	jmp	__sysv2nt
-	.endfn	__getpeername$nt,globl
+	.endfn	__sys_getpeername_nt,globl
 	.previous
diff --git a/libc/nt/ws2_32/getsockname.s b/libc/nt/ws2_32/getsockname.s
index b3e878869..b9bb433aa 100644
--- a/libc/nt/ws2_32/getsockname.s
+++ b/libc/nt/ws2_32/getsockname.s
@@ -2,11 +2,11 @@
 .imp	ws2_32,__imp_getsockname,getsockname,6
 
 	.text.windows
-__getsockname$nt:
+__sys_getsockname_nt:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
 	mov	__imp_getsockname(%rip),%rax
 	jmp	__sysv2nt
-	.endfn	__getsockname$nt,globl
+	.endfn	__sys_getsockname_nt,globl
 	.previous
diff --git a/libc/nt/ws2_32/getsockopt.s b/libc/nt/ws2_32/getsockopt.s
index fe9d7b5df..c02e46c6b 100644
--- a/libc/nt/ws2_32/getsockopt.s
+++ b/libc/nt/ws2_32/getsockopt.s
@@ -2,11 +2,11 @@
 .imp	ws2_32,__imp_getsockopt,getsockopt,7
 
 	.text.windows
-__getsockopt$nt:
+__sys_getsockopt_nt:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
 	mov	__imp_getsockopt(%rip),%rax
 	jmp	__sysv2nt6
-	.endfn	__getsockopt$nt,globl
+	.endfn	__sys_getsockopt_nt,globl
 	.previous
diff --git a/libc/nt/ws2_32/htonl.s b/libc/nt/ws2_32/htonl.s
deleted file mode 100644
index 0e2ce8eca..000000000
--- a/libc/nt/ws2_32/htonl.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	ws2_32,__imp_htonl,htonl,8
diff --git a/libc/nt/ws2_32/htons.s b/libc/nt/ws2_32/htons.s
deleted file mode 100644
index 651a21c39..000000000
--- a/libc/nt/ws2_32/htons.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	ws2_32,__imp_htons,htons,9
diff --git a/libc/nt/ws2_32/inet_addr.s b/libc/nt/ws2_32/inet_addr.s
deleted file mode 100644
index 4665fbd99..000000000
--- a/libc/nt/ws2_32/inet_addr.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	ws2_32,__imp_inet_addr,inet_addr,11
diff --git a/libc/nt/ws2_32/inet_ntoa.s b/libc/nt/ws2_32/inet_ntoa.s
deleted file mode 100644
index 9ffc86f67..000000000
--- a/libc/nt/ws2_32/inet_ntoa.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	ws2_32,__imp_inet_ntoa,inet_ntoa,12
diff --git a/libc/nt/ws2_32/inet_ntop.s b/libc/nt/ws2_32/inet_ntop.s
deleted file mode 100644
index 1ad0aaea3..000000000
--- a/libc/nt/ws2_32/inet_ntop.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	ws2_32,__imp_inet_ntop,inet_ntop,193
diff --git a/libc/nt/ws2_32/inet_pton.s b/libc/nt/ws2_32/inet_pton.s
deleted file mode 100644
index 853936d20..000000000
--- a/libc/nt/ws2_32/inet_pton.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	ws2_32,__imp_inet_pton,inet_pton,194
diff --git a/libc/nt/ws2_32/ioctlsocket.s b/libc/nt/ws2_32/ioctlsocket.s
index 008b1099d..73455b464 100644
--- a/libc/nt/ws2_32/ioctlsocket.s
+++ b/libc/nt/ws2_32/ioctlsocket.s
@@ -2,11 +2,11 @@
 .imp	ws2_32,__imp_ioctlsocket,ioctlsocket,10
 
 	.text.windows
-__ioctlsocket$nt:
+__sys_ioctlsocket_nt:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
 	mov	__imp_ioctlsocket(%rip),%rax
 	jmp	__sysv2nt
-	.endfn	__ioctlsocket$nt,globl
+	.endfn	__sys_ioctlsocket_nt,globl
 	.previous
diff --git a/libc/nt/ws2_32/listen.s b/libc/nt/ws2_32/listen.s
index ffebfa4d8..f00b2fdd7 100644
--- a/libc/nt/ws2_32/listen.s
+++ b/libc/nt/ws2_32/listen.s
@@ -2,11 +2,11 @@
 .imp	ws2_32,__imp_listen,listen,13
 
 	.text.windows
-__listen$nt:
+__sys_listen_nt:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
 	mov	__imp_listen(%rip),%rax
 	jmp	__sysv2nt
-	.endfn	__listen$nt,globl
+	.endfn	__sys_listen_nt,globl
 	.previous
diff --git a/libc/nt/ws2_32/ntohl.s b/libc/nt/ws2_32/ntohl.s
deleted file mode 100644
index 334821f3f..000000000
--- a/libc/nt/ws2_32/ntohl.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	ws2_32,__imp_ntohl,ntohl,14
diff --git a/libc/nt/ws2_32/ntohs.s b/libc/nt/ws2_32/ntohs.s
deleted file mode 100644
index d61c94c4e..000000000
--- a/libc/nt/ws2_32/ntohs.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	ws2_32,__imp_ntohs,ntohs,15
diff --git a/libc/nt/ws2_32/select.s b/libc/nt/ws2_32/select.s
index e38fa07f8..e101d1466 100644
--- a/libc/nt/ws2_32/select.s
+++ b/libc/nt/ws2_32/select.s
@@ -2,11 +2,11 @@
 .imp	ws2_32,__imp_select,select,18
 
 	.text.windows
-__select$nt:
+__sys_select_nt:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
 	mov	__imp_select(%rip),%rax
 	jmp	__sysv2nt6
-	.endfn	__select$nt,globl
+	.endfn	__sys_select_nt,globl
 	.previous
diff --git a/libc/nt/ws2_32/setsockopt.s b/libc/nt/ws2_32/setsockopt.s
index a334f22b4..70fb3ca75 100644
--- a/libc/nt/ws2_32/setsockopt.s
+++ b/libc/nt/ws2_32/setsockopt.s
@@ -2,11 +2,11 @@
 .imp	ws2_32,__imp_setsockopt,setsockopt,21
 
 	.text.windows
-__setsockopt$nt:
+__sys_setsockopt_nt:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
 	mov	__imp_setsockopt(%rip),%rax
 	jmp	__sysv2nt6
-	.endfn	__setsockopt$nt,globl
+	.endfn	__sys_setsockopt_nt,globl
 	.previous
diff --git a/libc/nt/ws2_32/shutdown.s b/libc/nt/ws2_32/shutdown.s
index 5f5233aa1..8494e7a22 100644
--- a/libc/nt/ws2_32/shutdown.s
+++ b/libc/nt/ws2_32/shutdown.s
@@ -2,11 +2,11 @@
 .imp	ws2_32,__imp_shutdown,shutdown,22
 
 	.text.windows
-__shutdown$nt:
+__sys_shutdown_nt:
 	push	%rbp
 	mov	%rsp,%rbp
 	.profilable
 	mov	__imp_shutdown(%rip),%rax
 	jmp	__sysv2nt
-	.endfn	__shutdown$nt,globl
+	.endfn	__sys_shutdown_nt,globl
 	.previous
diff --git a/libc/rand/devrand.c b/libc/rand/devrand.c
index e651aa57b..044cd7300 100644
--- a/libc/rand/devrand.c
+++ b/libc/rand/devrand.c
@@ -38,16 +38,16 @@ int devrand(void *buf, size_t size) {
   unsigned char *p, *pe;
   fd = -1;
   if (IsWindows()) return enosys();
-  if ((fd = openat$sysv(AT_FDCWD, "/dev/urandom", O_RDONLY, 0)) == -1) {
+  if ((fd = sys_openat(AT_FDCWD, "/dev/urandom", O_RDONLY, 0)) == -1) {
     return -1;
   }
   p = buf;
   pe = p + size;
   while (p < pe) {
-    if ((rc = read$sysv(fd, p, pe - p)) == -1) break;
+    if ((rc = sys_read(fd, p, pe - p)) == -1) break;
     if (!(got = (size_t)rc)) break;
     p += got;
   }
-  close$sysv(fd);
+  sys_close(fd);
   return p == pe ? 0 : -1;
 }
diff --git a/libc/rand/getrandom.c b/libc/rand/getrandom.c
index 69a99f415..95403ffe5 100644
--- a/libc/rand/getrandom.c
+++ b/libc/rand/getrandom.c
@@ -34,7 +34,7 @@
  *     from fallback sources no matter what
  */
 ssize_t getrandom(void *buf, size_t size, unsigned flags) {
-  ssize_t rc = getrandom$sysv(buf, size, flags);
+  ssize_t rc = sys_getrandom(buf, size, flags);
   size_t i = rc == -1 ? 0 : (size_t)rc;
   if (i > size) abort();
   if (i < size) {
diff --git a/libc/runtime/abort-nt.c b/libc/runtime/abort-nt.c
index 4491d2bb5..b78dd60fe 100644
--- a/libc/runtime/abort-nt.c
+++ b/libc/runtime/abort-nt.c
@@ -23,7 +23,7 @@
 #include "libc/str/str.h"
 #include "libc/sysv/consts/sig.h"
 
-textwindows wontreturn void abort$nt(void) {
+textwindows wontreturn void sys_abort_nt(void) {
   siginfo_t info;
   memset(&info, 0, sizeof(info));
   info.si_signo = SIGABRT;
diff --git a/libc/runtime/abort.S b/libc/runtime/abort.S
index a2a24c9c5..d43631663 100644
--- a/libc/runtime/abort.S
+++ b/libc/runtime/abort.S
@@ -48,7 +48,7 @@ abort:	push	%rbp
 	pop	(%rsi)
 	xor	%edx,%edx			# don't care about old sigmask
 	pushpop	4*4,%r10			# sizeof(sigset_t) for systemd
-	mov	__NR_sigprocmask,%eax		# sigprocmask$sysv is hookable
+	mov	__NR_sigprocmask,%eax		# sys_sigprocmask is hookable
 	syscall
 	mov	__NR_getpid,%eax
 	syscall
@@ -56,5 +56,5 @@ abort:	push	%rbp
 	mov	SIGABRT,%esi
 	mov	__NR_kill,%eax
 	syscall					# avoid hook and less bt noise
-2:	call	abort$nt
+2:	call	sys_abort_nt
 	.endfn	abort,globl,protected
diff --git a/libc/runtime/arch_prctl.c b/libc/runtime/arch_prctl.c
index 4f784b66a..59fcc4972 100644
--- a/libc/runtime/arch_prctl.c
+++ b/libc/runtime/arch_prctl.c
@@ -40,9 +40,9 @@
  * operating systems.
  */
 
-int arch_prctl$sysv(int, int64_t) hidden;
+int sys_arch_prctl(int, int64_t) hidden;
 
-static inline int arch_prctl$fsgsbase(int code, int64_t addr) {
+static inline int arch_prctl_fsgsbase(int code, int64_t addr) {
   switch (code) {
     case ARCH_SET_GS:
       asm volatile("wrgsbase\t%0" : /* no outputs */ : "r"(addr));
@@ -61,7 +61,7 @@ static inline int arch_prctl$fsgsbase(int code, int64_t addr) {
   }
 }
 
-static int arch_prctl$msr(int code, int64_t addr) {
+static int arch_prctl_msr(int code, int64_t addr) {
   switch (code) {
     case ARCH_SET_GS:
       wrmsr(MSR_IA32_GS_BASE, addr);
@@ -80,22 +80,22 @@ static int arch_prctl$msr(int code, int64_t addr) {
   }
 }
 
-static int arch_prctl$freebsd(int code, int64_t addr) {
+static int arch_prctl_freebsd(int code, int64_t addr) {
   switch (code) {
     case ARCH_GET_FS:
-      return arch_prctl$sysv(128, addr);
+      return sys_arch_prctl(128, addr);
     case ARCH_SET_FS:
-      return arch_prctl$sysv(129, addr);
+      return sys_arch_prctl(129, addr);
     case ARCH_GET_GS:
-      return arch_prctl$sysv(130, addr);
+      return sys_arch_prctl(130, addr);
     case ARCH_SET_GS:
-      return arch_prctl$sysv(131, addr);
+      return sys_arch_prctl(131, addr);
     default:
       return einval();
   }
 }
 
-static textsyscall int arch_prctl$xnu(int code, int64_t addr) {
+static textsyscall int arch_prctl_xnu(int code, int64_t addr) {
   int ax;
   switch (code) {
     case ARCH_SET_GS:
@@ -113,7 +113,7 @@ static textsyscall int arch_prctl$xnu(int code, int64_t addr) {
   }
 }
 
-static textsyscall int arch_prctl$openbsd(int code, int64_t addr) {
+static textsyscall int arch_prctl_openbsd(int code, int64_t addr) {
   int64_t rax;
   switch (code) {
     case ARCH_GET_FS:
@@ -144,7 +144,7 @@ static struct InterruptibleCall g_fsgs_icall;
  * Don't bother.
  */
 int arch_prctl(int code, int64_t addr) {
-  void *fn = arch_prctl$fsgsbase;
+  void *fn = arch_prctl_fsgsbase;
   if (!g_fsgs_once) {
     g_fsgs_once = true;
     if (X86_HAVE(FSGSBASE)) {
@@ -162,21 +162,21 @@ int arch_prctl(int code, int64_t addr) {
     }
   }
   if (g_fsgs_once == 2) {
-    return arch_prctl$fsgsbase(code, addr);
+    return arch_prctl_fsgsbase(code, addr);
   }
   switch (__hostos) {
     case METAL:
-      return arch_prctl$msr(code, addr);
+      return arch_prctl_msr(code, addr);
     case FREEBSD:
       /* claims support but it appears not */
-      return arch_prctl$freebsd(code, addr);
+      return arch_prctl_freebsd(code, addr);
     case OPENBSD:
-      return arch_prctl$openbsd(code, addr);
+      return arch_prctl_openbsd(code, addr);
     case LINUX:
-      return arch_prctl$sysv(code, addr);
+      return sys_arch_prctl(code, addr);
     case XNU:
       /* probably won't work */
-      return arch_prctl$xnu(code, addr);
+      return arch_prctl_xnu(code, addr);
     default:
       return enosys();
   }
diff --git a/libc/runtime/directmap.c b/libc/runtime/directmap.c
index c72769e18..c6d473c12 100644
--- a/libc/runtime/directmap.c
+++ b/libc/runtime/directmap.c
@@ -31,10 +31,10 @@
 noasan struct DirectMap __mmap(void *addr, size_t size, unsigned prot,
                                unsigned flags, int fd, int64_t off) {
   if (!IsWindows()) {
-    return (struct DirectMap){mmap$sysv(addr, size, prot, flags, fd, off),
+    return (struct DirectMap){sys_mmap(addr, size, prot, flags, fd, off),
                               kNtInvalidHandleValue};
   } else {
-    return __mmap$nt(addr, size, prot,
+    return __sys_mmap_nt(addr, size, prot,
                      fd != -1 ? g_fds.p[fd].handle : kNtInvalidHandleValue,
                      off);
   }
diff --git a/libc/runtime/directmap.h b/libc/runtime/directmap.h
index 4419c093b..8d4dda0ff 100644
--- a/libc/runtime/directmap.h
+++ b/libc/runtime/directmap.h
@@ -9,7 +9,7 @@ struct DirectMap {
 };
 
 struct DirectMap __mmap(void *, size_t, unsigned, unsigned, int, int64_t);
-struct DirectMap __mmap$nt(void *, size_t, unsigned, int64_t, int64_t);
+struct DirectMap __sys_mmap_nt(void *, size_t, unsigned, int64_t, int64_t);
 
 COSMOPOLITAN_C_END_
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
diff --git a/libc/runtime/directmapnt.c b/libc/runtime/directmapnt.c
index 19833004b..a628c0ab7 100644
--- a/libc/runtime/directmapnt.c
+++ b/libc/runtime/directmapnt.c
@@ -25,7 +25,7 @@
 #include "libc/runtime/directmap.h"
 #include "libc/sysv/consts/prot.h"
 
-textwindows noasan struct DirectMap __mmap$nt(void *addr, size_t size,
+textwindows noasan struct DirectMap __sys_mmap_nt(void *addr, size_t size,
                                               unsigned prot, int64_t handle,
                                               int64_t off) {
   struct DirectMap dm;
diff --git a/libc/runtime/fork-nt.c b/libc/runtime/fork-nt.c
index 4ecefb6b1..37799199b 100644
--- a/libc/runtime/fork-nt.c
+++ b/libc/runtime/fork-nt.c
@@ -97,7 +97,7 @@ textwindows noasan void WinMainForked(void) {
     size = ((uint64_t)(_mmi.p[i].y - _mmi.p[i].x) << 16) + FRAMESIZE;
     if (_mmi.p[i].flags & MAP_PRIVATE) {
       CloseHandle(_mmi.p[i].h);
-      _mmi.p[i].h = __mmap$nt(addr, size, _mmi.p[i].prot, -1, 0).maphandle;
+      _mmi.p[i].h = __sys_mmap_nt(addr, size, _mmi.p[i].prot, -1, 0).maphandle;
       ReadAll(reader, addr, size);
     } else {
       MapViewOfFileExNuma(
@@ -111,13 +111,13 @@ textwindows noasan void WinMainForked(void) {
   ReadAll(reader, _edata, _end - _edata);
   CloseHandle(reader);
   CloseHandle(writer);
-  if (weaken(__wincrash$nt)) {
-    AddVectoredExceptionHandler(1, (void *)weaken(__wincrash$nt));
+  if (weaken(__wincrash_nt)) {
+    AddVectoredExceptionHandler(1, (void *)weaken(__wincrash_nt));
   }
   longjmp(jb, 1);
 }
 
-textwindows int fork$nt(void) {
+textwindows int sys_fork_nt(void) {
   jmp_buf jb;
   char exe[PATH_MAX];
   int64_t reader, writer;
diff --git a/libc/runtime/fork.c b/libc/runtime/fork.c
index b578d9f8f..3199c8469 100644
--- a/libc/runtime/fork.c
+++ b/libc/runtime/fork.c
@@ -30,9 +30,9 @@
 int fork(void) {
   int rc;
   if (!IsWindows()) {
-    rc = fork$sysv();
+    rc = sys_fork();
   } else {
-    rc = fork$nt();
+    rc = sys_fork_nt();
   }
   if (rc == 0) {
     __onfork();
diff --git a/libc/runtime/msync-nt.c b/libc/runtime/msync-nt.c
index 43c0f3c58..72a309b1d 100644
--- a/libc/runtime/msync-nt.c
+++ b/libc/runtime/msync-nt.c
@@ -22,7 +22,7 @@
 #include "libc/nt/memory.h"
 #include "libc/runtime/memtrack.h"
 
-textwindows int msync$nt(void *addr, size_t size, int flags) {
+textwindows int sys_msync_nt(void *addr, size_t size, int flags) {
   int x, y, l, r, i;
   x = ROUNDDOWN((intptr_t)addr, FRAMESIZE) >> 16;
   y = ROUNDDOWN((intptr_t)addr + size - 1, FRAMESIZE) >> 16;
diff --git a/libc/runtime/msync.c b/libc/runtime/msync.c
index 6359652da..060ce9a08 100644
--- a/libc/runtime/msync.c
+++ b/libc/runtime/msync.c
@@ -35,8 +35,8 @@
 int msync(void *addr, size_t size, int flags) {
   assert(((flags & MS_SYNC) ^ (flags & MS_ASYNC)) || !(MS_SYNC && MS_ASYNC));
   if (!IsWindows()) {
-    return msync$sysv(addr, size, flags);
+    return sys_msync(addr, size, flags);
   } else {
-    return msync$nt(addr, size, flags);
+    return sys_msync_nt(addr, size, flags);
   }
 }
diff --git a/libc/runtime/munmap.c b/libc/runtime/munmap.c
index 891c43db6..6a008e6bd 100644
--- a/libc/runtime/munmap.c
+++ b/libc/runtime/munmap.c
@@ -46,5 +46,5 @@ int munmap(void *addr, size_t size) {
   if (!ALIGNED(addr) || !CANONICAL(addr) || !size) return einval();
   if (UntrackMemoryIntervals(addr, size) == -1) return -1;
   if (IsWindows()) return 0;
-  return munmap$sysv(addr, size);
+  return sys_munmap(addr, size);
 }
diff --git a/libc/runtime/print.greg.c b/libc/runtime/print.greg.c
index 7b176dd89..469a152a2 100644
--- a/libc/runtime/print.greg.c
+++ b/libc/runtime/print.greg.c
@@ -28,7 +28,7 @@
 #define WasImported(SLOT) \
   ((void *)*SLOT && *SLOT != (void *)&missingno /* see libc/crt/crt.S */)
 
-static void __print$nt(const void *data, size_t len) {
+static void __sys_print_nt(const void *data, size_t len) {
   int64_t hand;
   char xmm[256];
   uint32_t wrote;
@@ -51,7 +51,7 @@ static void __print$nt(const void *data, size_t len) {
 textsyscall void __print(const void *data, size_t len) {
   int64_t ax, ordinal;
   if (WasImported(__imp_WriteFile)) {
-    __print$nt(data, len);
+    __sys_print_nt(data, len);
   } else {
     ordinal = __NR_write > 0 ? __NR_write : IsXnu() ? 0x2000004 : 4;
     asm volatile("syscall"
diff --git a/libc/runtime/vfork.S b/libc/runtime/vfork.S
index 021160cd2..5d66a9e7d 100644
--- a/libc/runtime/vfork.S
+++ b/libc/runtime/vfork.S
@@ -37,7 +37,7 @@
 vfork:
 #if SupportsWindows()
 	testb	IsWindows()
-	jnz	fork$nt
+	jnz	sys_fork_nt
 #endif
 	mov	__NR_vfork(%rip),%eax
 	pop	%rsi			# saves return address in a register
diff --git a/libc/runtime/winmain.greg.c b/libc/runtime/winmain.greg.c
index d0e2e8944..b425cfb16 100644
--- a/libc/runtime/winmain.greg.c
+++ b/libc/runtime/winmain.greg.c
@@ -67,7 +67,7 @@ static noasan textwindows void MakeLongDoubleLongAgain(void) {
 static noasan textwindows void NormalizeCmdExe(void) {
   uint32_t mode;
   int64_t handle, hstdin, hstdout, hstderr;
-  if ((int)weakaddr("v_ntsubsystem") == kNtImageSubsystemWindowsCui &&
+  if ((int)weakaddr("sys_v_ntsubsystem") == kNtImageSubsystemWindowsCui &&
       NtGetVersion() >= kNtVersionWindows10) {
     hstdin = GetStdHandle(pushpop(kNtStdInputHandle));
     hstdout = GetStdHandle(pushpop(kNtStdOutputHandle));
@@ -107,9 +107,9 @@ static noasan textwindows wontreturn void WinMainNew(void) {
   *(/*unconst*/ int *)&__hostos = WINDOWS;
   addr = NtGetVersion() < kNtVersionWindows10 ? 0xff00000 : 0x777000000000;
   size = ROUNDUP(STACKSIZE + sizeof(struct WinArgs), FRAMESIZE);
-  _mmi.p[0].h =
-      __mmap$nt((char *)addr, size, PROT_READ | PROT_WRITE | PROT_EXEC, -1, 0)
-          .maphandle;
+  _mmi.p[0].h = __sys_mmap_nt((char *)addr, size,
+                              PROT_READ | PROT_WRITE | PROT_EXEC, -1, 0)
+                    .maphandle;
   _mmi.p[0].x = addr >> 16;
   _mmi.p[0].y = (addr >> 16) + ((size >> 16) - 1);
   _mmi.p[0].prot = PROT_READ | PROT_WRITE | PROT_EXEC;
@@ -167,7 +167,7 @@ static noasan textwindows wontreturn void WinMainNew(void) {
 noasan textwindows int64_t WinMain(int64_t hInstance, int64_t hPrevInstance,
                                    const char *lpCmdLine, int nCmdShow) {
   MakeLongDoubleLongAgain();
-  if (weaken(winsockinit)) weaken(winsockinit)();
+  if (weaken(__winsockinit)) weaken(__winsockinit)();
   if (weaken(WinMainForked)) weaken(WinMainForked)();
   WinMainNew();
 }
diff --git a/libc/sock/accept-nt.c b/libc/sock/accept-nt.c
index 76aaaa332..f3f140231 100644
--- a/libc/sock/accept-nt.c
+++ b/libc/sock/accept-nt.c
@@ -27,19 +27,19 @@
 #include "libc/sysv/consts/sock.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int accept$nt(struct Fd *fd, void *addr, uint32_t *addrsize,
+textwindows int sys_accept_nt(struct Fd *fd, void *addr, uint32_t *addrsize,
                           int flags) {
   int64_t h;
   int client;
   uint32_t yes;
   for (;;) {
-    if (!WSAPoll(&(struct pollfd$nt){fd->handle, POLLIN}, 1, 1000)) continue;
+    if (!WSAPoll(&(struct sys_pollfd_nt){fd->handle, POLLIN}, 1, 1000)) continue;
     if ((client = __reservefd()) == -1) return -1;
     if ((h = WSAAccept(fd->handle, addr, (int32_t *)addrsize, 0, 0)) != -1) {
       if (flags & SOCK_NONBLOCK) {
         yes = 1;
-        if (__ioctlsocket$nt(g_fds.p[client].handle, FIONBIO, &yes) == -1) {
-          __closesocket$nt(g_fds.p[client].handle);
+        if (__sys_ioctlsocket_nt(g_fds.p[client].handle, FIONBIO, &yes) == -1) {
+          __sys_closesocket_nt(g_fds.p[client].handle);
           __releasefd(client);
           return __winsockerr();
         }
diff --git a/libc/sock/accept-sysv.c b/libc/sock/accept-sysv.c
index b1a5afbf2..3d8b0d854 100644
--- a/libc/sock/accept-sysv.c
+++ b/libc/sock/accept-sysv.c
@@ -19,9 +19,9 @@
 #include "libc/dce.h"
 #include "libc/sock/internal.h"
 
-int accept$sysv(int server, void *addr, uint32_t *addrsize) {
+int sys_accept(int server, void *addr, uint32_t *addrsize) {
   int client;
-  if ((client = __accept$sysv(server, addr, addrsize, 0)) != -1 && IsBsd()) {
+  if ((client = __sys_accept(server, addr, addrsize, 0)) != -1 && IsBsd()) {
     sockaddr2linux(addr);
   }
   return client;
diff --git a/libc/sock/accept4-sysv.c b/libc/sock/accept4-sysv.c
index 6f67da58e..84b9751f0 100644
--- a/libc/sock/accept4-sysv.c
+++ b/libc/sock/accept4-sysv.c
@@ -23,17 +23,16 @@
 
 #define __NR_accept4_linux 0x0120 /* rhel5:enosysevil */
 
-int accept4$sysv(int server, void *addr, uint32_t *addrsize, int flags) {
+int sys_accept4(int server, void *addr, uint32_t *addrsize, int flags) {
   static bool once, demodernize;
   int olderr, client;
   if (!flags || demodernize) goto TriedAndTrue;
   olderr = errno;
-  client = __accept4$sysv(server, addr, addrsize, flags);
+  client = __sys_accept4(server, addr, addrsize, flags);
   if (client == -1 && errno == ENOSYS) {
     errno = olderr;
   TriedAndTrue:
-    client =
-        fixupnewsockfd$sysv(__accept$sysv(server, addr, addrsize, 0), flags);
+    client = __fixupnewsockfd(__sys_accept(server, addr, addrsize, 0), flags);
   } else if (SupportsLinux() && !once) {
     once = true;
     if (client == __NR_accept4_linux) {
diff --git a/libc/sock/accept4.c b/libc/sock/accept4.c
index 9aaa36152..e92d3331e 100644
--- a/libc/sock/accept4.c
+++ b/libc/sock/accept4.c
@@ -37,9 +37,9 @@ int accept4(int fd, void *out_addr, uint32_t *inout_addrsize, int flags) {
   if (!out_addr) return efault();
   if (!inout_addrsize) return efault();
   if (!IsWindows()) {
-    return accept4$sysv(fd, out_addr, inout_addrsize, flags);
+    return sys_accept4(fd, out_addr, inout_addrsize, flags);
   } else if (__isfdkind(fd, kFdSocket)) {
-    return accept$nt(&g_fds.p[fd], out_addr, inout_addrsize, flags);
+    return sys_accept_nt(&g_fds.p[fd], out_addr, inout_addrsize, flags);
   } else {
     return ebadf();
   }
diff --git a/libc/sock/bind-nt.c b/libc/sock/bind-nt.c
index 75c6ea5e8..616a60220 100644
--- a/libc/sock/bind-nt.c
+++ b/libc/sock/bind-nt.c
@@ -23,9 +23,9 @@
 #include "libc/sock/yoink.inc"
 #include "libc/sysv/errfuns.h"
 
-textwindows int bind$nt(struct Fd *fd, const void *addr, uint32_t addrsize) {
+textwindows int sys_bind_nt(struct Fd *fd, const void *addr, uint32_t addrsize) {
   assert(fd->kind == kFdSocket);
-  if (__bind$nt(fd->handle, addr, addrsize) != -1) {
+  if (__sys_bind_nt(fd->handle, addr, addrsize) != -1) {
     return 0;
   } else {
     return __winsockerr();
diff --git a/libc/sock/bind.c b/libc/sock/bind.c
index 496e74c34..28aecfd6a 100644
--- a/libc/sock/bind.c
+++ b/libc/sock/bind.c
@@ -38,17 +38,17 @@ int bind(int fd, const void *addr, uint32_t addrsize) {
   if (addrsize == sizeof(struct sockaddr_in)) {
     if (!IsWindows()) {
       if (!IsBsd()) {
-        return bind$sysv(fd, addr, addrsize);
+        return sys_bind(fd, addr, addrsize);
       } else {
-        struct sockaddr_in$bsd addr2;
+        struct sockaddr_in_bsd addr2;
         _Static_assert(sizeof(struct sockaddr_in) ==
-                       sizeof(struct sockaddr_in$bsd));
+                       sizeof(struct sockaddr_in_bsd));
         memcpy(&addr2, addr, sizeof(struct sockaddr_in));
         sockaddr2bsd(&addr2);
-        return bind$sysv(fd, &addr2, addrsize);
+        return sys_bind(fd, &addr2, addrsize);
       }
     } else if (__isfdkind(fd, kFdSocket)) {
-      return bind$nt(&g_fds.p[fd], addr, addrsize);
+      return sys_bind_nt(&g_fds.p[fd], addr, addrsize);
     } else {
       return ebadf();
     }
diff --git a/libc/sock/closesocket-nt.c b/libc/sock/closesocket-nt.c
index 864ebef92..ee7b4c8ea 100644
--- a/libc/sock/closesocket-nt.c
+++ b/libc/sock/closesocket-nt.c
@@ -23,10 +23,10 @@
 #include "libc/sock/yoink.inc"
 #include "libc/sysv/errfuns.h"
 
-textwindows int closesocket$nt(int fd) {
+textwindows int sys_closesocket_nt(int fd) {
   int rc;
   if (!__isfdkind(fd, kFdSocket)) return ebadf();
-  if (__closesocket$nt(g_fds.p[fd].handle) != -1) {
+  if (__sys_closesocket_nt(g_fds.p[fd].handle) != -1) {
     rc = 0;
   } else {
     rc = __winsockerr();
diff --git a/libc/sock/connect-nt.c b/libc/sock/connect-nt.c
index 3d98ed4bc..1481edfcf 100644
--- a/libc/sock/connect-nt.c
+++ b/libc/sock/connect-nt.c
@@ -23,9 +23,10 @@
 #include "libc/sock/yoink.inc"
 #include "libc/sysv/errfuns.h"
 
-textwindows int connect$nt(struct Fd *fd, const void *addr, uint32_t addrsize) {
+textwindows int sys_connect_nt(struct Fd *fd, const void *addr,
+                               uint32_t addrsize) {
   assert(fd->kind == kFdSocket);
-  return winsockblock(
+  return __winsockblock(
       fd->handle, FD_CONNECT_BIT,
       WSAConnect(fd->handle, addr, addrsize, NULL, NULL, NULL, NULL));
 }
diff --git a/libc/sock/connect-sysv.c b/libc/sock/connect-sysv.c
index 72b22708a..5c546437f 100644
--- a/libc/sock/connect-sysv.c
+++ b/libc/sock/connect-sysv.c
@@ -21,16 +21,16 @@
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
-int connect$sysv(int fd, const void *addr, uint32_t addrsize) {
+int sys_connect(int fd, const void *addr, uint32_t addrsize) {
   if (addrsize != sizeof(struct sockaddr_in)) return einval();
   if (!IsBsd()) {
-    return __connect$sysv(fd, addr, addrsize);
+    return __sys_connect(fd, addr, addrsize);
   } else {
-    struct sockaddr_in$bsd addr2;
+    struct sockaddr_in_bsd addr2;
     _Static_assert(sizeof(struct sockaddr_in) ==
-                   sizeof(struct sockaddr_in$bsd));
+                   sizeof(struct sockaddr_in_bsd));
     memcpy(&addr2, addr, sizeof(struct sockaddr_in));
     sockaddr2bsd(&addr2);
-    return connect$sysv(fd, &addr2, addrsize);
+    return sys_connect(fd, &addr2, addrsize);
   }
 }
diff --git a/libc/sock/connect.c b/libc/sock/connect.c
index e41a9d98a..9cbb2515e 100644
--- a/libc/sock/connect.c
+++ b/libc/sock/connect.c
@@ -35,9 +35,9 @@
 int connect(int fd, const void *addr, uint32_t addrsize) {
   if (!addr) return efault();
   if (!IsWindows()) {
-    return connect$sysv(fd, addr, addrsize);
+    return sys_connect(fd, addr, addrsize);
   } else if (__isfdkind(fd, kFdSocket)) {
-    return connect$nt(&g_fds.p[fd], addr, addrsize);
+    return sys_connect_nt(&g_fds.p[fd], addr, addrsize);
   } else {
     return ebadf();
   }
diff --git a/libc/sock/epoll.c b/libc/sock/epoll.c
index 63de0727e..42c0230b8 100644
--- a/libc/sock/epoll.c
+++ b/libc/sock/epoll.c
@@ -284,12 +284,12 @@ static int64_t reflock__keyed_event;
 static struct TsTree epoll__handle_tree;
 
 static textwindows void err_map_win_error(void) {
-  errno = MapDosErrorToErrno(GetLastError());
+  errno = __dos2errno(GetLastError());
 }
 
 static textwindows void err_set_win_error(uint32_t error) {
   SetLastError(error);
-  errno = MapDosErrorToErrno(error);
+  errno = __dos2errno(error);
 }
 
 static textwindows int err_check_handle(int64_t handle) {
@@ -1318,7 +1318,7 @@ static textwindows struct PortState *port_state_from_handle_tree_node(
   return CONTAINOF(tree_node, struct PortState, handle_tree_node);
 }
 
-static textwindows noinline int epoll_create1$nt(uint32_t flags) {
+static textwindows noinline int sys_epoll_create1_nt(uint32_t flags) {
   int fd;
   int64_t ephnd;
   struct PortState *port_state;
@@ -1344,13 +1344,13 @@ static textwindows noinline int epoll_create1$nt(uint32_t flags) {
   return fd;
 }
 
-static textwindows noinline int epoll_ctl$nt(int epfd, int op, int fd,
-                                             struct epoll_event *ev) {
+static textwindows noinline int sys_epoll_ctl_nt(int epfd, int op, int fd,
+                                                 struct epoll_event *ev) {
   int r;
   struct PortState *port_state;
   struct TsTreeNode *tree_node;
   if (!IsWindows()) {
-    return epoll_ctl$sysv(epfd, op, fd, ev);
+    return sys_epoll_ctl(epfd, op, fd, ev);
   } else {
     if (wepoll_init() < 0) return -1;
     if (!__isfdopen(fd)) return ebadf();
@@ -1374,9 +1374,10 @@ static textwindows noinline int epoll_ctl$nt(int epfd, int op, int fd,
   }
 }
 
-static textwindows noinline int epoll_wait$nt(int epfd,
-                                              struct epoll_event *events,
-                                              int maxevents, int timeoutms) {
+static textwindows noinline int sys_epoll_wait_nt(int epfd,
+                                                  struct epoll_event *events,
+                                                  int maxevents,
+                                                  int timeoutms) {
   int num_events;
   struct PortState *port_state;
   struct TsTreeNode *tree_node;
@@ -1398,7 +1399,7 @@ err:
   return -1;
 }
 
-static textwindows noinline int close$epoll$nt(int fd) {
+static textwindows noinline int sys_close_epoll_nt(int fd) {
   struct PortState *port_state;
   struct TsTreeNode *tree_node;
   if (wepoll_init() < 0) return -1;
@@ -1416,11 +1417,11 @@ err:
   return -1;
 }
 
-int close$epoll(int fd) {
+int sys_close_epoll(int fd) {
   if (!IsWindows()) {
-    return close$sysv(fd);
+    return sys_close(fd);
   } else {
-    return close$epoll$nt(fd);
+    return sys_close_epoll_nt(fd);
   }
 }
 
@@ -1447,9 +1448,9 @@ int epoll_create1(int flags) {
   int fd;
   if (flags & ~O_CLOEXEC) return einval();
   if (!IsWindows()) {
-    return __ensurefds(fixupnewfd$sysv(epoll_create$sysv(1337), flags));
+    return __ensurefds(__fixupnewfd(sys_epoll_create(1337), flags));
   } else {
-    return epoll_create1$nt(flags);
+    return sys_epoll_create1_nt(flags);
   }
 }
 
@@ -1487,9 +1488,9 @@ int epoll_create1(int flags) {
  */
 int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev) {
   if (!IsWindows()) {
-    return epoll_ctl$sysv(epfd, op, fd, ev);
+    return sys_epoll_ctl(epfd, op, fd, ev);
   } else {
-    return epoll_ctl$nt(epfd, op, fd, ev);
+    return sys_epoll_ctl_nt(epfd, op, fd, ev);
   }
 }
 
@@ -1504,8 +1505,8 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev) {
 int epoll_wait(int epfd, struct epoll_event *events, int maxevents,
                int timeoutms) {
   if (!IsWindows()) {
-    return epoll_wait$sysv(epfd, events, maxevents, timeoutms);
+    return sys_epoll_wait(epfd, events, maxevents, timeoutms);
   } else {
-    return epoll_wait$nt(epfd, events, maxevents, timeoutms);
+    return sys_epoll_wait_nt(epfd, events, maxevents, timeoutms);
   }
 }
diff --git a/libc/sock/fixupnewsockfd.c b/libc/sock/fixupnewsockfd.c
index 174636512..f73bc85c6 100644
--- a/libc/sock/fixupnewsockfd.c
+++ b/libc/sock/fixupnewsockfd.c
@@ -26,7 +26,7 @@
  *
  * @param fd of -1 means no-op
  */
-int fixupnewsockfd$sysv(int fd, int flags) {
-  return fixupnewfd$sysv(fd, (((flags & SOCK_CLOEXEC) ? O_CLOEXEC : 0) |
-                              ((flags & SOCK_NONBLOCK) ? O_NONBLOCK : 0)));
+int __fixupnewsockfd(int fd, int flags) {
+  return __fixupnewfd(fd, (((flags & SOCK_CLOEXEC) ? O_CLOEXEC : 0) |
+                           ((flags & SOCK_NONBLOCK) ? O_NONBLOCK : 0)));
 }
diff --git a/libc/sock/getpeername-nt.c b/libc/sock/getpeername-nt.c
index 432c1d9c6..cee74ca31 100644
--- a/libc/sock/getpeername-nt.c
+++ b/libc/sock/getpeername-nt.c
@@ -24,10 +24,10 @@
 #include "libc/sock/yoink.inc"
 #include "libc/sysv/errfuns.h"
 
-textwindows int getpeername$nt(struct Fd *fd, void *out_addr,
+textwindows int sys_getpeername_nt(struct Fd *fd, void *out_addr,
                                uint32_t *out_addrsize) {
   assert(fd->kind == kFdSocket);
-  if (__getpeername$nt(fd->handle, out_addr, out_addrsize) != -1) {
+  if (__sys_getpeername_nt(fd->handle, out_addr, out_addrsize) != -1) {
     return 0;
   } else {
     return __winsockerr();
diff --git a/libc/sock/getpeername-sysv.c b/libc/sock/getpeername-sysv.c
index 38e2acbd1..61160801e 100644
--- a/libc/sock/getpeername-sysv.c
+++ b/libc/sock/getpeername-sysv.c
@@ -19,8 +19,8 @@
 #include "libc/dce.h"
 #include "libc/sock/internal.h"
 
-int getpeername$sysv(int fd, void *out_addr, uint32_t *out_addrsize) {
-  int rc = __getpeername$sysv(fd, out_addr, out_addrsize);
+int sys_getpeername(int fd, void *out_addr, uint32_t *out_addrsize) {
+  int rc = __sys_getpeername(fd, out_addr, out_addrsize);
   if (rc != -1 && IsBsd()) {
     sockaddr2linux(out_addr);
   }
diff --git a/libc/sock/getpeername.c b/libc/sock/getpeername.c
index 7cd6980e0..0da57eb99 100644
--- a/libc/sock/getpeername.c
+++ b/libc/sock/getpeername.c
@@ -29,9 +29,9 @@
  */
 int getpeername(int fd, void *out_addr, uint32_t *out_addrsize) {
   if (!IsWindows()) {
-    return getpeername$sysv(fd, out_addr, out_addrsize);
+    return sys_getpeername(fd, out_addr, out_addrsize);
   } else if (__isfdkind(fd, kFdSocket)) {
-    return getpeername$nt(&g_fds.p[fd], out_addr, out_addrsize);
+    return sys_getpeername_nt(&g_fds.p[fd], out_addr, out_addrsize);
   } else {
     return ebadf();
   }
diff --git a/libc/sock/getsockname-nt.c b/libc/sock/getsockname-nt.c
index 99d06166f..765c3357a 100644
--- a/libc/sock/getsockname-nt.c
+++ b/libc/sock/getsockname-nt.c
@@ -24,10 +24,10 @@
 #include "libc/sock/yoink.inc"
 #include "libc/sysv/errfuns.h"
 
-textwindows int getsockname$nt(struct Fd *fd, void *out_addr,
+textwindows int sys_getsockname_nt(struct Fd *fd, void *out_addr,
                                uint32_t *out_addrsize) {
   assert(fd->kind == kFdSocket);
-  if (__getsockname$nt(fd->handle, out_addr, out_addrsize) != -1) {
+  if (__sys_getsockname_nt(fd->handle, out_addr, out_addrsize) != -1) {
     return 0;
   } else {
     return __winsockerr();
diff --git a/libc/sock/getsockname-sysv.c b/libc/sock/getsockname-sysv.c
index 3e6b41bcc..f62259e05 100644
--- a/libc/sock/getsockname-sysv.c
+++ b/libc/sock/getsockname-sysv.c
@@ -19,8 +19,8 @@
 #include "libc/dce.h"
 #include "libc/sock/internal.h"
 
-int getsockname$sysv(int fd, void *out_addr, uint32_t *out_addrsize) {
-  int rc = __getsockname$sysv(fd, out_addr, out_addrsize);
+int sys_getsockname(int fd, void *out_addr, uint32_t *out_addrsize) {
+  int rc = __sys_getsockname(fd, out_addr, out_addrsize);
   if (rc != -1 && IsBsd()) {
     sockaddr2linux(out_addr);
   }
diff --git a/libc/sock/getsockname.c b/libc/sock/getsockname.c
index de5792354..70409656b 100644
--- a/libc/sock/getsockname.c
+++ b/libc/sock/getsockname.c
@@ -29,9 +29,9 @@
  */
 int getsockname(int fd, void *out_addr, uint32_t *out_addrsize) {
   if (!IsWindows()) {
-    return getsockname$sysv(fd, out_addr, out_addrsize);
+    return sys_getsockname(fd, out_addr, out_addrsize);
   } else if (__isfdkind(fd, kFdSocket)) {
-    return getsockname$nt(&g_fds.p[fd], out_addr, out_addrsize);
+    return sys_getsockname_nt(&g_fds.p[fd], out_addr, out_addrsize);
   } else {
     return ebadf();
   }
diff --git a/libc/sock/getsockopt-nt.c b/libc/sock/getsockopt-nt.c
index 0d96b9ab7..7f589a176 100644
--- a/libc/sock/getsockopt-nt.c
+++ b/libc/sock/getsockopt-nt.c
@@ -23,11 +23,11 @@
 #include "libc/sock/yoink.inc"
 #include "libc/sysv/errfuns.h"
 
-textwindows int getsockopt$nt(struct Fd *fd, int level, int optname,
+textwindows int sys_getsockopt_nt(struct Fd *fd, int level, int optname,
                               void *out_opt_optval, uint32_t *out_optlen) {
   /* TODO(jart): Use WSAIoctl? */
   assert(fd->kind == kFdSocket);
-  if (__getsockopt$nt(fd->handle, level, optname, out_opt_optval, out_optlen) !=
+  if (__sys_getsockopt_nt(fd->handle, level, optname, out_opt_optval, out_optlen) !=
       -1) {
     return 0;
   } else {
diff --git a/libc/sock/getsockopt.c b/libc/sock/getsockopt.c
index 805979a06..2b5a9f673 100644
--- a/libc/sock/getsockopt.c
+++ b/libc/sock/getsockopt.c
@@ -37,9 +37,9 @@ int getsockopt(int fd, int level, int optname, void *out_opt_optval,
   if (!level || !optname) return enoprotoopt(); /* our sysvconsts definition */
   if (optname == -1) return 0;                  /* our sysvconsts definition */
   if (!IsWindows()) {
-    return getsockopt$sysv(fd, level, optname, out_opt_optval, out_optlen);
+    return sys_getsockopt(fd, level, optname, out_opt_optval, out_optlen);
   } else if (__isfdkind(fd, kFdSocket)) {
-    return getsockopt$nt(&g_fds.p[fd], level, optname, out_opt_optval,
+    return sys_getsockopt_nt(&g_fds.p[fd], level, optname, out_opt_optval,
                          out_optlen);
   } else {
     return ebadf();
diff --git a/libc/sock/internal.h b/libc/sock/internal.h
index 8a2ce860f..d568be9aa 100644
--- a/libc/sock/internal.h
+++ b/libc/sock/internal.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_LIBC_SOCK_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_SOCK_INTERNAL_H_
-#ifndef __STRICT_ANSI__
 #include "libc/bits/bits.h"
+#include "libc/calls/internal.h"
 #include "libc/nt/winsock.h"
 #include "libc/sock/select.h"
 #include "libc/sock/sock.h"
@@ -21,17 +21,13 @@ COSMOPOLITAN_C_START_
 #define FD_CLOSE       (1 << FD_CLOSE_BIT)
 #define FD_CLOSE_BIT   5
 
-struct Fd;
-struct iovec;
-struct timeval;
-
-struct sockaddr$bsd {
+struct sockaddr_bsd {
   uint8_t sa_len;    /* « different type */
   uint8_t sa_family; /* « different type */
   char sa_data[14];
 };
 
-struct sockaddr_in$bsd {
+struct sockaddr_in_bsd {
   uint8_t sin_len;    /* « different type */
   uint8_t sin_family; /* « different type */
   uint16_t sin_port;
@@ -39,7 +35,7 @@ struct sockaddr_in$bsd {
   uint8_t sin_zero[8];
 };
 
-struct msghdr$bsd {
+struct msghdr_bsd {
   void *msg_name;
   uint32_t msg_namelen;
   struct iovec *msg_iov;
@@ -49,69 +45,67 @@ struct msghdr$bsd {
   uint32_t msg_flags; /* « different type */
 };
 
-errno_t MapDosErrorToErrno(uint32_t);
+errno_t __dos2errno(uint32_t);
 
-int32_t __accept$sysv(int32_t, void *, uint32_t *, int) nodiscard hidden;
-int32_t __accept4$sysv(int32_t, void *, uint32_t *, int) nodiscard hidden;
-int32_t __connect$sysv(int32_t, const void *, uint32_t) hidden;
-int32_t __socket$sysv(int32_t, int32_t, int32_t) hidden;
-int32_t __getsockname$sysv(int32_t, void *, uint32_t *) hidden;
-int32_t __getpeername$sysv(int32_t, void *, uint32_t *) hidden;
+int32_t __sys_accept(int32_t, void *, uint32_t *, int) nodiscard hidden;
+int32_t __sys_accept4(int32_t, void *, uint32_t *, int) nodiscard hidden;
+int32_t __sys_connect(int32_t, const void *, uint32_t) hidden;
+int32_t __sys_socket(int32_t, int32_t, int32_t) hidden;
+int32_t __sys_getsockname(int32_t, void *, uint32_t *) hidden;
+int32_t __sys_getpeername(int32_t, void *, uint32_t *) hidden;
 
-int32_t accept4$sysv(int32_t, void *, uint32_t *, int) nodiscard hidden;
-int32_t accept$sysv(int32_t, void *, uint32_t *) hidden;
-int32_t bind$sysv(int32_t, const void *, uint32_t) hidden;
-int32_t connect$sysv(int32_t, const void *, uint32_t) hidden;
-int32_t getsockopt$sysv(int32_t, int32_t, int32_t, void *, uint32_t *) hidden;
-int32_t listen$sysv(int32_t, int32_t) hidden;
-int32_t getsockname$sysv(int32_t, void *, uint32_t *) hidden;
-int32_t getpeername$sysv(int32_t, void *, uint32_t *) hidden;
-int32_t poll$sysv(struct pollfd *, uint64_t, signed) hidden;
-int32_t shutdown$sysv(int32_t, int32_t) hidden;
-int32_t socket$sysv(int32_t, int32_t, int32_t) hidden;
-int64_t readv$sysv(int32_t, const struct iovec *, int32_t) hidden;
-int64_t writev$sysv(int32_t, const struct iovec *, int32_t) hidden;
-ssize_t recvfrom$sysv(int, void *, size_t, int, void *, uint32_t *) hidden;
-ssize_t sendto$sysv(int, const void *, size_t, int, const void *,
-                    uint32_t) hidden;
-int32_t select$sysv(int32_t, fd_set *, fd_set *, fd_set *,
-                    struct timeval *) hidden;
-int setsockopt$sysv(int, int, int, const void *, uint32_t) hidden;
-int32_t epoll_create$sysv(int32_t) hidden;
-int32_t epoll_ctl$sysv(int32_t, int32_t, int32_t, void *) hidden;
-int32_t epoll_wait$sysv(int32_t, void *, int32_t, int32_t) hidden;
+int32_t sys_accept4(int32_t, void *, uint32_t *, int) nodiscard hidden;
+int32_t sys_accept(int32_t, void *, uint32_t *) hidden;
+int32_t sys_bind(int32_t, const void *, uint32_t) hidden;
+int32_t sys_connect(int32_t, const void *, uint32_t) hidden;
+int32_t sys_getsockopt(int32_t, int32_t, int32_t, void *, uint32_t *) hidden;
+int32_t sys_listen(int32_t, int32_t) hidden;
+int32_t sys_getsockname(int32_t, void *, uint32_t *) hidden;
+int32_t sys_getpeername(int32_t, void *, uint32_t *) hidden;
+int32_t sys_poll(struct pollfd *, uint64_t, signed) hidden;
+int32_t sys_shutdown(int32_t, int32_t) hidden;
+int32_t sys_socket(int32_t, int32_t, int32_t) hidden;
+int64_t sys_readv(int32_t, const struct iovec *, int32_t) hidden;
+int64_t sys_writev(int32_t, const struct iovec *, int32_t) hidden;
+ssize_t sys_recvfrom(int, void *, size_t, int, void *, uint32_t *) hidden;
+ssize_t sys_sendto(int, const void *, size_t, int, const void *,
+                   uint32_t) hidden;
+int32_t sys_select(int32_t, fd_set *, fd_set *, fd_set *,
+                   struct timeval *) hidden;
+int sys_setsockopt(int, int, int, const void *, uint32_t) hidden;
+int32_t sys_epoll_create(int32_t) hidden;
+int32_t sys_epoll_ctl(int32_t, int32_t, int32_t, void *) hidden;
+int32_t sys_epoll_wait(int32_t, void *, int32_t, int32_t) hidden;
 
-int poll$nt(struct pollfd *, uint64_t, uint64_t) hidden;
-int getsockopt$nt(struct Fd *, int, int, void *, uint32_t *) hidden;
-int getsockname$nt(struct Fd *, void *, uint32_t *) hidden;
-int getpeername$nt(struct Fd *, void *, uint32_t *) hidden;
-int listen$nt(struct Fd *, int) hidden;
-int connect$nt(struct Fd *, const void *, uint32_t) hidden;
-int bind$nt(struct Fd *, const void *, uint32_t);
-int accept$nt(struct Fd *, void *, uint32_t *, int) hidden;
-int closesocket$nt(int) hidden;
-int socket$nt(int, int, int) hidden;
-int select$nt(int, fd_set *, fd_set *, fd_set *, struct timeval *) hidden;
-int shutdown$nt(struct Fd *, int) hidden;
+int sys_poll_nt(struct pollfd *, uint64_t, uint64_t) hidden;
+int sys_getsockopt_nt(struct Fd *, int, int, void *, uint32_t *) hidden;
+int sys_getsockname_nt(struct Fd *, void *, uint32_t *) hidden;
+int sys_getpeername_nt(struct Fd *, void *, uint32_t *) hidden;
+int sys_listen_nt(struct Fd *, int) hidden;
+int sys_connect_nt(struct Fd *, const void *, uint32_t) hidden;
+int sys_bind_nt(struct Fd *, const void *, uint32_t);
+int sys_accept_nt(struct Fd *, void *, uint32_t *, int) hidden;
+int sys_closesocket_nt(int) hidden;
+int sys_socket_nt(int, int, int) hidden;
+int sys_select_nt(int, fd_set *, fd_set *, fd_set *, struct timeval *) hidden;
+int sys_shutdown_nt(struct Fd *, int) hidden;
 
-size_t iovec2nt(struct NtIovec[hasatleast 16], const struct iovec *,
-                size_t) hidden;
-ssize_t sendto$nt(struct Fd *, const struct iovec *, size_t, uint32_t, void *,
-                  uint32_t) hidden;
-ssize_t recvfrom$nt(struct Fd *, const struct iovec *, size_t, uint32_t, void *,
-                    uint32_t *) hidden;
+size_t __iovec2nt(struct NtIovec[hasatleast 16], const struct iovec *,
+                  size_t) hidden;
+ssize_t sys_sendto_nt(struct Fd *, const struct iovec *, size_t, uint32_t,
+                      void *, uint32_t) hidden;
+ssize_t sys_recvfrom_nt(struct Fd *, const struct iovec *, size_t, uint32_t,
+                        void *, uint32_t *) hidden;
 
-void winsockinit(void) hidden;
+void __winsockinit(void) hidden;
 int64_t __winsockerr(void) nocallback hidden;
-int fixupnewsockfd$sysv(int, int) hidden;
-ssize_t WinSendRecv(int64_t, void *, size_t, uint32_t, struct sockaddr *,
-                    uint32_t *, bool) hidden;
-int64_t winsockblock(int64_t, unsigned, int64_t) hidden;
+int __fixupnewsockfd(int, int) hidden;
+int64_t __winsockblock(int64_t, unsigned, int64_t) hidden;
 
-int close$epoll(int) hidden;
+int sys_close_epoll(int) hidden;
 
 /**
- * Converts sockaddr (Linux/Windows) → sockaddr$bsd (XNU/BSD).
+ * Converts sockaddr (Linux/Windows) → sockaddr_bsd (XNU/BSD).
  */
 forceinline void sockaddr2bsd(void *saddr) {
   uint8_t *p;
@@ -119,13 +113,13 @@ forceinline void sockaddr2bsd(void *saddr) {
   if (saddr) {
     p = saddr;
     fam = READ16LE(p);
-    p[0] = sizeof(struct sockaddr_in$bsd);
+    p[0] = sizeof(struct sockaddr_in_bsd);
     p[1] = fam;
   }
 }
 
 /**
- * Converts sockaddr_in$bsd (XNU/BSD) → sockaddr (Linux/Windows).
+ * Converts sockaddr_in_bsd (XNU/BSD) → sockaddr (Linux/Windows).
  */
 forceinline void sockaddr2linux(void *saddr) {
   uint8_t *p, fam;
@@ -138,5 +132,4 @@ forceinline void sockaddr2linux(void *saddr) {
 
 COSMOPOLITAN_C_END_
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* !ANSI */
 #endif /* COSMOPOLITAN_LIBC_SOCK_INTERNAL_H_ */
diff --git a/libc/sock/iovec2nt.c b/libc/sock/iovec2nt.c
index 78c786c69..ba35fcd3a 100644
--- a/libc/sock/iovec2nt.c
+++ b/libc/sock/iovec2nt.c
@@ -28,8 +28,8 @@
  * @return effective iovlen
  * @see IOV_MAX
  */
-textwindows size_t iovec2nt(struct NtIovec iovnt[hasatleast 16],
-                            const struct iovec *iov, size_t iovlen) {
+textwindows size_t __iovec2nt(struct NtIovec iovnt[hasatleast 16],
+                              const struct iovec *iov, size_t iovlen) {
   size_t i, limit;
   for (limit = 0x7ffff000, i = 0; i < MIN(16, iovlen); ++i) {
     iovnt[i].buf = iov[i].iov_base;
diff --git a/libc/sock/kntwsadata.c b/libc/sock/kntwsadata.c
index bf21ef8fc..5a931f830 100644
--- a/libc/sock/kntwsadata.c
+++ b/libc/sock/kntwsadata.c
@@ -33,13 +33,13 @@
  */
 hidden struct NtWsaData kNtWsaData;
 
-static textwindows void winsockfini(void) {
+static textwindows void __winsockfini(void) {
   WSACleanup();
 }
 
-textwindows noasan void winsockinit(void) {
+textwindows noasan void __winsockinit(void) {
   int rc;
-  atexit(winsockfini);
+  atexit(__winsockfini);
   if ((rc = WSAStartup(VERSION, &kNtWsaData)) != 0 ||
       kNtWsaData.wVersion != VERSION) {
     ExitProcess(123);
diff --git a/libc/sock/listen-nt.c b/libc/sock/listen-nt.c
index ffe38dca9..be8800b4f 100644
--- a/libc/sock/listen-nt.c
+++ b/libc/sock/listen-nt.c
@@ -23,9 +23,9 @@
 #include "libc/sock/yoink.inc"
 #include "libc/sysv/errfuns.h"
 
-textwindows int listen$nt(struct Fd *fd, int backlog) {
+textwindows int sys_listen_nt(struct Fd *fd, int backlog) {
   assert(fd->kind == kFdSocket);
-  if (__listen$nt(fd->handle, backlog) != -1) {
+  if (__sys_listen_nt(fd->handle, backlog) != -1) {
     return 0;
   } else {
     return __winsockerr();
diff --git a/libc/sock/listen.c b/libc/sock/listen.c
index bf1875792..65c1465c1 100644
--- a/libc/sock/listen.c
+++ b/libc/sock/listen.c
@@ -35,9 +35,9 @@
  */
 int listen(int fd, int backlog) {
   if (!IsWindows()) {
-    return listen$sysv(fd, backlog);
+    return sys_listen(fd, backlog);
   } else if (__isfdkind(fd, kFdSocket)) {
-    return listen$nt(&g_fds.p[fd], backlog);
+    return sys_listen_nt(&g_fds.p[fd], backlog);
   } else {
     return ebadf();
   }
diff --git a/libc/sock/mapdoserrortoerrno.c b/libc/sock/mapdoserrortoerrno.c
index 9109a58ca..ea901d5d7 100644
--- a/libc/sock/mapdoserrortoerrno.c
+++ b/libc/sock/mapdoserrortoerrno.c
@@ -23,7 +23,7 @@
 /**
  * Translates Windows error using superset of consts.sh.
  */
-textwindows errno_t MapDosErrorToErrno(uint32_t error) {
+textwindows errno_t __dos2errno(uint32_t error) {
   switch (error) {
     case kNtErrorModNotFound:
       return ENOSYS;
diff --git a/libc/sock/poll-nt.c b/libc/sock/poll-nt.c
index b9c5e68b4..f566a3b3d 100644
--- a/libc/sock/poll-nt.c
+++ b/libc/sock/poll-nt.c
@@ -26,11 +26,11 @@
 #include "libc/sysv/consts/poll.h"
 #include "libc/sysv/errfuns.h"
 
-textwindows int poll$nt(struct pollfd *fds, uint64_t nfds, uint64_t timeoutms) {
+textwindows int sys_poll_nt(struct pollfd *fds, uint64_t nfds, uint64_t timeoutms) {
   int got;
   size_t i;
   uint64_t waitfor;
-  struct pollfd$nt ntfds[64];
+  struct sys_pollfd_nt ntfds[64];
   if (nfds > 64) return einval();
   for (i = 0; i < nfds; ++i) {
     if (!__isfdkind(fds[i].fd, kFdSocket)) return ebadf();
diff --git a/libc/sock/poll.c b/libc/sock/poll.c
index 6003c26d7..ab8c5a07f 100644
--- a/libc/sock/poll.c
+++ b/libc/sock/poll.c
@@ -38,8 +38,8 @@
  */
 int poll(struct pollfd *fds, uint64_t nfds, int32_t timeout_ms) {
   if (!IsWindows()) {
-    return poll$sysv(fds, nfds, timeout_ms);
+    return sys_poll(fds, nfds, timeout_ms);
   } else {
-    return poll$nt(fds, nfds, timeout_ms);
+    return sys_poll_nt(fds, nfds, timeout_ms);
   }
 }
diff --git a/libc/sock/recvfrom-nt.c b/libc/sock/recvfrom-nt.c
index 1a536152b..ac1f8a732 100644
--- a/libc/sock/recvfrom-nt.c
+++ b/libc/sock/recvfrom-nt.c
@@ -27,15 +27,16 @@
  * @param fd must be a socket
  * @return number of bytes received, or -1 w/ errno
  */
-textwindows ssize_t recvfrom$nt(struct Fd *fd, const struct iovec *iov,
-                                size_t iovlen, uint32_t flags,
-                                void *opt_out_srcaddr,
-                                uint32_t *opt_inout_srcaddrsize) {
+textwindows ssize_t sys_recvfrom_nt(struct Fd *fd, const struct iovec *iov,
+                                    size_t iovlen, uint32_t flags,
+                                    void *opt_out_srcaddr,
+                                    uint32_t *opt_inout_srcaddrsize) {
   uint32_t got;
   struct NtIovec iovnt[16];
   got = 0;
-  if (WSARecvFrom(fd->handle, iovnt, iovec2nt(iovnt, iov, iovlen), &got, &flags,
-                  opt_out_srcaddr, opt_inout_srcaddrsize, NULL, NULL) != -1) {
+  if (WSARecvFrom(fd->handle, iovnt, __iovec2nt(iovnt, iov, iovlen), &got,
+                  &flags, opt_out_srcaddr, opt_inout_srcaddrsize, NULL,
+                  NULL) != -1) {
     return got;
   } else {
     return __winsockerr();
diff --git a/libc/sock/recvfrom.c b/libc/sock/recvfrom.c
index 2c899e7df..8adcfa258 100644
--- a/libc/sock/recvfrom.c
+++ b/libc/sock/recvfrom.c
@@ -44,14 +44,14 @@ ssize_t recvfrom(int fd, void *buf, size_t size, uint32_t flags,
                  void *opt_out_srcaddr, uint32_t *opt_inout_srcaddrsize) {
   ssize_t got;
   if (!IsWindows()) {
-    got = recvfrom$sysv(fd, buf, size, flags, opt_out_srcaddr,
+    got = sys_recvfrom(fd, buf, size, flags, opt_out_srcaddr,
                         opt_inout_srcaddrsize);
     if (opt_out_srcaddr && IsBsd() && got != -1) {
       sockaddr2linux(opt_out_srcaddr);
     }
     return got;
   } else if (__isfdkind(fd, kFdSocket)) {
-    return recvfrom$nt(&g_fds.p[fd], (struct iovec[]){{buf, size}}, 1, flags,
+    return sys_recvfrom_nt(&g_fds.p[fd], (struct iovec[]){{buf, size}}, 1, flags,
                        opt_out_srcaddr, opt_inout_srcaddrsize);
   } else {
     return ebadf();
diff --git a/libc/sock/select-nt.c b/libc/sock/select-nt.c
index e77c51bc3..971e27264 100644
--- a/libc/sock/select-nt.c
+++ b/libc/sock/select-nt.c
@@ -92,7 +92,7 @@ static struct NtTimeval *TimevalToNtTimeval(struct timeval *tv,
   }
 }
 
-int select$nt(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+int sys_select_nt(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
               struct timeval *timeout) {
   int n, rc;
   struct NtTimeval nttimeout, *nttimeoutp;
@@ -102,7 +102,7 @@ int select$nt(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
   ntwritefds = FdSetToNtFdSet(nfds, writefds);
   ntexceptfds = FdSetToNtFdSet(nfds, exceptfds);
   nttimeoutp = TimevalToNtTimeval(timeout, &nttimeout);
-  rc = __select$nt(0, ntreadfds, ntwritefds, ntexceptfds, nttimeoutp);
+  rc = __sys_select_nt(0, ntreadfds, ntwritefds, ntexceptfds, nttimeoutp);
   NtFdSetToFdSet(nfds, readfds, ntreadfds);
   NtFdSetToFdSet(nfds, writefds, ntwritefds);
   NtFdSetToFdSet(nfds, exceptfds, ntexceptfds);
diff --git a/libc/sock/select.c b/libc/sock/select.c
index a7e8d41c5..887872fcd 100644
--- a/libc/sock/select.c
+++ b/libc/sock/select.c
@@ -28,8 +28,8 @@
 int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
            struct timeval *timeout) {
   if (!IsWindows()) {
-    return select$sysv(nfds, readfds, writefds, exceptfds, timeout);
+    return sys_select(nfds, readfds, writefds, exceptfds, timeout);
   } else {
-    return select$nt(nfds, readfds, writefds, exceptfds, timeout);
+    return sys_select_nt(nfds, readfds, writefds, exceptfds, timeout);
   }
 }
diff --git a/libc/sock/sendfile.c b/libc/sock/sendfile.c
index 794f9889c..65a065e2c 100644
--- a/libc/sock/sendfile.c
+++ b/libc/sock/sendfile.c
@@ -25,7 +25,7 @@
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
-static textwindows ssize_t sendfile$linux2nt(int outfd, int infd,
+static textwindows ssize_t sendfile_linux2nt(int outfd, int infd,
                                              int64_t *inout_opt_inoffset,
                                              size_t uptobytes) {
   struct NtOverlapped Overlapped;
@@ -48,18 +48,18 @@ static textwindows ssize_t sendfile$linux2nt(int outfd, int infd,
   }
 }
 
-static ssize_t sendfile$linux2netflix(int outfd, int infd,
+static ssize_t sendfile_linux2netflix(int outfd, int infd,
                                       int64_t *inout_opt_inoffset,
                                       size_t uptobytes) {
   int sendfile$netflix(int32_t infd, int32_t outfd, int64_t offset,
                        size_t nbytes, const void *opt_hdtr,
                        int64_t *out_opt_sbytes,
-                       int32_t flags) asm("sendfile$sysv") hidden;
+                       int32_t flags) asm("sys_sendfile") hidden;
   int rc;
   int64_t offset, sbytes;
   if (inout_opt_inoffset) {
     offset = *inout_opt_inoffset;
-  } else if ((offset = lseek$sysv(infd, 0, SEEK_CUR)) == -1) {
+  } else if ((offset = sys_lseek(infd, 0, SEEK_CUR)) == -1) {
     return -1;
   }
   if ((rc = sendfile$netflix(infd, outfd, offset, uptobytes, NULL, &sbytes,
@@ -90,11 +90,11 @@ ssize_t sendfile(int outfd, int infd, int64_t *inout_opt_inoffset,
   if (uptobytes > 0x7ffffffe /* Microsoft's off-by-one */) return eoverflow();
   if (IsModeDbg() && uptobytes > 1) uptobytes >>= 1;
   if (IsLinux()) {
-    return sendfile$sysv(outfd, infd, inout_opt_inoffset, uptobytes);
+    return sys_sendfile(outfd, infd, inout_opt_inoffset, uptobytes);
   } else if (IsFreebsd() || IsXnu()) {
-    return sendfile$linux2netflix(outfd, infd, inout_opt_inoffset, uptobytes);
+    return sendfile_linux2netflix(outfd, infd, inout_opt_inoffset, uptobytes);
   } else if (IsWindows()) {
-    return sendfile$linux2nt(outfd, infd, inout_opt_inoffset, uptobytes);
+    return sendfile_linux2nt(outfd, infd, inout_opt_inoffset, uptobytes);
   } else {
     return copyfd(infd, inout_opt_inoffset, outfd, NULL, uptobytes, 0);
   }
diff --git a/libc/sock/sendto-nt.c b/libc/sock/sendto-nt.c
index 082a4846e..c2b034478 100644
--- a/libc/sock/sendto-nt.c
+++ b/libc/sock/sendto-nt.c
@@ -30,12 +30,12 @@
  * @param fd must be a socket
  * @return number of bytes handed off, or -1 w/ errno
  */
-textwindows ssize_t sendto$nt(struct Fd *fd, const struct iovec *iov,
-                              size_t iovlen, uint32_t flags, void *opt_in_addr,
-                              uint32_t in_addrsize) {
+textwindows ssize_t sys_sendto_nt(struct Fd *fd, const struct iovec *iov,
+                                  size_t iovlen, uint32_t flags,
+                                  void *opt_in_addr, uint32_t in_addrsize) {
   uint32_t sent;
   struct NtIovec iovnt[16];
-  if (WSASendTo(fd->handle, iovnt, iovec2nt(iovnt, iov, iovlen), &sent, flags,
+  if (WSASendTo(fd->handle, iovnt, __iovec2nt(iovnt, iov, iovlen), &sent, flags,
                 opt_in_addr, in_addrsize, NULL, NULL) != -1) {
     return sent;
   } else {
diff --git a/libc/sock/sendto.c b/libc/sock/sendto.c
index 52e522b98..014becaf9 100644
--- a/libc/sock/sendto.c
+++ b/libc/sock/sendto.c
@@ -46,19 +46,19 @@
  */
 ssize_t sendto(int fd, const void *buf, size_t size, uint32_t flags,
                const void *opt_addr, uint32_t addrsize) {
-  _Static_assert(sizeof(struct sockaddr_in) == sizeof(struct sockaddr_in$bsd));
+  _Static_assert(sizeof(struct sockaddr_in) == sizeof(struct sockaddr_in_bsd));
   if (!IsWindows()) {
     if (!IsBsd() || !opt_addr) {
-      return sendto$sysv(fd, buf, size, flags, opt_addr, addrsize);
+      return sys_sendto(fd, buf, size, flags, opt_addr, addrsize);
     } else {
-      struct sockaddr_in$bsd addr2;
+      struct sockaddr_in_bsd addr2;
       if (addrsize != sizeof(addr2)) return einval();
       memcpy(&addr2, opt_addr, sizeof(struct sockaddr_in));
       sockaddr2bsd(&addr2);
-      return sendto$sysv(fd, buf, size, flags, &addr2, addrsize);
+      return sys_sendto(fd, buf, size, flags, &addr2, addrsize);
     }
   } else if (__isfdkind(fd, kFdSocket)) {
-    return sendto$nt(&g_fds.p[fd], (struct iovec[]){{buf, size}}, 1, flags,
+    return sys_sendto_nt(&g_fds.p[fd], (struct iovec[]){{buf, size}}, 1, flags,
                      opt_addr, addrsize);
   } else {
     return ebadf();
diff --git a/libc/sock/setsockopt.c b/libc/sock/setsockopt.c
index 45a39dfe2..adc808662 100644
--- a/libc/sock/setsockopt.c
+++ b/libc/sock/setsockopt.c
@@ -33,9 +33,9 @@ static bool setsockopt_polyfill(int *optname) {
   return false;
 }
 
-static textwindows int setsockopt$nt(struct Fd *fd, int level, int optname,
+static textwindows int sys_setsockopt_nt(struct Fd *fd, int level, int optname,
                                      const void *optval, uint32_t optlen) {
-  if (__setsockopt$nt(fd->handle, level, optname, optval, optlen) != -1) {
+  if (__sys_setsockopt_nt(fd->handle, level, optname, optval, optlen) != -1) {
     return 0;
   } else {
     return __winsockerr();
@@ -64,13 +64,13 @@ int setsockopt(int fd, int level, int optname, const void *optval,
   if (optname == -1) return 0;                  /* our sysvconsts definition */
   if (!IsWindows()) {
     do {
-      if (setsockopt$sysv(fd, level, optname, optval, optlen) != -1) {
+      if (sys_setsockopt(fd, level, optname, optval, optlen) != -1) {
         return 0;
       }
     } while (setsockopt_polyfill(&optname));
     return -1;
   } else if (__isfdkind(fd, kFdSocket)) {
-    return setsockopt$nt(&g_fds.p[fd], level, optname, optval, optlen);
+    return sys_setsockopt_nt(&g_fds.p[fd], level, optname, optval, optlen);
   } else {
     return ebadf();
   }
diff --git a/libc/sock/shutdown-nt.c b/libc/sock/shutdown-nt.c
index 3dde5fb15..d6433526b 100644
--- a/libc/sock/shutdown-nt.c
+++ b/libc/sock/shutdown-nt.c
@@ -20,8 +20,8 @@
 #include "libc/nt/winsock.h"
 #include "libc/sock/internal.h"
 
-textwindows int shutdown$nt(struct Fd *fd, int how) {
-  if (__shutdown$nt(fd->handle, how) != -1) {
+textwindows int sys_shutdown_nt(struct Fd *fd, int how) {
+  if (__sys_shutdown_nt(fd->handle, how) != -1) {
     return 0;
   } else {
     return __winsockerr();
diff --git a/libc/sock/shutdown.c b/libc/sock/shutdown.c
index c0f2ca868..2183b2f2f 100644
--- a/libc/sock/shutdown.c
+++ b/libc/sock/shutdown.c
@@ -32,9 +32,9 @@
  */
 int shutdown(int fd, int how) {
   if (!IsWindows()) {
-    return shutdown$sysv(fd, how);
+    return sys_shutdown(fd, how);
   } else if (__isfdkind(fd, kFdSocket)) {
-    return shutdown$nt(&g_fds.p[fd], how);
+    return sys_shutdown_nt(&g_fds.p[fd], how);
   } else {
     return ebadf();
   }
diff --git a/libc/sock/socket-nt.c b/libc/sock/socket-nt.c
index 31254eb40..fc199f5a0 100644
--- a/libc/sock/socket-nt.c
+++ b/libc/sock/socket-nt.c
@@ -26,7 +26,7 @@
 #define CLOEXEC  0x00080000
 #define NONBLOCK 0x00000800
 
-textwindows int socket$nt(int family, int type, int protocol) {
+textwindows int sys_socket_nt(int family, int type, int protocol) {
   int fd;
   uint32_t yes;
   if ((fd = __reservefd()) == -1) return -1;
@@ -34,8 +34,8 @@ textwindows int socket$nt(int family, int type, int protocol) {
                                       protocol, NULL, 0, 0)) != -1) {
     if (type & NONBLOCK) {
       yes = 1;
-      if (__ioctlsocket$nt(g_fds.p[fd].handle, FIONBIO, &yes) == -1) {
-        __closesocket$nt(g_fds.p[fd].handle);
+      if (__sys_ioctlsocket_nt(g_fds.p[fd].handle, FIONBIO, &yes) == -1) {
+        __sys_closesocket_nt(g_fds.p[fd].handle);
         return __winsockerr();
       }
     }
diff --git a/libc/sock/socket-sysv.c b/libc/sock/socket-sysv.c
index 42c7541ad..c40cab59c 100644
--- a/libc/sock/socket-sysv.c
+++ b/libc/sock/socket-sysv.c
@@ -21,16 +21,16 @@
 #include "libc/sock/internal.h"
 #include "libc/sysv/consts/sock.h"
 
-int socket$sysv(int family, int type, int protocol) {
+int sys_socket(int family, int type, int protocol) {
   int rc, olderr, modernflags;
   olderr = errno;
-  rc = __socket$sysv(family, type, protocol);
+  rc = __sys_socket(family, type, protocol);
   if ((SupportsLinux() || SupportsXnu()) &&
       (rc == -1 && errno == EINVAL /* rhel5 behavior */) &&
       (modernflags = (type & (SOCK_CLOEXEC | SOCK_NONBLOCK)))) {
     errno = olderr;
-    rc = fixupnewsockfd$sysv(
-        __socket$sysv(family, type & ~modernflags, protocol), modernflags);
+    rc = __fixupnewsockfd(__sys_socket(family, type & ~modernflags, protocol),
+                          modernflags);
   }
   return rc;
 }
diff --git a/libc/sock/socket.c b/libc/sock/socket.c
index d086df1e4..af0c96a36 100644
--- a/libc/sock/socket.c
+++ b/libc/sock/socket.c
@@ -45,8 +45,8 @@ int socket(int family, int type, int protocol) {
     return epfnosupport();
   }
   if (!IsWindows()) {
-    return socket$sysv(family, type, protocol);
+    return sys_socket(family, type, protocol);
   } else {
-    return socket$nt(family, type, protocol);
+    return sys_socket_nt(family, type, protocol);
   }
 }
diff --git a/libc/sock/winsockblock.c b/libc/sock/winsockblock.c
index fada0f5ef..cacffa124 100644
--- a/libc/sock/winsockblock.c
+++ b/libc/sock/winsockblock.c
@@ -23,7 +23,7 @@
 #include "libc/sock/sock.h"
 #include "libc/str/str.h"
 
-textwindows int64_t winsockblock(int64_t fh, unsigned eventbit, int64_t rc) {
+textwindows int64_t __winsockblock(int64_t fh, unsigned eventbit, int64_t rc) {
   int64_t eh;
   struct NtWsaNetworkEvents ev;
   if (rc != -1) return rc;
diff --git a/libc/sock/winsockerr.c b/libc/sock/winsockerr.c
index 870e21363..4d73176d6 100644
--- a/libc/sock/winsockerr.c
+++ b/libc/sock/winsockerr.c
@@ -24,6 +24,6 @@
  * Error return path for winsock wrappers.
  */
 textwindows int64_t __winsockerr(void) {
-  errno = MapDosErrorToErrno(WSAGetLastError());
+  errno = __dos2errno(WSAGetLastError());
   return -1;
 }
diff --git a/libc/sock/xinet_ntop.c b/libc/sock/xinet_ntop.c
index 0ae53b50f..ce1914156 100644
--- a/libc/sock/xinet_ntop.c
+++ b/libc/sock/xinet_ntop.c
@@ -29,7 +29,7 @@
  * @param src is the binary-encoded address, e.g. &addr->sin_addr
  * @return allocated IP address string, which must be free()'d
  */
-char *xinet_ntop(int af, const void *src) {
+char *sys_xinet_ntop(int af, const void *src) {
   char *res, ip[16];
   if (inet_ntop(af, src, ip, sizeof(ip)) && (res = strdup(ip))) {
     return res;
diff --git a/libc/sock/yoink.inc b/libc/sock/yoink.inc
index 45d50cb40..f17e7eb2f 100644
--- a/libc/sock/yoink.inc
+++ b/libc/sock/yoink.inc
@@ -1,4 +1,4 @@
-STATIC_YOINK("kNtWsaData");      // for winmain
-STATIC_YOINK("closesocket$nt");  // for close
-STATIC_YOINK("recvfrom$nt");     // for readv
-STATIC_YOINK("sendto$nt");       // for writev
+STATIC_YOINK("kNtWsaData");          // for winmain
+STATIC_YOINK("sys_closesocket_nt");  // for close
+STATIC_YOINK("sys_recvfrom_nt");     // for readv
+STATIC_YOINK("sys_sendto_nt");       // for writev
diff --git a/libc/stdio/dirstream.c b/libc/stdio/dirstream.c
index 8632e1574..d281432ba 100644
--- a/libc/stdio/dirstream.c
+++ b/libc/stdio/dirstream.c
@@ -65,7 +65,7 @@ struct dirstream {
 /**
  * FreeBSD getdents() and XNU getdirentries() ABI.
  */
-struct dirent$bsd {
+struct dirent_bsd {
   uint32_t d_fileno;
   uint16_t d_reclen;
   uint8_t d_type;
@@ -76,7 +76,7 @@ struct dirent$bsd {
 /**
  * OpenBSD getdents() ABI.
  */
-struct dirent$openbsd {
+struct dirent_openbsd {
   uint64_t d_fileno;
   int64_t d_off;
   uint16_t d_reclen;
@@ -86,7 +86,7 @@ struct dirent$openbsd {
   char d_name[256];
 };
 
-static textwindows noinline DIR *opendir$nt(const char *name) {
+static textwindows noinline DIR *opendir_nt(const char *name) {
   int len;
   DIR *res;
   char16_t name16[PATH_MAX];
@@ -106,7 +106,7 @@ static textwindows noinline DIR *opendir$nt(const char *name) {
   }
 }
 
-static textwindows noinline struct dirent *readdir$nt(DIR *dir) {
+static textwindows noinline struct dirent *readdir_nt(DIR *dir) {
   if (!dir->isdone) {
     memset(&dir->ent, 0, sizeof(dir->ent));
     dir->ent.d_ino = 0;
@@ -166,7 +166,7 @@ DIR *opendir(const char *name) {
     }
     return res;
   } else {
-    return opendir$nt(name);
+    return opendir_nt(name);
   }
 }
 
@@ -204,8 +204,8 @@ struct dirent *readdir(DIR *dir) {
   int rc;
   long basep;
   struct dirent *ent;
-  struct dirent$bsd *bsd;
-  struct dirent$openbsd *obsd;
+  struct dirent_bsd *bsd;
+  struct dirent_openbsd *obsd;
   if (!IsWindows()) {
     if (dir->buf_pos >= dir->buf_end) {
       basep = dir->tell; /* <- what does xnu do */
@@ -219,7 +219,7 @@ struct dirent *readdir(DIR *dir) {
       dir->buf_pos += ent->d_reclen;
       dir->tell = ent->d_off;
     } else if (IsOpenbsd()) {
-      obsd = (struct dirent$openbsd *)(dir->buf + dir->buf_pos);
+      obsd = (struct dirent_openbsd *)(dir->buf + dir->buf_pos);
       dir->buf_pos += obsd->d_reclen;
       ent = &dir->ent;
       ent->d_ino = obsd->d_fileno;
@@ -228,7 +228,7 @@ struct dirent *readdir(DIR *dir) {
       ent->d_type = obsd->d_type;
       memcpy(ent->d_name, obsd->d_name, obsd->d_namlen + 1);
     } else {
-      bsd = (struct dirent$bsd *)(dir->buf + dir->buf_pos);
+      bsd = (struct dirent_bsd *)(dir->buf + dir->buf_pos);
       dir->buf_pos += bsd->d_reclen;
       ent = &dir->ent;
       ent->d_ino = bsd->d_fileno;
@@ -239,7 +239,7 @@ struct dirent *readdir(DIR *dir) {
     }
     return ent;
   } else {
-    return readdir$nt(dir);
+    return readdir_nt(dir);
   }
 }
 
diff --git a/libc/sysv/calls/__accept-sysv.s b/libc/sysv/calls/__accept-sysv.s
deleted file mode 100644
index 030a04879..000000000
--- a/libc/sysv/calls/__accept-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __accept$sysv 0x001e021d201e002b globl hidden
diff --git a/libc/sysv/calls/__accept4-sysv.s b/libc/sysv/calls/__accept4-sysv.s
deleted file mode 100644
index ed926bf1e..000000000
--- a/libc/sysv/calls/__accept4-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __accept4$sysv 0x005d021dffff0120 globl hidden
diff --git a/libc/sysv/calls/__bsd_setegid.s b/libc/sysv/calls/__bsd_setegid.s
new file mode 100644
index 000000000..a13fe9809
--- /dev/null
+++ b/libc/sysv/calls/__bsd_setegid.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __bsd_setegid 0x00b600b620b6ffff globl hidden
diff --git a/libc/sysv/calls/__bsd_seteuid.s b/libc/sysv/calls/__bsd_seteuid.s
new file mode 100644
index 000000000..5f1a083ae
--- /dev/null
+++ b/libc/sysv/calls/__bsd_seteuid.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __bsd_seteuid 0x00b700b720b7ffff globl hidden
diff --git a/libc/sysv/calls/__connect-sysv.s b/libc/sysv/calls/__connect-sysv.s
deleted file mode 100644
index a5c2c1e5c..000000000
--- a/libc/sysv/calls/__connect-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __connect$sysv 0x006200622062002a globl hidden
diff --git a/libc/sysv/calls/__dup3-sysv.s b/libc/sysv/calls/__dup3-sysv.s
deleted file mode 100644
index f6387f08e..000000000
--- a/libc/sysv/calls/__dup3-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __dup3$sysv 0x0066ffffffff0124 globl hidden
diff --git a/libc/sysv/calls/__execve-sysv.s b/libc/sysv/calls/__execve-sysv.s
deleted file mode 100644
index bddbd0051..000000000
--- a/libc/sysv/calls/__execve-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __execve$sysv 0x003b003b203b003b globl hidden
diff --git a/libc/sysv/calls/__fork-sysv.s b/libc/sysv/calls/__fork-sysv.s
deleted file mode 100644
index 68c35c37f..000000000
--- a/libc/sysv/calls/__fork-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __fork$sysv 0x0002000220020039 globl hidden
diff --git a/libc/sysv/calls/__fstat-sysv.s b/libc/sysv/calls/__fstat-sysv.s
deleted file mode 100644
index 93cc758d5..000000000
--- a/libc/sysv/calls/__fstat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __fstat$sysv 0x0035022721530005 globl hidden
diff --git a/libc/sysv/calls/__fstatat-sysv.s b/libc/sysv/calls/__fstatat-sysv.s
deleted file mode 100644
index 272a20e5e..000000000
--- a/libc/sysv/calls/__fstatat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __fstatat$sysv 0x002a022821d60106 globl hidden
diff --git a/libc/sysv/calls/__ftruncate-sysv.s b/libc/sysv/calls/__ftruncate-sysv.s
deleted file mode 100644
index 5c4e48374..000000000
--- a/libc/sysv/calls/__ftruncate-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __ftruncate$sysv 0x00c901e020c9004d globl hidden
diff --git a/libc/sysv/calls/__getpeername-sysv.s b/libc/sysv/calls/__getpeername-sysv.s
deleted file mode 100644
index be60d3772..000000000
--- a/libc/sysv/calls/__getpeername-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __getpeername$sysv 0x001f008d201f0034 globl hidden
diff --git a/libc/sysv/calls/__getsockname-sysv.s b/libc/sysv/calls/__getsockname-sysv.s
deleted file mode 100644
index fba9bb1ce..000000000
--- a/libc/sysv/calls/__getsockname-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __getsockname$sysv 0x0020002020200033 globl hidden
diff --git a/libc/sysv/calls/__gettimeofday-sysv.s b/libc/sysv/calls/__gettimeofday-sysv.s
deleted file mode 100644
index bcb89e624..000000000
--- a/libc/sysv/calls/__gettimeofday-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __gettimeofday$sysv 0x0043007420740060 globl hidden
diff --git a/libc/sysv/calls/__lseek-sysv.s b/libc/sysv/calls/__lseek-sysv.s
deleted file mode 100644
index b95df615d..000000000
--- a/libc/sysv/calls/__lseek-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __lseek$sysv 0x00c701de20c70008 globl hidden
diff --git a/libc/sysv/calls/__lstat-sysv.s b/libc/sysv/calls/__lstat-sysv.s
deleted file mode 100644
index e1f2b9577..000000000
--- a/libc/sysv/calls/__lstat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __lstat$sysv 0x0028002821540006 globl hidden
diff --git a/libc/sysv/calls/__mmap-sysv.s b/libc/sysv/calls/__mmap-sysv.s
deleted file mode 100644
index df1a27965..000000000
--- a/libc/sysv/calls/__mmap-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __mmap$sysv 0x00c501dd20c50009 globl hidden
diff --git a/libc/sysv/calls/__pipe-sysv.s b/libc/sysv/calls/__pipe-sysv.s
deleted file mode 100644
index d2ad254cd..000000000
--- a/libc/sysv/calls/__pipe-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __pipe$sysv 0x0107021e202a0016 globl hidden
diff --git a/libc/sysv/calls/__pipe2-sysv.s b/libc/sysv/calls/__pipe2-sysv.s
deleted file mode 100644
index d8db06b7a..000000000
--- a/libc/sysv/calls/__pipe2-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __pipe2$sysv 0x0065021effff0125 globl hidden
diff --git a/libc/sysv/calls/__pread-sysv.s b/libc/sysv/calls/__pread-sysv.s
deleted file mode 100644
index 2cddd8d43..000000000
--- a/libc/sysv/calls/__pread-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __pread$sysv 0x00ad01db20990011 globl hidden
diff --git a/libc/sysv/calls/__preadv-sysv.s b/libc/sysv/calls/__preadv-sysv.s
deleted file mode 100644
index fc0005f53..000000000
--- a/libc/sysv/calls/__preadv-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __preadv$sysv 0x010b0121ffff0127 globl hidden
diff --git a/libc/sysv/calls/__pwrite-sysv.s b/libc/sysv/calls/__pwrite-sysv.s
deleted file mode 100644
index 8e61e8a18..000000000
--- a/libc/sysv/calls/__pwrite-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __pwrite$sysv 0x00ae01dc209a0012 globl hidden
diff --git a/libc/sysv/calls/__pwritev-sysv.s b/libc/sysv/calls/__pwritev-sysv.s
deleted file mode 100644
index 9e05b52bd..000000000
--- a/libc/sysv/calls/__pwritev-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __pwritev$sysv 0x010c0122ffff0128 globl hidden
diff --git a/libc/sysv/calls/__setegid-bsd.s b/libc/sysv/calls/__setegid-bsd.s
deleted file mode 100644
index 3df0458c8..000000000
--- a/libc/sysv/calls/__setegid-bsd.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __setegid$bsd 0x00b600b620b6ffff globl hidden
diff --git a/libc/sysv/calls/__seteuid-bsd.s b/libc/sysv/calls/__seteuid-bsd.s
deleted file mode 100644
index 0e91cf663..000000000
--- a/libc/sysv/calls/__seteuid-bsd.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __seteuid$bsd 0x00b700b720b7ffff globl hidden
diff --git a/libc/sysv/calls/__socket-sysv.s b/libc/sysv/calls/__socket-sysv.s
deleted file mode 100644
index fee2df701..000000000
--- a/libc/sysv/calls/__socket-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __socket$sysv 0x0061006120610029 globl hidden
diff --git a/libc/sysv/calls/__stat-sysv.s b/libc/sysv/calls/__stat-sysv.s
deleted file mode 100644
index eeee0c617..000000000
--- a/libc/sysv/calls/__stat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __stat$sysv 0x0026ffff21520004 globl hidden
diff --git a/libc/sysv/calls/__sys_accept.s b/libc/sysv/calls/__sys_accept.s
new file mode 100644
index 000000000..494b7274f
--- /dev/null
+++ b/libc/sysv/calls/__sys_accept.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_accept 0x001e021d201e002b globl hidden
diff --git a/libc/sysv/calls/__sys_accept4.s b/libc/sysv/calls/__sys_accept4.s
new file mode 100644
index 000000000..b8125d4b0
--- /dev/null
+++ b/libc/sysv/calls/__sys_accept4.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_accept4 0x005d021dffff0120 globl hidden
diff --git a/libc/sysv/calls/__sys_connect.s b/libc/sysv/calls/__sys_connect.s
new file mode 100644
index 000000000..ea753bdd9
--- /dev/null
+++ b/libc/sysv/calls/__sys_connect.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_connect 0x006200622062002a globl hidden
diff --git a/libc/sysv/calls/__sys_dup3.s b/libc/sysv/calls/__sys_dup3.s
new file mode 100644
index 000000000..d3b353f3f
--- /dev/null
+++ b/libc/sysv/calls/__sys_dup3.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_dup3 0x0066ffffffff0124 globl hidden
diff --git a/libc/sysv/calls/__sys_execve.s b/libc/sysv/calls/__sys_execve.s
new file mode 100644
index 000000000..c014295e0
--- /dev/null
+++ b/libc/sysv/calls/__sys_execve.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_execve 0x003b003b203b003b globl hidden
diff --git a/libc/sysv/calls/__sys_fork.s b/libc/sysv/calls/__sys_fork.s
new file mode 100644
index 000000000..c3398e5db
--- /dev/null
+++ b/libc/sysv/calls/__sys_fork.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_fork 0x0002000220020039 globl hidden
diff --git a/libc/sysv/calls/__sys_fstat.s b/libc/sysv/calls/__sys_fstat.s
new file mode 100644
index 000000000..9968b54a7
--- /dev/null
+++ b/libc/sysv/calls/__sys_fstat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_fstat 0x0035022721530005 globl hidden
diff --git a/libc/sysv/calls/__sys_fstatat.s b/libc/sysv/calls/__sys_fstatat.s
new file mode 100644
index 000000000..0a636dc1c
--- /dev/null
+++ b/libc/sysv/calls/__sys_fstatat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_fstatat 0x002a022821d60106 globl hidden
diff --git a/libc/sysv/calls/__sys_ftruncate.s b/libc/sysv/calls/__sys_ftruncate.s
new file mode 100644
index 000000000..333fa59d5
--- /dev/null
+++ b/libc/sysv/calls/__sys_ftruncate.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_ftruncate 0x00c901e020c9004d globl hidden
diff --git a/libc/sysv/calls/__sys_getpeername.s b/libc/sysv/calls/__sys_getpeername.s
new file mode 100644
index 000000000..5e818064f
--- /dev/null
+++ b/libc/sysv/calls/__sys_getpeername.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_getpeername 0x001f008d201f0034 globl hidden
diff --git a/libc/sysv/calls/__sys_getsockname.s b/libc/sysv/calls/__sys_getsockname.s
new file mode 100644
index 000000000..def85d1ac
--- /dev/null
+++ b/libc/sysv/calls/__sys_getsockname.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_getsockname 0x0020002020200033 globl hidden
diff --git a/libc/sysv/calls/__sys_gettimeofday.s b/libc/sysv/calls/__sys_gettimeofday.s
new file mode 100644
index 000000000..e09f7ad6d
--- /dev/null
+++ b/libc/sysv/calls/__sys_gettimeofday.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_gettimeofday 0x0043007420740060 globl hidden
diff --git a/libc/sysv/calls/__sys_lseek.s b/libc/sysv/calls/__sys_lseek.s
new file mode 100644
index 000000000..53fa7740d
--- /dev/null
+++ b/libc/sysv/calls/__sys_lseek.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_lseek 0x00c701de20c70008 globl hidden
diff --git a/libc/sysv/calls/__sys_lstat.s b/libc/sysv/calls/__sys_lstat.s
new file mode 100644
index 000000000..ad3a61e64
--- /dev/null
+++ b/libc/sysv/calls/__sys_lstat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_lstat 0x0028002821540006 globl hidden
diff --git a/libc/sysv/calls/__sys_mmap.s b/libc/sysv/calls/__sys_mmap.s
new file mode 100644
index 000000000..0932ee11f
--- /dev/null
+++ b/libc/sysv/calls/__sys_mmap.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_mmap 0x00c501dd20c50009 globl hidden
diff --git a/libc/sysv/calls/__sys_pipe.s b/libc/sysv/calls/__sys_pipe.s
new file mode 100644
index 000000000..a74fa08dd
--- /dev/null
+++ b/libc/sysv/calls/__sys_pipe.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_pipe 0x0107021e202a0016 globl hidden
diff --git a/libc/sysv/calls/__sys_pipe2.s b/libc/sysv/calls/__sys_pipe2.s
new file mode 100644
index 000000000..bac9997cf
--- /dev/null
+++ b/libc/sysv/calls/__sys_pipe2.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_pipe2 0x0065021effff0125 globl hidden
diff --git a/libc/sysv/calls/__sys_pread.s b/libc/sysv/calls/__sys_pread.s
new file mode 100644
index 000000000..eb8d02105
--- /dev/null
+++ b/libc/sysv/calls/__sys_pread.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_pread 0x00ad01db20990011 globl hidden
diff --git a/libc/sysv/calls/__sys_preadv.s b/libc/sysv/calls/__sys_preadv.s
new file mode 100644
index 000000000..59e97f0b2
--- /dev/null
+++ b/libc/sysv/calls/__sys_preadv.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_preadv 0x010b0121ffff0127 globl hidden
diff --git a/libc/sysv/calls/__sys_pwrite.s b/libc/sysv/calls/__sys_pwrite.s
new file mode 100644
index 000000000..793e9d5cf
--- /dev/null
+++ b/libc/sysv/calls/__sys_pwrite.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_pwrite 0x00ae01dc209a0012 globl hidden
diff --git a/libc/sysv/calls/__sys_pwritev.s b/libc/sysv/calls/__sys_pwritev.s
new file mode 100644
index 000000000..15862baec
--- /dev/null
+++ b/libc/sysv/calls/__sys_pwritev.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_pwritev 0x010c0122ffff0128 globl hidden
diff --git a/libc/sysv/calls/__sys_socket.s b/libc/sysv/calls/__sys_socket.s
new file mode 100644
index 000000000..8a66d3dc9
--- /dev/null
+++ b/libc/sysv/calls/__sys_socket.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_socket 0x0061006120610029 globl hidden
diff --git a/libc/sysv/calls/__sys_stat.s b/libc/sysv/calls/__sys_stat.s
new file mode 100644
index 000000000..f730084aa
--- /dev/null
+++ b/libc/sysv/calls/__sys_stat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_stat 0x0026ffff21520004 globl hidden
diff --git a/libc/sysv/calls/__sys_truncate.s b/libc/sysv/calls/__sys_truncate.s
new file mode 100644
index 000000000..f524591f6
--- /dev/null
+++ b/libc/sysv/calls/__sys_truncate.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_truncate 0x00c801df20c8004c globl hidden
diff --git a/libc/sysv/calls/__sys_utimensat.s b/libc/sysv/calls/__sys_utimensat.s
new file mode 100644
index 000000000..ad7952f15
--- /dev/null
+++ b/libc/sysv/calls/__sys_utimensat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall __sys_utimensat 0x00540223ffff0118 globl hidden
diff --git a/libc/sysv/calls/__truncate-sysv.s b/libc/sysv/calls/__truncate-sysv.s
deleted file mode 100644
index 1488286c9..000000000
--- a/libc/sysv/calls/__truncate-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __truncate$sysv 0x00c801df20c8004c globl hidden
diff --git a/libc/sysv/calls/__utimensat-sysv.s b/libc/sysv/calls/__utimensat-sysv.s
deleted file mode 100644
index 53ab72e96..000000000
--- a/libc/sysv/calls/__utimensat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall __utimensat$sysv 0x00540223ffff0118 globl hidden
diff --git a/libc/sysv/calls/access-sysv.s b/libc/sysv/calls/access-sysv.s
deleted file mode 100644
index dc4bec94f..000000000
--- a/libc/sysv/calls/access-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall access$sysv 0x0021002120210015 globl hidden
diff --git a/libc/sysv/calls/alarm-sysv.s b/libc/sysv/calls/alarm-sysv.s
deleted file mode 100644
index f5cf64708..000000000
--- a/libc/sysv/calls/alarm-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall alarm$sysv 0xffffffffffff0025 globl hidden
diff --git a/libc/sysv/calls/arch_prctl-sysv.s b/libc/sysv/calls/arch_prctl-sysv.s
deleted file mode 100644
index 619abbd68..000000000
--- a/libc/sysv/calls/arch_prctl-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall arch_prctl$sysv 0x00a500a5ffff009e globl hidden
diff --git a/libc/sysv/calls/bind-sysv.s b/libc/sysv/calls/bind-sysv.s
deleted file mode 100644
index 82c0a96af..000000000
--- a/libc/sysv/calls/bind-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall bind$sysv 0x0068006820680031 globl hidden
diff --git a/libc/sysv/calls/chdir-sysv.s b/libc/sysv/calls/chdir-sysv.s
deleted file mode 100644
index 6e3161b53..000000000
--- a/libc/sysv/calls/chdir-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall chdir$sysv 0x000c000c200c0050 globl hidden
diff --git a/libc/sysv/calls/chmod-sysv.s b/libc/sysv/calls/chmod-sysv.s
deleted file mode 100644
index 803556333..000000000
--- a/libc/sysv/calls/chmod-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall chmod$sysv 0x000f000f200f005a globl hidden
diff --git a/libc/sysv/calls/chown-sysv.s b/libc/sysv/calls/chown-sysv.s
deleted file mode 100644
index 6017050a3..000000000
--- a/libc/sysv/calls/chown-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall chown$sysv 0x001000102010005c globl hidden
diff --git a/libc/sysv/calls/clock_gettime-sysv.s b/libc/sysv/calls/clock_gettime-sysv.s
deleted file mode 100644
index 6c18b9add..000000000
--- a/libc/sysv/calls/clock_gettime-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall clock_gettime$sysv 0x005700e8ffff00e4 globl hidden
diff --git a/libc/sysv/calls/close-sysv.s b/libc/sysv/calls/close-sysv.s
deleted file mode 100644
index c6e325dd1..000000000
--- a/libc/sysv/calls/close-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall close$sysv 0x0006000620060003 globl hidden
diff --git a/libc/sysv/calls/copy_file_range-sysv.s b/libc/sysv/calls/copy_file_range-sysv.s
deleted file mode 100644
index adc6ded93..000000000
--- a/libc/sysv/calls/copy_file_range-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall copy_file_range$sysv 0xffff0239ffff0146 globl hidden
diff --git a/libc/sysv/calls/creat-sysv.s b/libc/sysv/calls/creat-sysv.s
deleted file mode 100644
index 697a7c7ed..000000000
--- a/libc/sysv/calls/creat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall creat$sysv 0xffff0008ffff0055 globl hidden
diff --git a/libc/sysv/calls/dup-sysv.s b/libc/sysv/calls/dup-sysv.s
deleted file mode 100644
index 9352bf1d2..000000000
--- a/libc/sysv/calls/dup-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall dup$sysv 0x0029002920290020 globl hidden
diff --git a/libc/sysv/calls/dup2-sysv.s b/libc/sysv/calls/dup2-sysv.s
deleted file mode 100644
index c1cb9dc40..000000000
--- a/libc/sysv/calls/dup2-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall dup2$sysv 0x005a005a205a0021 globl hidden
diff --git a/libc/sysv/calls/epoll_create-sysv.s b/libc/sysv/calls/epoll_create-sysv.s
deleted file mode 100644
index 375fabf95..000000000
--- a/libc/sysv/calls/epoll_create-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall epoll_create$sysv 0xffffffffffff00d5 globl
diff --git a/libc/sysv/calls/epoll_create1-sysv.s b/libc/sysv/calls/epoll_create1-sysv.s
deleted file mode 100644
index a78cc5391..000000000
--- a/libc/sysv/calls/epoll_create1-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall epoll_create1$sysv 0xffffffffffff0123 globl
diff --git a/libc/sysv/calls/epoll_ctl-sysv.s b/libc/sysv/calls/epoll_ctl-sysv.s
deleted file mode 100644
index ae2a35d47..000000000
--- a/libc/sysv/calls/epoll_ctl-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall epoll_ctl$sysv 0xffffffffffff00e9 globl
diff --git a/libc/sysv/calls/epoll_wait-sysv.s b/libc/sysv/calls/epoll_wait-sysv.s
deleted file mode 100644
index a0ecd50d6..000000000
--- a/libc/sysv/calls/epoll_wait-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall epoll_wait$sysv 0xffffffffffff00e8 globl
diff --git a/libc/sysv/calls/exit-sysv.s b/libc/sysv/calls/exit-sysv.s
deleted file mode 100644
index eda258687..000000000
--- a/libc/sysv/calls/exit-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall exit$sysv 0x00010001200100e7 globl hidden
diff --git a/libc/sysv/calls/faccessat-sysv.s b/libc/sysv/calls/faccessat-sysv.s
deleted file mode 100644
index 2e98fed6f..000000000
--- a/libc/sysv/calls/faccessat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall faccessat$sysv 0x013901e921d2010d globl hidden
diff --git a/libc/sysv/calls/fadvise-sysv.s b/libc/sysv/calls/fadvise-sysv.s
deleted file mode 100644
index 89ddabdd1..000000000
--- a/libc/sysv/calls/fadvise-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall fadvise$sysv 0xffff0213ffff00dd globl hidden
diff --git a/libc/sysv/calls/fallocate-sysv.s b/libc/sysv/calls/fallocate-sysv.s
deleted file mode 100644
index 47b137239..000000000
--- a/libc/sysv/calls/fallocate-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall fallocate$sysv 0xffffffffffff011d globl hidden
diff --git a/libc/sysv/calls/fchdir-sysv.s b/libc/sysv/calls/fchdir-sysv.s
deleted file mode 100644
index 9111c3285..000000000
--- a/libc/sysv/calls/fchdir-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall fchdir$sysv 0x000d000d200d0051 globl hidden
diff --git a/libc/sysv/calls/fchmod-sysv.s b/libc/sysv/calls/fchmod-sysv.s
deleted file mode 100644
index 48db6d6af..000000000
--- a/libc/sysv/calls/fchmod-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall fchmod$sysv 0x007c007c207c005b globl hidden
diff --git a/libc/sysv/calls/fchmodat-sysv.s b/libc/sysv/calls/fchmodat-sysv.s
deleted file mode 100644
index 59a95202b..000000000
--- a/libc/sysv/calls/fchmodat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall fchmodat$sysv 0x013a01ea21d3010c globl hidden
diff --git a/libc/sysv/calls/fchown-sysv.s b/libc/sysv/calls/fchown-sysv.s
deleted file mode 100644
index f88e0efd5..000000000
--- a/libc/sysv/calls/fchown-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall fchown$sysv 0x007b007b207b005d globl hidden
diff --git a/libc/sysv/calls/fchownat-sysv.s b/libc/sysv/calls/fchownat-sysv.s
deleted file mode 100644
index 15d15b704..000000000
--- a/libc/sysv/calls/fchownat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall fchownat$sysv 0x013b01eb21d40104 globl hidden
diff --git a/libc/sysv/calls/fcntl-sysv.s b/libc/sysv/calls/fcntl-sysv.s
deleted file mode 100644
index 34f8a7c87..000000000
--- a/libc/sysv/calls/fcntl-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall fcntl$sysv 0x005c005c205c0048 globl hidden
diff --git a/libc/sysv/calls/fdatasync-sysv.s b/libc/sysv/calls/fdatasync-sysv.s
deleted file mode 100644
index 1255135b9..000000000
--- a/libc/sysv/calls/fdatasync-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall fdatasync$sysv 0x005f022620bb004b globl hidden
diff --git a/libc/sysv/calls/flock-sysv.s b/libc/sysv/calls/flock-sysv.s
deleted file mode 100644
index ff75cb34a..000000000
--- a/libc/sysv/calls/flock-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall flock$sysv 0x0083008320830049 globl hidden
diff --git a/libc/sysv/calls/fsync-sysv.s b/libc/sysv/calls/fsync-sysv.s
deleted file mode 100644
index 4c7db0888..000000000
--- a/libc/sysv/calls/fsync-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall fsync$sysv 0x005f005f205f004a globl hidden
diff --git a/libc/sysv/calls/futimens-sysv.s b/libc/sysv/calls/futimens-sysv.s
deleted file mode 100644
index 00834a3b2..000000000
--- a/libc/sysv/calls/futimens-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall futimens$sysv 0x00550222ffffffff globl hidden
diff --git a/libc/sysv/calls/futimes-sysv.s b/libc/sysv/calls/futimes-sysv.s
deleted file mode 100644
index ec6216b86..000000000
--- a/libc/sysv/calls/futimes-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall futimes$sysv 0x004d00ce208bffff globl hidden
diff --git a/libc/sysv/calls/futimesat-sysv.s b/libc/sysv/calls/futimesat-sysv.s
deleted file mode 100644
index c24382cce..000000000
--- a/libc/sysv/calls/futimesat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall futimesat$sysv 0xffff01eeffff0105 globl hidden
diff --git a/libc/sysv/calls/getcwd-sysv.s b/libc/sysv/calls/getcwd-sysv.s
deleted file mode 100644
index 92875de7c..000000000
--- a/libc/sysv/calls/getcwd-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getcwd$sysv 0x01300146ffff004f globl hidden
diff --git a/libc/sysv/calls/getgid-sysv.s b/libc/sysv/calls/getgid-sysv.s
deleted file mode 100644
index 81175946e..000000000
--- a/libc/sysv/calls/getgid-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getgid$sysv 0x002f002f202f0068 globl hidden
diff --git a/libc/sysv/calls/getitimer-sysv.s b/libc/sysv/calls/getitimer-sysv.s
deleted file mode 100644
index 32a059d59..000000000
--- a/libc/sysv/calls/getitimer-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getitimer$sysv 0x0046005620560024 globl hidden
diff --git a/libc/sysv/calls/getpagesize-freebsd.s b/libc/sysv/calls/getpagesize-freebsd.s
deleted file mode 100644
index d31897834..000000000
--- a/libc/sysv/calls/getpagesize-freebsd.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getpagesize$freebsd 0xffff0040ffffffff globl hidden
diff --git a/libc/sysv/calls/getpagesize_freebsd.s b/libc/sysv/calls/getpagesize_freebsd.s
new file mode 100644
index 000000000..e5d174780
--- /dev/null
+++ b/libc/sysv/calls/getpagesize_freebsd.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall getpagesize_freebsd 0xffff0040ffffffff globl hidden
diff --git a/libc/sysv/calls/getpid-sysv.s b/libc/sysv/calls/getpid-sysv.s
deleted file mode 100644
index 17d95fe22..000000000
--- a/libc/sysv/calls/getpid-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getpid$sysv 0x0014001420140027 globl hidden
diff --git a/libc/sysv/calls/getppid-sysv.s b/libc/sysv/calls/getppid-sysv.s
deleted file mode 100644
index fb39b6e60..000000000
--- a/libc/sysv/calls/getppid-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getppid$sysv 0x002700272027006e globl hidden
diff --git a/libc/sysv/calls/getpriority-sysv.s b/libc/sysv/calls/getpriority-sysv.s
deleted file mode 100644
index d1933e333..000000000
--- a/libc/sysv/calls/getpriority-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getpriority$sysv 0x006400642064008c globl hidden
diff --git a/libc/sysv/calls/getrandom-sysv.s b/libc/sysv/calls/getrandom-sysv.s
deleted file mode 100644
index 7990bf7ca..000000000
--- a/libc/sysv/calls/getrandom-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getrandom$sysv 0x0007023321f4013e globl hidden
diff --git a/libc/sysv/calls/getrlimit-sysv.s b/libc/sysv/calls/getrlimit-sysv.s
deleted file mode 100644
index a6e725fba..000000000
--- a/libc/sysv/calls/getrlimit-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getrlimit$sysv 0x00c200c220c20061 globl hidden
diff --git a/libc/sysv/calls/getrusage-sysv.s b/libc/sysv/calls/getrusage-sysv.s
deleted file mode 100644
index 6cbb532b9..000000000
--- a/libc/sysv/calls/getrusage-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getrusage$sysv 0x0013007520750062 globl hidden
diff --git a/libc/sysv/calls/getsid-sysv.s b/libc/sysv/calls/getsid-sysv.s
deleted file mode 100644
index fddc57275..000000000
--- a/libc/sysv/calls/getsid-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getsid$sysv 0x00ff01362136007c globl hidden
diff --git a/libc/sysv/calls/getsockopt-sysv.s b/libc/sysv/calls/getsockopt-sysv.s
deleted file mode 100644
index c36a70d14..000000000
--- a/libc/sysv/calls/getsockopt-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getsockopt$sysv 0x0076007620760037 globl hidden
diff --git a/libc/sysv/calls/gettid-sysv.s b/libc/sysv/calls/gettid-sysv.s
deleted file mode 100644
index 3cf348785..000000000
--- a/libc/sysv/calls/gettid-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall gettid$sysv 0xffffffff211e00ba globl hidden
diff --git a/libc/sysv/calls/getuid-sysv.s b/libc/sysv/calls/getuid-sysv.s
deleted file mode 100644
index c3137597c..000000000
--- a/libc/sysv/calls/getuid-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall getuid$sysv 0x0018001820180066 globl hidden
diff --git a/libc/sysv/calls/ioctl-sysv.s b/libc/sysv/calls/ioctl-sysv.s
deleted file mode 100644
index b19bb11d7..000000000
--- a/libc/sysv/calls/ioctl-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall ioctl$sysv 0x0036003620360010 globl hidden
diff --git a/libc/sysv/calls/kill-sysv.s b/libc/sysv/calls/kill-sysv.s
deleted file mode 100644
index 2334e53fc..000000000
--- a/libc/sysv/calls/kill-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall kill$sysv 0x007a00252025003e globl hidden
diff --git a/libc/sysv/calls/killpg-sysv.s b/libc/sysv/calls/killpg-sysv.s
deleted file mode 100644
index 3ead81bb8..000000000
--- a/libc/sysv/calls/killpg-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall killpg$sysv 0xffff0092ffffffff globl hidden
diff --git a/libc/sysv/calls/lchown-sysv.s b/libc/sysv/calls/lchown-sysv.s
deleted file mode 100644
index 555546ba4..000000000
--- a/libc/sysv/calls/lchown-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall lchown$sysv 0x00fe00fe216c005e globl hidden
diff --git a/libc/sysv/calls/link-sysv.s b/libc/sysv/calls/link-sysv.s
deleted file mode 100644
index 5a0664630..000000000
--- a/libc/sysv/calls/link-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall link$sysv 0x0009000920090056 globl hidden
diff --git a/libc/sysv/calls/linkat-sysv.s b/libc/sysv/calls/linkat-sysv.s
deleted file mode 100644
index 58a1b54cf..000000000
--- a/libc/sysv/calls/linkat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall linkat$sysv 0x013d01ef21d70109 globl hidden
diff --git a/libc/sysv/calls/listen-sysv.s b/libc/sysv/calls/listen-sysv.s
deleted file mode 100644
index ecfd359c9..000000000
--- a/libc/sysv/calls/listen-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall listen$sysv 0x006a006a206a0032 globl hidden
diff --git a/libc/sysv/calls/madvise-sysv.s b/libc/sysv/calls/madvise-sysv.s
deleted file mode 100644
index 53cea3a05..000000000
--- a/libc/sysv/calls/madvise-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall madvise$sysv 0x004b004b204b001c globl hidden
diff --git a/libc/sysv/calls/mkdir-sysv.s b/libc/sysv/calls/mkdir-sysv.s
deleted file mode 100644
index 791aadbdc..000000000
--- a/libc/sysv/calls/mkdir-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall mkdir$sysv 0x0088008820880053 globl hidden
diff --git a/libc/sysv/calls/mkdirat-sysv.s b/libc/sysv/calls/mkdirat-sysv.s
deleted file mode 100644
index f08871047..000000000
--- a/libc/sysv/calls/mkdirat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall mkdirat$sysv 0x013e01f021db0102 globl hidden
diff --git a/libc/sysv/calls/mkfifo-sysv.s b/libc/sysv/calls/mkfifo-sysv.s
deleted file mode 100644
index a594d8522..000000000
--- a/libc/sysv/calls/mkfifo-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall mkfifo$sysv 0x008400842084ffff globl hidden
diff --git a/libc/sysv/calls/mknod-sysv.s b/libc/sysv/calls/mknod-sysv.s
deleted file mode 100644
index 3a141926d..000000000
--- a/libc/sysv/calls/mknod-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall mknod$sysv 0x000e000e200e0085 globl hidden
diff --git a/libc/sysv/calls/mprotect-sysv.s b/libc/sysv/calls/mprotect-sysv.s
deleted file mode 100644
index c63fbdccb..000000000
--- a/libc/sysv/calls/mprotect-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall mprotect$sysv 0x004a004a204a000a globl hidden
diff --git a/libc/sysv/calls/mremap-sysv.s b/libc/sysv/calls/mremap-sysv.s
deleted file mode 100644
index 31c582181..000000000
--- a/libc/sysv/calls/mremap-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall mremap$sysv 0xffffffffffff0019 globl hidden
diff --git a/libc/sysv/calls/msync-sysv.s b/libc/sysv/calls/msync-sysv.s
deleted file mode 100644
index ef7b5841c..000000000
--- a/libc/sysv/calls/msync-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall msync$sysv 0x010000412041001a globl hidden
diff --git a/libc/sysv/calls/munmap-sysv.s b/libc/sysv/calls/munmap-sysv.s
deleted file mode 100644
index c90b9251d..000000000
--- a/libc/sysv/calls/munmap-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall munmap$sysv 0x004900492049000b globl hidden
diff --git a/libc/sysv/calls/nanosleep-sysv.s b/libc/sysv/calls/nanosleep-sysv.s
deleted file mode 100644
index d935cdca6..000000000
--- a/libc/sysv/calls/nanosleep-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall nanosleep$sysv 0x005b00f0ffff0023 globl hidden
diff --git a/libc/sysv/calls/open-sysv.s b/libc/sysv/calls/open-sysv.s
deleted file mode 100644
index 491808e9e..000000000
--- a/libc/sysv/calls/open-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall open$sysv 0x0005000520050002 globl hidden
diff --git a/libc/sysv/calls/openat-sysv.s b/libc/sysv/calls/openat-sysv.s
deleted file mode 100644
index 7ad761deb..000000000
--- a/libc/sysv/calls/openat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall openat$sysv 0x014101f321cf0101 globl hidden
diff --git a/libc/sysv/calls/pause-sysv.s b/libc/sysv/calls/pause-sysv.s
deleted file mode 100644
index 135094403..000000000
--- a/libc/sysv/calls/pause-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall pause$sysv 0xffffffffffff0022 globl hidden
diff --git a/libc/sysv/calls/poll-sysv.s b/libc/sysv/calls/poll-sysv.s
deleted file mode 100644
index f340dc588..000000000
--- a/libc/sysv/calls/poll-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall poll$sysv 0x00fc00d120e60007 globl hidden
diff --git a/libc/sysv/calls/posix_fallocate-sysv.s b/libc/sysv/calls/posix_fallocate-sysv.s
deleted file mode 100644
index 2480e552e..000000000
--- a/libc/sysv/calls/posix_fallocate-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall posix_fallocate$sysv 0xffff0212ffffffff globl hidden
diff --git a/libc/sysv/calls/posix_openpt-sysv.s b/libc/sysv/calls/posix_openpt-sysv.s
deleted file mode 100644
index bc4fbc33f..000000000
--- a/libc/sysv/calls/posix_openpt-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall posix_openpt$sysv 0xffff01f8ffffffff globl hidden
diff --git a/libc/sysv/calls/posix_spawn-sysv.s b/libc/sysv/calls/posix_spawn-sysv.s
deleted file mode 100644
index 8cb423bab..000000000
--- a/libc/sysv/calls/posix_spawn-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall posix_spawn$sysv 0xffffffff20f4ffff globl hidden
diff --git a/libc/sysv/calls/ppoll-sysv.s b/libc/sysv/calls/ppoll-sysv.s
deleted file mode 100644
index 033b55164..000000000
--- a/libc/sysv/calls/ppoll-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall ppoll$sysv 0x006d0221ffff010f globl hidden
diff --git a/libc/sysv/calls/ptrace-sysv.s b/libc/sysv/calls/ptrace-sysv.s
deleted file mode 100644
index 738265a62..000000000
--- a/libc/sysv/calls/ptrace-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall ptrace$sysv 0x001a001a201a0065 globl hidden
diff --git a/libc/sysv/calls/read-sysv.s b/libc/sysv/calls/read-sysv.s
deleted file mode 100644
index 7bd081abf..000000000
--- a/libc/sysv/calls/read-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall read$sysv 0x0003000320030000 globl hidden
diff --git a/libc/sysv/calls/readlinkat-sysv.s b/libc/sysv/calls/readlinkat-sysv.s
deleted file mode 100644
index 87b70a2ed..000000000
--- a/libc/sysv/calls/readlinkat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall readlinkat$sysv 0x014201f421d9010b globl hidden
diff --git a/libc/sysv/calls/readv-sysv.s b/libc/sysv/calls/readv-sysv.s
deleted file mode 100644
index a4a27209d..000000000
--- a/libc/sysv/calls/readv-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall readv$sysv 0x0078007820780013 globl hidden
diff --git a/libc/sysv/calls/recvfrom-sysv.s b/libc/sysv/calls/recvfrom-sysv.s
deleted file mode 100644
index c5d1a8bb7..000000000
--- a/libc/sysv/calls/recvfrom-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall recvfrom$sysv 0x001d001d201d002d globl hidden
diff --git a/libc/sysv/calls/recvmsg-sysv.s b/libc/sysv/calls/recvmsg-sysv.s
deleted file mode 100644
index dd4ab65c1..000000000
--- a/libc/sysv/calls/recvmsg-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall recvmsg$sysv 0x001b001b201b002f globl hidden
diff --git a/libc/sysv/calls/rename-sysv.s b/libc/sysv/calls/rename-sysv.s
deleted file mode 100644
index 19cee5cc2..000000000
--- a/libc/sysv/calls/rename-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall rename$sysv 0x0080008020800052 globl hidden
diff --git a/libc/sysv/calls/renameat-sysv.s b/libc/sysv/calls/renameat-sysv.s
deleted file mode 100644
index cadbf3c10..000000000
--- a/libc/sysv/calls/renameat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall renameat$sysv 0x014301f521d10108 globl hidden
diff --git a/libc/sysv/calls/rmdir-sysv.s b/libc/sysv/calls/rmdir-sysv.s
deleted file mode 100644
index 20e031f45..000000000
--- a/libc/sysv/calls/rmdir-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall rmdir$sysv 0x0089008920890054 globl hidden
diff --git a/libc/sysv/calls/sched_setaffinity-sysv.s b/libc/sysv/calls/sched_setaffinity-sysv.s
deleted file mode 100644
index 3c69e1b0a..000000000
--- a/libc/sysv/calls/sched_setaffinity-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall sched_setaffinity$sysv 0xffffffffffff00cb globl hidden
diff --git a/libc/sysv/calls/sched_yield-sysv.s b/libc/sysv/calls/sched_yield-sysv.s
deleted file mode 100644
index 9385fe14f..000000000
--- a/libc/sysv/calls/sched_yield-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall sched_yield$sysv 0x012a014b103c0018 globl hidden
diff --git a/libc/sysv/calls/select-sysv.s b/libc/sysv/calls/select-sysv.s
deleted file mode 100644
index 125cae736..000000000
--- a/libc/sysv/calls/select-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall select$sysv 0x0047005d205d0017 globl hidden
diff --git a/libc/sysv/calls/sendfile-sysv.s b/libc/sysv/calls/sendfile-sysv.s
deleted file mode 100644
index 019ad7f3c..000000000
--- a/libc/sysv/calls/sendfile-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall sendfile$sysv 0xffff018921510028 globl hidden
diff --git a/libc/sysv/calls/sendmsg-sysv.s b/libc/sysv/calls/sendmsg-sysv.s
deleted file mode 100644
index 7fd6f23f5..000000000
--- a/libc/sysv/calls/sendmsg-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall sendmsg$sysv 0x001c001c201c002e globl hidden
diff --git a/libc/sysv/calls/sendto-sysv.s b/libc/sysv/calls/sendto-sysv.s
deleted file mode 100644
index d0dcb235c..000000000
--- a/libc/sysv/calls/sendto-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall sendto$sysv 0x008500852085002c globl hidden
diff --git a/libc/sysv/calls/setitimer-sysv.s b/libc/sysv/calls/setitimer-sysv.s
deleted file mode 100644
index 6480f1d82..000000000
--- a/libc/sysv/calls/setitimer-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall setitimer$sysv 0x0045005320530026 globl hidden
diff --git a/libc/sysv/calls/setpriority-sysv.s b/libc/sysv/calls/setpriority-sysv.s
deleted file mode 100644
index 0f290732b..000000000
--- a/libc/sysv/calls/setpriority-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall setpriority$sysv 0x006000602060008d globl hidden
diff --git a/libc/sysv/calls/setresgid-sysv.s b/libc/sysv/calls/setresgid-sysv.s
deleted file mode 100644
index 9a23240ec..000000000
--- a/libc/sysv/calls/setresgid-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall setresgid$sysv 0x011c0138ffff0077 globl hidden
diff --git a/libc/sysv/calls/setresuid-sysv.s b/libc/sysv/calls/setresuid-sysv.s
deleted file mode 100644
index e0b506441..000000000
--- a/libc/sysv/calls/setresuid-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall setresuid$sysv 0x011a0137ffff0075 globl hidden
diff --git a/libc/sysv/calls/setrlimit-sysv.s b/libc/sysv/calls/setrlimit-sysv.s
deleted file mode 100644
index 492272364..000000000
--- a/libc/sysv/calls/setrlimit-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall setrlimit$sysv 0x00c300c320c300a0 globl hidden
diff --git a/libc/sysv/calls/setsid-sysv.s b/libc/sysv/calls/setsid-sysv.s
deleted file mode 100644
index a91f3e73d..000000000
--- a/libc/sysv/calls/setsid-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall setsid$sysv 0x0093009320930070 globl hidden
diff --git a/libc/sysv/calls/setsockopt-sysv.s b/libc/sysv/calls/setsockopt-sysv.s
deleted file mode 100644
index bf94b5427..000000000
--- a/libc/sysv/calls/setsockopt-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall setsockopt$sysv 0x0069006920690036 globl hidden
diff --git a/libc/sysv/calls/shutdown-sysv.s b/libc/sysv/calls/shutdown-sysv.s
deleted file mode 100644
index 36aa06c3d..000000000
--- a/libc/sysv/calls/shutdown-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall shutdown$sysv 0x0086008620860030 globl hidden
diff --git a/libc/sysv/calls/sigaction-sysv.s b/libc/sysv/calls/sigaction-sysv.s
deleted file mode 100644
index 974854e7a..000000000
--- a/libc/sysv/calls/sigaction-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall sigaction$sysv 0x002e01a0202e000d globl hidden
diff --git a/libc/sysv/calls/sigprocmask-sysv.s b/libc/sysv/calls/sigprocmask-sysv.s
deleted file mode 100644
index f235e7cc4..000000000
--- a/libc/sysv/calls/sigprocmask-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall sigprocmask$sysv 0x003001542030000e globl hidden
diff --git a/libc/sysv/calls/sigsuspend-sysv.s b/libc/sysv/calls/sigsuspend-sysv.s
deleted file mode 100644
index 8f5a25785..000000000
--- a/libc/sysv/calls/sigsuspend-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall sigsuspend$sysv 0x006f0155206f0082 globl hidden
diff --git a/libc/sysv/calls/socketpair-sysv.s b/libc/sysv/calls/socketpair-sysv.s
deleted file mode 100644
index 8197f5860..000000000
--- a/libc/sysv/calls/socketpair-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall socketpair$sysv 0x0087008720870035 globl hidden
diff --git a/libc/sysv/calls/splice-sysv.s b/libc/sysv/calls/splice-sysv.s
deleted file mode 100644
index 54f4c4d71..000000000
--- a/libc/sysv/calls/splice-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall splice$sysv 0xffffffffffff0113 globl hidden
diff --git a/libc/sysv/calls/symlink-sysv.s b/libc/sysv/calls/symlink-sysv.s
deleted file mode 100644
index 94fb2b24d..000000000
--- a/libc/sysv/calls/symlink-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall symlink$sysv 0x0039003920390058 globl hidden
diff --git a/libc/sysv/calls/symlinkat-sysv.s b/libc/sysv/calls/symlinkat-sysv.s
deleted file mode 100644
index 7a95c27e0..000000000
--- a/libc/sysv/calls/symlinkat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall symlinkat$sysv 0x014401f621da010a globl hidden
diff --git a/libc/sysv/calls/sync-sysv.s b/libc/sysv/calls/sync-sysv.s
deleted file mode 100644
index 395d5e596..000000000
--- a/libc/sysv/calls/sync-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall sync$sysv 0x00240024202400a2 globl hidden
diff --git a/libc/sysv/calls/sync_file_range-sysv.s b/libc/sysv/calls/sync_file_range-sysv.s
deleted file mode 100644
index d72f3d712..000000000
--- a/libc/sysv/calls/sync_file_range-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall sync_file_range$sysv 0xffffffffffff0115 globl hidden
diff --git a/libc/sysv/calls/sys_access.s b/libc/sysv/calls/sys_access.s
new file mode 100644
index 000000000..bd683c194
--- /dev/null
+++ b/libc/sysv/calls/sys_access.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_access 0x0021002120210015 globl hidden
diff --git a/libc/sysv/calls/sys_alarm.s b/libc/sysv/calls/sys_alarm.s
new file mode 100644
index 000000000..5b1db11d9
--- /dev/null
+++ b/libc/sysv/calls/sys_alarm.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_alarm 0xffffffffffff0025 globl hidden
diff --git a/libc/sysv/calls/sys_arch_prctl.s b/libc/sysv/calls/sys_arch_prctl.s
new file mode 100644
index 000000000..47d1d7a6a
--- /dev/null
+++ b/libc/sysv/calls/sys_arch_prctl.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_arch_prctl 0x00a500a5ffff009e globl hidden
diff --git a/libc/sysv/calls/sys_bind.s b/libc/sysv/calls/sys_bind.s
new file mode 100644
index 000000000..8159cf61f
--- /dev/null
+++ b/libc/sysv/calls/sys_bind.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_bind 0x0068006820680031 globl hidden
diff --git a/libc/sysv/calls/sys_chdir.s b/libc/sysv/calls/sys_chdir.s
new file mode 100644
index 000000000..db34d1ae9
--- /dev/null
+++ b/libc/sysv/calls/sys_chdir.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_chdir 0x000c000c200c0050 globl hidden
diff --git a/libc/sysv/calls/sys_chmod.s b/libc/sysv/calls/sys_chmod.s
new file mode 100644
index 000000000..9d59d5a55
--- /dev/null
+++ b/libc/sysv/calls/sys_chmod.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_chmod 0x000f000f200f005a globl hidden
diff --git a/libc/sysv/calls/sys_chown.s b/libc/sysv/calls/sys_chown.s
new file mode 100644
index 000000000..66ed272b3
--- /dev/null
+++ b/libc/sysv/calls/sys_chown.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_chown 0x001000102010005c globl hidden
diff --git a/libc/sysv/calls/sys_clock_gettime.s b/libc/sysv/calls/sys_clock_gettime.s
new file mode 100644
index 000000000..31bf45d10
--- /dev/null
+++ b/libc/sysv/calls/sys_clock_gettime.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_clock_gettime 0x005700e8ffff00e4 globl hidden
diff --git a/libc/sysv/calls/sys_close.s b/libc/sysv/calls/sys_close.s
new file mode 100644
index 000000000..d805a11c4
--- /dev/null
+++ b/libc/sysv/calls/sys_close.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_close 0x0006000620060003 globl hidden
diff --git a/libc/sysv/calls/sys_copy_file_range.s b/libc/sysv/calls/sys_copy_file_range.s
new file mode 100644
index 000000000..a91148dd1
--- /dev/null
+++ b/libc/sysv/calls/sys_copy_file_range.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_copy_file_range 0xffff0239ffff0146 globl hidden
diff --git a/libc/sysv/calls/sys_creat.s b/libc/sysv/calls/sys_creat.s
new file mode 100644
index 000000000..7f1158015
--- /dev/null
+++ b/libc/sysv/calls/sys_creat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_creat 0xffff0008ffff0055 globl hidden
diff --git a/libc/sysv/calls/sys_dup.s b/libc/sysv/calls/sys_dup.s
new file mode 100644
index 000000000..98bfff00f
--- /dev/null
+++ b/libc/sysv/calls/sys_dup.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_dup 0x0029002920290020 globl hidden
diff --git a/libc/sysv/calls/sys_dup2.s b/libc/sysv/calls/sys_dup2.s
new file mode 100644
index 000000000..236d02371
--- /dev/null
+++ b/libc/sysv/calls/sys_dup2.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_dup2 0x005a005a205a0021 globl hidden
diff --git a/libc/sysv/calls/sys_epoll_create.s b/libc/sysv/calls/sys_epoll_create.s
new file mode 100644
index 000000000..842e29961
--- /dev/null
+++ b/libc/sysv/calls/sys_epoll_create.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_epoll_create 0xffffffffffff00d5 globl
diff --git a/libc/sysv/calls/sys_epoll_create1.s b/libc/sysv/calls/sys_epoll_create1.s
new file mode 100644
index 000000000..6a00b574f
--- /dev/null
+++ b/libc/sysv/calls/sys_epoll_create1.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_epoll_create1 0xffffffffffff0123 globl
diff --git a/libc/sysv/calls/sys_epoll_ctl.s b/libc/sysv/calls/sys_epoll_ctl.s
new file mode 100644
index 000000000..8bf800787
--- /dev/null
+++ b/libc/sysv/calls/sys_epoll_ctl.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_epoll_ctl 0xffffffffffff00e9 globl
diff --git a/libc/sysv/calls/sys_epoll_wait.s b/libc/sysv/calls/sys_epoll_wait.s
new file mode 100644
index 000000000..d05bd0ab4
--- /dev/null
+++ b/libc/sysv/calls/sys_epoll_wait.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_epoll_wait 0xffffffffffff00e8 globl
diff --git a/libc/sysv/calls/sys_exit.s b/libc/sysv/calls/sys_exit.s
new file mode 100644
index 000000000..5b83eb6ac
--- /dev/null
+++ b/libc/sysv/calls/sys_exit.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_exit 0x00010001200100e7 globl hidden
diff --git a/libc/sysv/calls/sys_faccessat.s b/libc/sysv/calls/sys_faccessat.s
new file mode 100644
index 000000000..600cde9e4
--- /dev/null
+++ b/libc/sysv/calls/sys_faccessat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_faccessat 0x013901e921d2010d globl hidden
diff --git a/libc/sysv/calls/sys_fadvise.s b/libc/sysv/calls/sys_fadvise.s
new file mode 100644
index 000000000..063582532
--- /dev/null
+++ b/libc/sysv/calls/sys_fadvise.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_fadvise 0xffff0213ffff00dd globl hidden
diff --git a/libc/sysv/calls/sys_fallocate.s b/libc/sysv/calls/sys_fallocate.s
new file mode 100644
index 000000000..80dc0589d
--- /dev/null
+++ b/libc/sysv/calls/sys_fallocate.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_fallocate 0xffffffffffff011d globl hidden
diff --git a/libc/sysv/calls/sys_fchdir.s b/libc/sysv/calls/sys_fchdir.s
new file mode 100644
index 000000000..3b627c435
--- /dev/null
+++ b/libc/sysv/calls/sys_fchdir.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_fchdir 0x000d000d200d0051 globl hidden
diff --git a/libc/sysv/calls/sys_fchmod.s b/libc/sysv/calls/sys_fchmod.s
new file mode 100644
index 000000000..f54357760
--- /dev/null
+++ b/libc/sysv/calls/sys_fchmod.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_fchmod 0x007c007c207c005b globl hidden
diff --git a/libc/sysv/calls/sys_fchmodat.s b/libc/sysv/calls/sys_fchmodat.s
new file mode 100644
index 000000000..ddfcf236c
--- /dev/null
+++ b/libc/sysv/calls/sys_fchmodat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_fchmodat 0x013a01ea21d3010c globl hidden
diff --git a/libc/sysv/calls/sys_fchown.s b/libc/sysv/calls/sys_fchown.s
new file mode 100644
index 000000000..ad99e3162
--- /dev/null
+++ b/libc/sysv/calls/sys_fchown.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_fchown 0x007b007b207b005d globl hidden
diff --git a/libc/sysv/calls/sys_fchownat.s b/libc/sysv/calls/sys_fchownat.s
new file mode 100644
index 000000000..ab2b77222
--- /dev/null
+++ b/libc/sysv/calls/sys_fchownat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_fchownat 0x013b01eb21d40104 globl hidden
diff --git a/libc/sysv/calls/sys_fcntl.s b/libc/sysv/calls/sys_fcntl.s
new file mode 100644
index 000000000..f273388a9
--- /dev/null
+++ b/libc/sysv/calls/sys_fcntl.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_fcntl 0x005c005c205c0048 globl hidden
diff --git a/libc/sysv/calls/sys_fdatasync.s b/libc/sysv/calls/sys_fdatasync.s
new file mode 100644
index 000000000..17c7f2965
--- /dev/null
+++ b/libc/sysv/calls/sys_fdatasync.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_fdatasync 0x005f022620bb004b globl hidden
diff --git a/libc/sysv/calls/sys_flock.s b/libc/sysv/calls/sys_flock.s
new file mode 100644
index 000000000..26ff2a8b0
--- /dev/null
+++ b/libc/sysv/calls/sys_flock.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_flock 0x0083008320830049 globl hidden
diff --git a/libc/sysv/calls/sys_fsync.s b/libc/sysv/calls/sys_fsync.s
new file mode 100644
index 000000000..6882d4801
--- /dev/null
+++ b/libc/sysv/calls/sys_fsync.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_fsync 0x005f005f205f004a globl hidden
diff --git a/libc/sysv/calls/sys_futimens.s b/libc/sysv/calls/sys_futimens.s
new file mode 100644
index 000000000..6004436cc
--- /dev/null
+++ b/libc/sysv/calls/sys_futimens.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_futimens 0x00550222ffffffff globl hidden
diff --git a/libc/sysv/calls/sys_futimes.s b/libc/sysv/calls/sys_futimes.s
new file mode 100644
index 000000000..66d38d5cf
--- /dev/null
+++ b/libc/sysv/calls/sys_futimes.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_futimes 0x004d00ce208bffff globl hidden
diff --git a/libc/sysv/calls/sys_futimesat.s b/libc/sysv/calls/sys_futimesat.s
new file mode 100644
index 000000000..b3a1ed18b
--- /dev/null
+++ b/libc/sysv/calls/sys_futimesat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_futimesat 0xffff01eeffff0105 globl hidden
diff --git a/libc/sysv/calls/sys_getcwd.s b/libc/sysv/calls/sys_getcwd.s
new file mode 100644
index 000000000..cc7f22e27
--- /dev/null
+++ b/libc/sysv/calls/sys_getcwd.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_getcwd 0x01300146ffff004f globl hidden
diff --git a/libc/sysv/calls/sys_getgid.s b/libc/sysv/calls/sys_getgid.s
new file mode 100644
index 000000000..b8aff476c
--- /dev/null
+++ b/libc/sysv/calls/sys_getgid.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_getgid 0x002f002f202f0068 globl hidden
diff --git a/libc/sysv/calls/sys_getitimer.s b/libc/sysv/calls/sys_getitimer.s
new file mode 100644
index 000000000..9b2d6080b
--- /dev/null
+++ b/libc/sysv/calls/sys_getitimer.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_getitimer 0x0046005620560024 globl hidden
diff --git a/libc/sysv/calls/sys_getpid.s b/libc/sysv/calls/sys_getpid.s
new file mode 100644
index 000000000..f4f5139ad
--- /dev/null
+++ b/libc/sysv/calls/sys_getpid.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_getpid 0x0014001420140027 globl hidden
diff --git a/libc/sysv/calls/sys_getppid.s b/libc/sysv/calls/sys_getppid.s
new file mode 100644
index 000000000..2af623220
--- /dev/null
+++ b/libc/sysv/calls/sys_getppid.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_getppid 0x002700272027006e globl hidden
diff --git a/libc/sysv/calls/sys_getpriority.s b/libc/sysv/calls/sys_getpriority.s
new file mode 100644
index 000000000..f7625d030
--- /dev/null
+++ b/libc/sysv/calls/sys_getpriority.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_getpriority 0x006400642064008c globl hidden
diff --git a/libc/sysv/calls/sys_getrandom.s b/libc/sysv/calls/sys_getrandom.s
new file mode 100644
index 000000000..ae490dbf6
--- /dev/null
+++ b/libc/sysv/calls/sys_getrandom.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_getrandom 0x0007023321f4013e globl hidden
diff --git a/libc/sysv/calls/sys_getrlimit.s b/libc/sysv/calls/sys_getrlimit.s
new file mode 100644
index 000000000..2e990f6d2
--- /dev/null
+++ b/libc/sysv/calls/sys_getrlimit.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_getrlimit 0x00c200c220c20061 globl hidden
diff --git a/libc/sysv/calls/sys_getrusage.s b/libc/sysv/calls/sys_getrusage.s
new file mode 100644
index 000000000..82059f39f
--- /dev/null
+++ b/libc/sysv/calls/sys_getrusage.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_getrusage 0x0013007520750062 globl hidden
diff --git a/libc/sysv/calls/sys_getsid.s b/libc/sysv/calls/sys_getsid.s
new file mode 100644
index 000000000..9238c4e19
--- /dev/null
+++ b/libc/sysv/calls/sys_getsid.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_getsid 0x00ff01362136007c globl hidden
diff --git a/libc/sysv/calls/sys_getsockopt.s b/libc/sysv/calls/sys_getsockopt.s
new file mode 100644
index 000000000..9b895c4b2
--- /dev/null
+++ b/libc/sysv/calls/sys_getsockopt.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_getsockopt 0x0076007620760037 globl hidden
diff --git a/libc/sysv/calls/sys_gettid.s b/libc/sysv/calls/sys_gettid.s
new file mode 100644
index 000000000..bb32d96d1
--- /dev/null
+++ b/libc/sysv/calls/sys_gettid.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_gettid 0xffffffff211e00ba globl hidden
diff --git a/libc/sysv/calls/sys_getuid.s b/libc/sysv/calls/sys_getuid.s
new file mode 100644
index 000000000..3143e3c3b
--- /dev/null
+++ b/libc/sysv/calls/sys_getuid.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_getuid 0x0018001820180066 globl hidden
diff --git a/libc/sysv/calls/sys_ioctl.s b/libc/sysv/calls/sys_ioctl.s
new file mode 100644
index 000000000..c5f0a8d54
--- /dev/null
+++ b/libc/sysv/calls/sys_ioctl.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_ioctl 0x0036003620360010 globl hidden
diff --git a/libc/sysv/calls/sys_kill.s b/libc/sysv/calls/sys_kill.s
new file mode 100644
index 000000000..107c91b08
--- /dev/null
+++ b/libc/sysv/calls/sys_kill.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_kill 0x007a00252025003e globl hidden
diff --git a/libc/sysv/calls/sys_killpg.s b/libc/sysv/calls/sys_killpg.s
new file mode 100644
index 000000000..89e71a7d6
--- /dev/null
+++ b/libc/sysv/calls/sys_killpg.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_killpg 0xffff0092ffffffff globl hidden
diff --git a/libc/sysv/calls/sys_lchown.s b/libc/sysv/calls/sys_lchown.s
new file mode 100644
index 000000000..bab85a1b9
--- /dev/null
+++ b/libc/sysv/calls/sys_lchown.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_lchown 0x00fe00fe216c005e globl hidden
diff --git a/libc/sysv/calls/sys_link.s b/libc/sysv/calls/sys_link.s
new file mode 100644
index 000000000..a6be7aba6
--- /dev/null
+++ b/libc/sysv/calls/sys_link.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_link 0x0009000920090056 globl hidden
diff --git a/libc/sysv/calls/sys_linkat.s b/libc/sysv/calls/sys_linkat.s
new file mode 100644
index 000000000..6cc4c1229
--- /dev/null
+++ b/libc/sysv/calls/sys_linkat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_linkat 0x013d01ef21d70109 globl hidden
diff --git a/libc/sysv/calls/sys_listen.s b/libc/sysv/calls/sys_listen.s
new file mode 100644
index 000000000..a6b02da53
--- /dev/null
+++ b/libc/sysv/calls/sys_listen.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_listen 0x006a006a206a0032 globl hidden
diff --git a/libc/sysv/calls/sys_madvise.s b/libc/sysv/calls/sys_madvise.s
new file mode 100644
index 000000000..89d0c633f
--- /dev/null
+++ b/libc/sysv/calls/sys_madvise.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_madvise 0x004b004b204b001c globl hidden
diff --git a/libc/sysv/calls/sys_mkdir.s b/libc/sysv/calls/sys_mkdir.s
new file mode 100644
index 000000000..95d9a8d16
--- /dev/null
+++ b/libc/sysv/calls/sys_mkdir.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_mkdir 0x0088008820880053 globl hidden
diff --git a/libc/sysv/calls/sys_mkdirat.s b/libc/sysv/calls/sys_mkdirat.s
new file mode 100644
index 000000000..657149b79
--- /dev/null
+++ b/libc/sysv/calls/sys_mkdirat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_mkdirat 0x013e01f021db0102 globl hidden
diff --git a/libc/sysv/calls/sys_mkfifo.s b/libc/sysv/calls/sys_mkfifo.s
new file mode 100644
index 000000000..2c85eae43
--- /dev/null
+++ b/libc/sysv/calls/sys_mkfifo.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_mkfifo 0x008400842084ffff globl hidden
diff --git a/libc/sysv/calls/sys_mknod.s b/libc/sysv/calls/sys_mknod.s
new file mode 100644
index 000000000..a9e823535
--- /dev/null
+++ b/libc/sysv/calls/sys_mknod.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_mknod 0x000e000e200e0085 globl hidden
diff --git a/libc/sysv/calls/sys_mprotect.s b/libc/sysv/calls/sys_mprotect.s
new file mode 100644
index 000000000..eaca0f50e
--- /dev/null
+++ b/libc/sysv/calls/sys_mprotect.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_mprotect 0x004a004a204a000a globl hidden
diff --git a/libc/sysv/calls/sys_mremap.s b/libc/sysv/calls/sys_mremap.s
new file mode 100644
index 000000000..1f0bad1e5
--- /dev/null
+++ b/libc/sysv/calls/sys_mremap.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_mremap 0xffffffffffff0019 globl hidden
diff --git a/libc/sysv/calls/sys_msync.s b/libc/sysv/calls/sys_msync.s
new file mode 100644
index 000000000..29ade6246
--- /dev/null
+++ b/libc/sysv/calls/sys_msync.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_msync 0x010000412041001a globl hidden
diff --git a/libc/sysv/calls/sys_munmap.s b/libc/sysv/calls/sys_munmap.s
new file mode 100644
index 000000000..f5eba48e5
--- /dev/null
+++ b/libc/sysv/calls/sys_munmap.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_munmap 0x004900492049000b globl hidden
diff --git a/libc/sysv/calls/sys_nanosleep.s b/libc/sysv/calls/sys_nanosleep.s
new file mode 100644
index 000000000..a1de7da5b
--- /dev/null
+++ b/libc/sysv/calls/sys_nanosleep.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_nanosleep 0x005b00f0ffff0023 globl hidden
diff --git a/libc/sysv/calls/sys_open.s b/libc/sysv/calls/sys_open.s
new file mode 100644
index 000000000..01a54065e
--- /dev/null
+++ b/libc/sysv/calls/sys_open.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_open 0x0005000520050002 globl hidden
diff --git a/libc/sysv/calls/sys_openat.s b/libc/sysv/calls/sys_openat.s
new file mode 100644
index 000000000..571cfb9c1
--- /dev/null
+++ b/libc/sysv/calls/sys_openat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_openat 0x014101f321cf0101 globl hidden
diff --git a/libc/sysv/calls/sys_pause.s b/libc/sysv/calls/sys_pause.s
new file mode 100644
index 000000000..f59f8ef1f
--- /dev/null
+++ b/libc/sysv/calls/sys_pause.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_pause 0xffffffffffff0022 globl hidden
diff --git a/libc/sysv/calls/sys_poll.s b/libc/sysv/calls/sys_poll.s
new file mode 100644
index 000000000..483a275aa
--- /dev/null
+++ b/libc/sysv/calls/sys_poll.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_poll 0x00fc00d120e60007 globl hidden
diff --git a/libc/sysv/calls/sys_posix_fallocate.s b/libc/sysv/calls/sys_posix_fallocate.s
new file mode 100644
index 000000000..401454e25
--- /dev/null
+++ b/libc/sysv/calls/sys_posix_fallocate.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_posix_fallocate 0xffff0212ffffffff globl hidden
diff --git a/libc/sysv/calls/sys_posix_openpt.s b/libc/sysv/calls/sys_posix_openpt.s
new file mode 100644
index 000000000..37ecabd07
--- /dev/null
+++ b/libc/sysv/calls/sys_posix_openpt.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_posix_openpt 0xffff01f8ffffffff globl hidden
diff --git a/libc/sysv/calls/sys_posix_spawn.s b/libc/sysv/calls/sys_posix_spawn.s
new file mode 100644
index 000000000..0012ba62c
--- /dev/null
+++ b/libc/sysv/calls/sys_posix_spawn.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_posix_spawn 0xffffffff20f4ffff globl hidden
diff --git a/libc/sysv/calls/sys_ppoll.s b/libc/sysv/calls/sys_ppoll.s
new file mode 100644
index 000000000..a39263971
--- /dev/null
+++ b/libc/sysv/calls/sys_ppoll.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_ppoll 0x006d0221ffff010f globl hidden
diff --git a/libc/sysv/calls/sys_ptrace.s b/libc/sysv/calls/sys_ptrace.s
new file mode 100644
index 000000000..ac50394f3
--- /dev/null
+++ b/libc/sysv/calls/sys_ptrace.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_ptrace 0x001a001a201a0065 globl hidden
diff --git a/libc/sysv/calls/sys_read.s b/libc/sysv/calls/sys_read.s
new file mode 100644
index 000000000..450ba018a
--- /dev/null
+++ b/libc/sysv/calls/sys_read.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_read 0x0003000320030000 globl hidden
diff --git a/libc/sysv/calls/sys_readlinkat.s b/libc/sysv/calls/sys_readlinkat.s
new file mode 100644
index 000000000..0a22b6956
--- /dev/null
+++ b/libc/sysv/calls/sys_readlinkat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_readlinkat 0x014201f421d9010b globl hidden
diff --git a/libc/sysv/calls/sys_readv.s b/libc/sysv/calls/sys_readv.s
new file mode 100644
index 000000000..8986a6dcd
--- /dev/null
+++ b/libc/sysv/calls/sys_readv.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_readv 0x0078007820780013 globl hidden
diff --git a/libc/sysv/calls/sys_recvfrom.s b/libc/sysv/calls/sys_recvfrom.s
new file mode 100644
index 000000000..f7601691d
--- /dev/null
+++ b/libc/sysv/calls/sys_recvfrom.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_recvfrom 0x001d001d201d002d globl hidden
diff --git a/libc/sysv/calls/sys_recvmsg.s b/libc/sysv/calls/sys_recvmsg.s
new file mode 100644
index 000000000..64f2a7954
--- /dev/null
+++ b/libc/sysv/calls/sys_recvmsg.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_recvmsg 0x001b001b201b002f globl hidden
diff --git a/libc/sysv/calls/sys_rename.s b/libc/sysv/calls/sys_rename.s
new file mode 100644
index 000000000..51c737369
--- /dev/null
+++ b/libc/sysv/calls/sys_rename.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_rename 0x0080008020800052 globl hidden
diff --git a/libc/sysv/calls/sys_renameat.s b/libc/sysv/calls/sys_renameat.s
new file mode 100644
index 000000000..ccc3b08de
--- /dev/null
+++ b/libc/sysv/calls/sys_renameat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_renameat 0x014301f521d10108 globl hidden
diff --git a/libc/sysv/calls/sys_rmdir.s b/libc/sysv/calls/sys_rmdir.s
new file mode 100644
index 000000000..5023afcc5
--- /dev/null
+++ b/libc/sysv/calls/sys_rmdir.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_rmdir 0x0089008920890054 globl hidden
diff --git a/libc/sysv/calls/sys_sched_setaffinity.s b/libc/sysv/calls/sys_sched_setaffinity.s
new file mode 100644
index 000000000..21741a7a3
--- /dev/null
+++ b/libc/sysv/calls/sys_sched_setaffinity.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_sched_setaffinity 0xffffffffffff00cb globl hidden
diff --git a/libc/sysv/calls/sys_sched_yield.s b/libc/sysv/calls/sys_sched_yield.s
new file mode 100644
index 000000000..fc5fc4ac8
--- /dev/null
+++ b/libc/sysv/calls/sys_sched_yield.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_sched_yield 0x012a014b103c0018 globl hidden
diff --git a/libc/sysv/calls/sys_select.s b/libc/sysv/calls/sys_select.s
new file mode 100644
index 000000000..fd314c44f
--- /dev/null
+++ b/libc/sysv/calls/sys_select.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_select 0x0047005d205d0017 globl hidden
diff --git a/libc/sysv/calls/sys_sendfile.s b/libc/sysv/calls/sys_sendfile.s
new file mode 100644
index 000000000..01baf4c50
--- /dev/null
+++ b/libc/sysv/calls/sys_sendfile.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_sendfile 0xffff018921510028 globl hidden
diff --git a/libc/sysv/calls/sys_sendmsg.s b/libc/sysv/calls/sys_sendmsg.s
new file mode 100644
index 000000000..cc8a877ac
--- /dev/null
+++ b/libc/sysv/calls/sys_sendmsg.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_sendmsg 0x001c001c201c002e globl hidden
diff --git a/libc/sysv/calls/sys_sendto.s b/libc/sysv/calls/sys_sendto.s
new file mode 100644
index 000000000..405896b6e
--- /dev/null
+++ b/libc/sysv/calls/sys_sendto.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_sendto 0x008500852085002c globl hidden
diff --git a/libc/sysv/calls/sys_setitimer.s b/libc/sysv/calls/sys_setitimer.s
new file mode 100644
index 000000000..ea979d80a
--- /dev/null
+++ b/libc/sysv/calls/sys_setitimer.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_setitimer 0x0045005320530026 globl hidden
diff --git a/libc/sysv/calls/sys_setpriority.s b/libc/sysv/calls/sys_setpriority.s
new file mode 100644
index 000000000..c91840a73
--- /dev/null
+++ b/libc/sysv/calls/sys_setpriority.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_setpriority 0x006000602060008d globl hidden
diff --git a/libc/sysv/calls/sys_setresgid.s b/libc/sysv/calls/sys_setresgid.s
new file mode 100644
index 000000000..244f1c025
--- /dev/null
+++ b/libc/sysv/calls/sys_setresgid.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_setresgid 0x011c0138ffff0077 globl hidden
diff --git a/libc/sysv/calls/sys_setresuid.s b/libc/sysv/calls/sys_setresuid.s
new file mode 100644
index 000000000..f7df8191a
--- /dev/null
+++ b/libc/sysv/calls/sys_setresuid.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_setresuid 0x011a0137ffff0075 globl hidden
diff --git a/libc/sysv/calls/sys_setrlimit.s b/libc/sysv/calls/sys_setrlimit.s
new file mode 100644
index 000000000..9d5e361d1
--- /dev/null
+++ b/libc/sysv/calls/sys_setrlimit.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_setrlimit 0x00c300c320c300a0 globl hidden
diff --git a/libc/sysv/calls/sys_setsid.s b/libc/sysv/calls/sys_setsid.s
new file mode 100644
index 000000000..576237073
--- /dev/null
+++ b/libc/sysv/calls/sys_setsid.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_setsid 0x0093009320930070 globl hidden
diff --git a/libc/sysv/calls/sys_setsockopt.s b/libc/sysv/calls/sys_setsockopt.s
new file mode 100644
index 000000000..e67c9040e
--- /dev/null
+++ b/libc/sysv/calls/sys_setsockopt.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_setsockopt 0x0069006920690036 globl hidden
diff --git a/libc/sysv/calls/sys_shutdown.s b/libc/sysv/calls/sys_shutdown.s
new file mode 100644
index 000000000..57a83e083
--- /dev/null
+++ b/libc/sysv/calls/sys_shutdown.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_shutdown 0x0086008620860030 globl hidden
diff --git a/libc/sysv/calls/sys_sigaction.s b/libc/sysv/calls/sys_sigaction.s
new file mode 100644
index 000000000..9f57594e1
--- /dev/null
+++ b/libc/sysv/calls/sys_sigaction.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_sigaction 0x002e01a0202e000d globl hidden
diff --git a/libc/sysv/calls/sys_sigprocmask.s b/libc/sysv/calls/sys_sigprocmask.s
new file mode 100644
index 000000000..4187a59ea
--- /dev/null
+++ b/libc/sysv/calls/sys_sigprocmask.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_sigprocmask 0x003001542030000e globl hidden
diff --git a/libc/sysv/calls/sys_sigsuspend.s b/libc/sysv/calls/sys_sigsuspend.s
new file mode 100644
index 000000000..7d66ac4bc
--- /dev/null
+++ b/libc/sysv/calls/sys_sigsuspend.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_sigsuspend 0x006f0155206f0082 globl hidden
diff --git a/libc/sysv/calls/sys_socketpair.s b/libc/sysv/calls/sys_socketpair.s
new file mode 100644
index 000000000..d881b2560
--- /dev/null
+++ b/libc/sysv/calls/sys_socketpair.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_socketpair 0x0087008720870035 globl hidden
diff --git a/libc/sysv/calls/sys_splice.s b/libc/sysv/calls/sys_splice.s
new file mode 100644
index 000000000..baf3c82a3
--- /dev/null
+++ b/libc/sysv/calls/sys_splice.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_splice 0xffffffffffff0113 globl hidden
diff --git a/libc/sysv/calls/sys_symlink.s b/libc/sysv/calls/sys_symlink.s
new file mode 100644
index 000000000..dbb57a713
--- /dev/null
+++ b/libc/sysv/calls/sys_symlink.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_symlink 0x0039003920390058 globl hidden
diff --git a/libc/sysv/calls/sys_symlinkat.s b/libc/sysv/calls/sys_symlinkat.s
new file mode 100644
index 000000000..98ffff630
--- /dev/null
+++ b/libc/sysv/calls/sys_symlinkat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_symlinkat 0x014401f621da010a globl hidden
diff --git a/libc/sysv/calls/sys_sync.s b/libc/sysv/calls/sys_sync.s
new file mode 100644
index 000000000..5ef92433e
--- /dev/null
+++ b/libc/sysv/calls/sys_sync.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_sync 0x00240024202400a2 globl hidden
diff --git a/libc/sysv/calls/sys_sync_file_range.s b/libc/sysv/calls/sys_sync_file_range.s
new file mode 100644
index 000000000..46c7aa946
--- /dev/null
+++ b/libc/sysv/calls/sys_sync_file_range.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_sync_file_range 0xffffffffffff0115 globl hidden
diff --git a/libc/sysv/calls/sys_sysinfo.s b/libc/sysv/calls/sys_sysinfo.s
new file mode 100644
index 000000000..13dcc93ce
--- /dev/null
+++ b/libc/sysv/calls/sys_sysinfo.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_sysinfo 0xffffffffffff0063 globl hidden
diff --git a/libc/sysv/calls/sys_times.s b/libc/sysv/calls/sys_times.s
new file mode 100644
index 000000000..3af59a5aa
--- /dev/null
+++ b/libc/sysv/calls/sys_times.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_times 0xffffffffffff0064 globl hidden
diff --git a/libc/sysv/calls/sys_uname.s b/libc/sysv/calls/sys_uname.s
new file mode 100644
index 000000000..d1ae2799d
--- /dev/null
+++ b/libc/sysv/calls/sys_uname.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_uname 0xffff00a4ffff003f globl hidden
diff --git a/libc/sysv/calls/sys_unlink.s b/libc/sysv/calls/sys_unlink.s
new file mode 100644
index 000000000..3a68345ef
--- /dev/null
+++ b/libc/sysv/calls/sys_unlink.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_unlink 0x000a000a200a0057 globl hidden
diff --git a/libc/sysv/calls/sys_unlinkat.s b/libc/sysv/calls/sys_unlinkat.s
new file mode 100644
index 000000000..480d6637f
--- /dev/null
+++ b/libc/sysv/calls/sys_unlinkat.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_unlinkat 0x014501f721d80107 globl hidden
diff --git a/libc/sysv/calls/sys_utime.s b/libc/sysv/calls/sys_utime.s
new file mode 100644
index 000000000..9f234ba2a
--- /dev/null
+++ b/libc/sysv/calls/sys_utime.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_utime 0xffffffffffff0084 globl hidden
diff --git a/libc/sysv/calls/sys_utimes.s b/libc/sysv/calls/sys_utimes.s
new file mode 100644
index 000000000..17525b26e
--- /dev/null
+++ b/libc/sysv/calls/sys_utimes.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_utimes 0x004c008a208a00eb globl hidden
diff --git a/libc/sysv/calls/sys_vmsplice.s b/libc/sysv/calls/sys_vmsplice.s
new file mode 100644
index 000000000..8b18cb3be
--- /dev/null
+++ b/libc/sysv/calls/sys_vmsplice.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_vmsplice 0xffffffffffff0116 globl hidden
diff --git a/libc/sysv/calls/sys_wait4.s b/libc/sysv/calls/sys_wait4.s
new file mode 100644
index 000000000..9a7230618
--- /dev/null
+++ b/libc/sysv/calls/sys_wait4.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_wait4 0x000b00072007003d globl hidden
diff --git a/libc/sysv/calls/sys_write.s b/libc/sysv/calls/sys_write.s
new file mode 100644
index 000000000..bfea8884d
--- /dev/null
+++ b/libc/sysv/calls/sys_write.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_write 0x0004000420040001 globl hidden
diff --git a/libc/sysv/calls/sys_writev.s b/libc/sysv/calls/sys_writev.s
new file mode 100644
index 000000000..c4c3af777
--- /dev/null
+++ b/libc/sysv/calls/sys_writev.s
@@ -0,0 +1,2 @@
+.include "o/libc/sysv/macros.internal.inc"
+.scall sys_writev 0x0079007920790014 globl hidden
diff --git a/libc/sysv/calls/sysinfo-sysv.s b/libc/sysv/calls/sysinfo-sysv.s
deleted file mode 100644
index 238269010..000000000
--- a/libc/sysv/calls/sysinfo-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall sysinfo$sysv 0xffffffffffff0063 globl hidden
diff --git a/libc/sysv/calls/times-sysv.s b/libc/sysv/calls/times-sysv.s
deleted file mode 100644
index 7f504bfd9..000000000
--- a/libc/sysv/calls/times-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall times$sysv 0xffffffffffff0064 globl hidden
diff --git a/libc/sysv/calls/uname-sysv.s b/libc/sysv/calls/uname-sysv.s
deleted file mode 100644
index 3e245a60c..000000000
--- a/libc/sysv/calls/uname-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall uname$sysv 0xffff00a4ffff003f globl hidden
diff --git a/libc/sysv/calls/unlink-sysv.s b/libc/sysv/calls/unlink-sysv.s
deleted file mode 100644
index ebf9a4f06..000000000
--- a/libc/sysv/calls/unlink-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall unlink$sysv 0x000a000a200a0057 globl hidden
diff --git a/libc/sysv/calls/unlinkat-sysv.s b/libc/sysv/calls/unlinkat-sysv.s
deleted file mode 100644
index f95f158ff..000000000
--- a/libc/sysv/calls/unlinkat-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall unlinkat$sysv 0x014501f721d80107 globl hidden
diff --git a/libc/sysv/calls/utime-sysv.s b/libc/sysv/calls/utime-sysv.s
deleted file mode 100644
index 41a5a42de..000000000
--- a/libc/sysv/calls/utime-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall utime$sysv 0xffffffffffff0084 globl hidden
diff --git a/libc/sysv/calls/utimes-sysv.s b/libc/sysv/calls/utimes-sysv.s
deleted file mode 100644
index cdae3bcd8..000000000
--- a/libc/sysv/calls/utimes-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall utimes$sysv 0x004c008a208a00eb globl hidden
diff --git a/libc/sysv/calls/vmsplice-sysv.s b/libc/sysv/calls/vmsplice-sysv.s
deleted file mode 100644
index a6967d05d..000000000
--- a/libc/sysv/calls/vmsplice-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall vmsplice$sysv 0xffffffffffff0116 globl hidden
diff --git a/libc/sysv/calls/wait4-sysv.s b/libc/sysv/calls/wait4-sysv.s
deleted file mode 100644
index f82e9ef99..000000000
--- a/libc/sysv/calls/wait4-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall wait4$sysv 0x000b00072007003d globl hidden
diff --git a/libc/sysv/calls/write-sysv.s b/libc/sysv/calls/write-sysv.s
deleted file mode 100644
index f11a54238..000000000
--- a/libc/sysv/calls/write-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall write$sysv 0x0004000420040001 globl hidden
diff --git a/libc/sysv/calls/writev-sysv.s b/libc/sysv/calls/writev-sysv.s
deleted file mode 100644
index daa2124c4..000000000
--- a/libc/sysv/calls/writev-sysv.s
+++ /dev/null
@@ -1,2 +0,0 @@
-.include "o/libc/sysv/macros.internal.inc"
-.scall writev$sysv 0x0079007920790014 globl hidden
diff --git a/libc/sysv/nr.py b/libc/sysv/nr.py
index f3b74d207..d1d08a3ee 100644
--- a/libc/sysv/nr.py
+++ b/libc/sysv/nr.py
@@ -9,9 +9,9 @@ for line in lines:
   if name.startswith("'"): name = name[1:]
   if name.endswith("'"): name = name[:-1]
   if name.startswith("__"): name = name[2:]
-  if name.endswith("$sysv"): name = name[:-5]
-  if name.endswith("$bsd"): name = name[:-4]
-  if name.endswith("$freebsd"): name = name[:-8]
+  if name.startswith("sys_"): name = name[:-5]
+  if name.endswith("_bsd"): name = name[:-4]
+  if name.endswith("_freebsd"): name = name[:-8]
   numbers = int(fields[2][2:], 16)
   systemd = (numbers >> 000) & 0xffff
   xnu     = (numbers >> 020) & 0x0fff | ((numbers >> 28) & 0xf) << 20
diff --git a/libc/sysv/syscalls.sh b/libc/sysv/syscalls.sh
index 15b540241..33af52bba 100755
--- a/libc/sysv/syscalls.sh
+++ b/libc/sysv/syscalls.sh
@@ -22,86 +22,86 @@ dir=libc/sysv/calls
 #       The Fifth Bell System Interface, Community Edition     ┌─────────────────────────┐
 #	» so many numbers                                      │ legend                  │
 #	                                                       ├─────────────────────────┤
-#	                             GNU/Systemd┐              │ ffff │ unavailable      │
-# 	                                 2.6.18+│              │    $ │ wrapped          │
-#	                            Mac OS X┐   │              │   __ │ wrapped twice    │
+#	                             GNU/Systemd┐              │   ffff │ unavailable    │
+# 	                                 2.6.18+│              │   sys_ │ wrapped        │
+#	                            Mac OS X┐   │              │ __sys_ │ wrapped twice  │
 #	                               15.6+│   │              └─────────────────────────┘
 #	                         FreeBSD┐   │   │
 #	                             12+│ ┌─│───│── XnuClass{1:Mach,2:Unix}
 #	                     OpenBSD┐   │ │ │   │
 #	                        6.4+│   │ │ │   │
 #	Symbol                    ┌─┴┐┌─┴┐│┬┴┐┌─┴┐      Directives & Commentary
-scall	'exit$sysv'		0x00010001200100e7	globl hidden # a.k.a. exit_group
-scall	'read$sysv'		0x0003000320030000	globl hidden
-scall	'write$sysv'		0x0004000420040001	globl hidden
-scall	'open$sysv'		0x0005000520050002	globl hidden
-scall	'close$sysv'		0x0006000620060003	globl hidden
-scall	'__stat$sysv'		0x0026ffff21520004	globl hidden # FreeBSD 11→12 fumble; use fstatat$sysv(); blocked on Android
-scall	'__fstat$sysv'		0x0035022721530005	globl hidden # needs stat2linux()
-scall	'__lstat$sysv'		0x0028002821540006	globl hidden # needs stat2linux(); blocked on Android
-scall	'poll$sysv'		0x00fc00d120e60007	globl hidden
-scall	'ppoll$sysv'		0x006d0221ffff010f	globl hidden # consider INTON/INTOFF tutorial in examples/unbourne.c
-scall	'__lseek$sysv'		0x00c701de20c70008	globl hidden # openbsd:evilpad
-scall	'__mmap$sysv'		0x00c501dd20c50009	globl hidden # openbsd:pad
-scall	'msync$sysv'		0x010000412041001a	globl hidden
-scall	'mprotect$sysv'		0x004a004a204a000a	globl hidden
-scall	'munmap$sysv'		0x004900492049000b	globl hidden
-scall	'sigaction$sysv'	0x002e01a0202e000d	globl hidden # rt_sigaction on Lunix
-scall	'sigprocmask$sysv'	0x003001542030000e	globl hidden # a.k.a. rt_sigprocmask
-scall	'ioctl$sysv'		0x0036003620360010	globl hidden
-scall	'__pread$sysv'		0x00ad01db20990011	globl hidden # a.k.a. pread64; openbsd:pad
-scall	'__pwrite$sysv'		0x00ae01dc209a0012	globl hidden # a.k.a. pwrite64; openbsd:pad
-scall	'readv$sysv'		0x0078007820780013	globl hidden
-scall	'writev$sysv'		0x0079007920790014	globl hidden
-scall	'access$sysv'		0x0021002120210015	globl hidden
-scall	'__pipe$sysv'		0x0107021e202a0016	globl hidden # NOTE: pipe2() on FreeBSD; XNU is pipe(void)→eax:edx
-scall	'select$sysv'		0x0047005d205d0017	globl hidden
+scall	sys_exit		0x00010001200100e7	globl hidden # a.k.a. exit_group
+scall	sys_read		0x0003000320030000	globl hidden
+scall	sys_write		0x0004000420040001	globl hidden
+scall	sys_open		0x0005000520050002	globl hidden
+scall	sys_close		0x0006000620060003	globl hidden
+scall	__sys_stat		0x0026ffff21520004	globl hidden # FreeBSD 11→12 fumble; use sys_fstatat(); blocked on Android
+scall	__sys_fstat		0x0035022721530005	globl hidden # needs __stat2linux()
+scall	__sys_lstat		0x0028002821540006	globl hidden # needs __stat2linux(); blocked on Android
+scall	sys_poll		0x00fc00d120e60007	globl hidden
+scall	sys_ppoll		0x006d0221ffff010f	globl hidden # consider INTON/INTOFF tutorial in examples/unbourne.c
+scall	__sys_lseek		0x00c701de20c70008	globl hidden # openbsd:evilpad
+scall	__sys_mmap		0x00c501dd20c50009	globl hidden # openbsd:pad
+scall	sys_msync		0x010000412041001a	globl hidden
+scall	sys_mprotect		0x004a004a204a000a	globl hidden
+scall	sys_munmap		0x004900492049000b	globl hidden
+scall	sys_sigaction		0x002e01a0202e000d	globl hidden # rt_sigaction on Lunix
+scall	sys_sigprocmask		0x003001542030000e	globl hidden # a.k.a. rt_sigprocmask
+scall	sys_ioctl		0x0036003620360010	globl hidden
+scall	__sys_pread		0x00ad01db20990011	globl hidden # a.k.a. pread64; openbsd:pad
+scall	__sys_pwrite		0x00ae01dc209a0012	globl hidden # a.k.a. pwrite64; openbsd:pad
+scall	sys_readv		0x0078007820780013	globl hidden
+scall	sys_writev		0x0079007920790014	globl hidden
+scall	sys_access		0x0021002120210015	globl hidden
+scall	__sys_pipe		0x0107021e202a0016	globl hidden # NOTE: pipe2() on FreeBSD; XNU is pipe(void)→eax:edx
+scall	sys_select		0x0047005d205d0017	globl hidden
 scall	pselect			0x006e020a218affff	globl
 scall	pselect6		0xffffffffffff010e	globl
-scall	'sched_yield$sysv'	0x012a014b103c0018	globl hidden # swtch() on xnu
-scall	'mremap$sysv'		0xffffffffffff0019	globl hidden
+scall	sys_sched_yield		0x012a014b103c0018	globl hidden # swtch() on xnu
+scall	sys_mremap		0xffffffffffff0019	globl hidden
 scall	mincore			0x004e004e204e001b	globl
-scall	'madvise$sysv'		0x004b004b204b001c	globl hidden
+scall	sys_madvise		0x004b004b204b001c	globl hidden
 scall	shmget			0x012100e72109001d	globl # consider mmap
 scall	shmat			0x00e400e42106001e	globl # consider mmap
 scall	shmctl			0x012802002107001f	globl # consider mmap
-scall	'dup$sysv'		0x0029002920290020	globl hidden
-scall	'dup2$sysv'		0x005a005a205a0021	globl hidden
-scall	'pause$sysv'		0xffffffffffff0022	globl hidden
-scall	'nanosleep$sysv'	0x005b00f0ffff0023	globl hidden
-scall	'getitimer$sysv'	0x0046005620560024	globl hidden
-scall	'setitimer$sysv'	0x0045005320530026	globl hidden
-scall	'alarm$sysv'		0xffffffffffff0025	globl hidden
-scall	'getpid$sysv'		0x0014001420140027	globl hidden
-scall	'sendfile$sysv'		0xffff018921510028	globl hidden # Linux vs. XNU/BSD ABIs very different
-scall	'__socket$sysv'		0x0061006120610029	globl hidden
-scall	'__connect$sysv'	0x006200622062002a	globl hidden
-scall	'__accept$sysv'		0x001e021d201e002b	globl hidden # accept4 on freebsd
-scall	'sendto$sysv'		0x008500852085002c	globl hidden
-scall	'recvfrom$sysv'		0x001d001d201d002d	globl hidden
-scall	'sendmsg$sysv'		0x001c001c201c002e	globl hidden
-scall	'recvmsg$sysv'		0x001b001b201b002f	globl hidden
-scall	'shutdown$sysv'		0x0086008620860030	globl hidden
-scall	'bind$sysv'		0x0068006820680031	globl hidden
-scall	'listen$sysv'		0x006a006a206a0032	globl hidden
-scall	'__getsockname$sysv'	0x0020002020200033	globl hidden
-scall	'__getpeername$sysv'	0x001f008d201f0034	globl hidden
-scall	'socketpair$sysv'	0x0087008720870035	globl hidden
-scall	'setsockopt$sysv'	0x0069006920690036	globl hidden
-scall	'getsockopt$sysv'	0x0076007620760037	globl hidden
-scall	'__fork$sysv'		0x0002000220020039	globl hidden # xnu needs eax=~-edx b/c eax always holds pid and edx is 0 for parent and 1 for child
+scall	sys_dup			0x0029002920290020	globl hidden
+scall	sys_dup2		0x005a005a205a0021	globl hidden
+scall	sys_pause		0xffffffffffff0022	globl hidden
+scall	sys_nanosleep		0x005b00f0ffff0023	globl hidden
+scall	sys_getitimer		0x0046005620560024	globl hidden
+scall	sys_setitimer		0x0045005320530026	globl hidden
+scall	sys_alarm		0xffffffffffff0025	globl hidden
+scall	sys_getpid		0x0014001420140027	globl hidden
+scall	sys_sendfile		0xffff018921510028	globl hidden # Linux vs. XNU/BSD ABIs very different
+scall	__sys_socket		0x0061006120610029	globl hidden
+scall	__sys_connect		0x006200622062002a	globl hidden
+scall	__sys_accept		0x001e021d201e002b	globl hidden # accept4 on freebsd
+scall	sys_sendto		0x008500852085002c	globl hidden
+scall	sys_recvfrom		0x001d001d201d002d	globl hidden
+scall	sys_sendmsg		0x001c001c201c002e	globl hidden
+scall	sys_recvmsg		0x001b001b201b002f	globl hidden
+scall	sys_shutdown		0x0086008620860030	globl hidden
+scall	sys_bind		0x0068006820680031	globl hidden
+scall	sys_listen		0x006a006a206a0032	globl hidden
+scall	__sys_getsockname	0x0020002020200033	globl hidden
+scall	__sys_getpeername	0x001f008d201f0034	globl hidden
+scall	sys_socketpair		0x0087008720870035	globl hidden
+scall	sys_setsockopt		0x0069006920690036	globl hidden
+scall	sys_getsockopt		0x0076007620760037	globl hidden
+scall	__sys_fork		0x0002000220020039	globl hidden # xnu needs eax=~-edx b/c eax always holds pid and edx is 0 for parent and 1 for child
 #scall	vfork			0x004200422042003a	globl        # this syscall is from the moon so we implement it by hand in libc/calls/hefty/vfork.S
-scall	'posix_spawn$sysv'	0xffffffff20f4ffff	globl hidden # good luck figuring out how xnu defines this
-scall	'__execve$sysv'		0x003b003b203b003b	globl hidden
-scall	'wait4$sysv'		0x000b00072007003d	globl hidden
-scall	'kill$sysv'		0x007a00252025003e	globl hidden # kill(pid, sig, 1) b/c xnu
-scall	'killpg$sysv'		0xffff0092ffffffff	globl hidden
+scall	sys_posix_spawn		0xffffffff20f4ffff	globl hidden # good luck figuring out how xnu defines this
+scall	__sys_execve		0x003b003b203b003b	globl hidden
+scall	sys_wait4		0x000b00072007003d	globl hidden
+scall	sys_kill		0x007a00252025003e	globl hidden # kill(pid, sig, 1) b/c xnu
+scall	sys_killpg		0xffff0092ffffffff	globl hidden
 scall	clone			0xffffffffffff0038	globl
 scall	tkill			0xffffffffffff00c8	globl
 scall	futex			0x0053ffffffff00ca	globl
 scall	set_robust_list		0xffffffffffff0111	globl
 scall	get_robust_list		0xffffffffffff0112	globl
-scall	'uname$sysv'		0xffff00a4ffff003f	globl hidden
+scall	sys_uname		0xffff00a4ffff003f	globl hidden
 scall	semget			0x00dd00dd20ff0040	globl # won't polyfill for windows
 scall	semop			0x012200de21000041	globl # won't polyfill for windows
 scall	semctl			0x012701fe20fe0042	globl # won't polyfill for windows
@@ -110,42 +110,42 @@ scall	msgget			0x00e100e121030044	globl # won't polyfill for windows
 scall	msgsnd			0x00e200e221040045	globl # won't polyfill for windows
 scall	msgrcv			0x00e300e321050046	globl # won't polyfill for windows
 scall	msgctl			0x012901ff21020047	globl # won't polyfill for windows
-scall	'fcntl$sysv'		0x005c005c205c0048	globl hidden
-scall	'flock$sysv'		0x0083008320830049	globl hidden
-scall	'fsync$sysv'		0x005f005f205f004a	globl hidden
-scall	'fdatasync$sysv'	0x005f022620bb004b	globl hidden # fsync() on openbsd
-scall	'__truncate$sysv'	0x00c801df20c8004c	globl hidden # openbsd:pad
-scall	'__ftruncate$sysv'	0x00c901e020c9004d	globl hidden # openbsd:pad
-scall	'getcwd$sysv'		0x01300146ffff004f	globl hidden
-scall	'chdir$sysv'		0x000c000c200c0050	globl hidden
-scall	'fchdir$sysv'		0x000d000d200d0051	globl hidden
-scall	'rename$sysv'		0x0080008020800052	globl hidden
-scall	'mkdir$sysv'		0x0088008820880053	globl hidden
-scall	'rmdir$sysv'		0x0089008920890054	globl hidden
-scall	'creat$sysv'		0xffff0008ffff0055	globl hidden
-scall	'link$sysv'		0x0009000920090056	globl hidden
-scall	'unlink$sysv'		0x000a000a200a0057	globl hidden
-scall	'symlink$sysv'		0x0039003920390058	globl hidden
+scall	sys_fcntl		0x005c005c205c0048	globl hidden
+scall	sys_flock		0x0083008320830049	globl hidden
+scall	sys_fsync		0x005f005f205f004a	globl hidden
+scall	sys_fdatasync		0x005f022620bb004b	globl hidden # fsync() on openbsd
+scall	__sys_truncate		0x00c801df20c8004c	globl hidden # openbsd:pad
+scall	__sys_ftruncate		0x00c901e020c9004d	globl hidden # openbsd:pad
+scall	sys_getcwd		0x01300146ffff004f	globl hidden
+scall	sys_chdir		0x000c000c200c0050	globl hidden
+scall	sys_fchdir		0x000d000d200d0051	globl hidden
+scall	sys_rename		0x0080008020800052	globl hidden
+scall	sys_mkdir		0x0088008820880053	globl hidden
+scall	sys_rmdir		0x0089008920890054	globl hidden
+scall	sys_creat		0xffff0008ffff0055	globl hidden
+scall	sys_link		0x0009000920090056	globl hidden
+scall	sys_unlink		0x000a000a200a0057	globl hidden
+scall	sys_symlink		0x0039003920390058	globl hidden
 scall	readlink		0x003a003a203a0059	globl        # usually an anti-pattern
-scall	'chmod$sysv'		0x000f000f200f005a	globl hidden
-scall	'fchmod$sysv'		0x007c007c207c005b	globl hidden
-scall	'chown$sysv'		0x001000102010005c	globl hidden # impl. w/ fchownat() @asyncsignalsafe
-scall	'fchown$sysv'		0x007b007b207b005d	globl hidden # @asyncsignalsafe
-scall	'lchown$sysv'		0x00fe00fe216c005e	globl hidden # impl. w/ fchownat()
+scall	sys_chmod		0x000f000f200f005a	globl hidden
+scall	sys_fchmod		0x007c007c207c005b	globl hidden
+scall	sys_chown		0x001000102010005c	globl hidden # impl. w/ fchownat() @asyncsignalsafe
+scall	sys_fchown		0x007b007b207b005d	globl hidden # @asyncsignalsafe
+scall	sys_lchown		0x00fe00fe216c005e	globl hidden # impl. w/ fchownat()
 scall	umask			0x003c003c203c005f	globl
-scall	'__gettimeofday$sysv'	0x0043007420740060	globl hidden # xnu esi/edx=0
-scall	'getrlimit$sysv'	0x00c200c220c20061	globl hidden
-scall	'getrusage$sysv'	0x0013007520750062	globl hidden
-scall	'sysinfo$sysv'		0xffffffffffff0063	globl hidden
-scall	'times$sysv'		0xffffffffffff0064	globl hidden
-scall	'ptrace$sysv'		0x001a001a201a0065	globl hidden
+scall	__sys_gettimeofday	0x0043007420740060	globl hidden # xnu esi/edx=0
+scall	sys_getrlimit		0x00c200c220c20061	globl hidden
+scall	sys_getrusage		0x0013007520750062	globl hidden
+scall	sys_sysinfo		0xffffffffffff0063	globl hidden
+scall	sys_times		0xffffffffffff0064	globl hidden
+scall	sys_ptrace		0x001a001a201a0065	globl hidden
 scall	syslog			0xffffffffffff0067	globl
-scall	'getuid$sysv'		0x0018001820180066	globl hidden
-scall	'getgid$sysv'		0x002f002f202f0068	globl hidden
-scall	'getppid$sysv'		0x002700272027006e	globl hidden
+scall	sys_getuid		0x0018001820180066	globl hidden
+scall	sys_getgid		0x002f002f202f0068	globl hidden
+scall	sys_getppid		0x002700272027006e	globl hidden
 scall	getpgrp			0x005100512051006f	globl
-scall	'setsid$sysv'		0x0093009320930070	globl hidden
-scall	'getsid$sysv'		0x00ff01362136007c	globl hidden
+scall	sys_setsid		0x0093009320930070	globl hidden
+scall	sys_getsid		0x00ff01362136007c	globl hidden
 scall	getpgid			0x00cf00cf20970079	globl
 scall	setpgid			0x005200522052006d	globl
 scall	geteuid			0x001900192019006b	globl
@@ -156,28 +156,28 @@ scall	setreuid		0x007e007e207e0071	globl
 scall	setregid		0x007f007f207f0072	globl
 scall	setuid			0x0017001720170069	globl
 scall	setgid			0x00b500b520b5006a	globl
-scall	'setresuid$sysv'	0x011a0137ffff0075	globl hidden # polyfilled for xnu
-scall	'setresgid$sysv'	0x011c0138ffff0077	globl hidden # polyfilled for xnu
+scall	sys_setresuid		0x011a0137ffff0075	globl hidden # polyfilled for xnu
+scall	sys_setresgid		0x011c0138ffff0077	globl hidden # polyfilled for xnu
 scall	getresuid		0x01190168ffff0076	globl # semantics aren't well-defined
 scall	getresgid		0x011b0169ffff0078	globl # semantics aren't well-defined
 scall	sigpending		0x003400342034007f	globl
-scall	'sigsuspend$sysv'	0x006f0155206f0082	globl hidden
+scall	sys_sigsuspend		0x006f0155206f0082	globl hidden
 scall	sigaltstack		0x0120003520350083	globl
-scall	'mknod$sysv'		0x000e000e200e0085	globl hidden
+scall	sys_mknod		0x000e000e200e0085	globl hidden
 scall	mknodat			0x0140022fffff0103	globl # FreeBSD 12+
-scall	'mkfifo$sysv'		0x008400842084ffff	globl hidden
+scall	sys_mkfifo		0x008400842084ffff	globl hidden
 scall	mkfifoat		0x013f01f1ffffffff	globl
 scall	statfs			0x003f022b21590089	globl
 scall	fstatfs			0x0040022c215a008a	globl
-scall	'getpriority$sysv'	0x006400642064008c	globl hidden
-scall	'setpriority$sysv'	0x006000602060008d	globl hidden # modern nice()
+scall	sys_getpriority		0x006400642064008c	globl hidden
+scall	sys_setpriority		0x006000602060008d	globl hidden # modern nice()
 scall	mlock			0x00cb00cb20cb0095	globl
 scall	munlock			0x00cc00cc20cc0096	globl
 scall	mlockall		0x010f014421440097	globl
 scall	munlockall		0x0110014521450098	globl
-scall	'setrlimit$sysv'	0x00c300c320c300a0	globl hidden
+scall	sys_setrlimit		0x00c300c320c300a0	globl hidden
 scall	chroot			0x003d003d203d00a1	globl
-scall	'sync$sysv'		0x00240024202400a2	globl hidden
+scall	sys_sync		0x00240024202400a2	globl hidden
 scall	acct			0x00330033203300a3	globl
 scall	settimeofday		0x0044007a207a00a4	globl
 scall	mount			0x0015001520a700a5	globl
@@ -204,7 +204,7 @@ scall	modify_ldt		0xffffffffffff009a	globl
 scall	pivot_root		0xffffffffffff009b	globl
 scall	_sysctl			0xffffffffffff009c	globl
 scall	prctl			0xffffffffffff009d	globl
-scall	'arch_prctl$sysv'	0x00a500a5ffff009e	globl hidden # sysarch() on bsd
+scall	sys_arch_prctl		0x00a500a5ffff009e	globl hidden # sysarch() on bsd
 scall	adjtimex		0xffffffffffff009f	globl
 scall	umount2			0xffffffffffff00a6	globl
 scall	swapon			0xffff0055205500a7	globl
@@ -215,7 +215,7 @@ scall	iopl			0xffffffffffff00ac	globl
 scall	ioperm			0xffffffffffff00ad	globl
 scall	init_module		0xffffffffffff00af	globl
 scall	delete_module		0xffffffffffff00b0	globl
-scall	'gettid$sysv'		0xffffffff211e00ba	globl hidden
+scall	sys_gettid		0xffffffff211e00ba	globl hidden
 scall	readahead		0xffffffffffff00bb	globl # consider fadvise() / madvise()
 scall	setxattr		0xffffffff20ec00bc	globl
 scall	fsetxattr		0xffffffff20ed00be	globl
@@ -229,7 +229,7 @@ scall	lsetxattr		0xffffffffffff00bd	globl
 scall	lgetxattr		0xffffffffffff00c0	globl
 scall	llistxattr		0xffffffffffff00c3	globl
 scall	lremovexattr		0xffffffffffff00c6	globl
-scall  'sched_setaffinity$sysv'	0xffffffffffff00cb	globl hidden
+scall	sys_sched_setaffinity	0xffffffffffff00cb	globl hidden
 scall	sched_getaffinity	0xffffffffffff00cc	globl
 scall	cpuset_getaffinity	0xffff01e7ffffffff	globl
 scall	cpuset_setaffinity	0xffff01e8ffffffff	globl
@@ -239,21 +239,21 @@ scall	io_getevents		0xffffffffffff00d0	globl
 scall	io_submit		0xffffffffffff00d1	globl
 scall	io_cancel		0xffffffffffff00d2	globl
 scall	lookup_dcookie		0xffffffffffff00d4	globl
-scall	'epoll_create$sysv'	0xffffffffffff00d5	globl
-scall	'epoll_wait$sysv'	0xffffffffffff00e8	globl
-scall	'epoll_ctl$sysv'	0xffffffffffff00e9	globl
+scall	sys_epoll_create	0xffffffffffff00d5	globl
+scall	sys_epoll_wait		0xffffffffffff00e8	globl
+scall	sys_epoll_ctl		0xffffffffffff00e9	globl
 scall	getdents		0x0063011020c400d9	globl hidden # four args b/c xnu, getdirentries on xnu, 32-bit on xnu/freebsd, getdents64 on linux, 64-bit on openbsd
 scall	set_tid_address		0xffffffffffff00da	globl
 scall	restart_syscall		0xffffffffffff00db	globl
 scall	semtimedop		0xffffffffffff00dc	globl
-scall	'fadvise$sysv'		0xffff0213ffff00dd	globl hidden
+scall	sys_fadvise		0xffff0213ffff00dd	globl hidden
 scall	timer_create		0xffffffffffff00de	globl
 scall	timer_settime		0xffffffffffff00df	globl
 scall	timer_gettime		0xffffffffffff00e0	globl
 scall	timer_getoverrun	0xffffffffffff00e1	globl
 scall	timer_delete		0xffffffffffff00e2	globl
 scall	clock_settime		0x005800e9ffff00e3	globl
-scall	'clock_gettime$sysv'	0x005700e8ffff00e4	globl hidden # Linux 2.6+ (c. 2003); XNU uses magic address
+scall	sys_clock_gettime	0x005700e8ffff00e4	globl hidden # Linux 2.6+ (c. 2003); XNU uses magic address
 scall	clock_getres		0x005900eaffff00e5	globl
 scall	clock_nanosleep		0xffff00f4ffff00e6	globl
 scall	tgkill			0xffffffffffff00ea	globl
@@ -276,40 +276,40 @@ scall	ioprio_get		0xffffffffffff00fc	globl
 scall	inotify_init		0xffffffffffff00fd	globl # wicked
 scall	inotify_add_watch	0xffffffffffff00fe	globl
 scall	inotify_rm_watch	0xffffffffffff00ff	globl
-scall	'openat$sysv'		0x014101f321cf0101	globl hidden # Linux 2.6.16+ (c. 2007)
-scall	'mkdirat$sysv'		0x013e01f021db0102	globl hidden
-scall	'fchownat$sysv'		0x013b01eb21d40104	globl hidden # @asyncsignalsafe
-scall	'utime$sysv'		0xffffffffffff0084	globl hidden
-scall	'utimes$sysv'		0x004c008a208a00eb	globl hidden
-scall	'futimesat$sysv'	0xffff01eeffff0105	globl hidden # @asyncsignalsafe
-scall	'futimes$sysv'		0x004d00ce208bffff	globl hidden
-scall	'futimens$sysv'		0x00550222ffffffff	globl hidden
-scall	'__fstatat$sysv'	0x002a022821d60106	globl hidden # a.k.a. newfstatat(); FreeBSD 12+; needs stat2linux()
-scall	'unlinkat$sysv'		0x014501f721d80107	globl hidden
-scall	'renameat$sysv'		0x014301f521d10108	globl hidden
-scall	'linkat$sysv'		0x013d01ef21d70109	globl hidden
-scall	'symlinkat$sysv'	0x014401f621da010a	globl hidden
-scall	'readlinkat$sysv'	0x014201f421d9010b	globl hidden
-scall	'fchmodat$sysv'		0x013a01ea21d3010c	globl hidden
-scall	'faccessat$sysv'	0x013901e921d2010d	globl hidden
+scall	sys_openat		0x014101f321cf0101	globl hidden # Linux 2.6.16+ (c. 2007)
+scall	sys_mkdirat		0x013e01f021db0102	globl hidden
+scall	sys_fchownat		0x013b01eb21d40104	globl hidden # @asyncsignalsafe
+scall	sys_utime		0xffffffffffff0084	globl hidden
+scall	sys_utimes		0x004c008a208a00eb	globl hidden
+scall	sys_futimesat		0xffff01eeffff0105	globl hidden # @asyncsignalsafe
+scall	sys_futimes		0x004d00ce208bffff	globl hidden
+scall	sys_futimens		0x00550222ffffffff	globl hidden
+scall	__sys_fstatat		0x002a022821d60106	globl hidden # a.k.a. newfstatat(); FreeBSD 12+; needs __stat2linux()
+scall	sys_unlinkat		0x014501f721d80107	globl hidden
+scall	sys_renameat		0x014301f521d10108	globl hidden
+scall	sys_linkat		0x013d01ef21d70109	globl hidden
+scall	sys_symlinkat		0x014401f621da010a	globl hidden
+scall	sys_readlinkat		0x014201f421d9010b	globl hidden
+scall	sys_fchmodat		0x013a01ea21d3010c	globl hidden
+scall	sys_faccessat		0x013901e921d2010d	globl hidden
 scall	unshare			0xffffffffffff0110	globl
-scall	'splice$sysv'		0xffffffffffff0113	globl hidden # Linux 2.6.17+ (c. 2007)
+scall	sys_splice		0xffffffffffff0113	globl hidden # Linux 2.6.17+ (c. 2007)
 scall	tee			0xffffffffffff0114	globl        # Linux 2.6.17+
-scall	'sync_file_range$sysv'	0xffffffffffff0115	globl hidden # Linux 2.6.17+
-scall	'vmsplice$sysv'		0xffffffffffff0116	globl hidden
+scall	sys_sync_file_range	0xffffffffffff0115	globl hidden # Linux 2.6.17+
+scall	sys_vmsplice		0xffffffffffff0116	globl hidden
 scall	migrate_pages		0xffffffffffff0100	globl        # numa numa yay
 scall	move_pages		0xffffffffffff0117	globl        # NOTE: We view Red Hat versions as "epochs" for all distros.
 #──────────────────────RHEL 5.0 LIMIT────────────────────────        # ←┬─ last distro with gplv2 licensed compiler c. 2007
-scall	'__preadv$sysv'		0x010b0121ffff0127	globl hidden #  ├─ last distro with system v shell script init
-scall	'__pwritev$sysv'	0x010c0122ffff0128	globl hidden #  ├─ rob landley unleashes busybox gpl lawsuits
-scall	'__utimensat$sysv'	0x00540223ffff0118	globl hidden #  ├─ python modules need this due to pep513
-scall	'fallocate$sysv'	0xffffffffffff011d	globl hidden #  ├─ end of life 2020-11-30 (extended)
-scall	'posix_fallocate$sysv'	0xffff0212ffffffff	globl hidden #  └─ cosmopolitan supports rhel5+
-scall	'__accept4$sysv'	0x005d021dffff0120	globl hidden # Linux 2.6.28+
-scall	'__dup3$sysv'		0x0066ffffffff0124	globl hidden # Linux 2.6.27+
-scall	'__pipe2$sysv'		0x0065021effff0125	globl hidden # Linux 2.6.27+
+scall	__sys_preadv		0x010b0121ffff0127	globl hidden #  ├─ last distro with system v shell script init
+scall	__sys_pwritev		0x010c0122ffff0128	globl hidden #  ├─ rob landley unleashes busybox gpl lawsuits
+scall	__sys_utimensat		0x00540223ffff0118	globl hidden #  ├─ python modules need this due to pep513
+scall	sys_fallocate		0xffffffffffff011d	globl hidden #  ├─ end of life 2020-11-30 (extended)
+scall	sys_posix_fallocate	0xffff0212ffffffff	globl hidden #  └─ cosmopolitan supports rhel5+
+scall	__sys_accept4		0x005d021dffff0120	globl hidden # Linux 2.6.28+
+scall	__sys_dup3		0x0066ffffffff0124	globl hidden # Linux 2.6.27+
+scall	__sys_pipe2		0x0065021effff0125	globl hidden # Linux 2.6.27+
 scall	epoll_pwait		0xffffffffffff0119	globl
-scall	'epoll_create1$sysv'	0xffffffffffff0123	globl
+scall	sys_epoll_create1	0xffffffffffff0123	globl
 scall	perf_event_open		0xffffffffffff012a	globl
 scall	inotify_init1		0xffffffffffff0126	globl
 scall	rt_tgsigqueueinfo	0xffffffffffff0129	globl
@@ -341,7 +341,7 @@ scall	sched_setattr		0xffffffffffff013a	globl #  ├─ desktop replaced with ta
 scall	sched_getattr		0xffffffffffff013b	globl #  ├─ karen sandler requires systemd init and boot for tablet gui
 scall	renameat2		0xffffffffffff013c	globl #  └─ debian founder ian murdock found strangled with vacuum cord
 scall	seccomp			0xffffffffffff013d	globl
-scall	'getrandom$sysv'	0x0007023321f4013e	globl hidden  # Linux 3.17+ and getentropy() on XNU/OpenBSD
+scall	sys_getrandom		0x0007023321f4013e	globl hidden  # Linux 3.17+ and getentropy() on XNU/OpenBSD
 scall	memfd_create		0xffffffffffff013f	globl # wut
 scall	kexec_file_load		0xffffffffffff0140	globl
 scall	bpf			0xffffffffffff0141	globl
@@ -349,7 +349,7 @@ scall	execveat		0xffffffffffff0142	globl
 scall	userfaultfd		0xffffffffffff0143	globl # Linux 4.3+ (c. 2015)
 scall	membarrier		0xffffffffffff0144	globl # Linux 4.3+ (c. 2015)
 scall	mlock2			0xffffffffffff0145	globl # Linux 4.5+ (c. 2016)
-scall	'copy_file_range$sysv'	0xffff0239ffff0146	globl hidden # Linux 4.5+ (c. 2016), FreeBSD 13+
+scall	sys_copy_file_range	0xffff0239ffff0146	globl hidden # Linux 4.5+ (c. 2016), FreeBSD 13+
 scall	preadv2			0xffffffffffff0147	globl
 scall	pwritev2		0xffffffffffff0148	globl
 scall	pkey_mprotect		0xffffffffffff0149	globl
@@ -385,8 +385,8 @@ scall	getfsstat		0x003e022d215bffff	globl
 scall	nfssvc			0x009b009b209bffff	globl
 scall	adjtime			0x008c008c208cffff	globl
 scall	fchflags		0x002300232023ffff	globl
-scall	'__seteuid$bsd'		0x00b700b720b7ffff	globl hidden # wrapped via setreuid()
-scall	'__setegid$bsd'		0x00b600b620b6ffff	globl hidden # wrapped via setregid()
+scall	__bsd_seteuid		0x00b700b720b7ffff	globl hidden # wrapped via setreuid()
+scall	__bsd_setegid		0x00b600b620b6ffff	globl hidden # wrapped via setregid()
 scall	fpathconf		0x00c000c020c0ffff	globl
 scall	fhopen			0x0108012a20f8ffff	globl
 scall	unmount			0x00160016209fffff	globl
@@ -656,7 +656,7 @@ scall	gethostid		0xffff008effffffff	globl
 #scall	gethostname		0xffff0057ffffffff	globl
 scall	getkerninfo		0xffff003fffffffff	globl
 scall	getloginclass		0xffff020bffffffff	globl
-scall	'getpagesize$freebsd'	0xffff0040ffffffff	globl hidden
+scall	getpagesize_freebsd	0xffff0040ffffffff	globl hidden
 scall	gssd_syscall		0xffff01f9ffffffff	globl
 scall	jail			0xffff0152ffffffff	globl
 scall	jail_attach		0xffff01b4ffffffff	globl
@@ -711,7 +711,7 @@ scall	nstat			0xffff0116ffffffff	globl
 scall	pdfork			0xffff0206ffffffff	globl
 scall	pdgetpid		0xffff0208ffffffff	globl
 scall	pdkill			0xffff0207ffffffff	globl
-scall	'posix_openpt$sysv'	0xffff01f8ffffffff	globl hidden
+scall	sys_posix_openpt	0xffff01f8ffffffff	globl hidden
 scall	procctl			0xffff0220ffffffff	globl
 scall	psynch_cvwait		0xffffffff2131ffff	globl
 scall	quota			0xffff0095ffffffff	globl
diff --git a/libc/testlib/showerror.c b/libc/testlib/showerror.c
index 4ae2887dc..06ef39c90 100644
--- a/libc/testlib/showerror.c
+++ b/libc/testlib/showerror.c
@@ -33,8 +33,8 @@ testonly void testlib_showerror(const char *file, int line, const char *func,
                                 const char *method, const char *symbol,
                                 const char *code, char *v1, char *v2) {
   /* TODO(jart): Pay off tech debt re duplication */
-  getpid$sysv(); /* make strace easier to read */
-  getpid$sysv();
+  sys_getpid(); /* make strace easier to read */
+  sys_getpid();
   fprintf(stderr,
           "%s%s%s%s:%s:%d%s: %s() %s %s(%s)\n"
           "\t%s\n"
diff --git a/libc/testlib/testmain.c b/libc/testlib/testmain.c
index 091c44007..75b572d3e 100644
--- a/libc/testlib/testmain.c
+++ b/libc/testlib/testmain.c
@@ -74,7 +74,7 @@ testonly int main(int argc, char *argv[]) {
   GetOpts(argc, argv);
   showcrashreports();
   g_testlib_shoulddebugbreak = IsDebuggerPresent(false);
-  getpid$sysv(); /* make strace easier to read */
+  sys_getpid(); /* make strace easier to read */
   testlib_clearxmmregisters();
   testlib_runalltests();
   if (!g_testlib_failed && runbenchmarks_ && weaken(testlib_runallbenchmarks)) {
diff --git a/libc/testlib/testrunner.c b/libc/testlib/testrunner.c
index 6a226016b..806c367d5 100644
--- a/libc/testlib/testrunner.c
+++ b/libc/testlib/testrunner.c
@@ -77,11 +77,11 @@ testonly void testlib_runtestcases(testfn_t *start, testfn_t *end,
     if (weaken(SetUp)) weaken(SetUp)();
     errno = 0;
     SetLastError(0);
-    getpid$sysv();
+    sys_getpid();
     if (warmup) warmup();
     testlib_clearxmmregisters();
     (*fn)();
-    getpid$sysv();
+    sys_getpid();
     if (weaken(TearDown)) weaken(TearDown)();
     if (weaken(testlib_enable_tmp_setup_teardown)) {
       CHECK_NE(-1, chdir(cwd));
diff --git a/libc/zipos/close.c b/libc/zipos/close.c
index 6be9b02d4..4edce2397 100644
--- a/libc/zipos/close.c
+++ b/libc/zipos/close.c
@@ -31,7 +31,7 @@ int __zipos_close(int fd) {
   struct ZiposHandle *h;
   h = (struct ZiposHandle *)(intptr_t)g_fds.p[fd].handle;
   if (!IsWindows()) {
-    close$sysv(fd);
+    sys_close(fd);
   } else {
     CloseHandle(h->handle);
   }
diff --git a/third_party/dlmalloc/dlmalloc.c b/third_party/dlmalloc/dlmalloc.c
index 4e02470dc..3fdcfba37 100644
--- a/third_party/dlmalloc/dlmalloc.c
+++ b/third_party/dlmalloc/dlmalloc.c
@@ -836,7 +836,7 @@ textstartup void dlmalloc_init(void) {
   if (g_mparams.magic == 0) {
     size_t magic;
     size_t psize = PAGESIZE;
-    size_t gsize = MAX(g_ntsysteminfo.dwAllocationGranularity, 64 * 1024);
+    size_t gsize = MAX(__nt_systeminfo.dwAllocationGranularity, 64 * 1024);
     /* Sanity-check configuration:
        size_t must be unsigned and as wide as pointer type.
        ints must be at least 4 bytes.
diff --git a/tool/build/lib/syscall.c b/tool/build/lib/syscall.c
index a51ca8514..bb6d9d1a2 100644
--- a/tool/build/lib/syscall.c
+++ b/tool/build/lib/syscall.c
@@ -466,7 +466,7 @@ static int AppendIovsGuest(struct Machine *m, struct Iovs *iv, int64_t iovaddr,
 }
 
 static struct sigaction *CoerceSigactionToCosmo(
-    struct sigaction *dst, const struct sigaction$linux *src) {
+    struct sigaction *dst, const struct sigaction_linux *src) {
   if (!src) return NULL;
   memset(dst, 0, sizeof(*dst));
   ASSIGN(dst->sa_handler, src->sa_handler);
@@ -476,8 +476,8 @@ static struct sigaction *CoerceSigactionToCosmo(
   return dst;
 }
 
-static struct sigaction$linux *CoerceSigactionToLinux(
-    struct sigaction$linux *dst, const struct sigaction *src) {
+static struct sigaction_linux *CoerceSigactionToLinux(
+    struct sigaction_linux *dst, const struct sigaction *src) {
   if (!dst) return NULL;
   memset(dst, 0, sizeof(*dst));
   ASSIGN(dst->sa_handler, src->sa_handler);
@@ -1145,14 +1145,14 @@ static int OpSigaction(struct Machine *m, int sig, int64_t act, int64_t old) {
   int rc;
   struct OpSigactionMemory {
     struct sigaction act, old;
-    uint8_t b[sizeof(struct sigaction$linux)];
+    uint8_t b[sizeof(struct sigaction_linux)];
     void *p[2];
   } * mem;
   if (!(mem = malloc(sizeof(*mem)))) return enomem();
   if ((rc = sigaction(
            XlatSignal(sig),
            CoerceSigactionToCosmo(
-               &mem->act, LoadBuf(m, act, sizeof(struct sigaction$linux))),
+               &mem->act, LoadBuf(m, act, sizeof(struct sigaction_linux))),
            &mem->old)) != -1) {
     CoerceSigactionToLinux(BeginStoreNp(m, old, sizeof(mem->b), mem->p, mem->b),
                            &mem->old);
diff --git a/tool/viz/printpeb.c b/tool/viz/printpeb.c
index aee83de7a..42bc96214 100644
--- a/tool/viz/printpeb.c
+++ b/tool/viz/printpeb.c
@@ -87,7 +87,7 @@ noasan void PrintStartupInfo(void) {
 ╚──────────────────────────────────────────────────────────────────────────────╝\n\
 \n");
 #define X(D, F) \
-  printf("%s.%-22s= " D "\n", "g_ntstartupinfo", #F, g_ntstartupinfo.F);
+  printf("%s.%-22s= " D "\n", "__nt_startupinfo", #F, __nt_startupinfo.F);
   X("%u", cb);
   X("%p", lpReserved);
   X("%hs", lpDesktop);
@@ -99,8 +99,8 @@ noasan void PrintStartupInfo(void) {
   X("%u", dwXCountChars);
   X("%u", dwYCountChars);
   X("%u", dwFillAttribute);
-  printf("%s.%-22s: %s\n", "g_ntstartupinfo", "dwFlags",
-         RecreateFlags(kNtStartfFlagNames, g_ntstartupinfo.dwFlags));
+  printf("%s.%-22s: %s\n", "__nt_startupinfo", "dwFlags",
+         RecreateFlags(kNtStartfFlagNames, __nt_startupinfo.dwFlags));
   X("%hu", wShowWindow);
   X("%hu", cbReserved2);
   X("%s", lpReserved2);
@@ -117,7 +117,7 @@ void PrintSystemInfo(void) {
 ╚──────────────────────────────────────────────────────────────────────────────╝\n\
 \n");
 #define X(D, F) \
-  printf("%s.%-28s= " D "\n", "g_ntsysteminfo", #F, g_ntsysteminfo.F);
+  printf("%s.%-28s= " D "\n", "__nt_systeminfo", #F, __nt_systeminfo.F);
   X("%08x", dwOemId);
   X("%04hx", wProcessorArchitecture);
   X("%d", dwPageSize);