diff --git a/dsp/core/scalevolume.c b/dsp/core/scalevolume.c
index 4586aeb22..2ca6e479f 100644
--- a/dsp/core/scalevolume.c
+++ b/dsp/core/scalevolume.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/core.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 
 /**
diff --git a/dsp/tty/ident.c b/dsp/tty/ident.c
index 9e28c817d..da830cab7 100644
--- a/dsp/tty/ident.c
+++ b/dsp/tty/ident.c
@@ -21,7 +21,7 @@
 #include "libc/calls/termios.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/intrin/weaken.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
diff --git a/dsp/tty/ttymove.c b/dsp/tty/ttymove.c
index 48d6696e4..838259f7e 100644
--- a/dsp/tty/ttymove.c
+++ b/dsp/tty/ttymove.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/itoa8.h"
 #include "dsp/tty/tty.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 
diff --git a/dsp/tty/ttyraster.c b/dsp/tty/ttyraster.c
index 1ced9e374..a4e5e98fd 100644
--- a/dsp/tty/ttyraster.c
+++ b/dsp/tty/ttyraster.c
@@ -22,7 +22,7 @@
 #include "dsp/tty/ttyrgb.h"
 #include "dsp/tty/windex.h"
 #include "libc/assert.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
diff --git a/examples/nesemu1.cc b/examples/nesemu1.cc
index 0104fd100..a7799bff0 100644
--- a/examples/nesemu1.cc
+++ b/examples/nesemu1.cc
@@ -19,7 +19,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/inttypes.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
diff --git a/examples/unbourne.c b/examples/unbourne.c
index c8fe70c0f..0500f1088 100644
--- a/examples/unbourne.c
+++ b/examples/unbourne.c
@@ -122,7 +122,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
diff --git a/libc/calls/assertfail.c b/libc/calls/assertfail.c
index 9a15d2e8c..dc69fca5c 100644
--- a/libc/calls/assertfail.c
+++ b/libc/calls/assertfail.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describebacktrace.internal.h"
+#include "libc/intrin/describebacktrace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/symbols.internal.h"
 
diff --git a/libc/calls/cachestat.c b/libc/calls/cachestat.c
index 0163aeed7..6ab48a757 100644
--- a/libc/calls/cachestat.c
+++ b/libc/calls/cachestat.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 
 #include "libc/calls/cachestat.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 int sys_cachestat(int, struct cachestat_range *, struct cachestat *, uint32_t);
 
diff --git a/libc/calls/chdir.c b/libc/calls/chdir.c
index b37eaf655..876dedb60 100644
--- a/libc/calls/chdir.c
+++ b/libc/calls/chdir.c
@@ -20,7 +20,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/log.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/calls/chroot.c b/libc/calls/chroot.c
index c5256fd1a..e18ed88c0 100644
--- a/libc/calls/chroot.c
+++ b/libc/calls/chroot.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/clktck.c b/libc/calls/clktck.c
index b59a73711..3e39b4e3f 100644
--- a/libc/calls/clktck.c
+++ b/libc/calls/clktck.c
@@ -20,7 +20,7 @@
 #include "libc/calls/calls.h"
 #include "libc/dce.h"
 #include "libc/fmt/wintime.internal.h"
-#include "libc/intrin/getauxval.internal.h"
+#include "libc/intrin/getauxval.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/consts/auxv.h"
 
diff --git a/libc/calls/clock_getres.c b/libc/calls/clock_getres.c
index e400e0569..fae7959c4 100644
--- a/libc/calls/clock_getres.c
+++ b/libc/calls/clock_getres.c
@@ -18,8 +18,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/struct/timespec.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/clock.h"
 #include "libc/sysv/errfuns.h"
 #include "libc/time.h"
diff --git a/libc/calls/clock_gettime.c b/libc/calls/clock_gettime.c
index c5f72fdd9..2aac56c98 100644
--- a/libc/calls/clock_gettime.c
+++ b/libc/calls/clock_gettime.c
@@ -21,8 +21,8 @@
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/syslib.internal.h"
 
 #ifdef __aarch64__
diff --git a/libc/calls/clock_nanosleep-sys.c b/libc/calls/clock_nanosleep-sys.c
index 3d0e5cef8..d33d9454c 100644
--- a/libc/calls/clock_nanosleep-sys.c
+++ b/libc/calls/clock_nanosleep-sys.c
@@ -22,8 +22,8 @@
 #include "libc/calls/struct/timespec.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/sysv/errfuns.h"
 #include "libc/thread/thread.h"
diff --git a/libc/calls/clock_settime.c b/libc/calls/clock_settime.c
index e738d35df..b618cbdec 100644
--- a/libc/calls/clock_settime.c
+++ b/libc/calls/clock_settime.c
@@ -21,8 +21,8 @@
 #include "libc/calls/struct/timeval.h"
 #include "libc/calls/struct/timeval.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/clock.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/close-nt.c b/libc/calls/close-nt.c
index 5d5b49645..74475c8d3 100644
--- a/libc/calls/close-nt.c
+++ b/libc/calls/close-nt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/intrin/weaken.h"
diff --git a/libc/calls/close.c b/libc/calls/close.c
index d054f8199..979d24937 100644
--- a/libc/calls/close.c
+++ b/libc/calls/close.c
@@ -20,14 +20,14 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sock/syscall_fd.internal.h"
diff --git a/libc/calls/close_range.c b/libc/calls/close_range.c
index adf2049e5..3ee22d119 100644
--- a/libc/calls/close_range.c
+++ b/libc/calls/close_range.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/closefrom.c b/libc/calls/closefrom.c
index f102259cf..fe30a4672 100644
--- a/libc/calls/closefrom.c
+++ b/libc/calls/closefrom.c
@@ -21,7 +21,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/commandv.c b/libc/calls/commandv.c
index a603e4373..925ffbe1c 100644
--- a/libc/calls/commandv.c
+++ b/libc/calls/commandv.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/paths.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/copy_file_range.c b/libc/calls/copy_file_range.c
index d35fcbc9a..af90ab52d 100644
--- a/libc/calls/copy_file_range.c
+++ b/libc/calls/copy_file_range.c
@@ -27,8 +27,8 @@
 #include "libc/cosmo.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/sig.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/dup.c b/libc/calls/dup.c
index caab149ee..e502622fb 100644
--- a/libc/calls/dup.c
+++ b/libc/calls/dup.c
@@ -21,7 +21,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/dup2.c b/libc/calls/dup2.c
index 34d42dd12..3d5178259 100644
--- a/libc/calls/dup2.c
+++ b/libc/calls/dup2.c
@@ -23,7 +23,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/dup3-sysv.c b/libc/calls/dup3-sysv.c
index 5f7889091..93cf8a732 100644
--- a/libc/calls/dup3-sysv.c
+++ b/libc/calls/dup3-sysv.c
@@ -22,7 +22,7 @@
 #include "libc/cosmo.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/o.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/dup3.c b/libc/calls/dup3.c
index 368942c61..4d2f327cc 100644
--- a/libc/calls/dup3.c
+++ b/libc/calls/dup3.c
@@ -23,7 +23,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/faccessat.c b/libc/calls/faccessat.c
index 7493e5e90..f9df7a9c0 100644
--- a/libc/calls/faccessat.c
+++ b/libc/calls/faccessat.c
@@ -22,8 +22,8 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sysv/consts/at.h"
diff --git a/libc/calls/fadvise.c b/libc/calls/fadvise.c
index fb191ff34..36078bbcd 100644
--- a/libc/calls/fadvise.c
+++ b/libc/calls/fadvise.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/fchdir.c b/libc/calls/fchdir.c
index cfa17b725..509d078f3 100644
--- a/libc/calls/fchdir.c
+++ b/libc/calls/fchdir.c
@@ -21,7 +21,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/fchmod-nt.c b/libc/calls/fchmod-nt.c
index 5b31226c0..bd3249070 100644
--- a/libc/calls/fchmod-nt.c
+++ b/libc/calls/fchmod-nt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/nt/enum/fileflagandattributes.h"
diff --git a/libc/calls/fchmod.c b/libc/calls/fchmod.c
index a4070cb02..88a0221d9 100644
--- a/libc/calls/fchmod.c
+++ b/libc/calls/fchmod.c
@@ -21,7 +21,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/fchmodat.c b/libc/calls/fchmodat.c
index e5bbc9bdf..744ad5bdb 100644
--- a/libc/calls/fchmodat.c
+++ b/libc/calls/fchmodat.c
@@ -22,8 +22,8 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/fchown.c b/libc/calls/fchown.c
index e105e7bb6..2418873b8 100644
--- a/libc/calls/fchown.c
+++ b/libc/calls/fchown.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/at.h"
 
 /**
diff --git a/libc/calls/fchownat.c b/libc/calls/fchownat.c
index 132cacac5..235f403ff 100644
--- a/libc/calls/fchownat.c
+++ b/libc/calls/fchownat.c
@@ -19,8 +19,8 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/fcntl-nt.c b/libc/calls/fcntl-nt.c
index 73584e48d..a94130412 100644
--- a/libc/calls/fcntl-nt.c
+++ b/libc/calls/fcntl-nt.c
@@ -20,7 +20,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/createfileflags.internal.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/flock.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/syscall-nt.internal.h"
diff --git a/libc/calls/fcntl.c b/libc/calls/fcntl.c
index 497ff2ccb..5193c291e 100644
--- a/libc/calls/fcntl.c
+++ b/libc/calls/fcntl.c
@@ -24,8 +24,8 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/fdatasync.c b/libc/calls/fdatasync.c
index a452e6bdf..0bf8c3453 100644
--- a/libc/calls/fdatasync.c
+++ b/libc/calls/fdatasync.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/fdexists.c b/libc/calls/fdexists.c
index fd5b9b71b..0965ec528 100644
--- a/libc/calls/fdexists.c
+++ b/libc/calls/fdexists.c
@@ -21,7 +21,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/f.h"
 
 /**
diff --git a/libc/calls/fileexists.c b/libc/calls/fileexists.c
index 03d3a9b80..56d58474d 100644
--- a/libc/calls/fileexists.c
+++ b/libc/calls/fileexists.c
@@ -23,7 +23,7 @@
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nt/files.h"
 #include "libc/runtime/zipos.internal.h"
diff --git a/libc/calls/finddebugbinary.c b/libc/calls/finddebugbinary.c
index b4bae854e..e8afd3935 100644
--- a/libc/calls/finddebugbinary.c
+++ b/libc/calls/finddebugbinary.c
@@ -26,7 +26,7 @@
 #include "libc/elf/def.h"
 #include "libc/elf/tinyelf.internal.h"
 #include "libc/errno.h"
-#include "libc/intrin/directmap.internal.h"
+#include "libc/intrin/directmap.h"
 #include "libc/nt/memory.h"
 #include "libc/nt/runtime.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/calls/flock-nt.c b/libc/calls/flock-nt.c
index 734362ffa..1f23a0e69 100644
--- a/libc/calls/flock-nt.c
+++ b/libc/calls/flock-nt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/nt/enum/filelockflags.h"
diff --git a/libc/calls/flock.c b/libc/calls/flock.c
index 080e2f1f7..2935e1e65 100644
--- a/libc/calls/flock.c
+++ b/libc/calls/flock.c
@@ -21,7 +21,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Acquires lock on file.
diff --git a/libc/calls/fstat-nt.c b/libc/calls/fstat-nt.c
index 97a941b1c..3c6b8c1cd 100644
--- a/libc/calls/fstat-nt.c
+++ b/libc/calls/fstat-nt.c
@@ -19,14 +19,14 @@
 #include "libc/assert.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/calls/struct/stat.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/fmt/wintime.internal.h"
 #include "libc/intrin/atomic.h"
 #include "libc/intrin/bsr.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/alloca.h"
 #include "libc/nt/enum/fileflagandattributes.h"
diff --git a/libc/calls/fstat.c b/libc/calls/fstat.c
index bec74978d..094ae5347 100644
--- a/libc/calls/fstat.c
+++ b/libc/calls/fstat.c
@@ -20,8 +20,8 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/stat.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/fstatat-nt.c b/libc/calls/fstatat-nt.c
index b8b75e8f8..1415cb84c 100644
--- a/libc/calls/fstatat-nt.c
+++ b/libc/calls/fstatat-nt.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/struct/stat.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
diff --git a/libc/calls/fstatat.c b/libc/calls/fstatat.c
index 9e4247067..0d4946f95 100644
--- a/libc/calls/fstatat.c
+++ b/libc/calls/fstatat.c
@@ -23,8 +23,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/log.h"
 #include "libc/mem/alloca.h"
diff --git a/libc/calls/fstatfs.c b/libc/calls/fstatfs.c
index 607acb621..fee2e5039 100644
--- a/libc/calls/fstatfs.c
+++ b/libc/calls/fstatfs.c
@@ -19,11 +19,11 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/cp.internal.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/statfs-meta.internal.h"
 #include "libc/calls/struct/statfs.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/stack.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/fsync.c b/libc/calls/fsync.c
index 95a28e45e..72c2bd823 100644
--- a/libc/calls/fsync.c
+++ b/libc/calls/fsync.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/ftruncate.c b/libc/calls/ftruncate.c
index e441d4617..0b76efa4c 100644
--- a/libc/calls/ftruncate.c
+++ b/libc/calls/ftruncate.c
@@ -23,7 +23,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/futimens.c b/libc/calls/futimens.c
index 5a45ef505..e2c2332db 100644
--- a/libc/calls/futimens.c
+++ b/libc/calls/futimens.c
@@ -19,7 +19,7 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/timespec.h"
 #include "libc/calls/struct/timespec.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/futimes.c b/libc/calls/futimes.c
index 50f814c14..0bb6572cf 100644
--- a/libc/calls/futimes.c
+++ b/libc/calls/futimes.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/timeval.h"
 #include "libc/calls/struct/timeval.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/getcwd.greg.c b/libc/calls/getcwd.greg.c
index edabb8af1..81dde1559 100644
--- a/libc/calls/getcwd.greg.c
+++ b/libc/calls/getcwd.greg.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/nt/files.h"
 #include "libc/stdio/sysparam.h"
diff --git a/libc/calls/getdomainname.c b/libc/calls/getdomainname.c
index b188ff066..9cfb722f6 100644
--- a/libc/calls/getdomainname.c
+++ b/libc/calls/getdomainname.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/computernameformat.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/getegid.c b/libc/calls/getegid.c
index 09d8cec0d..c48ab96cc 100644
--- a/libc/calls/getegid.c
+++ b/libc/calls/getegid.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 
 /**
diff --git a/libc/calls/geteuid.c b/libc/calls/geteuid.c
index aa618ddcc..eedafcd9c 100644
--- a/libc/calls/geteuid.c
+++ b/libc/calls/geteuid.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Returns effective user ID of calling process.
diff --git a/libc/calls/getgroups.c b/libc/calls/getgroups.c
index 72d49a49a..d4c8fe1a9 100644
--- a/libc/calls/getgroups.c
+++ b/libc/calls/getgroups.c
@@ -19,8 +19,8 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/groups.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/stdckdint.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/gethostname.c b/libc/calls/gethostname.c
index 6419fbae2..10a3cb12c 100644
--- a/libc/calls/gethostname.c
+++ b/libc/calls/gethostname.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/enum/computernameformat.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/getloadavg.c b/libc/calls/getloadavg.c
index eb28d34c4..ad13a8610 100644
--- a/libc/calls/getloadavg.c
+++ b/libc/calls/getloadavg.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/sysinfo.internal.h"
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 #define CTL_VM     2
diff --git a/libc/calls/getpgid.c b/libc/calls/getpgid.c
index 3b6760ddd..ba353cd7d 100644
--- a/libc/calls/getpgid.c
+++ b/libc/calls/getpgid.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Returns process group id.
diff --git a/libc/calls/getpgrp.c b/libc/calls/getpgrp.c
index 6ba24c23c..718b7b8a5 100644
--- a/libc/calls/getpgrp.c
+++ b/libc/calls/getpgrp.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Returns process group id of calling process.
diff --git a/libc/calls/getppid.c b/libc/calls/getppid.c
index 075d610a7..e1f80863a 100644
--- a/libc/calls/getppid.c
+++ b/libc/calls/getppid.c
@@ -20,7 +20,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Returns parent process id.
diff --git a/libc/calls/getprogramexecutablename.greg.c b/libc/calls/getprogramexecutablename.greg.c
index 067e7a0a3..12f02933c 100644
--- a/libc/calls/getprogramexecutablename.greg.c
+++ b/libc/calls/getprogramexecutablename.greg.c
@@ -24,8 +24,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/libgen.h"
-#include "libc/intrin/getenv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/getenv.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/runtime.h"
diff --git a/libc/calls/getrandom.c b/libc/calls/getrandom.c
index b15abf069..957c7bc18 100644
--- a/libc/calls/getrandom.c
+++ b/libc/calls/getrandom.c
@@ -30,7 +30,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/asmflag.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/macros.internal.h"
 #include "libc/nexgen32e/kcpuids.h"
diff --git a/libc/calls/getresgid.c b/libc/calls/getresgid.c
index 53edea9f1..584d9f1c0 100644
--- a/libc/calls/getresgid.c
+++ b/libc/calls/getresgid.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Gets real, effective, and "saved" group ids.
diff --git a/libc/calls/getresuid.c b/libc/calls/getresuid.c
index 7234882e1..c7e1257b8 100644
--- a/libc/calls/getresuid.c
+++ b/libc/calls/getresuid.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Gets real, effective, and "saved" user ids.
diff --git a/libc/calls/getrlimit.c b/libc/calls/getrlimit.c
index f02ac5226..de7df079e 100644
--- a/libc/calls/getrlimit.c
+++ b/libc/calls/getrlimit.c
@@ -20,8 +20,8 @@
 #include "libc/calls/struct/rlimit.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/stack.h"
 #include "libc/runtime/syslib.internal.h"
diff --git a/libc/calls/getsid.c b/libc/calls/getsid.c
index 7c76e9b76..6c71174d0 100644
--- a/libc/calls/getsid.c
+++ b/libc/calls/getsid.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Creates session and sets the process group id.
diff --git a/libc/calls/getuid.c b/libc/calls/getuid.c
index bebd5cee8..483be9c15 100644
--- a/libc/calls/getuid.c
+++ b/libc/calls/getuid.c
@@ -23,7 +23,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/calls/grantpt.c b/libc/calls/grantpt.c
index ee8c14ed5..476b82f86 100644
--- a/libc/calls/grantpt.c
+++ b/libc/calls/grantpt.c
@@ -17,12 +17,12 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/calls/termios.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 #define TIOCPTYGRANT 0x20007454
diff --git a/libc/calls/internal.h b/libc/calls/internal.h
index 5640aa719..8a9b54819 100644
--- a/libc/calls/internal.h
+++ b/libc/calls/internal.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_LIBC_CALLS_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_CALLS_INTERNAL_H_
 #include "libc/atomic.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/sigval.h"
 #include "libc/dce.h"
 #include "libc/macros.internal.h"
diff --git a/libc/calls/ioctl.c b/libc/calls/ioctl.c
index 87ea17031..bd0c0642d 100644
--- a/libc/calls/ioctl.c
+++ b/libc/calls/ioctl.c
@@ -18,14 +18,14 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/calls/termios.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/cmpxchg.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/alloca.h"
diff --git a/libc/calls/isatty-nt.c b/libc/calls/isatty-nt.c
index 7098291a5..72342c683 100644
--- a/libc/calls/isatty-nt.c
+++ b/libc/calls/isatty-nt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/isatty.c b/libc/calls/isatty.c
index f5bd51491..9462d31a9 100644
--- a/libc/calls/isatty.c
+++ b/libc/calls/isatty.c
@@ -23,7 +23,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/termios.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/isdirectory.c b/libc/calls/isdirectory.c
index c5847f7b9..9299fbf23 100644
--- a/libc/calls/isdirectory.c
+++ b/libc/calls/isdirectory.c
@@ -23,7 +23,7 @@
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nt/files.h"
 #include "libc/runtime/zipos.internal.h"
diff --git a/libc/calls/isregularfile.c b/libc/calls/isregularfile.c
index 5dd12bd97..8baa68b21 100644
--- a/libc/calls/isregularfile.c
+++ b/libc/calls/isregularfile.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sysv/consts/at.h"
diff --git a/libc/calls/issetugid.c b/libc/calls/issetugid.c
index 7dd7aa5b4..8a8a700f5 100644
--- a/libc/calls/issetugid.c
+++ b/libc/calls/issetugid.c
@@ -19,8 +19,8 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/getauxval.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/getauxval.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/auxv.h"
 
 /**
diff --git a/libc/calls/issymlink.c b/libc/calls/issymlink.c
index f030b20b6..8a6fe4c25 100644
--- a/libc/calls/issymlink.c
+++ b/libc/calls/issymlink.c
@@ -23,7 +23,7 @@
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nt/files.h"
 #include "libc/runtime/zipos.internal.h"
diff --git a/libc/calls/kemptyfd.c b/libc/calls/kemptyfd.c
index 138980eba..17f646919 100644
--- a/libc/calls/kemptyfd.c
+++ b/libc/calls/kemptyfd.c
@@ -17,6 +17,6 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 
 const struct Fd kEmptyFd;
diff --git a/libc/calls/landlock_add_rule.c b/libc/calls/landlock_add_rule.c
index 34cb1d1bb..b87c22081 100644
--- a/libc/calls/landlock_add_rule.c
+++ b/libc/calls/landlock_add_rule.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/landlock.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 int sys_landlock_add_rule(int, enum landlock_rule_type, const void *, uint32_t);
 
diff --git a/libc/calls/landlock_create_ruleset.c b/libc/calls/landlock_create_ruleset.c
index baee3b920..a8dec3f99 100644
--- a/libc/calls/landlock_create_ruleset.c
+++ b/libc/calls/landlock_create_ruleset.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/landlock.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 int sys_landlock_create_ruleset(const struct landlock_ruleset_attr *, size_t,
                                 uint32_t);
diff --git a/libc/calls/landlock_restrict_self.c b/libc/calls/landlock_restrict_self.c
index 2bf173c1e..96a36e8fd 100644
--- a/libc/calls/landlock_restrict_self.c
+++ b/libc/calls/landlock_restrict_self.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/landlock.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 int sys_landlock_restrict_self(int, uint32_t);
 
diff --git a/libc/calls/linkat.c b/libc/calls/linkat.c
index 2b3d466d3..09c2153b7 100644
--- a/libc/calls/linkat.c
+++ b/libc/calls/linkat.c
@@ -20,8 +20,8 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/lseek.c b/libc/calls/lseek.c
index 696889f2b..2cf78a674 100644
--- a/libc/calls/lseek.c
+++ b/libc/calls/lseek.c
@@ -21,8 +21,8 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/backtrace.internal.h"
 #include "libc/runtime/zipos.internal.h"
diff --git a/libc/calls/madvise.c b/libc/calls/madvise.c
index 885e727f3..8bf52c515 100644
--- a/libc/calls/madvise.c
+++ b/libc/calls/madvise.c
@@ -20,7 +20,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/memfd_create.c b/libc/calls/memfd_create.c
index fa0950ab1..9215b7736 100644
--- a/libc/calls/memfd_create.c
+++ b/libc/calls/memfd_create.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Creates anonymous file.
diff --git a/libc/calls/metalfile.c b/libc/calls/metalfile.c
index 0832d52f5..cdfb6bc5f 100644
--- a/libc/calls/metalfile.c
+++ b/libc/calls/metalfile.c
@@ -29,7 +29,7 @@
 #include "libc/assert.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/metalfile.internal.h"
-#include "libc/intrin/directmap.internal.h"
+#include "libc/intrin/directmap.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/weaken.h"
 #include "libc/macros.internal.h"
diff --git a/libc/calls/mincore.c b/libc/calls/mincore.c
index 40187d2c0..62c6a0eee 100644
--- a/libc/calls/mincore.c
+++ b/libc/calls/mincore.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Tells you which pages are resident in memory.
diff --git a/libc/calls/mkdirat.c b/libc/calls/mkdirat.c
index 3dd07d8b3..64ad9ea2d 100644
--- a/libc/calls/mkdirat.c
+++ b/libc/calls/mkdirat.c
@@ -20,8 +20,8 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sysv/consts/at.h"
diff --git a/libc/calls/mknod.c b/libc/calls/mknod.c
index 33ee93d32..2c1fa90b9 100644
--- a/libc/calls/mknod.c
+++ b/libc/calls/mknod.c
@@ -20,7 +20,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/at.h"
 #include "libc/sysv/consts/s.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/mkntenvblock.c b/libc/calls/mkntenvblock.c
index 9ea54b03e..ad47b28d2 100644
--- a/libc/calls/mkntenvblock.c
+++ b/libc/calls/mkntenvblock.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/intrin/getenv.internal.h"
+#include "libc/intrin/getenv.h"
 #include "libc/mem/alloca.h"
 #include "libc/proc/ntspawn.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/calls/mkntpath.c b/libc/calls/mkntpath.c
index 32477d412..f1ca7d153 100644
--- a/libc/calls/mkntpath.c
+++ b/libc/calls/mkntpath.c
@@ -19,7 +19,7 @@
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/systeminfo.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/mkntpathat.c b/libc/calls/mkntpathat.c
index 8eec12b4c..e1e845b55 100644
--- a/libc/calls/mkntpathat.c
+++ b/libc/calls/mkntpathat.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/fileflagandattributes.h"
 #include "libc/nt/files.h"
diff --git a/libc/calls/ntaccesscheck.c b/libc/calls/ntaccesscheck.c
index 708238736..695d5480b 100644
--- a/libc/calls/ntaccesscheck.c
+++ b/libc/calls/ntaccesscheck.c
@@ -24,7 +24,7 @@
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/mem/mem.h"
 #include "libc/nt/createfile.h"
diff --git a/libc/calls/ntspawn.c b/libc/calls/ntspawn.c
index 3cd4c8ae0..392531915 100644
--- a/libc/calls/ntspawn.c
+++ b/libc/calls/ntspawn.c
@@ -19,7 +19,7 @@
 #include "libc/proc/ntspawn.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/createfile.h"
 #include "libc/nt/enum/accessmask.h"
 #include "libc/nt/enum/creationdisposition.h"
diff --git a/libc/calls/openat-metal.c b/libc/calls/openat-metal.c
index 34d4d799d..ec958f4c0 100644
--- a/libc/calls/openat-metal.c
+++ b/libc/calls/openat-metal.c
@@ -21,7 +21,7 @@
 #include "libc/assert.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/metalfile.internal.h"
-#include "libc/intrin/directmap.internal.h"
+#include "libc/intrin/directmap.h"
 #include "libc/intrin/weaken.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
diff --git a/libc/calls/openat.c b/libc/calls/openat.c
index 94e4452bc..327867ba3 100644
--- a/libc/calls/openat.c
+++ b/libc/calls/openat.c
@@ -26,8 +26,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/log.h"
 #include "libc/runtime/zipos.internal.h"
diff --git a/libc/calls/pause.c b/libc/calls/pause.c
index 7d24dd2d9..d73537081 100644
--- a/libc/calls/pause.c
+++ b/libc/calls/pause.c
@@ -20,7 +20,7 @@
 #include "libc/calls/cp.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/internal.h"
 
 /**
diff --git a/libc/calls/pipe.c b/libc/calls/pipe.c
index 2f668c31d..1071cfaf8 100644
--- a/libc/calls/pipe.c
+++ b/libc/calls/pipe.c
@@ -20,7 +20,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/pipe2.c b/libc/calls/pipe2.c
index 36593d76c..caab1cb42 100644
--- a/libc/calls/pipe2.c
+++ b/libc/calls/pipe2.c
@@ -19,7 +19,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/o.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/pivot_root.c b/libc/calls/pivot_root.c
index aec7fe4bf..53c6af00c 100644
--- a/libc/calls/pivot_root.c
+++ b/libc/calls/pivot_root.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Changes root mount.
diff --git a/libc/calls/pledge-linux.c b/libc/calls/pledge-linux.c
index d36684bfd..fbafd3d1e 100644
--- a/libc/calls/pledge-linux.c
+++ b/libc/calls/pledge-linux.c
@@ -28,7 +28,7 @@
 #include "libc/calls/ucontext.h"
 #include "libc/intrin/bsr.h"
 #include "libc/intrin/likely.h"
-#include "libc/intrin/promises.internal.h"
+#include "libc/intrin/promises.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/stack.h"
diff --git a/libc/calls/pledge.c b/libc/calls/pledge.c
index f56af95fa..b5a6dbb63 100644
--- a/libc/calls/pledge.c
+++ b/libc/calls/pledge.c
@@ -24,8 +24,8 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/promises.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/promises.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nexgen32e/vendor.internal.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/calls/pledge.internal.h b/libc/calls/pledge.internal.h
index a133cc904..773d38b55 100644
--- a/libc/calls/pledge.internal.h
+++ b/libc/calls/pledge.internal.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_LIBC_CALLS_PLEDGE_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_CALLS_PLEDGE_INTERNAL_H_
 #include "libc/calls/pledge.h"
-#include "libc/intrin/promises.internal.h"
+#include "libc/intrin/promises.h"
 COSMOPOLITAN_C_START_
 
 struct Pledges {
diff --git a/libc/calls/poll-metal.c b/libc/calls/poll-metal.c
index 613d4d415..d81af2658 100644
--- a/libc/calls/poll-metal.c
+++ b/libc/calls/poll-metal.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/nexgen32e/rdtsc.h"
 #include "libc/nexgen32e/uart.internal.h"
 #include "libc/runtime/pc.internal.h"
diff --git a/libc/calls/poll-nt.c b/libc/calls/poll-nt.c
index f2b16e91d..ac1e64c7e 100644
--- a/libc/calls/poll-nt.c
+++ b/libc/calls/poll-nt.c
@@ -27,7 +27,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nt/console.h"
diff --git a/libc/calls/poll.c b/libc/calls/poll.c
index 0108475bb..5e13677a5 100644
--- a/libc/calls/poll.c
+++ b/libc/calls/poll.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/cp.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/struct/pollfd.h"
 #include "libc/sock/struct/pollfd.internal.h"
 #include "libc/stdckdint.h"
diff --git a/libc/calls/posix_fadvise.c b/libc/calls/posix_fadvise.c
index 2aea15d7b..f7ba74c91 100644
--- a/libc/calls/posix_fadvise.c
+++ b/libc/calls/posix_fadvise.c
@@ -19,13 +19,13 @@
 #include "libc/assert.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/posix_openpt.c b/libc/calls/posix_openpt.c
index ae36362fb..2868bba77 100644
--- a/libc/calls/posix_openpt.c
+++ b/libc/calls/posix_openpt.c
@@ -20,8 +20,8 @@
 #include "libc/calls/termios.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/at.h"
 #include "libc/sysv/consts/o.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/ppoll.c b/libc/calls/ppoll.c
index 8c2d6d38f..a50cfc5e0 100644
--- a/libc/calls/ppoll.c
+++ b/libc/calls/ppoll.c
@@ -23,7 +23,7 @@
 #include "libc/calls/struct/timespec.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/struct/pollfd.h"
 #include "libc/sock/struct/pollfd.internal.h"
 #include "libc/stdckdint.h"
diff --git a/libc/calls/prctl.c b/libc/calls/prctl.c
index 456df4cee..4d5119cf8 100644
--- a/libc/calls/prctl.c
+++ b/libc/calls/prctl.c
@@ -21,8 +21,8 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/pr.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/pread.c b/libc/calls/pread.c
index 4aa7b0c53..0064397cb 100644
--- a/libc/calls/pread.c
+++ b/libc/calls/pread.c
@@ -24,7 +24,7 @@
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/calls/preadv.c b/libc/calls/preadv.c
index 586141b80..83a6f2a86 100644
--- a/libc/calls/preadv.c
+++ b/libc/calls/preadv.c
@@ -25,7 +25,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/likely.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
 #include "libc/mem/alloca.h"
diff --git a/libc/calls/printfds.c b/libc/calls/printfds.c
index 9e3ad0e55..36cb548d7 100644
--- a/libc/calls/printfds.c
+++ b/libc/calls/printfds.c
@@ -18,8 +18,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"
-#include "libc/calls/struct/fd.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/fds.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 
 static const char *__fdkind2str(int x) {
diff --git a/libc/calls/pselect.c b/libc/calls/pselect.c
index 391d94f53..9d3036a4c 100644
--- a/libc/calls/pselect.c
+++ b/libc/calls/pselect.c
@@ -23,8 +23,8 @@
 #include "libc/calls/struct/timespec.internal.h"
 #include "libc/calls/struct/timeval.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/select.h"
 #include "libc/sock/select.internal.h"
diff --git a/libc/calls/ptrace.c b/libc/calls/ptrace.c
index 8acb3c8de..a48d0cc0a 100644
--- a/libc/calls/ptrace.c
+++ b/libc/calls/ptrace.c
@@ -19,8 +19,8 @@
 #include "libc/sysv/consts/ptrace.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/ptsname.c b/libc/calls/ptsname.c
index 67fc87abc..abf6b9f90 100644
--- a/libc/calls/ptsname.c
+++ b/libc/calls/ptsname.c
@@ -17,11 +17,11 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/calls/termios.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 static char g_ptsname[16];
diff --git a/libc/calls/pwrite.c b/libc/calls/pwrite.c
index f22f52f52..e1f030def 100644
--- a/libc/calls/pwrite.c
+++ b/libc/calls/pwrite.c
@@ -20,12 +20,12 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/cp.internal.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/stdio/sysparam.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/pwritev.c b/libc/calls/pwritev.c
index 651b320aa..d2d8cd043 100644
--- a/libc/calls/pwritev.c
+++ b/libc/calls/pwritev.c
@@ -25,7 +25,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/likely.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
 #include "libc/mem/alloca.h"
diff --git a/libc/calls/raise.c b/libc/calls/raise.c
index 8ba3e67ff..096f9bea0 100644
--- a/libc/calls/raise.c
+++ b/libc/calls/raise.c
@@ -20,7 +20,7 @@
 #include "libc/calls/sig.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/syslib.internal.h"
 #include "libc/sysv/consts/sicode.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/read-nt.c b/libc/calls/read-nt.c
index 931e9b1f9..e49d6b3d7 100644
--- a/libc/calls/read-nt.c
+++ b/libc/calls/read-nt.c
@@ -20,17 +20,17 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/sig.internal.h"
 #include "libc/calls/state.internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/cosmo.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/nomultics.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/nomultics.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/console.h"
diff --git a/libc/calls/read.c b/libc/calls/read.c
index af9461971..69b593652 100644
--- a/libc/calls/read.c
+++ b/libc/calls/read.c
@@ -23,7 +23,7 @@
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sock/internal.h"
diff --git a/libc/calls/readlinkat-nt.c b/libc/calls/readlinkat-nt.c
index ff9a6eca2..9a82c9845 100644
--- a/libc/calls/readlinkat-nt.c
+++ b/libc/calls/readlinkat-nt.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/mem/alloca.h"
 #include "libc/nt/createfile.h"
 #include "libc/nt/enum/accessmask.h"
diff --git a/libc/calls/readlinkat.c b/libc/calls/readlinkat.c
index 0312fae73..dc5041c21 100644
--- a/libc/calls/readlinkat.c
+++ b/libc/calls/readlinkat.c
@@ -19,8 +19,8 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/zipos.internal.h"
diff --git a/libc/calls/readv-metal.c b/libc/calls/readv-metal.c
index 6e43f431a..5de8ace91 100644
--- a/libc/calls/readv-metal.c
+++ b/libc/calls/readv-metal.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
 #include "libc/calls/metalfile.internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/intrin/weaken.h"
diff --git a/libc/calls/readv-serial.c b/libc/calls/readv-serial.c
index 677e3481b..5b7976dc2 100644
--- a/libc/calls/readv-serial.c
+++ b/libc/calls/readv-serial.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/nexgen32e/uart.internal.h"
 #include "libc/runtime/pc.internal.h"
diff --git a/libc/calls/readv.c b/libc/calls/readv.c
index e885ca6de..b48ca2ff6 100644
--- a/libc/calls/readv.c
+++ b/libc/calls/readv.c
@@ -23,9 +23,9 @@
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/likely.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
 #include "libc/mem/alloca.h"
diff --git a/libc/calls/readwrite-nt.c b/libc/calls/readwrite-nt.c
index 530880f4b..6fbfc1075 100644
--- a/libc/calls/readwrite-nt.c
+++ b/libc/calls/readwrite-nt.c
@@ -19,7 +19,7 @@
 #include "libc/calls/createfileflags.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/sig.internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/sigset.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/intrin/weaken.h"
diff --git a/libc/calls/renameat.c b/libc/calls/renameat.c
index 4c329abe6..80f2a230c 100644
--- a/libc/calls/renameat.c
+++ b/libc/calls/renameat.c
@@ -20,8 +20,8 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sysv/consts/at.h"
diff --git a/libc/calls/sched_get_priority_max.c b/libc/calls/sched_get_priority_max.c
index 247fea944..89fff487f 100644
--- a/libc/calls/sched_get_priority_max.c
+++ b/libc/calls/sched_get_priority_max.c
@@ -19,8 +19,8 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/sched-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/sched.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/sched_get_priority_min.c b/libc/calls/sched_get_priority_min.c
index 80059e8d1..7d9552ec1 100644
--- a/libc/calls/sched_get_priority_min.c
+++ b/libc/calls/sched_get_priority_min.c
@@ -19,8 +19,8 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/sched-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/sched.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/sched_getparam.c b/libc/calls/sched_getparam.c
index 0b5a9705f..98699211d 100644
--- a/libc/calls/sched_getparam.c
+++ b/libc/calls/sched_getparam.c
@@ -20,7 +20,7 @@
 #include "libc/calls/struct/sched_param.h"
 #include "libc/calls/struct/sched_param.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/sched_getscheduler.c b/libc/calls/sched_getscheduler.c
index fe6e39f25..d7a15554f 100644
--- a/libc/calls/sched_getscheduler.c
+++ b/libc/calls/sched_getscheduler.c
@@ -19,8 +19,8 @@
 #include "libc/calls/sched-sysv.internal.h"
 #include "libc/calls/struct/sched_param.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Gets scheduler policy for `pid`.
diff --git a/libc/calls/sched_rr_get_interval.c b/libc/calls/sched_rr_get_interval.c
index 6e1c43001..15881ceab 100644
--- a/libc/calls/sched_rr_get_interval.c
+++ b/libc/calls/sched_rr_get_interval.c
@@ -18,8 +18,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/timespec.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 
 int sys_sched_rr_get_interval(int, struct timespec *);
 
diff --git a/libc/calls/sched_setparam.c b/libc/calls/sched_setparam.c
index 4fae3cbbd..10b64bd66 100644
--- a/libc/calls/sched_setparam.c
+++ b/libc/calls/sched_setparam.c
@@ -20,7 +20,7 @@
 #include "libc/calls/struct/sched_param.h"
 #include "libc/calls/struct/sched_param.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/sched_setscheduler.c b/libc/calls/sched_setscheduler.c
index 80a48e95a..576ecadfa 100644
--- a/libc/calls/sched_setscheduler.c
+++ b/libc/calls/sched_setscheduler.c
@@ -20,8 +20,8 @@
 #include "libc/calls/struct/sched_param.h"
 #include "libc/calls/struct/sched_param.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 #include "libc/thread/tls.h"
diff --git a/libc/calls/seccomp.c b/libc/calls/seccomp.c
index eaa1e4708..3048745d0 100644
--- a/libc/calls/seccomp.c
+++ b/libc/calls/seccomp.c
@@ -21,8 +21,8 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/pr.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/sedebug.c b/libc/calls/sedebug.c
index 64c4ac52d..eed940e25 100644
--- a/libc/calls/sedebug.c
+++ b/libc/calls/sedebug.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/enum/accessmask.h"
 #include "libc/nt/enum/securityimpersonationlevel.h"
 #include "libc/nt/errors.h"
diff --git a/libc/calls/select.c b/libc/calls/select.c
index d517eb4ea..9c234f601 100644
--- a/libc/calls/select.c
+++ b/libc/calls/select.c
@@ -23,8 +23,8 @@
 #include "libc/calls/struct/timeval.h"
 #include "libc/calls/struct/timeval.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/select.h"
 #include "libc/sock/select.internal.h"
diff --git a/libc/calls/setegid.c b/libc/calls/setegid.c
index 3d6edd902..fd6dba78e 100644
--- a/libc/calls/setegid.c
+++ b/libc/calls/setegid.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Sets effective group ID.
diff --git a/libc/calls/seteuid.c b/libc/calls/seteuid.c
index 995c7cccb..7bbb79ffb 100644
--- a/libc/calls/seteuid.c
+++ b/libc/calls/seteuid.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Sets effective user ID.
diff --git a/libc/calls/setfl.c b/libc/calls/setfl.c
index 553179598..e96137862 100644
--- a/libc/calls/setfl.c
+++ b/libc/calls/setfl.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/createfileflags.internal.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/nt/createfile.h"
 #include "libc/nt/enum/fileflagandattributes.h"
diff --git a/libc/calls/setfsgid.c b/libc/calls/setfsgid.c
index 5deee2daa..f69a32187 100644
--- a/libc/calls/setfsgid.c
+++ b/libc/calls/setfsgid.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Sets user id of current process for file system ops.
diff --git a/libc/calls/setfsuid.c b/libc/calls/setfsuid.c
index 62b7c6c79..d992e53e2 100644
--- a/libc/calls/setfsuid.c
+++ b/libc/calls/setfsuid.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Sets user id of current process for file system ops.
diff --git a/libc/calls/setgid.c b/libc/calls/setgid.c
index 44a55c5ad..5a1208a83 100644
--- a/libc/calls/setgid.c
+++ b/libc/calls/setgid.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Sets group id of current process.
diff --git a/libc/calls/setgroups.c b/libc/calls/setgroups.c
index 0c12a106b..d030239bb 100644
--- a/libc/calls/setgroups.c
+++ b/libc/calls/setgroups.c
@@ -19,8 +19,8 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/groups.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/stdckdint.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/setpgid.c b/libc/calls/setpgid.c
index c883c2e6a..26980b4f9 100644
--- a/libc/calls/setpgid.c
+++ b/libc/calls/setpgid.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Changes process group for process.
diff --git a/libc/calls/setregid.c b/libc/calls/setregid.c
index 03367acb1..859db8bea 100644
--- a/libc/calls/setregid.c
+++ b/libc/calls/setregid.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Sets real and/or effective group ids.
diff --git a/libc/calls/setresgid.c b/libc/calls/setresgid.c
index e8310cc1a..bf27e7f9b 100644
--- a/libc/calls/setresgid.c
+++ b/libc/calls/setresgid.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Sets real, effective, and "saved" group ids.
diff --git a/libc/calls/setresuid.c b/libc/calls/setresuid.c
index eaa95f1a9..c6ae50caa 100644
--- a/libc/calls/setresuid.c
+++ b/libc/calls/setresuid.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Sets real, effective, and "saved" user ids.
diff --git a/libc/calls/setreuid.c b/libc/calls/setreuid.c
index f01680988..0b7149ba7 100644
--- a/libc/calls/setreuid.c
+++ b/libc/calls/setreuid.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Sets real and/or effective user ids.
diff --git a/libc/calls/setrlimit.c b/libc/calls/setrlimit.c
index de7b5adc9..7cfaeccc6 100644
--- a/libc/calls/setrlimit.c
+++ b/libc/calls/setrlimit.c
@@ -22,8 +22,8 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/syslib.internal.h"
diff --git a/libc/calls/setsid.c b/libc/calls/setsid.c
index 026f97b3c..efd10aef7 100644
--- a/libc/calls/setsid.c
+++ b/libc/calls/setsid.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Creates session and sets the process group id.
diff --git a/libc/calls/settimeofday.c b/libc/calls/settimeofday.c
index f0774746d..e35ba6e01 100644
--- a/libc/calls/settimeofday.c
+++ b/libc/calls/settimeofday.c
@@ -19,7 +19,7 @@
 #include "libc/calls/struct/timeval.h"
 #include "libc/calls/struct/timeval.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 #include "libc/time.h"
 
diff --git a/libc/calls/setuid.c b/libc/calls/setuid.c
index f9e922906..5d22f24ef 100644
--- a/libc/calls/setuid.c
+++ b/libc/calls/setuid.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Sets user id of current process.
diff --git a/libc/calls/sig.c b/libc/calls/sig.c
index 21f321223..c97e41d2a 100644
--- a/libc/calls/sig.c
+++ b/libc/calls/sig.c
@@ -30,10 +30,10 @@
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
 #include "libc/intrin/bsf.h"
-#include "libc/intrin/describebacktrace.internal.h"
+#include "libc/intrin/describebacktrace.h"
 #include "libc/intrin/dll.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nt/console.h"
 #include "libc/nt/enum/context.h"
diff --git a/libc/calls/sigaction.c b/libc/calls/sigaction.c
index 8def7b1dd..d3f46e71b 100644
--- a/libc/calls/sigaction.c
+++ b/libc/calls/sigaction.c
@@ -30,9 +30,9 @@
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/calls/ucontext.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/log/backtrace.internal.h"
 #include "libc/log/log.h"
diff --git a/libc/calls/sigaltstack.c b/libc/calls/sigaltstack.c
index 7cfb961e4..1fb21189f 100644
--- a/libc/calls/sigaltstack.c
+++ b/libc/calls/sigaltstack.c
@@ -21,8 +21,8 @@
 #include "libc/calls/struct/sigaltstack.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/syslib.internal.h"
diff --git a/libc/calls/sigcrashsig.c b/libc/calls/sigcrashsig.c
index e48eeab3f..21e0d0203 100644
--- a/libc/calls/sigcrashsig.c
+++ b/libc/calls/sigcrashsig.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/sig.internal.h"
-#include "libc/intrin/pushpop.internal.h"
+#include "libc/intrin/pushpop.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/signal.h"
 #include "libc/nt/enum/status.h"
diff --git a/libc/calls/sigpending.c b/libc/calls/sigpending.c
index 648a6d223..e11e194c0 100644
--- a/libc/calls/sigpending.c
+++ b/libc/calls/sigpending.c
@@ -21,8 +21,8 @@
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/dce.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 #include "libc/thread/tls.h"
 
diff --git a/libc/calls/sigsuspend.c b/libc/calls/sigsuspend.c
index 8c4c5d69e..134eda44c 100644
--- a/libc/calls/sigsuspend.c
+++ b/libc/calls/sigsuspend.c
@@ -24,7 +24,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/synchronization.h"
 #include "libc/sysv/consts/sig.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/sigtimedwait.c b/libc/calls/sigtimedwait.c
index d68958113..20579e199 100644
--- a/libc/calls/sigtimedwait.c
+++ b/libc/calls/sigtimedwait.c
@@ -23,7 +23,7 @@
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/struct/timespec.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/splice.c b/libc/calls/splice.c
index ce936f6ff..6460d0c79 100644
--- a/libc/calls/splice.c
+++ b/libc/calls/splice.c
@@ -23,8 +23,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/mem/alloca.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/statfs.c b/libc/calls/statfs.c
index c8d573a06..6068760d7 100644
--- a/libc/calls/statfs.c
+++ b/libc/calls/statfs.c
@@ -24,7 +24,7 @@
 #include "libc/calls/struct/statfs.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/stack.h"
 #include "libc/runtime/zipos.internal.h"
diff --git a/libc/calls/struct/iovec.internal.h b/libc/calls/struct/iovec.internal.h
index 34fd4e07d..cfa58b479 100644
--- a/libc/calls/struct/iovec.internal.h
+++ b/libc/calls/struct/iovec.internal.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_IOVEC_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_CALLS_STRUCT_IOVEC_INTERNAL_H_
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/mem/alloca.h"
 COSMOPOLITAN_C_START_
diff --git a/libc/calls/struct/winsize.internal.h b/libc/calls/struct/winsize.internal.h
index 8e1d5dbec..642b995d8 100644
--- a/libc/calls/struct/winsize.internal.h
+++ b/libc/calls/struct/winsize.internal.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_CALLS_STRUCT_WINSIZE_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_CALLS_STRUCT_WINSIZE_INTERNAL_H_
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/winsize.h"
 #include "libc/mem/alloca.h"
 COSMOPOLITAN_C_START_
diff --git a/libc/calls/symlinkat.c b/libc/calls/symlinkat.c
index 3af90f91d..c4aa3e726 100644
--- a/libc/calls/symlinkat.c
+++ b/libc/calls/symlinkat.c
@@ -20,8 +20,8 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/at.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/sync.c b/libc/calls/sync.c
index bdf2c7592..ca6cd1b84 100644
--- a/libc/calls/sync.c
+++ b/libc/calls/sync.c
@@ -20,7 +20,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 
 /**
diff --git a/libc/calls/sys_ptrace.c b/libc/calls/sys_ptrace.c
index 21cfda437..3121e0bc3 100644
--- a/libc/calls/sys_ptrace.c
+++ b/libc/calls/sys_ptrace.c
@@ -19,9 +19,9 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/likely.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 
 #define IsPeek(request) (IsLinux() && (request) - 1u < 3)
diff --git a/libc/calls/sysinfo.c b/libc/calls/sysinfo.c
index 5f5fc832f..cf7ce29d3 100644
--- a/libc/calls/sysinfo.c
+++ b/libc/calls/sysinfo.c
@@ -22,7 +22,7 @@
 #include "libc/calls/struct/timespec.h"
 #include "libc/calls/struct/timeval.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/tcdrain.c b/libc/calls/tcdrain.c
index c172d4027..1e4dc4522 100644
--- a/libc/calls/tcdrain.c
+++ b/libc/calls/tcdrain.c
@@ -18,13 +18,13 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/cp.internal.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/calls/termios.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/sysv/consts/termios.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/tcflow.c b/libc/calls/tcflow.c
index 6543319c3..512de21bd 100644
--- a/libc/calls/tcflow.c
+++ b/libc/calls/tcflow.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/metatermios.internal.h"
 #include "libc/calls/struct/termios.h"
 #include "libc/calls/syscall-sysv.internal.h"
@@ -25,7 +25,7 @@
 #include "libc/calls/termios.h"
 #include "libc/dce.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/mem/alloca.h"
 #include "libc/nt/comms.h"
 #include "libc/sysv/consts/termios.h"
diff --git a/libc/calls/tcflush.c b/libc/calls/tcflush.c
index cfa4bd9a1..3802897b6 100644
--- a/libc/calls/tcflush.c
+++ b/libc/calls/tcflush.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
@@ -25,7 +25,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/mem/alloca.h"
 #include "libc/nt/comms.h"
 #include "libc/nt/console.h"
diff --git a/libc/calls/tcgetattr-nt.c b/libc/calls/tcgetattr-nt.c
index bf4262ebf..00950d3c0 100644
--- a/libc/calls/tcgetattr-nt.c
+++ b/libc/calls/tcgetattr-nt.c
@@ -18,10 +18,10 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/termios.h"
 #include "libc/calls/syscall-nt.internal.h"
-#include "libc/intrin/nomultics.internal.h"
+#include "libc/intrin/nomultics.h"
 #include "libc/nt/console.h"
 #include "libc/nt/enum/consolemodeflags.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/tcgetattr.c b/libc/calls/tcgetattr.c
index e22e0c780..4c2f116eb 100644
--- a/libc/calls/tcgetattr.c
+++ b/libc/calls/tcgetattr.c
@@ -24,7 +24,7 @@
 #include "libc/calls/termios.internal.h"
 #include "libc/calls/ttydefaults.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/tcgetpgrp.c b/libc/calls/tcgetpgrp.c
index f6a6ade21..2f996c9d6 100644
--- a/libc/calls/tcgetpgrp.c
+++ b/libc/calls/tcgetpgrp.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/termios.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/console.h"
 #include "libc/sysv/consts/termios.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/tcgetsid.c b/libc/calls/tcgetsid.c
index 147cfacde..77c9617f5 100644
--- a/libc/calls/tcgetsid.c
+++ b/libc/calls/tcgetsid.c
@@ -20,7 +20,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/termios.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 #define TIOCGSID (IsLinux() ? 0x5429 : 0x40047463)
diff --git a/libc/calls/tcgetwinsize.c b/libc/calls/tcgetwinsize.c
index 6ed585a47..ad1bd76e6 100644
--- a/libc/calls/tcgetwinsize.c
+++ b/libc/calls/tcgetwinsize.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/termios.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/termios.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/tcsendbreak.c b/libc/calls/tcsendbreak.c
index 9e6e3b55b..f00ef83db 100644
--- a/libc/calls/tcsendbreak.c
+++ b/libc/calls/tcsendbreak.c
@@ -21,7 +21,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/comms.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/tcsetattr-nt.c b/libc/calls/tcsetattr-nt.c
index b0f49e803..4a5484ad3 100644
--- a/libc/calls/tcsetattr-nt.c
+++ b/libc/calls/tcsetattr-nt.c
@@ -18,11 +18,11 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/termios.h"
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/ttydefaults.h"
-#include "libc/intrin/nomultics.internal.h"
+#include "libc/intrin/nomultics.h"
 #include "libc/nt/console.h"
 #include "libc/nt/enum/consolemodeflags.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/tcsetattr.c b/libc/calls/tcsetattr.c
index db59486db..030e42790 100644
--- a/libc/calls/tcsetattr.c
+++ b/libc/calls/tcsetattr.c
@@ -24,7 +24,7 @@
 #include "libc/calls/termios.internal.h"
 #include "libc/dce.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/mem/alloca.h"
 #include "libc/sysv/consts/termios.h"
diff --git a/libc/calls/tcsetpgrp.c b/libc/calls/tcsetpgrp.c
index eafe3ab2b..ba88f1422 100644
--- a/libc/calls/tcsetpgrp.c
+++ b/libc/calls/tcsetpgrp.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/termios.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/console.h"
 #include "libc/sysv/consts/termios.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/tcsetsid.c b/libc/calls/tcsetsid.c
index de7e241ef..59f6052a5 100644
--- a/libc/calls/tcsetsid.c
+++ b/libc/calls/tcsetsid.c
@@ -20,7 +20,7 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/termios.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/tcsetwinsize.c b/libc/calls/tcsetwinsize.c
index a8503ca68..7c0e6bd2c 100644
--- a/libc/calls/tcsetwinsize.c
+++ b/libc/calls/tcsetwinsize.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/termios.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/termios.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/truncate.c b/libc/calls/truncate.c
index 956fd81fc..756353a13 100644
--- a/libc/calls/truncate.c
+++ b/libc/calls/truncate.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/ttyname_r.c b/libc/calls/ttyname_r.c
index c87d4a99a..4d700a51d 100644
--- a/libc/calls/ttyname_r.c
+++ b/libc/calls/ttyname_r.c
@@ -19,14 +19,14 @@
 #include "libc/assert.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/log/log.h"
 #include "libc/nt/console.h"
 #include "libc/nt/enum/consolemodeflags.h"
diff --git a/libc/calls/umask.c b/libc/calls/umask.c
index 79f0ea314..29b10e8e3 100644
--- a/libc/calls/umask.c
+++ b/libc/calls/umask.c
@@ -21,7 +21,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/nr.h"
 
 /**
diff --git a/libc/calls/uname.c b/libc/calls/uname.c
index e61181f20..8569c7839 100644
--- a/libc/calls/uname.c
+++ b/libc/calls/uname.c
@@ -25,7 +25,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/computernameformat.h"
diff --git a/libc/calls/unassert.c b/libc/calls/unassert.c
index d7a8ce42d..b44f8a1d8 100644
--- a/libc/calls/unassert.c
+++ b/libc/calls/unassert.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describebacktrace.internal.h"
+#include "libc/intrin/describebacktrace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/symbols.internal.h"
 
diff --git a/libc/calls/unlinkat.c b/libc/calls/unlinkat.c
index 75ecfdcb9..33bd2f572 100644
--- a/libc/calls/unlinkat.c
+++ b/libc/calls/unlinkat.c
@@ -22,8 +22,8 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sysv/consts/s.h"
diff --git a/libc/calls/unlockpt.c b/libc/calls/unlockpt.c
index 181115065..438a4b955 100644
--- a/libc/calls/unlockpt.c
+++ b/libc/calls/unlockpt.c
@@ -18,12 +18,12 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/calls/termios.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/pty.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/unmount.c b/libc/calls/unmount.c
index db84e4670..e78172bef 100644
--- a/libc/calls/unmount.c
+++ b/libc/calls/unmount.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/mount.h"
 #include "libc/calls/syscall-sysv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Unmounts file system.
diff --git a/libc/calls/unveil.c b/libc/calls/unveil.c
index 57f4cfc28..8112fc721 100644
--- a/libc/calls/unveil.c
+++ b/libc/calls/unveil.c
@@ -31,7 +31,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/libgen.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
 #include "libc/nexgen32e/vendor.internal.h"
diff --git a/libc/calls/utimens.c b/libc/calls/utimens.c
index 333b49432..c768d5235 100644
--- a/libc/calls/utimens.c
+++ b/libc/calls/utimens.c
@@ -23,8 +23,8 @@
 #include "libc/calls/struct/timeval.internal.h"
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sysv/consts/at.h"
diff --git a/libc/calls/utimensat.c b/libc/calls/utimensat.c
index adac0714e..a8065a1a1 100644
--- a/libc/calls/utimensat.c
+++ b/libc/calls/utimensat.c
@@ -18,8 +18,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/struct/timespec.h"
 #include "libc/calls/struct/timespec.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/utimes.c b/libc/calls/utimes.c
index 7f863fd3e..a5dd2f66c 100644
--- a/libc/calls/utimes.c
+++ b/libc/calls/utimes.c
@@ -20,7 +20,7 @@
 #include "libc/calls/struct/timespec.internal.h"
 #include "libc/calls/struct/timeval.h"
 #include "libc/calls/struct/timeval.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/at.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/vdsofunc.greg.c b/libc/calls/vdsofunc.greg.c
index 69b2f774d..a063c41a1 100644
--- a/libc/calls/vdsofunc.greg.c
+++ b/libc/calls/vdsofunc.greg.c
@@ -26,8 +26,8 @@
 #include "libc/elf/struct/sym.h"
 #include "libc/elf/struct/verdaux.h"
 #include "libc/elf/struct/verdef.h"
-#include "libc/intrin/getauxval.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/getauxval.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/auxv.h"
diff --git a/libc/calls/write-nt.c b/libc/calls/write-nt.c
index edea79f9f..3e5eb0163 100644
--- a/libc/calls/write-nt.c
+++ b/libc/calls/write-nt.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
 #include "libc/calls/sig.internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/sigset.h"
 #include "libc/calls/struct/sigset.internal.h"
@@ -26,7 +26,7 @@
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/nomultics.internal.h"
+#include "libc/intrin/nomultics.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nt/console.h"
 #include "libc/nt/enum/consolemodeflags.h"
diff --git a/libc/calls/write.c b/libc/calls/write.c
index 258386df3..bf1d4fa19 100644
--- a/libc/calls/write.c
+++ b/libc/calls/write.c
@@ -22,7 +22,7 @@
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/sock/sock.h"
diff --git a/libc/calls/writev-metal.c b/libc/calls/writev-metal.c
index a3e87c6cd..d028e5f83 100644
--- a/libc/calls/writev-metal.c
+++ b/libc/calls/writev-metal.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/intrin/weaken.h"
diff --git a/libc/calls/writev-serial.c b/libc/calls/writev-serial.c
index c896fec31..9c5822d7b 100644
--- a/libc/calls/writev-serial.c
+++ b/libc/calls/writev-serial.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/nexgen32e/uart.internal.h"
diff --git a/libc/calls/writev.c b/libc/calls/writev.c
index 42d141461..7c476d3e5 100644
--- a/libc/calls/writev.c
+++ b/libc/calls/writev.c
@@ -22,9 +22,9 @@
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/likely.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
 #include "libc/runtime/stack.h"
diff --git a/libc/dlopen/dlopen.c b/libc/dlopen/dlopen.c
index a39921b54..99c648776 100644
--- a/libc/dlopen/dlopen.c
+++ b/libc/dlopen/dlopen.c
@@ -38,7 +38,7 @@
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/atomic.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/nt/dll.h"
 #include "libc/nt/enum/filemapflags.h"
diff --git a/libc/intrin/BUILD.mk b/libc/intrin/BUILD.mk
index 300e0631f..fa18d9b46 100644
--- a/libc/intrin/BUILD.mk
+++ b/libc/intrin/BUILD.mk
@@ -16,7 +16,7 @@ LIBC_INTRIN_A_CHECKS = $(LIBC_INTRIN_A).pkg
 
 ifeq ($(ARCH), aarch64)
 LIBC_INTRIN_A_SRCS_S += $(wildcard libc/intrin/aarch64/*.S)
-LIBC_INTRIN_A_HDRS += libc/intrin/aarch64/asmdefs.internal.h
+LIBC_INTRIN_A_HDRS += libc/intrin/aarch64/asmdefs.h
 endif
 
 LIBC_INTRIN_A_OBJS =					\
diff --git a/libc/intrin/__getauxval.c b/libc/intrin/__getauxval.c
index 277cd1142..db75a12ff 100644
--- a/libc/intrin/__getauxval.c
+++ b/libc/intrin/__getauxval.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/getauxval.internal.h"
+#include "libc/intrin/getauxval.h"
 #include "libc/runtime/runtime.h"
 
 /**
diff --git a/libc/intrin/__getenv.c b/libc/intrin/__getenv.c
index b94d09798..b387b458d 100644
--- a/libc/intrin/__getenv.c
+++ b/libc/intrin/__getenv.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/intrin/getenv.internal.h"
+#include "libc/intrin/getenv.h"
 #include "libc/intrin/kprintf.h"
 
 privileged struct Env __getenv(char **p, const char *k) {
diff --git a/libc/intrin/aarch64/asmdefs.internal.h b/libc/intrin/aarch64/asmdefs.h
similarity index 100%
rename from libc/intrin/aarch64/asmdefs.internal.h
rename to libc/intrin/aarch64/asmdefs.h
diff --git a/libc/intrin/aarch64/memchr.S b/libc/intrin/aarch64/memchr.S
index 7242bfc86..22361b26d 100644
--- a/libc/intrin/aarch64/memchr.S
+++ b/libc/intrin/aarch64/memchr.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __memchr_aarch64 memchr
diff --git a/libc/intrin/aarch64/memcpy.S b/libc/intrin/aarch64/memcpy.S
index 65b58d75a..d9294db9d 100644
--- a/libc/intrin/aarch64/memcpy.S
+++ b/libc/intrin/aarch64/memcpy.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __memcpy_aarch64_simd memcpy
diff --git a/libc/intrin/aarch64/memrchr.S b/libc/intrin/aarch64/memrchr.S
index 3041eeab7..57e6c4354 100644
--- a/libc/intrin/aarch64/memrchr.S
+++ b/libc/intrin/aarch64/memrchr.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __memrchr_aarch64 memrchr
diff --git a/libc/intrin/aarch64/memset.S b/libc/intrin/aarch64/memset.S
index cef8edd9c..c9e2d3dd7 100644
--- a/libc/intrin/aarch64/memset.S
+++ b/libc/intrin/aarch64/memset.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __memset_aarch64 memset
diff --git a/libc/intrin/aarch64/stpcpy.S b/libc/intrin/aarch64/stpcpy.S
index a34f1aa8f..3bf49d8cb 100644
--- a/libc/intrin/aarch64/stpcpy.S
+++ b/libc/intrin/aarch64/stpcpy.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __stpcpy_aarch64 stpcpy
diff --git a/libc/intrin/aarch64/strchr.S b/libc/intrin/aarch64/strchr.S
index 462d94806..20a7e8dab 100644
--- a/libc/intrin/aarch64/strchr.S
+++ b/libc/intrin/aarch64/strchr.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __strchr_aarch64 strchr
diff --git a/libc/intrin/aarch64/strchrnul.S b/libc/intrin/aarch64/strchrnul.S
index 184305b22..a86383f62 100644
--- a/libc/intrin/aarch64/strchrnul.S
+++ b/libc/intrin/aarch64/strchrnul.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __strchrnul_aarch64 strchrnul
diff --git a/libc/intrin/aarch64/strcmp.S b/libc/intrin/aarch64/strcmp.S
index 98f26d486..190fd77e3 100644
--- a/libc/intrin/aarch64/strcmp.S
+++ b/libc/intrin/aarch64/strcmp.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __strcmp_aarch64 strcmp
diff --git a/libc/intrin/aarch64/strcpy.S b/libc/intrin/aarch64/strcpy.S
index 93cb85fec..dc53c8f50 100644
--- a/libc/intrin/aarch64/strcpy.S
+++ b/libc/intrin/aarch64/strcpy.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __strcpy_aarch64 strcpy
diff --git a/libc/intrin/aarch64/strlen.S b/libc/intrin/aarch64/strlen.S
index 7464eafc9..600640cf3 100644
--- a/libc/intrin/aarch64/strlen.S
+++ b/libc/intrin/aarch64/strlen.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __strlen_aarch64 strlen
diff --git a/libc/intrin/aarch64/strncmp.S b/libc/intrin/aarch64/strncmp.S
index 8a0b75397..4734185bc 100644
--- a/libc/intrin/aarch64/strncmp.S
+++ b/libc/intrin/aarch64/strncmp.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __strncmp_aarch64 strncmp
diff --git a/libc/intrin/aarch64/strnlen.S b/libc/intrin/aarch64/strnlen.S
index 988c15f63..750b1de48 100644
--- a/libc/intrin/aarch64/strnlen.S
+++ b/libc/intrin/aarch64/strnlen.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __strnlen_aarch64 strnlen
diff --git a/libc/intrin/aarch64/strrchr.S b/libc/intrin/aarch64/strrchr.S
index 5199254ff..0ad8f7b3b 100644
--- a/libc/intrin/aarch64/strrchr.S
+++ b/libc/intrin/aarch64/strrchr.S
@@ -25,7 +25,7 @@
 │  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                      │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/aarch64/asmdefs.internal.h"
+#include "libc/intrin/aarch64/asmdefs.h"
 .yoink arm_optimized_routines_notice
 
 #define __strrchr_aarch64 strrchr
diff --git a/libc/intrin/clearenv.c b/libc/intrin/clearenv.c
index 35dcda617..14ed915f8 100644
--- a/libc/intrin/clearenv.c
+++ b/libc/intrin/clearenv.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 
 /**
diff --git a/libc/intrin/createdirectory.c b/libc/intrin/createdirectory.c
index e0e787859..af41e4ba5 100644
--- a/libc/intrin/createdirectory.c
+++ b/libc/intrin/createdirectory.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/nt/thunk/msabi.h"
 
diff --git a/libc/intrin/createfile.c b/libc/intrin/createfile.c
index 594329c64..265675a1b 100644
--- a/libc/intrin/createfile.c
+++ b/libc/intrin/createfile.c
@@ -19,8 +19,8 @@
 #include "libc/nt/createfile.h"
 #include "libc/calls/sig.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/enum/accessmask.h"
 #include "libc/nt/enum/creationdisposition.h"
 #include "libc/nt/errors.h"
diff --git a/libc/intrin/createfilemapping.c b/libc/intrin/createfilemapping.c
index 147793ec7..7d6912967 100644
--- a/libc/intrin/createfilemapping.c
+++ b/libc/intrin/createfilemapping.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/memory.h"
 #include "libc/nt/struct/securityattributes.h"
 #include "libc/nt/thunk/msabi.h"
diff --git a/libc/intrin/createfilemappingnuma.c b/libc/intrin/createfilemappingnuma.c
index a99653617..50ee5f7c4 100644
--- a/libc/intrin/createfilemappingnuma.c
+++ b/libc/intrin/createfilemappingnuma.c
@@ -18,8 +18,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/memory.h"
 #include "libc/nt/struct/securityattributes.h"
 
diff --git a/libc/intrin/createnamedpipe.c b/libc/intrin/createnamedpipe.c
index 2bb67417a..b62a4e482 100644
--- a/libc/intrin/createnamedpipe.c
+++ b/libc/intrin/createnamedpipe.c
@@ -18,8 +18,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/sig.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/errors.h"
 #include "libc/nt/ipc.h"
 #include "libc/nt/runtime.h"
diff --git a/libc/intrin/createpipe.c b/libc/intrin/createpipe.c
index 7d6e9df1e..bde3623e1 100644
--- a/libc/intrin/createpipe.c
+++ b/libc/intrin/createpipe.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/ipc.h"
 #include "libc/nt/struct/securityattributes.h"
 #include "libc/nt/thunk/msabi.h"
diff --git a/libc/intrin/createprocess.c b/libc/intrin/createprocess.c
index 4205b5bcd..232c2d17b 100644
--- a/libc/intrin/createprocess.c
+++ b/libc/intrin/createprocess.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/process.h"
 #include "libc/nt/runtime.h"
 #include "libc/nt/thunk/msabi.h"
diff --git a/libc/intrin/createsymboliclink.c b/libc/intrin/createsymboliclink.c
index 663753b13..cd6be90c7 100644
--- a/libc/intrin/createsymboliclink.c
+++ b/libc/intrin/createsymboliclink.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 
 __msabi extern typeof(CreateSymbolicLink) *const __imp_CreateSymbolicLinkW;
diff --git a/libc/intrin/createthread.c b/libc/intrin/createthread.c
index 8a4bc7a64..a910e629f 100644
--- a/libc/intrin/createthread.c
+++ b/libc/intrin/createthread.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/runtime.h"
 #include "libc/nt/struct/securityattributes.h"
 #include "libc/nt/thread.h"
diff --git a/libc/intrin/cxaatexit.c b/libc/intrin/cxaatexit.c
index a5b001162..7f13261bf 100644
--- a/libc/intrin/cxaatexit.c
+++ b/libc/intrin/cxaatexit.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/bsr.h"
-#include "libc/intrin/cxaatexit.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/cxaatexit.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
diff --git a/libc/intrin/cxaatexit.internal.h b/libc/intrin/cxaatexit.h
similarity index 100%
rename from libc/intrin/cxaatexit.internal.h
rename to libc/intrin/cxaatexit.h
diff --git a/libc/intrin/cxablocks.c b/libc/intrin/cxablocks.c
index 86b4965da..af74fdf9a 100644
--- a/libc/intrin/cxablocks.c
+++ b/libc/intrin/cxablocks.c
@@ -16,6 +16,6 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/cxaatexit.internal.h"
+#include "libc/intrin/cxaatexit.h"
 
 struct CxaAtexitBlocks __cxa_blocks;
diff --git a/libc/intrin/cxafinalize.c b/libc/intrin/cxafinalize.c
index 119bebdd4..da9b30441 100644
--- a/libc/intrin/cxafinalize.c
+++ b/libc/intrin/cxafinalize.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/bsf.h"
-#include "libc/intrin/cxaatexit.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/cxaatexit.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/intrin/cxalock.c b/libc/intrin/cxalock.c
index 4e6de59d0..e0d43f534 100644
--- a/libc/intrin/cxalock.c
+++ b/libc/intrin/cxalock.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/cxaatexit.internal.h"
+#include "libc/intrin/cxaatexit.h"
 #include "libc/thread/thread.h"
 
 static pthread_mutex_t __cxa_lock_obj;
diff --git a/libc/intrin/deletefile.c b/libc/intrin/deletefile.c
index 1fd3b54ed..6161b816b 100644
--- a/libc/intrin/deletefile.c
+++ b/libc/intrin/deletefile.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/nt/thunk/msabi.h"
 
diff --git a/libc/intrin/describearchprctlcode.c b/libc/intrin/describearchprctlcode.c
index 57ad37830..9c1fea1f9 100644
--- a/libc/intrin/describearchprctlcode.c
+++ b/libc/intrin/describearchprctlcode.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/arch.h"
 
 const char *(DescribeArchPrctlCode)(char buf[12], int x) {
diff --git a/libc/intrin/describebacktrace.c b/libc/intrin/describebacktrace.c
index d6bd8f8e0..113854ff6 100644
--- a/libc/intrin/describebacktrace.c
+++ b/libc/intrin/describebacktrace.c
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describebacktrace.internal.h"
-#include "libc/intrin/iscall.internal.h"
+#include "libc/intrin/describebacktrace.h"
+#include "libc/intrin/iscall.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nexgen32e/stackframe.h"
diff --git a/libc/intrin/describebacktrace.internal.h b/libc/intrin/describebacktrace.h
similarity index 100%
rename from libc/intrin/describebacktrace.internal.h
rename to libc/intrin/describebacktrace.h
diff --git a/libc/intrin/describecancelstate.c b/libc/intrin/describecancelstate.c
index b6ef58702..4b5856666 100644
--- a/libc/intrin/describecancelstate.c
+++ b/libc/intrin/describecancelstate.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/thread/thread.h"
 
 const char *(DescribeCancelState)(char buf[12], int err, int *state) {
diff --git a/libc/intrin/describecapability.c b/libc/intrin/describecapability.c
index f38ed5b8b..6e072f4dd 100644
--- a/libc/intrin/describecapability.c
+++ b/libc/intrin/describecapability.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/cap.h"
diff --git a/libc/intrin/describeclockname.c b/libc/intrin/describeclockname.c
index b5640c620..c8e704ca5 100644
--- a/libc/intrin/describeclockname.c
+++ b/libc/intrin/describeclockname.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 
 /**
  * Describes clock_gettime() clock argument.
diff --git a/libc/intrin/describecontrolkeystate.c b/libc/intrin/describecontrolkeystate.c
index 93f685cad..c46d859a2 100644
--- a/libc/intrin/describecontrolkeystate.c
+++ b/libc/intrin/describecontrolkeystate.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/struct/inputrecord.h"
 
diff --git a/libc/intrin/describedirfd.c b/libc/intrin/describedirfd.c
index a769f1225..6b33d8ebf 100644
--- a/libc/intrin/describedirfd.c
+++ b/libc/intrin/describedirfd.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/at.h"
 
 const char *(DescribeDirfd)(char buf[12], int dirfd) {
diff --git a/libc/intrin/describednotify.c b/libc/intrin/describednotify.c
index c6693dbb9..b4b719940 100644
--- a/libc/intrin/describednotify.c
+++ b/libc/intrin/describednotify.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/processaccess.h"
 #include "libc/sysv/consts/dn.h"
diff --git a/libc/intrin/describeerrnoresult.c b/libc/intrin/describeerrnoresult.c
index 672665edb..0deed696e 100644
--- a/libc/intrin/describeerrnoresult.c
+++ b/libc/intrin/describeerrnoresult.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/log/libfatal.internal.h"
 #include "libc/str/str.h"
 
diff --git a/libc/intrin/describefcntlcmd.c b/libc/intrin/describefcntlcmd.c
index 338b476a6..bcebd1b19 100644
--- a/libc/intrin/describefcntlcmd.c
+++ b/libc/intrin/describefcntlcmd.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/str/str.h"
 
 const char *(DescribeFcntlCmd)(char buf[20], int x) {
diff --git a/libc/intrin/describeflags.c b/libc/intrin/describeflags.c
index cb316b244..10aa0ea1c 100644
--- a/libc/intrin/describeflags.c
+++ b/libc/intrin/describeflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 
 const char *DescribeFlags(char *p, size_t n, const struct DescribeFlags *d,
                           size_t m, const char *prefix, unsigned x) {
diff --git a/libc/intrin/describeflags.internal.h b/libc/intrin/describeflags.h
similarity index 100%
rename from libc/intrin/describeflags.internal.h
rename to libc/intrin/describeflags.h
diff --git a/libc/intrin/describeflock.c b/libc/intrin/describeflock.c
index c2399e583..ea7b744bd 100644
--- a/libc/intrin/describeflock.c
+++ b/libc/intrin/describeflock.c
@@ -19,7 +19,7 @@
 #include "libc/calls/struct/flock.h"
 #include "libc/calls/struct/flock.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/sysv/consts/f.h"
 
diff --git a/libc/intrin/describefutexop.c b/libc/intrin/describefutexop.c
index 9dead5932..7a4b0c783 100644
--- a/libc/intrin/describefutexop.c
+++ b/libc/intrin/describefutexop.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/futex.h"
 
diff --git a/libc/intrin/describehow.c b/libc/intrin/describehow.c
index a4c447025..f4fc6798d 100644
--- a/libc/intrin/describehow.c
+++ b/libc/intrin/describehow.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/sig.h"
 
 const char *(DescribeHow)(char buf[12], int how) {
diff --git a/libc/intrin/describeinoutint64.c b/libc/intrin/describeinoutint64.c
index 977c32a15..49fe1015b 100644
--- a/libc/intrin/describeinoutint64.c
+++ b/libc/intrin/describeinoutint64.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 
 const char *(DescribeInOutInt64)(char buf[23], ssize_t rc, int64_t *x) {
   if (!x)
diff --git a/libc/intrin/describeiovnt.c b/libc/intrin/describeiovnt.c
index 1f94bc5d2..8229301d2 100644
--- a/libc/intrin/describeiovnt.c
+++ b/libc/intrin/describeiovnt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/winsock.h"
diff --git a/libc/intrin/describeitimer.c b/libc/intrin/describeitimer.c
index d1e83a28d..98c4e2a8c 100644
--- a/libc/intrin/describeitimer.c
+++ b/libc/intrin/describeitimer.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/itimer.h"
 
 const char *(DescribeItimer)(char buf[12], int which) {
diff --git a/libc/intrin/describeitimerval.c b/libc/intrin/describeitimerval.c
index 9ea8ff455..1e5661f50 100644
--- a/libc/intrin/describeitimerval.c
+++ b/libc/intrin/describeitimerval.c
@@ -20,7 +20,7 @@
 #include "libc/calls/struct/timeval.h"
 #include "libc/calls/struct/timeval.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 
 #define N 90
diff --git a/libc/intrin/describemapflags.c b/libc/intrin/describemapflags.c
index fa1514435..770798ac0 100644
--- a/libc/intrin/describemapflags.c
+++ b/libc/intrin/describemapflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/consolemodeflags.h"
 #include "libc/sysv/consts/map.h"
diff --git a/libc/intrin/describemapping.c b/libc/intrin/describemapping.c
index 792c510a7..79f1cf706 100644
--- a/libc/intrin/describemapping.c
+++ b/libc/intrin/describemapping.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/runtime/memtrack.internal.h"
 #include "libc/sysv/consts/map.h"
 #include "libc/sysv/consts/prot.h"
diff --git a/libc/intrin/describemremapflags.c b/libc/intrin/describemremapflags.c
index 53f976b20..185206e3c 100644
--- a/libc/intrin/describemremapflags.c
+++ b/libc/intrin/describemremapflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/sysv/consts/mremap.h"
 
diff --git a/libc/intrin/describentconsolemodeinputflags.c b/libc/intrin/describentconsolemodeinputflags.c
index 8083e49a3..caeeae037 100644
--- a/libc/intrin/describentconsolemodeinputflags.c
+++ b/libc/intrin/describentconsolemodeinputflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/consolemodeflags.h"
 
diff --git a/libc/intrin/describentconsolemodeoutputflags.c b/libc/intrin/describentconsolemodeoutputflags.c
index 93b9adf78..68ab4c2c1 100644
--- a/libc/intrin/describentconsolemodeoutputflags.c
+++ b/libc/intrin/describentconsolemodeoutputflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/consolemodeflags.h"
 
diff --git a/libc/intrin/describentcreationdisposition.c b/libc/intrin/describentcreationdisposition.c
index 33ee9015f..136a8119f 100644
--- a/libc/intrin/describentcreationdisposition.c
+++ b/libc/intrin/describentcreationdisposition.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/nt/enum/creationdisposition.h"
 
 const char *DescribeNtCreationDisposition(uint32_t x) {
diff --git a/libc/intrin/describentfileaccessflags.c b/libc/intrin/describentfileaccessflags.c
index 6bcfe0ed2..996c9f36b 100644
--- a/libc/intrin/describentfileaccessflags.c
+++ b/libc/intrin/describentfileaccessflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/accessmask.h"
 #include "libc/nt/enum/filesharemode.h"
diff --git a/libc/intrin/describentfileflagattr.c b/libc/intrin/describentfileflagattr.c
index 36762db5a..a27024fbd 100644
--- a/libc/intrin/describentfileflagattr.c
+++ b/libc/intrin/describentfileflagattr.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/fileflagandattributes.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/intrin/describentfilemapflags.c b/libc/intrin/describentfilemapflags.c
index 6d1848b3f..11d28d561 100644
--- a/libc/intrin/describentfilemapflags.c
+++ b/libc/intrin/describentfilemapflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/filemapflags.h"
 
diff --git a/libc/intrin/describentfileshareflags.c b/libc/intrin/describentfileshareflags.c
index 5878b1140..865cda1d7 100644
--- a/libc/intrin/describentfileshareflags.c
+++ b/libc/intrin/describentfileshareflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/filesharemode.h"
 
diff --git a/libc/intrin/describentfiletypeflags.c b/libc/intrin/describentfiletypeflags.c
index 4ba2ffe00..8e720f302 100644
--- a/libc/intrin/describentfiletypeflags.c
+++ b/libc/intrin/describentfiletypeflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/filetype.h"
 #include "libc/sysv/consts/mremap.h"
diff --git a/libc/intrin/describentlockfileflags.c b/libc/intrin/describentlockfileflags.c
index af02f1d9f..69f0875bc 100644
--- a/libc/intrin/describentlockfileflags.c
+++ b/libc/intrin/describentlockfileflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/filelockflags.h"
 
diff --git a/libc/intrin/describentmovfileinpflags.c b/libc/intrin/describentmovfileinpflags.c
index 7cb601066..1b301cd6a 100644
--- a/libc/intrin/describentmovfileinpflags.c
+++ b/libc/intrin/describentmovfileinpflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/movefileexflags.h"
 
diff --git a/libc/intrin/describentoverlapped.c b/libc/intrin/describentoverlapped.c
index a4f3e1e07..d6727424d 100644
--- a/libc/intrin/describentoverlapped.c
+++ b/libc/intrin/describentoverlapped.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describentoverlapped.internal.h"
+#include "libc/intrin/describentoverlapped.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/macros.internal.h"
 
diff --git a/libc/intrin/describentoverlapped.internal.h b/libc/intrin/describentoverlapped.h
similarity index 100%
rename from libc/intrin/describentoverlapped.internal.h
rename to libc/intrin/describentoverlapped.h
diff --git a/libc/intrin/describentpageflags.c b/libc/intrin/describentpageflags.c
index 543f630f2..30acb62bc 100644
--- a/libc/intrin/describentpageflags.c
+++ b/libc/intrin/describentpageflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/pageflags.h"
 
diff --git a/libc/intrin/describentpipemodeflags.c b/libc/intrin/describentpipemodeflags.c
index 490bdb037..4bab699f4 100644
--- a/libc/intrin/describentpipemodeflags.c
+++ b/libc/intrin/describentpipemodeflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/filemapflags.h"
 #include "libc/nt/ipc.h"
diff --git a/libc/intrin/describentpipeopenflags.c b/libc/intrin/describentpipeopenflags.c
index ec3a0c5c6..bc8134229 100644
--- a/libc/intrin/describentpipeopenflags.c
+++ b/libc/intrin/describentpipeopenflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/accessmask.h"
 #include "libc/nt/enum/fileflagandattributes.h"
diff --git a/libc/intrin/describentprocaccessflags.c b/libc/intrin/describentprocaccessflags.c
index b8d18202e..a7f5db917 100644
--- a/libc/intrin/describentprocaccessflags.c
+++ b/libc/intrin/describentprocaccessflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/processaccess.h"
 
diff --git a/libc/intrin/describentsecurityattributes.c b/libc/intrin/describentsecurityattributes.c
index 3031b3c3a..058c2a49f 100644
--- a/libc/intrin/describentsecurityattributes.c
+++ b/libc/intrin/describentsecurityattributes.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/state.internal.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/nt/struct/securityattributes.h"
 
 const char *(
diff --git a/libc/intrin/describentstartflags.c b/libc/intrin/describentstartflags.c
index 02aaec9ee..6a46b736c 100644
--- a/libc/intrin/describentstartflags.c
+++ b/libc/intrin/describentstartflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/startf.h"
 #include "libc/sysv/consts/prot.h"
diff --git a/libc/intrin/describentsymlinkflags.c b/libc/intrin/describentsymlinkflags.c
index 4cc66d262..85e5d5896 100644
--- a/libc/intrin/describentsymlinkflags.c
+++ b/libc/intrin/describentsymlinkflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/symboliclink.h"
 
diff --git a/libc/intrin/describeopenflags.c b/libc/intrin/describeopenflags.c
index b57fc9219..984ecd76e 100644
--- a/libc/intrin/describeopenflags.c
+++ b/libc/intrin/describeopenflags.c
@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/fmt/itoa.h"
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/o.h"
diff --git a/libc/intrin/describeopenmode.c b/libc/intrin/describeopenmode.c
index 692427508..bbfa86e8e 100644
--- a/libc/intrin/describeopenmode.c
+++ b/libc/intrin/describeopenmode.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/o.h"
 
 #define O_TMPFILE_LINUX 0x00410000
diff --git a/libc/intrin/describepersonalityflags.c b/libc/intrin/describepersonalityflags.c
index d92bc2c0d..86d5563cf 100644
--- a/libc/intrin/describepersonalityflags.c
+++ b/libc/intrin/describepersonalityflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/accessmask.h"
 #include "libc/nt/enum/filesharemode.h"
diff --git a/libc/intrin/describepollfds.c b/libc/intrin/describepollfds.c
index 941fa09e2..dd1b8a19a 100644
--- a/libc/intrin/describepollfds.c
+++ b/libc/intrin/describepollfds.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
diff --git a/libc/intrin/describepollflags.c b/libc/intrin/describepollflags.c
index 6556e4f16..e902914a3 100644
--- a/libc/intrin/describepollflags.c
+++ b/libc/intrin/describepollflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/filemapflags.h"
 #include "libc/sysv/consts/poll.h"
diff --git a/libc/intrin/describeprotflags.c b/libc/intrin/describeprotflags.c
index 5761ac0fe..33baf5fcf 100644
--- a/libc/intrin/describeprotflags.c
+++ b/libc/intrin/describeprotflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/sysv/consts/prot.h"
 
diff --git a/libc/intrin/describeptrace.c b/libc/intrin/describeptrace.c
index 7b9969fce..d4c6f4fec 100644
--- a/libc/intrin/describeptrace.c
+++ b/libc/intrin/describeptrace.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/ptrace.h"
 
 const char *(DescribePtrace)(char buf[12], int x) {
diff --git a/libc/intrin/describeptraceevent.c b/libc/intrin/describeptraceevent.c
index f8e8e49ed..b3ba1ee18 100644
--- a/libc/intrin/describeptraceevent.c
+++ b/libc/intrin/describeptraceevent.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/ptrace.h"
 
 const char *(DescribePtraceEvent)(char buf[32], int x) {
diff --git a/libc/intrin/describerlimit.c b/libc/intrin/describerlimit.c
index 9d211a6c4..feb7574ee 100644
--- a/libc/intrin/describerlimit.c
+++ b/libc/intrin/describerlimit.c
@@ -20,7 +20,7 @@
 #include "libc/dce.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/rlim.h"
 
diff --git a/libc/intrin/describerlimitname.c b/libc/intrin/describerlimitname.c
index d7b578853..15ee5a7b9 100644
--- a/libc/intrin/describerlimitname.c
+++ b/libc/intrin/describerlimitname.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 
 /**
  * Describes setrlimit() / getrlimit() argument.
diff --git a/libc/intrin/describeschedparam.c b/libc/intrin/describeschedparam.c
index 059d66088..369f52d93 100644
--- a/libc/intrin/describeschedparam.c
+++ b/libc/intrin/describeschedparam.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/struct/sched_param.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/describeschedpolicy.c b/libc/intrin/describeschedpolicy.c
index 626a8efe0..687636ae3 100644
--- a/libc/intrin/describeschedpolicy.c
+++ b/libc/intrin/describeschedpolicy.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/sched.h"
diff --git a/libc/intrin/describeseccompoperation.c b/libc/intrin/describeseccompoperation.c
index 74a379f9e..a18b18d6f 100644
--- a/libc/intrin/describeseccompoperation.c
+++ b/libc/intrin/describeseccompoperation.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/struct/seccomp.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 
 const char *DescribeSeccompOperation(int x) {
   switch (x) {
diff --git a/libc/intrin/describesigaction.c b/libc/intrin/describesigaction.c
index 968ce057c..a9b1fb8d6 100644
--- a/libc/intrin/describesigaction.c
+++ b/libc/intrin/describesigaction.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/sigset.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/alloca.h"
diff --git a/libc/intrin/describesigaltstack.c b/libc/intrin/describesigaltstack.c
index 5121a93e5..90770f3a6 100644
--- a/libc/intrin/describesigaltstack.c
+++ b/libc/intrin/describesigaltstack.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/struct/sigaltstack.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 
 const char *(DescribeSigaltstk)(char buf[128], int rc,
diff --git a/libc/intrin/describesiginfo.c b/libc/intrin/describesiginfo.c
index d1bc5508d..8235b078b 100644
--- a/libc/intrin/describesiginfo.c
+++ b/libc/intrin/describesiginfo.c
@@ -19,7 +19,7 @@
 #include "libc/calls/struct/siginfo.h"
 #include "libc/calls/struct/siginfo.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/weaken.h"
 #include "libc/str/str.h"
diff --git a/libc/intrin/describesleepflags.c b/libc/intrin/describesleepflags.c
index 8b37755fd..858a254f6 100644
--- a/libc/intrin/describesleepflags.c
+++ b/libc/intrin/describesleepflags.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/timer.h"
 
 /**
diff --git a/libc/intrin/describesocketfamily.c b/libc/intrin/describesocketfamily.c
index 7f1b32ade..e4bacb527 100644
--- a/libc/intrin/describesocketfamily.c
+++ b/libc/intrin/describesocketfamily.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/af.h"
 
 const char *(DescribeSocketFamily)(char buf[12], int family) {
diff --git a/libc/intrin/describesocketprotocol.c b/libc/intrin/describesocketprotocol.c
index 933ce7b41..39086245f 100644
--- a/libc/intrin/describesocketprotocol.c
+++ b/libc/intrin/describesocketprotocol.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/ipproto.h"
 
 const char *(DescribeSocketProtocol)(char buf[12], int family) {
diff --git a/libc/intrin/describesockettype.c b/libc/intrin/describesockettype.c
index 69cf9d76e..f28ffc5b8 100644
--- a/libc/intrin/describesockettype.c
+++ b/libc/intrin/describesockettype.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/sock.h"
 
diff --git a/libc/intrin/describesocklevel.c b/libc/intrin/describesocklevel.c
index dc1959ee1..8edadadc5 100644
--- a/libc/intrin/describesocklevel.c
+++ b/libc/intrin/describesocklevel.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/sol.h"
 
 /**
diff --git a/libc/intrin/describesockoptname.c b/libc/intrin/describesockoptname.c
index 1341008eb..baf37f81b 100644
--- a/libc/intrin/describesockoptname.c
+++ b/libc/intrin/describesockoptname.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/sol.h"
 
diff --git a/libc/intrin/describestdiostate.c b/libc/intrin/describestdiostate.c
index 74a934cdc..822bd2ed9 100644
--- a/libc/intrin/describestdiostate.c
+++ b/libc/intrin/describestdiostate.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/str/str.h"
 
 const char *(DescribeStdioState)(char buf[12], int x) {
diff --git a/libc/intrin/describestringlist.c b/libc/intrin/describestringlist.c
index b998b1cea..9f0e5949f 100644
--- a/libc/intrin/describestringlist.c
+++ b/libc/intrin/describestringlist.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 
 #define N 300
diff --git a/libc/intrin/describetermios.c b/libc/intrin/describetermios.c
index 825d3f0c6..6a76a2234 100644
--- a/libc/intrin/describetermios.c
+++ b/libc/intrin/describetermios.c
@@ -20,7 +20,7 @@
 #include "libc/calls/struct/termios.internal.h"
 #include "libc/calls/ttydefaults.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/macros.internal.h"
 #include "libc/sysv/consts/termios.h"
diff --git a/libc/intrin/describethreadcreationflags.c b/libc/intrin/describethreadcreationflags.c
index 54f5ec657..1b0e75b62 100644
--- a/libc/intrin/describethreadcreationflags.c
+++ b/libc/intrin/describethreadcreationflags.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/processcreationflags.h"
 
diff --git a/libc/intrin/describetimespec.c b/libc/intrin/describetimespec.c
index 7b5c56d9c..a07f0c992 100644
--- a/libc/intrin/describetimespec.c
+++ b/libc/intrin/describetimespec.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/struct/timespec.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/str/str.h"
 
diff --git a/libc/intrin/describetimeval.c b/libc/intrin/describetimeval.c
index 328d95d90..896b10c3d 100644
--- a/libc/intrin/describetimeval.c
+++ b/libc/intrin/describetimeval.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/struct/timeval.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 
 const char *(DescribeTimeval)(char buf[45], int rc, const struct timeval *tv) {
diff --git a/libc/intrin/describewhence.c b/libc/intrin/describewhence.c
index 3de47df18..3d166fcbd 100644
--- a/libc/intrin/describewhence.c
+++ b/libc/intrin/describewhence.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 
 const char *(DescribeWhence)(char buf[12], int whence) {
   if (whence == SEEK_SET)
diff --git a/libc/intrin/describewhichprio.c b/libc/intrin/describewhichprio.c
index 3459dc17e..c72bf5eca 100644
--- a/libc/intrin/describewhichprio.c
+++ b/libc/intrin/describewhichprio.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/prio.h"
 
 const char *(DescribeWhichPrio)(char buf[12], int x) {
diff --git a/libc/intrin/describewinsize.c b/libc/intrin/describewinsize.c
index abc91c867..994ade424 100644
--- a/libc/intrin/describewinsize.c
+++ b/libc/intrin/describewinsize.c
@@ -19,7 +19,7 @@
 #include "libc/calls/struct/winsize.h"
 #include "libc/calls/struct/winsize.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
diff --git a/libc/intrin/deviceiocontrol.c b/libc/intrin/deviceiocontrol.c
index bd164fe29..983870285 100644
--- a/libc/intrin/deviceiocontrol.c
+++ b/libc/intrin/deviceiocontrol.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describentoverlapped.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describentoverlapped.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/nt/struct/overlapped.h"
 #include "libc/nt/thunk/msabi.h"
diff --git a/libc/intrin/directmap-metal.c b/libc/intrin/directmap-metal.c
index af0e1889c..77c0ee8b9 100644
--- a/libc/intrin/directmap-metal.c
+++ b/libc/intrin/directmap-metal.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/metalfile.internal.h"
-#include "libc/intrin/directmap.internal.h"
+#include "libc/intrin/directmap.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/pc.internal.h"
 #include "libc/str/str.h"
diff --git a/libc/intrin/directmap-nt.c b/libc/intrin/directmap-nt.c
index 00b93463d..3cd19da78 100644
--- a/libc/intrin/directmap-nt.c
+++ b/libc/intrin/directmap-nt.c
@@ -20,7 +20,7 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"
 #include "libc/errno.h"
-#include "libc/intrin/directmap.internal.h"
+#include "libc/intrin/directmap.h"
 #include "libc/nt/enum/filemapflags.h"
 #include "libc/nt/enum/pageflags.h"
 #include "libc/nt/errors.h"
diff --git a/libc/intrin/directmap.c b/libc/intrin/directmap.c
index edac9eb8d..b0a40ff59 100644
--- a/libc/intrin/directmap.c
+++ b/libc/intrin/directmap.c
@@ -20,9 +20,9 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/directmap.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/directmap.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/runtime.h"
 #include "libc/runtime/memtrack.internal.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/intrin/directmap.internal.h b/libc/intrin/directmap.h
similarity index 100%
rename from libc/intrin/directmap.internal.h
rename to libc/intrin/directmap.h
diff --git a/libc/intrin/dos2errno.c b/libc/intrin/dos2errno.c
index 4e88bd67b..2cbca8f1e 100644
--- a/libc/intrin/dos2errno.c
+++ b/libc/intrin/dos2errno.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
-#include "libc/intrin/dos2errno.internal.h"
+#include "libc/intrin/dos2errno.h"
 #include "libc/nt/errors.h"
 #include "libc/sock/sock.h"
 
diff --git a/libc/intrin/dos2errno.internal.h b/libc/intrin/dos2errno.h
similarity index 100%
rename from libc/intrin/dos2errno.internal.h
rename to libc/intrin/dos2errno.h
diff --git a/libc/intrin/exit.c b/libc/intrin/exit.c
index 8d1a92f6c..1338e1846 100644
--- a/libc/intrin/exit.c
+++ b/libc/intrin/exit.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/intrin/promises.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/promises.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nexgen32e/vendor.internal.h"
 #include "libc/nt/enum/status.h"
diff --git a/libc/intrin/extend.internal.h b/libc/intrin/extend.h
similarity index 100%
rename from libc/intrin/extend.internal.h
rename to libc/intrin/extend.h
diff --git a/libc/intrin/g_fds.c b/libc/intrin/fds.c
similarity index 96%
rename from libc/intrin/g_fds.c
rename to libc/intrin/fds.c
index addae54ad..f70abfb92 100644
--- a/libc/intrin/g_fds.c
+++ b/libc/intrin/fds.c
@@ -18,14 +18,14 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"
-#include "libc/calls/struct/fd.internal.h"
 #include "libc/calls/ttydefaults.h"
 #include "libc/dce.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/extend.internal.h"
+#include "libc/intrin/extend.h"
+#include "libc/intrin/fds.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/nomultics.internal.h"
-#include "libc/intrin/pushpop.internal.h"
+#include "libc/intrin/nomultics.h"
+#include "libc/intrin/pushpop.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nt/console.h"
 #include "libc/nt/createfile.h"
@@ -45,7 +45,7 @@
 #define OPEN_MAX 16
 
 #ifdef __x86_64__
-__static_yoink("_init_g_fds");
+__static_yoink("_init_fds");
 #endif
 
 struct Fds g_fds;
diff --git a/libc/calls/struct/fd.internal.h b/libc/intrin/fds.h
similarity index 100%
rename from libc/calls/struct/fd.internal.h
rename to libc/intrin/fds.h
diff --git a/libc/intrin/g_fds_init.S b/libc/intrin/fds_init.S
similarity index 97%
rename from libc/intrin/g_fds_init.S
rename to libc/intrin/fds_init.S
index c39f63767..d0fa0b96d 100644
--- a/libc/intrin/g_fds_init.S
+++ b/libc/intrin/fds_init.S
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/macros.internal.h"
 
-	.init.start 305,_init_g_fds
+	.init.start 305,_init_fds
 	push	%rdi
 	push	%rsi
 	mov	%r12d,%edi			// argc
@@ -27,4 +27,4 @@
 	call	__init_fds
 	pop	%rsi
 	pop	%rdi
-	.init.end 305,_init_g_fds
+	.init.end 305,_init_fds
diff --git a/libc/intrin/findclose.c b/libc/intrin/findclose.c
index eccb3dff0..7f208ac21 100644
--- a/libc/intrin/findclose.c
+++ b/libc/intrin/findclose.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/nt/thunk/msabi.h"
 
diff --git a/libc/intrin/findfirstfile.c b/libc/intrin/findfirstfile.c
index 661de9c3d..f43759706 100644
--- a/libc/intrin/findfirstfile.c
+++ b/libc/intrin/findfirstfile.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/nt/memory.h"
 #include "libc/nt/struct/win32finddata.h"
diff --git a/libc/intrin/findnextfile.c b/libc/intrin/findnextfile.c
index 5bb42cc87..e1cb288e6 100644
--- a/libc/intrin/findnextfile.c
+++ b/libc/intrin/findnextfile.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/errors.h"
 #include "libc/nt/files.h"
 #include "libc/nt/memory.h"
diff --git a/libc/intrin/flushfilebuffers.c b/libc/intrin/flushfilebuffers.c
index 1105d8dd1..4c03a89ae 100644
--- a/libc/intrin/flushfilebuffers.c
+++ b/libc/intrin/flushfilebuffers.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/nt/runtime.h"
 
diff --git a/libc/intrin/flushviewoffile.c b/libc/intrin/flushviewoffile.c
index 049a9c0e1..1f977481c 100644
--- a/libc/intrin/flushviewoffile.c
+++ b/libc/intrin/flushviewoffile.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/memory.h"
 
 __msabi extern typeof(FlushViewOfFile) *const __imp_FlushViewOfFile;
diff --git a/libc/intrin/generateconsolectrlevent.c b/libc/intrin/generateconsolectrlevent.c
index a9b24dd0e..8a2c673cd 100644
--- a/libc/intrin/generateconsolectrlevent.c
+++ b/libc/intrin/generateconsolectrlevent.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/console.h"
 #include "libc/nt/thunk/msabi.h"
 
diff --git a/libc/intrin/getauxval.c b/libc/intrin/getauxval.c
index 54bc4a7e5..503be8f26 100644
--- a/libc/intrin/getauxval.c
+++ b/libc/intrin/getauxval.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
-#include "libc/intrin/getauxval.internal.h"
+#include "libc/intrin/getauxval.h"
 #include "libc/runtime/runtime.h"
 
 /**
diff --git a/libc/intrin/getauxval.internal.h b/libc/intrin/getauxval.h
similarity index 100%
rename from libc/intrin/getauxval.internal.h
rename to libc/intrin/getauxval.h
diff --git a/libc/intrin/getenv.c b/libc/intrin/getenv.c
index e272d3ed1..29a003d71 100644
--- a/libc/intrin/getenv.c
+++ b/libc/intrin/getenv.c
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/getenv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/getenv.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 
 /**
diff --git a/libc/intrin/getenv.internal.h b/libc/intrin/getenv.h
similarity index 100%
rename from libc/intrin/getenv.internal.h
rename to libc/intrin/getenv.h
diff --git a/libc/intrin/getexitcodeprocess.c b/libc/intrin/getexitcodeprocess.c
index 8f359803a..630cb4d77 100644
--- a/libc/intrin/getexitcodeprocess.c
+++ b/libc/intrin/getexitcodeprocess.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/accounting.h"
 #include "libc/nt/thunk/msabi.h"
 
diff --git a/libc/intrin/getfileattributes.c b/libc/intrin/getfileattributes.c
index 17f520589..976d0a2e3 100644
--- a/libc/intrin/getfileattributes.c
+++ b/libc/intrin/getfileattributes.c
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/nt/thunk/msabi.h"
 
diff --git a/libc/intrin/getmainstack.c b/libc/intrin/getmainstack.c
index 3638898d9..af6e901ba 100644
--- a/libc/intrin/getmainstack.c
+++ b/libc/intrin/getmainstack.c
@@ -19,7 +19,7 @@
 #include "libc/calls/struct/rlimit.h"
 #include "libc/calls/struct/rlimit.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/getauxval.internal.h"
+#include "libc/intrin/getauxval.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/maps.h"
 #include "libc/macros.internal.h"
diff --git a/libc/intrin/getminsigstksz.c b/libc/intrin/getminsigstksz.c
index 95306f23b..cb87e441c 100644
--- a/libc/intrin/getminsigstksz.c
+++ b/libc/intrin/getminsigstksz.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/getauxval.internal.h"
+#include "libc/intrin/getauxval.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/consts/auxv.h"
diff --git a/libc/intrin/iscall.c b/libc/intrin/iscall.c
index 7907d8525..d97d446c1 100644
--- a/libc/intrin/iscall.c
+++ b/libc/intrin/iscall.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/iscall.internal.h"
+#include "libc/intrin/iscall.h"
 
 // returns true if `p` is preceded by x86 call instruction
 // this is actually impossible to do but we'll do our best
diff --git a/libc/intrin/iscall.internal.h b/libc/intrin/iscall.h
similarity index 100%
rename from libc/intrin/iscall.internal.h
rename to libc/intrin/iscall.h
diff --git a/libc/intrin/isdebuggerpresent.c b/libc/intrin/isdebuggerpresent.c
index 0e12034f3..37474326e 100644
--- a/libc/intrin/isdebuggerpresent.c
+++ b/libc/intrin/isdebuggerpresent.c
@@ -20,8 +20,8 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/getenv.internal.h"
-#include "libc/intrin/promises.internal.h"
+#include "libc/intrin/getenv.h"
+#include "libc/intrin/promises.h"
 #include "libc/log/libfatal.internal.h"
 #include "libc/log/log.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/intrin/kprintf.greg.c b/libc/intrin/kprintf.greg.c
index d32c52c64..1677f8953 100644
--- a/libc/intrin/kprintf.greg.c
+++ b/libc/intrin/kprintf.greg.c
@@ -25,11 +25,11 @@
 #include "libc/fmt/magnumstrs.internal.h"
 #include "libc/intrin/asmflag.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/getenv.internal.h"
+#include "libc/intrin/getenv.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/likely.h"
 #include "libc/intrin/maps.h"
-#include "libc/intrin/nomultics.internal.h"
+#include "libc/intrin/nomultics.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/internal.h"
 #include "libc/nexgen32e/rdtsc.h"
diff --git a/libc/intrin/lockfileex.c b/libc/intrin/lockfileex.c
index e156ebe54..88f3cb9e0 100644
--- a/libc/intrin/lockfileex.c
+++ b/libc/intrin/lockfileex.c
@@ -17,9 +17,9 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/describentoverlapped.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/describentoverlapped.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/enum/filelockflags.h"
 #include "libc/nt/files.h"
 
diff --git a/libc/intrin/mapviewoffileex.c b/libc/intrin/mapviewoffileex.c
index 3841269bf..992a1897d 100644
--- a/libc/intrin/mapviewoffileex.c
+++ b/libc/intrin/mapviewoffileex.c
@@ -18,8 +18,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/enum/filemapflags.h"
 #include "libc/nt/memory.h"
 
diff --git a/libc/intrin/mapviewoffileexnuma.c b/libc/intrin/mapviewoffileexnuma.c
index 2ee4e40de..879ba345c 100644
--- a/libc/intrin/mapviewoffileexnuma.c
+++ b/libc/intrin/mapviewoffileexnuma.c
@@ -19,8 +19,8 @@
 #include "libc/assert.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/enum/filemapflags.h"
 #include "libc/nt/memory.h"
 
diff --git a/libc/intrin/mmap.c b/libc/intrin/mmap.c
index 887d4de34..6982507a6 100644
--- a/libc/intrin/mmap.c
+++ b/libc/intrin/mmap.c
@@ -28,12 +28,12 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describebacktrace.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/directmap.internal.h"
+#include "libc/intrin/describebacktrace.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/directmap.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/maps.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nt/memory.h"
 #include "libc/nt/runtime.h"
diff --git a/libc/intrin/movefileex.c b/libc/intrin/movefileex.c
index 66e32fe02..bd7496db2 100644
--- a/libc/intrin/movefileex.c
+++ b/libc/intrin/movefileex.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/nt/memory.h"
 #include "libc/nt/thunk/msabi.h"
diff --git a/libc/intrin/mprotect.c b/libc/intrin/mprotect.c
index a3c38744a..cc8a23ee9 100644
--- a/libc/intrin/mprotect.c
+++ b/libc/intrin/mprotect.c
@@ -19,12 +19,12 @@
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/directmap.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/directmap.h"
 #include "libc/intrin/dll.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/maps.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/tree.h"
 #include "libc/nt/memory.h"
 #include "libc/runtime/internal.h"
diff --git a/libc/intrin/msync.c b/libc/intrin/msync.c
index a9b03ea8c..69bf5730b 100644
--- a/libc/intrin/msync.c
+++ b/libc/intrin/msync.c
@@ -23,7 +23,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/intrin/munmap-metal.c b/libc/intrin/munmap-metal.c
index b022ddfc4..83f889bb6 100644
--- a/libc/intrin/munmap-metal.c
+++ b/libc/intrin/munmap-metal.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/directmap.internal.h"
+#include "libc/intrin/directmap.h"
 #include "libc/runtime/pc.internal.h"
 #ifdef __x86_64__
 
diff --git a/libc/intrin/munmap-sysv.c b/libc/intrin/munmap-sysv.c
index 258782d60..0f00ddc5c 100644
--- a/libc/intrin/munmap-sysv.c
+++ b/libc/intrin/munmap-sysv.c
@@ -18,9 +18,9 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/directmap.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/directmap.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/syslib.internal.h"
 
diff --git a/libc/intrin/nomultics.c b/libc/intrin/nomultics.c
index 065eb42fc..fa38350f1 100644
--- a/libc/intrin/nomultics.c
+++ b/libc/intrin/nomultics.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/ttydefaults.h"
-#include "libc/intrin/nomultics.internal.h"
+#include "libc/intrin/nomultics.h"
 
 struct TtyConf __ttyconf = {
     .vmin = 1,
diff --git a/libc/intrin/nomultics.internal.h b/libc/intrin/nomultics.h
similarity index 100%
rename from libc/intrin/nomultics.internal.h
rename to libc/intrin/nomultics.h
diff --git a/libc/intrin/openprocess.c b/libc/intrin/openprocess.c
index 338da91bf..3f9fed97c 100644
--- a/libc/intrin/openprocess.c
+++ b/libc/intrin/openprocess.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/memory.h"
 #include "libc/nt/process.h"
 #include "libc/nt/struct/securityattributes.h"
diff --git a/libc/intrin/printmaps.c b/libc/intrin/printmaps.c
index 0a67103b3..d9eaa32af 100644
--- a/libc/intrin/printmaps.c
+++ b/libc/intrin/printmaps.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/maps.h"
 #include "libc/macros.internal.h"
diff --git a/libc/intrin/promises.c b/libc/intrin/promises.c
index a04f9cd8a..99778d9b5 100644
--- a/libc/intrin/promises.c
+++ b/libc/intrin/promises.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/pledge.h"
-#include "libc/intrin/promises.internal.h"
+#include "libc/intrin/promises.h"
 
 // XXX: should be inherited thread local
 //      see also sys_pledge_linux() which is 100% pure
diff --git a/libc/intrin/promises.internal.h b/libc/intrin/promises.h
similarity index 100%
rename from libc/intrin/promises.internal.h
rename to libc/intrin/promises.h
diff --git a/libc/intrin/prot2nt.greg.c b/libc/intrin/prot2nt.greg.c
index 59dd01491..569786b9b 100644
--- a/libc/intrin/prot2nt.greg.c
+++ b/libc/intrin/prot2nt.greg.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/directmap.internal.h"
+#include "libc/intrin/directmap.h"
 #include "libc/nt/enum/pageflags.h"
 #include "libc/sysv/consts/prot.h"
 
diff --git a/libc/intrin/pthread_atfork_actual.c b/libc/intrin/pthread_atfork_actual.c
index 251d9c81f..815517206 100644
--- a/libc/intrin/pthread_atfork_actual.c
+++ b/libc/intrin/pthread_atfork_actual.c
@@ -23,7 +23,7 @@
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/proc/proc.internal.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/intrin/pthread_delay_np.c b/libc/intrin/pthread_delay_np.c
index 3a7c98024..03d51f08d 100644
--- a/libc/intrin/pthread_delay_np.c
+++ b/libc/intrin/pthread_delay_np.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/thread/thread.h"
 
 /**
diff --git a/libc/intrin/pthread_mutex_lock.c b/libc/intrin/pthread_mutex_lock.c
index 509af6e04..99d4d9ba2 100644
--- a/libc/intrin/pthread_mutex_lock.c
+++ b/libc/intrin/pthread_mutex_lock.c
@@ -21,8 +21,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/internal.h"
 #include "libc/thread/lock.h"
diff --git a/libc/intrin/pthread_mutex_unlock.c b/libc/intrin/pthread_mutex_unlock.c
index dc8d0fb1f..652896475 100644
--- a/libc/intrin/pthread_mutex_unlock.c
+++ b/libc/intrin/pthread_mutex_unlock.c
@@ -20,7 +20,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/internal.h"
 #include "libc/thread/lock.h"
diff --git a/libc/intrin/pthread_setcancelstate.c b/libc/intrin/pthread_setcancelstate.c
index ae8f9a129..9ce15824d 100644
--- a/libc/intrin/pthread_setcancelstate.c
+++ b/libc/intrin/pthread_setcancelstate.c
@@ -18,8 +18,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/thread/posixthread.internal.h"
 #include "libc/thread/thread.h"
 #include "libc/thread/tls.h"
diff --git a/libc/intrin/pushpop.internal.h b/libc/intrin/pushpop.h
similarity index 100%
rename from libc/intrin/pushpop.internal.h
rename to libc/intrin/pushpop.h
diff --git a/libc/intrin/rand64.c b/libc/intrin/rand64.c
index f631d109f..0014d0de9 100644
--- a/libc/intrin/rand64.c
+++ b/libc/intrin/rand64.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/getauxval.internal.h"
+#include "libc/intrin/getauxval.h"
 #include "libc/nexgen32e/rdtsc.h"
 #include "libc/runtime/internal.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/intrin/removedirectory.c b/libc/intrin/removedirectory.c
index 38f03d205..0e7864bf7 100644
--- a/libc/intrin/removedirectory.c
+++ b/libc/intrin/removedirectory.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/nt/thunk/msabi.h"
 
diff --git a/libc/intrin/reopenfile.c b/libc/intrin/reopenfile.c
index 0c769d8be..d49b008ef 100644
--- a/libc/intrin/reopenfile.c
+++ b/libc/intrin/reopenfile.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/nt/runtime.h"
 #include "libc/nt/thunk/msabi.h"
diff --git a/libc/intrin/reservefd.c b/libc/intrin/reservefd.c
index a8d47a477..e751c1dd6 100644
--- a/libc/intrin/reservefd.c
+++ b/libc/intrin/reservefd.c
@@ -18,10 +18,10 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/intrin/atomic.h"
 #include "libc/intrin/cmpxchg.h"
-#include "libc/intrin/extend.internal.h"
+#include "libc/intrin/extend.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/memtrack.internal.h"
 #include "libc/str/str.h"
diff --git a/libc/intrin/safemacros.internal.h b/libc/intrin/safemacros.h
similarity index 100%
rename from libc/intrin/safemacros.internal.h
rename to libc/intrin/safemacros.h
diff --git a/libc/intrin/setcurrentdirectory.c b/libc/intrin/setcurrentdirectory.c
index ae8b70c43..3e2398bf5 100644
--- a/libc/intrin/setcurrentdirectory.c
+++ b/libc/intrin/setcurrentdirectory.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/nt/memory.h"
 #include "libc/nt/thunk/msabi.h"
diff --git a/libc/intrin/setjmp.internal.h b/libc/intrin/setjmp.h
similarity index 100%
rename from libc/intrin/setjmp.internal.h
rename to libc/intrin/setjmp.h
diff --git a/libc/intrin/sigprocmask.c b/libc/intrin/sigprocmask.c
index aa77cac8c..aa76966ab 100644
--- a/libc/intrin/sigprocmask.c
+++ b/libc/intrin/sigprocmask.c
@@ -23,8 +23,8 @@
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/dce.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/sig.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/intrin/strace.internal.h b/libc/intrin/strace.h
similarity index 100%
rename from libc/intrin/strace.internal.h
rename to libc/intrin/strace.h
diff --git a/libc/intrin/stracef.greg.c b/libc/intrin/stracef.greg.c
index 3bbfe1166..04cc8a80a 100644
--- a/libc/intrin/stracef.greg.c
+++ b/libc/intrin/stracef.greg.c
@@ -17,9 +17,9 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/intrin/describebacktrace.internal.h"
+#include "libc/intrin/describebacktrace.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 
 dontinstrument void __stracef(const char *fmt, ...) {
diff --git a/libc/intrin/terminateprocess.c b/libc/intrin/terminateprocess.c
index b69e68351..b03966dd6 100644
--- a/libc/intrin/terminateprocess.c
+++ b/libc/intrin/terminateprocess.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/console.h"
 #include "libc/nt/runtime.h"
 #include "libc/nt/thunk/msabi.h"
diff --git a/libc/intrin/ubsan.c b/libc/intrin/ubsan.c
index 98c22d85d..e6107594a 100644
--- a/libc/intrin/ubsan.c
+++ b/libc/intrin/ubsan.c
@@ -19,8 +19,8 @@
 #include "libc/intrin/ubsan.h"
 #include "libc/calls/calls.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/pushpop.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/pushpop.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
 #include "libc/log/color.internal.h"
diff --git a/libc/intrin/ulock.c b/libc/intrin/ulock.c
index 190d18133..906f96ecc 100644
--- a/libc/intrin/ulock.c
+++ b/libc/intrin/ulock.c
@@ -21,8 +21,8 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 
 // XNU futexes
 // https://opensource.apple.com/source/xnu/xnu-7195.50.7.100.1/bsd/sys/ulock.h.auto.html
diff --git a/libc/intrin/unlockfileex.c b/libc/intrin/unlockfileex.c
index 46cc29248..295b7ae77 100644
--- a/libc/intrin/unlockfileex.c
+++ b/libc/intrin/unlockfileex.c
@@ -18,9 +18,9 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/describentoverlapped.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/describentoverlapped.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/files.h"
 #include "libc/str/str.h"
 
diff --git a/libc/intrin/unmapviewoffile.c b/libc/intrin/unmapviewoffile.c
index 853893895..7c5972082 100644
--- a/libc/intrin/unmapviewoffile.c
+++ b/libc/intrin/unmapviewoffile.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/memory.h"
 
 __msabi extern typeof(UnmapViewOfFile) *const __imp_UnmapViewOfFile;
diff --git a/libc/intrin/unsetenv.c b/libc/intrin/unsetenv.c
index d96e1e4f4..e882448ff 100644
--- a/libc/intrin/unsetenv.c
+++ b/libc/intrin/unsetenv.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/intrin/getenv.internal.h"
+#include "libc/intrin/getenv.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/intrin/virtualprotect.c b/libc/intrin/virtualprotect.c
index 55c97470c..4b1aaa1a0 100644
--- a/libc/intrin/virtualprotect.c
+++ b/libc/intrin/virtualprotect.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/log/libfatal.internal.h"
 #include "libc/nt/memory.h"
 
diff --git a/libc/intrin/waitformultipleobjects.c b/libc/intrin/waitformultipleobjects.c
index 3ea1abba3..661f8946b 100644
--- a/libc/intrin/waitformultipleobjects.c
+++ b/libc/intrin/waitformultipleobjects.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/runtime.h"
 #include "libc/nt/synchronization.h"
 #include "libc/nt/thunk/msabi.h"
diff --git a/libc/intrin/waitforsingleobject.c b/libc/intrin/waitforsingleobject.c
index 038ff2683..c42d3b5d2 100644
--- a/libc/intrin/waitforsingleobject.c
+++ b/libc/intrin/waitforsingleobject.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/runtime.h"
 #include "libc/nt/synchronization.h"
 #include "libc/nt/thunk/msabi.h"
diff --git a/libc/intrin/wsagetoverlappedresult.c b/libc/intrin/wsagetoverlappedresult.c
index a9096ec8a..f1315bcef 100644
--- a/libc/intrin/wsagetoverlappedresult.c
+++ b/libc/intrin/wsagetoverlappedresult.c
@@ -17,9 +17,9 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
-#include "libc/intrin/describentoverlapped.internal.h"
+#include "libc/intrin/describentoverlapped.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/mem/alloca.h"
 #include "libc/nt/thunk/msabi.h"
 #include "libc/nt/winsock.h"
diff --git a/libc/intrin/wsarecv.c b/libc/intrin/wsarecv.c
index 89cad8a1c..e4fe65f11 100644
--- a/libc/intrin/wsarecv.c
+++ b/libc/intrin/wsarecv.c
@@ -18,11 +18,11 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/describentoverlapped.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/describentoverlapped.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/likely.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/thunk/msabi.h"
 #include "libc/nt/winsock.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/intrin/wsarecvfrom.c b/libc/intrin/wsarecvfrom.c
index 9965974d3..170eb9977 100644
--- a/libc/intrin/wsarecvfrom.c
+++ b/libc/intrin/wsarecvfrom.c
@@ -17,11 +17,11 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/describentoverlapped.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/describentoverlapped.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/likely.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/runtime.h"
 #include "libc/nt/thunk/msabi.h"
 #include "libc/nt/winsock.h"
diff --git a/libc/intrin/wsawaitformultipleevents.c b/libc/intrin/wsawaitformultipleevents.c
index 33f8d65c7..115d9615e 100644
--- a/libc/intrin/wsawaitformultipleevents.c
+++ b/libc/intrin/wsawaitformultipleevents.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/thunk/msabi.h"
 #include "libc/nt/winsock.h"
 
diff --git a/libc/intrin/xchg.internal.h b/libc/intrin/xchg.h
similarity index 100%
rename from libc/intrin/xchg.internal.h
rename to libc/intrin/xchg.h
diff --git a/libc/irq/acpi-xsdt.c b/libc/irq/acpi-xsdt.c
index e37f92a3d..94dc50a82 100644
--- a/libc/irq/acpi-xsdt.c
+++ b/libc/irq/acpi-xsdt.c
@@ -26,7 +26,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/directmap.internal.h"
+#include "libc/intrin/directmap.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/irq/acpi.internal.h"
 #include "libc/log/color.internal.h"
diff --git a/libc/log/attachdebugger.c b/libc/log/attachdebugger.c
index 337f6c4e8..6d0238c53 100644
--- a/libc/log/attachdebugger.c
+++ b/libc/log/attachdebugger.c
@@ -20,7 +20,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/log/color.internal.h"
 #include "libc/log/gdb.h"
 #include "libc/log/internal.h"
diff --git a/libc/log/backtrace2.c b/libc/log/backtrace2.c
index b3eeac606..34be29c7d 100644
--- a/libc/log/backtrace2.c
+++ b/libc/log/backtrace2.c
@@ -24,10 +24,10 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describebacktrace.internal.h"
-#include "libc/intrin/iscall.internal.h"
+#include "libc/intrin/describebacktrace.h"
+#include "libc/intrin/iscall.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/promises.internal.h"
+#include "libc/intrin/promises.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/backtrace.internal.h"
 #include "libc/log/color.internal.h"
diff --git a/libc/log/backtrace3.c b/libc/log/backtrace3.c
index 37d0c1462..a49240bce 100644
--- a/libc/log/backtrace3.c
+++ b/libc/log/backtrace3.c
@@ -20,7 +20,7 @@
 #include "libc/calls/calls.h"
 #include "libc/cosmo.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/iscall.internal.h"
+#include "libc/intrin/iscall.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/backtrace.internal.h"
diff --git a/libc/log/checkfail.c b/libc/log/checkfail.c
index f1b0d26eb..51cb08efb 100644
--- a/libc/log/checkfail.c
+++ b/libc/log/checkfail.c
@@ -19,8 +19,8 @@
 #include "libc/calls/calls.h"
 #include "libc/errno.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/safemacros.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/safemacros.h"
+#include "libc/intrin/strace.h"
 #include "libc/log/check.h"
 #include "libc/log/color.internal.h"
 #include "libc/log/internal.h"
diff --git a/libc/log/commandvenv.c b/libc/log/commandvenv.c
index e028d89db..f0e2430fc 100644
--- a/libc/log/commandvenv.c
+++ b/libc/log/commandvenv.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/log/log.h"
 #include "libc/mem/mem.h"
diff --git a/libc/log/cxaprintexits.c b/libc/log/cxaprintexits.c
index a7be1130c..2264a6bbe 100644
--- a/libc/log/cxaprintexits.c
+++ b/libc/log/cxaprintexits.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/bsf.h"
-#include "libc/intrin/cxaatexit.internal.h"
+#include "libc/intrin/cxaatexit.h"
 #include "libc/log/log.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
diff --git a/libc/log/die.c b/libc/log/die.c
index 30458102c..15f86e8e6 100644
--- a/libc/log/die.c
+++ b/libc/log/die.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/errno.h"
-#include "libc/intrin/describebacktrace.internal.h"
+#include "libc/intrin/describebacktrace.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/log/backtrace.internal.h"
 #include "libc/log/internal.h"
diff --git a/libc/log/gdbexec.c b/libc/log/gdbexec.c
index 0d63a9682..a29bc4f98 100644
--- a/libc/log/gdbexec.c
+++ b/libc/log/gdbexec.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/log/gdb.h"
 #include "libc/log/log.h"
 #include "libc/nexgen32e/stackframe.h"
diff --git a/libc/log/minicrash.c b/libc/log/minicrash.c
index 6a02251ca..7197b8ce9 100644
--- a/libc/log/minicrash.c
+++ b/libc/log/minicrash.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/ucontext.internal.h"
 #include "libc/calls/ucontext.h"
 #include "libc/errno.h"
-#include "libc/intrin/describebacktrace.internal.h"
+#include "libc/intrin/describebacktrace.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/log/internal.h"
 #include "libc/log/log.h"
diff --git a/libc/log/oncrash_amd64.c b/libc/log/oncrash_amd64.c
index f9df5f99b..e55cfa7e5 100644
--- a/libc/log/oncrash_amd64.c
+++ b/libc/log/oncrash_amd64.c
@@ -32,10 +32,10 @@
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describebacktrace.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describebacktrace.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/backtrace.internal.h"
 #include "libc/log/gdb.h"
diff --git a/libc/log/oncrash_arm64.c b/libc/log/oncrash_arm64.c
index 0e6530018..83a347a75 100644
--- a/libc/log/oncrash_arm64.c
+++ b/libc/log/oncrash_arm64.c
@@ -36,8 +36,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describebacktrace.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describebacktrace.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/log/internal.h"
 #include "libc/log/log.h"
diff --git a/libc/log/printwindowsmemory.c b/libc/log/printwindowsmemory.c
index 9ec34dd57..ed9a4a145 100644
--- a/libc/log/printwindowsmemory.c
+++ b/libc/log/printwindowsmemory.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
diff --git a/libc/log/startfatal.c b/libc/log/startfatal.c
index 197c61659..7b1bc54d8 100644
--- a/libc/log/startfatal.c
+++ b/libc/log/startfatal.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/log/internal.h"
 #include "libc/thread/thread.h"
 
diff --git a/libc/log/vflogf.c b/libc/log/vflogf.c
index f90b118e3..53eed5421 100644
--- a/libc/log/vflogf.c
+++ b/libc/log/vflogf.c
@@ -25,8 +25,8 @@
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/libgen.h"
-#include "libc/intrin/safemacros.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/safemacros.h"
+#include "libc/intrin/strace.h"
 #include "libc/log/internal.h"
 #include "libc/log/log.h"
 #include "libc/math.h"
diff --git a/libc/mem/leaks.c b/libc/mem/leaks.c
index be64764aa..570124226 100644
--- a/libc/mem/leaks.c
+++ b/libc/mem/leaks.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/cxxabi.h"
-#include "libc/intrin/cxaatexit.internal.h"
+#include "libc/intrin/cxaatexit.h"
 #include "libc/intrin/dll.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/weaken.h"
diff --git a/libc/mem/putenv.c b/libc/mem/putenv.c
index 3482f8b99..9a096673c 100644
--- a/libc/mem/putenv.c
+++ b/libc/mem/putenv.c
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/getenv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/getenv.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/internal.h"
 #include "libc/mem/leaks.h"
diff --git a/libc/mem/realpath.c b/libc/mem/realpath.c
index 966921565..f74a16e05 100644
--- a/libc/mem/realpath.c
+++ b/libc/mem/realpath.c
@@ -29,7 +29,7 @@
 #include "libc/calls/calls.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/log/backtrace.internal.h"
 #include "libc/mem/mem.h"
diff --git a/libc/mem/reverse.internal.h b/libc/mem/reverse.internal.h
index 07861b0ee..cc26e6e11 100644
--- a/libc/mem/reverse.internal.h
+++ b/libc/mem/reverse.internal.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_ALG_REVERSE_H_
 #define COSMOPOLITAN_LIBC_ALG_REVERSE_H_
-#include "libc/intrin/xchg.internal.h"
+#include "libc/intrin/xchg.h"
 
 /**
  * Reverses array.
diff --git a/libc/mem/setenv.c b/libc/mem/setenv.c
index 10135428b..971e328ec 100644
--- a/libc/mem/setenv.c
+++ b/libc/mem/setenv.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/mem/internal.h"
 #include "libc/mem/leaks.h"
 #include "libc/mem/mem.h"
diff --git a/libc/mem/shuffle.internal.h b/libc/mem/shuffle.internal.h
index 229cc91b6..2b543a89d 100644
--- a/libc/mem/shuffle.internal.h
+++ b/libc/mem/shuffle.internal.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_
 #define COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_
-#include "libc/intrin/xchg.internal.h"
+#include "libc/intrin/xchg.h"
 
 /**
  * Fisher-Yates shuffle.
diff --git a/libc/proc/cocmd.c b/libc/proc/cocmd.c
index 59aba86cc..7babef174 100644
--- a/libc/proc/cocmd.c
+++ b/libc/proc/cocmd.c
@@ -25,7 +25,7 @@
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/getenv.internal.h"
+#include "libc/intrin/getenv.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
diff --git a/libc/proc/describefds.c b/libc/proc/describefds.c
index 71d36c17f..d2cee918c 100644
--- a/libc/proc/describefds.c
+++ b/libc/proc/describefds.c
@@ -17,10 +17,10 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/mem/mem.h"
 #include "libc/nt/files.h"
 #include "libc/nt/runtime.h"
diff --git a/libc/proc/describefds.internal.h b/libc/proc/describefds.internal.h
index 437fabdf7..dd192630a 100644
--- a/libc/proc/describefds.internal.h
+++ b/libc/proc/describefds.internal.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_PROC_DESCRIBEFDS_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_PROC_DESCRIBEFDS_INTERNAL_H_
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/nt/struct/startupinfo.h"
 COSMOPOLITAN_C_START_
 
diff --git a/libc/proc/execve-nt.greg.c b/libc/proc/execve-nt.greg.c
index 03d8590c1..607ac1623 100644
--- a/libc/proc/execve-nt.greg.c
+++ b/libc/proc/execve-nt.greg.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/errno.h"
diff --git a/libc/proc/execve-sysv.c b/libc/proc/execve-sysv.c
index 93c22f8c0..e0dbc53b1 100644
--- a/libc/proc/execve-sysv.c
+++ b/libc/proc/execve-sysv.c
@@ -27,9 +27,9 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/safemacros.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/safemacros.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/mem/alloca.h"
 #include "libc/paths.h"
diff --git a/libc/proc/execve.c b/libc/proc/execve.c
index 2fde8ee9b..781bd3f26 100644
--- a/libc/proc/execve.c
+++ b/libc/proc/execve.c
@@ -22,10 +22,10 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/likely.h"
-#include "libc/intrin/promises.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/promises.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/libfatal.internal.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/proc/fexecve.c b/libc/proc/fexecve.c
index 9ed672c8d..762865acf 100644
--- a/libc/proc/fexecve.c
+++ b/libc/proc/fexecve.c
@@ -27,10 +27,10 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/safemacros.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/safemacros.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
 #include "libc/proc/execve.internal.h"
diff --git a/libc/proc/fork-nt.c b/libc/proc/fork-nt.c
index 0c670b9c0..201c08595 100644
--- a/libc/proc/fork-nt.c
+++ b/libc/proc/fork-nt.c
@@ -26,10 +26,10 @@
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/directmap.internal.h"
+#include "libc/intrin/directmap.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/maps.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/tree.h"
 #include "libc/intrin/weaken.h"
 #include "libc/macros.internal.h"
diff --git a/libc/proc/fork.c b/libc/proc/fork.c
index f1f138231..bc7bfbf2b 100644
--- a/libc/proc/fork.c
+++ b/libc/proc/fork.c
@@ -30,7 +30,7 @@
 #include "libc/intrin/dll.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/maps.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nt/files.h"
 #include "libc/nt/process.h"
diff --git a/libc/proc/getpriority-nt.c b/libc/proc/getpriority-nt.c
index 8cfbcc1fe..67d84363c 100644
--- a/libc/proc/getpriority-nt.c
+++ b/libc/proc/getpriority-nt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/enum/processcreationflags.h"
 #include "libc/nt/errors.h"
 #include "libc/nt/process.h"
diff --git a/libc/proc/getpriority.c b/libc/proc/getpriority.c
index b66cbc26a..fcaa7b756 100644
--- a/libc/proc/getpriority.c
+++ b/libc/proc/getpriority.c
@@ -22,8 +22,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/asmflag.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/proc/getrusage.c b/libc/proc/getrusage.c
index 95d385a50..be0cec92d 100644
--- a/libc/proc/getrusage.c
+++ b/libc/proc/getrusage.c
@@ -20,7 +20,7 @@
 #include "libc/calls/struct/rusage.h"
 #include "libc/calls/struct/rusage.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/proc/kill-nt.c b/libc/proc/kill-nt.c
index 0a60bf350..afe759dcc 100644
--- a/libc/proc/kill-nt.c
+++ b/libc/proc/kill-nt.c
@@ -21,7 +21,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/errno.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/console.h"
 #include "libc/nt/enum/ctrlevent.h"
 #include "libc/nt/enum/processaccess.h"
diff --git a/libc/proc/kill.c b/libc/proc/kill.c
index 34342add9..9c0e99a6e 100644
--- a/libc/proc/kill.c
+++ b/libc/proc/kill.c
@@ -20,7 +20,7 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/proc/posix_spawn.c b/libc/proc/posix_spawn.c
index 967392ad8..a7209abac 100644
--- a/libc/proc/posix_spawn.c
+++ b/libc/proc/posix_spawn.c
@@ -22,7 +22,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/rlimit.h"
 #include "libc/calls/struct/rlimit.internal.h"
 #include "libc/calls/struct/rusage.internal.h"
@@ -37,9 +37,9 @@
 #include "libc/fmt/magnumstrs.internal.h"
 #include "libc/intrin/atomic.h"
 #include "libc/intrin/bsf.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/mem/alloca.h"
 #include "libc/mem/mem.h"
diff --git a/libc/proc/proc.c b/libc/proc/proc.c
index e43262ce8..d147135b3 100644
--- a/libc/proc/proc.c
+++ b/libc/proc/proc.c
@@ -27,7 +27,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/wintime.internal.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/mem/leaks.h"
 #include "libc/mem/mem.h"
diff --git a/libc/proc/sched_getaffinity.c b/libc/proc/sched_getaffinity.c
index 095e28c3b..5bddf33bf 100644
--- a/libc/proc/sched_getaffinity.c
+++ b/libc/proc/sched_getaffinity.c
@@ -20,7 +20,7 @@
 #include "libc/calls/struct/cpuset.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/errors.h"
 #include "libc/nt/process.h"
 #include "libc/nt/runtime.h"
diff --git a/libc/proc/sched_setaffinity.c b/libc/proc/sched_setaffinity.c
index c7c43fefa..5e494ee98 100644
--- a/libc/proc/sched_setaffinity.c
+++ b/libc/proc/sched_setaffinity.c
@@ -20,7 +20,7 @@
 #include "libc/calls/struct/cpuset.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/errors.h"
 #include "libc/nt/process.h"
 #include "libc/nt/runtime.h"
diff --git a/libc/proc/setpriority-nt.c b/libc/proc/setpriority-nt.c
index fc3f2fb09..837bd8743 100644
--- a/libc/proc/setpriority-nt.c
+++ b/libc/proc/setpriority-nt.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall_support-nt.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/enum/processcreationflags.h"
 #include "libc/nt/errors.h"
 #include "libc/nt/process.h"
diff --git a/libc/proc/setpriority.c b/libc/proc/setpriority.c
index 07845826a..4b09a631c 100644
--- a/libc/proc/setpriority.c
+++ b/libc/proc/setpriority.c
@@ -20,8 +20,8 @@
 #include "libc/calls/syscall-nt.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 
 /**
  * Sets nice value of thing.
diff --git a/libc/proc/vfork.S b/libc/proc/vfork.S
index 482d3b23a..39d7ae6e2 100644
--- a/libc/proc/vfork.S
+++ b/libc/proc/vfork.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/thread/tls.h"
 #include "libc/macros.internal.h"
 
diff --git a/libc/proc/wait4-nt.c b/libc/proc/wait4-nt.c
index d1f2bc396..5f4a4f9d4 100644
--- a/libc/proc/wait4-nt.c
+++ b/libc/proc/wait4-nt.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/sigset.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/nt/enum/wait.h"
 #include "libc/nt/events.h"
diff --git a/libc/proc/wait4.c b/libc/proc/wait4.c
index 7d6056aff..056e9b371 100644
--- a/libc/proc/wait4.c
+++ b/libc/proc/wait4.c
@@ -20,7 +20,7 @@
 #include "libc/calls/cp.internal.h"
 #include "libc/calls/struct/rusage.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/proc/proc.internal.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/runtime/clone.c b/libc/runtime/clone.c
index be9b73488..46347d47b 100644
--- a/libc/runtime/clone.c
+++ b/libc/runtime/clone.c
@@ -28,7 +28,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/ulock.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
diff --git a/libc/runtime/cosmo.S b/libc/runtime/cosmo.S
index fcaa2376e..eccd05cfa 100644
--- a/libc/runtime/cosmo.S
+++ b/libc/runtime/cosmo.S
@@ -19,7 +19,7 @@
 #include "libc/macros.internal.h"
 #include "libc/sysv/consts/prot.h"
 #include "libc/sysv/consts/map.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/map.h"
 #include "libc/dce.h"
 #ifdef __x86_64__
diff --git a/libc/runtime/cosmo2.c b/libc/runtime/cosmo2.c
index e102b8fee..ccd926192 100644
--- a/libc/runtime/cosmo2.c
+++ b/libc/runtime/cosmo2.c
@@ -22,7 +22,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/maps.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
 #include "libc/nexgen32e/rdtsc.h"
diff --git a/libc/runtime/cxa_thread_atexit.c b/libc/runtime/cxa_thread_atexit.c
index 143727024..4e8a2efff 100644
--- a/libc/runtime/cxa_thread_atexit.c
+++ b/libc/runtime/cxa_thread_atexit.c
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/cxaatexit.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/cxaatexit.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/gc.internal.h"
diff --git a/libc/runtime/enable_tls.c b/libc/runtime/enable_tls.c
index 92807978e..580450ef2 100644
--- a/libc/runtime/enable_tls.c
+++ b/libc/runtime/enable_tls.c
@@ -22,7 +22,7 @@
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/getenv.internal.h"
+#include "libc/intrin/getenv.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/intrin/maps.h"
 #include "libc/intrin/weaken.h"
diff --git a/libc/runtime/exit.c b/libc/runtime/exit.c
index 33456c7fe..6320d4323 100644
--- a/libc/runtime/exit.c
+++ b/libc/runtime/exit.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/cxxabi.h"
-#include "libc/intrin/cxaatexit.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/cxaatexit.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/internal.h"
 
diff --git a/libc/runtime/getlogin.c b/libc/runtime/getlogin.c
index a62748cfa..73b8dec59 100644
--- a/libc/runtime/getlogin.c
+++ b/libc/runtime/getlogin.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/accounting.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/runtime/getlogin_r.c b/libc/runtime/getlogin_r.c
index 197929644..4b2311b07 100644
--- a/libc/runtime/getlogin_r.c
+++ b/libc/runtime/getlogin_r.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/accounting.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/runtime/getsymboltable.c b/libc/runtime/getsymboltable.c
index 0c8fad9d6..90dcb169f 100644
--- a/libc/runtime/getsymboltable.c
+++ b/libc/runtime/getsymboltable.c
@@ -18,8 +18,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/errno.h"
-#include "libc/intrin/promises.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/promises.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/internal.h"
diff --git a/libc/runtime/inflate.c b/libc/runtime/inflate.c
index 9a52edce3..c7a82fa0b 100644
--- a/libc/runtime/inflate.c
+++ b/libc/runtime/inflate.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/internal.h"
diff --git a/libc/runtime/login_tty.c b/libc/runtime/login_tty.c
index 14679663f..0a80916d8 100644
--- a/libc/runtime/login_tty.c
+++ b/libc/runtime/login_tty.c
@@ -21,7 +21,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/utmp.h"
 #include "libc/sysv/consts/termios.h"
diff --git a/libc/runtime/opensymboltable.greg.c b/libc/runtime/opensymboltable.greg.c
index 7cd2c8d7a..2a54eb7b6 100644
--- a/libc/runtime/opensymboltable.greg.c
+++ b/libc/runtime/opensymboltable.greg.c
@@ -22,7 +22,7 @@
 #include "libc/dce.h"
 #include "libc/elf/tinyelf.internal.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/log/libfatal.internal.h"
 #include "libc/macros.internal.h"
diff --git a/libc/runtime/straceinit.greg.c b/libc/runtime/straceinit.greg.c
index ba2084888..151e3449a 100644
--- a/libc/runtime/straceinit.greg.c
+++ b/libc/runtime/straceinit.greg.c
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/getenv.internal.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/getenv.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/log/libfatal.internal.h"
 #include "libc/runtime/internal.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/runtime/winmain.greg.c b/libc/runtime/winmain.greg.c
index 9dda29289..77ebd63c2 100644
--- a/libc/runtime/winmain.greg.c
+++ b/libc/runtime/winmain.greg.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/intrin/dll.h"
 #include "libc/intrin/maps.h"
-#include "libc/intrin/nomultics.internal.h"
+#include "libc/intrin/nomultics.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
diff --git a/libc/runtime/zipos-get.c b/libc/runtime/zipos-get.c
index e2067a400..e3615c5f4 100644
--- a/libc/runtime/zipos-get.c
+++ b/libc/runtime/zipos-get.c
@@ -23,8 +23,8 @@
 #include "libc/cosmo.h"
 #include "libc/fmt/conv.h"
 #include "libc/intrin/cmpxchg.h"
-#include "libc/intrin/promises.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/promises.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/alg.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/runtime/zipos-mmap.c b/libc/runtime/zipos-mmap.c
index ae3559494..d2551ed3d 100644
--- a/libc/runtime/zipos-mmap.c
+++ b/libc/runtime/zipos-mmap.c
@@ -21,7 +21,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/maps.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/zipos.internal.h"
diff --git a/libc/runtime/zipos-open.c b/libc/runtime/zipos-open.c
index 5dfda7ea5..46707b179 100644
--- a/libc/runtime/zipos-open.c
+++ b/libc/runtime/zipos-open.c
@@ -19,7 +19,7 @@
 #include "libc/calls/blockcancel.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/state.internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/calls/syscall_support-sysv.internal.h"
diff --git a/libc/runtime/zipos-stat-impl.c b/libc/runtime/zipos-stat-impl.c
index 93109bbc7..ff0a4b316 100644
--- a/libc/runtime/zipos-stat-impl.c
+++ b/libc/runtime/zipos-stat-impl.c
@@ -19,7 +19,7 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/zipos.internal.h"
 #include "libc/str/str.h"
diff --git a/libc/sock/accept-nt.c b/libc/sock/accept-nt.c
index 9aa702760..839553624 100644
--- a/libc/sock/accept-nt.c
+++ b/libc/sock/accept-nt.c
@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/atomic.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/cosmo.h"
 #include "libc/errno.h"
diff --git a/libc/sock/accept4.c b/libc/sock/accept4.c
index 5aee5e465..9b44071cc 100644
--- a/libc/sock/accept4.c
+++ b/libc/sock/accept4.c
@@ -19,7 +19,7 @@
 #include "libc/calls/cp.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
 #include "libc/sock/struct/sockaddr.h"
diff --git a/libc/sock/bind.c b/libc/sock/bind.c
index 5ff0ff37b..8401776f9 100644
--- a/libc/sock/bind.c
+++ b/libc/sock/bind.c
@@ -17,9 +17,9 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
 #include "libc/sock/struct/sockaddr.h"
diff --git a/libc/sock/connect-nt.c b/libc/sock/connect-nt.c
index ce1951452..6fbd14937 100644
--- a/libc/sock/connect-nt.c
+++ b/libc/sock/connect-nt.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/atomic.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/cosmo.h"
 #include "libc/errno.h"
diff --git a/libc/sock/connect.c b/libc/sock/connect.c
index 9453c62d5..5f3fd2d7c 100644
--- a/libc/sock/connect.c
+++ b/libc/sock/connect.c
@@ -18,9 +18,9 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/cp.internal.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
 #include "libc/sock/struct/sockaddr.h"
diff --git a/libc/sock/epoll.c b/libc/sock/epoll.c
index 1be06e4d5..818ddf19e 100644
--- a/libc/sock/epoll.c
+++ b/libc/sock/epoll.c
@@ -41,7 +41,7 @@
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
diff --git a/libc/sock/getsockname.c b/libc/sock/getsockname.c
index e04d620ad..b09543f2f 100644
--- a/libc/sock/getsockname.c
+++ b/libc/sock/getsockname.c
@@ -17,9 +17,9 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/errors.h"
 #include "libc/nt/thunk/msabi.h"
 #include "libc/nt/winsock.h"
diff --git a/libc/sock/getsockopt.c b/libc/sock/getsockopt.c
index 3a7106ddd..46957a415 100644
--- a/libc/sock/getsockopt.c
+++ b/libc/sock/getsockopt.c
@@ -17,10 +17,10 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
 #include "libc/sock/syscall_fd.internal.h"
diff --git a/libc/sock/kntwsadata.c b/libc/sock/kntwsadata.c
index a3450d88c..2c08015e1 100644
--- a/libc/sock/kntwsadata.c
+++ b/libc/sock/kntwsadata.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/mem/mem.h"
 #include "libc/nt/runtime.h"
 #include "libc/nt/winsock.h"
diff --git a/libc/sock/listen.c b/libc/sock/listen.c
index c4c51430d..b1262c51f 100644
--- a/libc/sock/listen.c
+++ b/libc/sock/listen.c
@@ -17,9 +17,9 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
 #include "libc/sock/syscall_fd.internal.h"
diff --git a/libc/sock/recv-nt.c b/libc/sock/recv-nt.c
index 7ce09a186..1652c113e 100644
--- a/libc/sock/recv-nt.c
+++ b/libc/sock/recv-nt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/nt/struct/iovec.h"
diff --git a/libc/sock/recv.c b/libc/sock/recv.c
index 26b9a7436..ec85a9b48 100644
--- a/libc/sock/recv.c
+++ b/libc/sock/recv.c
@@ -20,7 +20,7 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
 #include "libc/sock/syscall_fd.internal.h"
diff --git a/libc/sock/recvfrom-nt.c b/libc/sock/recvfrom-nt.c
index 25d571ad7..69f436d07 100644
--- a/libc/sock/recvfrom-nt.c
+++ b/libc/sock/recvfrom-nt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/nt/struct/iovec.h"
diff --git a/libc/sock/recvfrom.c b/libc/sock/recvfrom.c
index b015cf2af..d5e7565cf 100644
--- a/libc/sock/recvfrom.c
+++ b/libc/sock/recvfrom.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/winsock.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
diff --git a/libc/sock/recvmsg.c b/libc/sock/recvmsg.c
index 56f6d4762..c172f74c1 100644
--- a/libc/sock/recvmsg.c
+++ b/libc/sock/recvmsg.c
@@ -19,13 +19,13 @@
 #include "libc/assert.h"
 #include "libc/calls/cp.internal.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sock/sock.h"
 #include "libc/sock/struct/msghdr.h"
diff --git a/libc/sock/send-nt.c b/libc/sock/send-nt.c
index a186159b2..63cf646cf 100644
--- a/libc/sock/send-nt.c
+++ b/libc/sock/send-nt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/nt/struct/iovec.h"
diff --git a/libc/sock/send.c b/libc/sock/send.c
index b66ee698c..4d9df49ad 100644
--- a/libc/sock/send.c
+++ b/libc/sock/send.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
diff --git a/libc/sock/sendfile.c b/libc/sock/sendfile.c
index f5b107a1b..26d7cef55 100644
--- a/libc/sock/sendfile.c
+++ b/libc/sock/sendfile.c
@@ -25,8 +25,8 @@
 #include "libc/cosmo.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/enum/wsaid.h"
 #include "libc/nt/errors.h"
 #include "libc/nt/events.h"
diff --git a/libc/sock/sendmsg.c b/libc/sock/sendmsg.c
index 1b1e32a1d..197e5fd8c 100644
--- a/libc/sock/sendmsg.c
+++ b/libc/sock/sendmsg.c
@@ -19,13 +19,13 @@
 #include "libc/assert.h"
 #include "libc/calls/cp.internal.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
diff --git a/libc/sock/sendto-nt.c b/libc/sock/sendto-nt.c
index e6fdb1f17..2daf9badc 100644
--- a/libc/sock/sendto-nt.c
+++ b/libc/sock/sendto-nt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/nt/struct/iovec.h"
diff --git a/libc/sock/sendto.c b/libc/sock/sendto.c
index 61638e132..803e48fa0 100644
--- a/libc/sock/sendto.c
+++ b/libc/sock/sendto.c
@@ -22,7 +22,7 @@
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
diff --git a/libc/sock/setsockopt-nt.c b/libc/sock/setsockopt-nt.c
index c6a79b57a..f9e7a6a4d 100644
--- a/libc/sock/setsockopt-nt.c
+++ b/libc/sock/setsockopt-nt.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/timeval.h"
 #include "libc/nt/struct/linger.h"
 #include "libc/nt/thunk/msabi.h"
diff --git a/libc/sock/setsockopt.c b/libc/sock/setsockopt.c
index c7c204eb9..5b4db5661 100644
--- a/libc/sock/setsockopt.c
+++ b/libc/sock/setsockopt.c
@@ -17,11 +17,11 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/winsock.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
diff --git a/libc/sock/shutdown.c b/libc/sock/shutdown.c
index bcf816928..1ec433181 100644
--- a/libc/sock/shutdown.c
+++ b/libc/sock/shutdown.c
@@ -17,9 +17,9 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
 #include "libc/sock/syscall_fd.internal.h"
diff --git a/libc/sock/sockatmark.c b/libc/sock/sockatmark.c
index 767305d7b..be6ed7696 100644
--- a/libc/sock/sockatmark.c
+++ b/libc/sock/sockatmark.c
@@ -17,10 +17,10 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/winsock.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
diff --git a/libc/sock/sockdebug.c b/libc/sock/sockdebug.c
index 89e029fba..fd98aeb30 100644
--- a/libc/sock/sockdebug.c
+++ b/libc/sock/sockdebug.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/sock/sock.h"
 #include "libc/sock/struct/sockaddr.h"
diff --git a/libc/sock/socket.c b/libc/sock/socket.c
index 23f8de2e3..61b6463ac 100644
--- a/libc/sock/socket.c
+++ b/libc/sock/socket.c
@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sock/internal.h"
 #include "libc/sock/sock.h"
 #include "libc/sysv/consts/af.h"
diff --git a/libc/sock/syscall_fd.internal.h b/libc/sock/syscall_fd.internal.h
index ef898b72e..1c51d00ff 100644
--- a/libc/sock/syscall_fd.internal.h
+++ b/libc/sock/syscall_fd.internal.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_SOCK_SYSCALL_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_SOCK_SYSCALL_INTERNAL_H_
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/nt/struct/overlapped.h"
 #include "libc/sock/struct/sockaddr.h"
diff --git a/libc/sock/syslog.c b/libc/sock/syslog.c
index c0ac9caf5..8c5840016 100644
--- a/libc/sock/syslog.c
+++ b/libc/sock/syslog.c
@@ -23,7 +23,7 @@
 #include "libc/calls/weirdtypes.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/log/internal.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/events.h"
diff --git a/libc/stdio/dirstream.c b/libc/stdio/dirstream.c
index 2f080fabe..215eb9093 100644
--- a/libc/stdio/dirstream.c
+++ b/libc/stdio/dirstream.c
@@ -26,7 +26,7 @@
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
diff --git a/libc/stdio/fflush_unlocked.c b/libc/stdio/fflush_unlocked.c
index 579bc3676..49099d7e7 100644
--- a/libc/stdio/fflush_unlocked.c
+++ b/libc/stdio/fflush_unlocked.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/cxxabi.h"
-#include "libc/intrin/pushpop.internal.h"
+#include "libc/intrin/pushpop.h"
 #include "libc/mem/arraylist.internal.h"
 #include "libc/stdio/fflush.internal.h"
 #include "libc/stdio/internal.h"
diff --git a/libc/stdio/fmt.c b/libc/stdio/fmt.c
index b8c31bc63..cafe4f63e 100644
--- a/libc/stdio/fmt.c
+++ b/libc/stdio/fmt.c
@@ -44,8 +44,8 @@
 #include "libc/fmt/divmod10.internal.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/bsr.h"
-#include "libc/intrin/nomultics.internal.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/nomultics.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
 #include "libc/math.h"
diff --git a/libc/stdio/fread.c b/libc/stdio/fread.c
index 5c47656cb..22bf3d2f5 100644
--- a/libc/stdio/fread.c
+++ b/libc/stdio/fread.c
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/internal.h"
 
diff --git a/libc/stdio/fseek.c b/libc/stdio/fseek.c
index 49235a912..d8a549ac5 100644
--- a/libc/stdio/fseek.c
+++ b/libc/stdio/fseek.c
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/stdio/internal.h"
 
 /**
diff --git a/libc/stdio/fwrite.c b/libc/stdio/fwrite.c
index 11d2445ae..41d7141d9 100644
--- a/libc/stdio/fwrite.c
+++ b/libc/stdio/fwrite.c
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/stdio/internal.h"
 
 /**
diff --git a/libc/stdio/getentropy.c b/libc/stdio/getentropy.c
index c9cebf50b..45b5b918e 100644
--- a/libc/stdio/getentropy.c
+++ b/libc/stdio/getentropy.c
@@ -20,7 +20,7 @@
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/stdio/rand.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/stdio/printargs.c b/libc/stdio/printargs.c
index 5d2a61c2f..3e2ba0bb7 100644
--- a/libc/stdio/printargs.c
+++ b/libc/stdio/printargs.c
@@ -27,10 +27,10 @@
 #include "libc/calls/ttydefaults.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/promises.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/promises.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
 #include "libc/nexgen32e/cpuid4.internal.h"
diff --git a/libc/stdio/scanf.c b/libc/stdio/scanf.c
index 34f62f620..3afb23cad 100644
--- a/libc/stdio/scanf.c
+++ b/libc/stdio/scanf.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/fmt/internal.h"
 #include "libc/stdio/stdio.h"
 
diff --git a/libc/str/intsort.c b/libc/str/intsort.c
index 335b7f98d..2b71b1c41 100644
--- a/libc/str/intsort.c
+++ b/libc/str/intsort.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 
 static inline void InsertionSort(int *A, long n) {
diff --git a/libc/str/longsort.c b/libc/str/longsort.c
index 5ed1911cf..e5d091f7f 100644
--- a/libc/str/longsort.c
+++ b/libc/str/longsort.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 
 static inline void InsertionSort(long *A, long n) {
diff --git a/libc/str/lz4cpy.c b/libc/str/lz4cpy.c
index 832501510..125114985 100644
--- a/libc/str/lz4cpy.c
+++ b/libc/str/lz4cpy.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/pushpop.internal.h"
+#include "libc/intrin/pushpop.h"
 #include "libc/intrin/repmovsb.h"
 #include "libc/nexgen32e/kompressor.h"
 #include "libc/serialize.h"
diff --git a/libc/str/lz4len.c b/libc/str/lz4len.c
index 8dd0fcf04..3b4147794 100644
--- a/libc/str/lz4len.c
+++ b/libc/str/lz4len.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/pushpop.internal.h"
+#include "libc/intrin/pushpop.h"
 #include "libc/nexgen32e/kompressor.h"
 #include "libc/str/str.h"
 
diff --git a/libc/str/setlocale.c b/libc/str/setlocale.c
index 409e97590..9e4ecbeed 100644
--- a/libc/str/setlocale.c
+++ b/libc/str/setlocale.c
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/safemacros.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/safemacros.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/locale.h"
 #include "libc/str/str.h"
 
diff --git a/libc/str/strnwidth16.c b/libc/str/strnwidth16.c
index c07f5144d..afc854bc9 100644
--- a/libc/str/strnwidth16.c
+++ b/libc/str/strnwidth16.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/str/str.h"
 #include "libc/str/unicode.h"
 #include "libc/str/utf16.h"
diff --git a/libc/str/strwidth16.c b/libc/str/strwidth16.c
index ddcab3bad..b2a2355d1 100644
--- a/libc/str/strwidth16.c
+++ b/libc/str/strwidth16.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/str/strwidth.h"
 
diff --git a/libc/testlib/ezbenchreport.c b/libc/testlib/ezbenchreport.c
index 04ad5facd..3af989847 100644
--- a/libc/testlib/ezbenchreport.c
+++ b/libc/testlib/ezbenchreport.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/math.h"
 #include "libc/runtime/runtime.h"
 
diff --git a/libc/testlib/showerror.c b/libc/testlib/showerror.c
index 713afbb67..2197956ca 100644
--- a/libc/testlib/showerror.c
+++ b/libc/testlib/showerror.c
@@ -23,7 +23,7 @@
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/atomic.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/color.internal.h"
 #include "libc/log/internal.h"
diff --git a/libc/testlib/testmain.c b/libc/testlib/testmain.c
index 78cacd2a4..bd6093851 100644
--- a/libc/testlib/testmain.c
+++ b/libc/testlib/testmain.c
@@ -26,9 +26,9 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/getenv.internal.h"
-#include "libc/intrin/safemacros.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/getenv.h"
+#include "libc/intrin/safemacros.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/ubsan.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/log.h"
diff --git a/libc/testlib/testrunner.c b/libc/testlib/testrunner.c
index f77738c05..efe4483e2 100644
--- a/libc/testlib/testrunner.c
+++ b/libc/testlib/testrunner.c
@@ -22,8 +22,8 @@
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/getenv.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/getenv.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
diff --git a/libc/thread/getitimer.c b/libc/thread/getitimer.c
index 4e37b0d40..afa356d18 100644
--- a/libc/thread/getitimer.c
+++ b/libc/thread/getitimer.c
@@ -20,8 +20,8 @@
 #include "libc/calls/struct/itimerval.h"
 #include "libc/calls/struct/itimerval.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/thread/itimer.c b/libc/thread/itimer.c
index a4b63a0d5..91a55580a 100644
--- a/libc/thread/itimer.c
+++ b/libc/thread/itimer.c
@@ -24,7 +24,7 @@
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/calls/struct/timeval.h"
 #include "libc/cosmo.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/enum/processcreationflags.h"
 #include "libc/nt/thread.h"
 #include "libc/str/str.h"
diff --git a/libc/thread/pthread_cancel.c b/libc/thread/pthread_cancel.c
index 14b0ce8b8..5ddbea0db 100644
--- a/libc/thread/pthread_cancel.c
+++ b/libc/thread/pthread_cancel.c
@@ -29,9 +29,9 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/sa.h"
 #include "libc/sysv/consts/sig.h"
diff --git a/libc/thread/pthread_create.c b/libc/thread/pthread_create.c
index c0933e50a..8be2420c7 100644
--- a/libc/thread/pthread_create.c
+++ b/libc/thread/pthread_create.c
@@ -25,10 +25,10 @@
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/bsr.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/dll.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/internal.h"
 #include "libc/macros.internal.h"
diff --git a/libc/thread/pthread_detach.c b/libc/thread/pthread_detach.c
index 16557e2f0..2a33b4988 100644
--- a/libc/thread/pthread_detach.c
+++ b/libc/thread/pthread_detach.c
@@ -19,8 +19,8 @@
 #include "libc/assert.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/thread/posixthread.internal.h"
diff --git a/libc/thread/pthread_exit.c b/libc/thread/pthread_exit.c
index 0ce26c4d3..7e5c941a1 100644
--- a/libc/thread/pthread_exit.c
+++ b/libc/thread/pthread_exit.c
@@ -21,8 +21,8 @@
 #include "libc/cxxabi.h"
 #include "libc/dce.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/cxaatexit.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/cxaatexit.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
 #include "libc/mem/gc.h"
diff --git a/libc/thread/pthread_getaffinity_np.c b/libc/thread/pthread_getaffinity_np.c
index 1cd9aad31..50cd3e011 100644
--- a/libc/thread/pthread_getaffinity_np.c
+++ b/libc/thread/pthread_getaffinity_np.c
@@ -21,8 +21,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 #include "libc/thread/posixthread.internal.h"
diff --git a/libc/thread/pthread_kill.c b/libc/thread/pthread_kill.c
index c1a1c4fc2..472da205e 100644
--- a/libc/thread/pthread_kill.c
+++ b/libc/thread/pthread_kill.c
@@ -22,8 +22,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/syslib.internal.h"
 #include "libc/sysv/consts/sicode.h"
 #include "libc/thread/posixthread.internal.h"
diff --git a/libc/thread/pthread_setaffinity_np.c b/libc/thread/pthread_setaffinity_np.c
index 131f03a4d..4c1b3aa46 100644
--- a/libc/thread/pthread_setaffinity_np.c
+++ b/libc/thread/pthread_setaffinity_np.c
@@ -22,8 +22,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/nt/enum/threadaccess.h"
 #include "libc/nt/runtime.h"
 #include "libc/nt/thread.h"
diff --git a/libc/thread/pthread_setcanceltype.c b/libc/thread/pthread_setcanceltype.c
index 48290d5cf..f65187104 100644
--- a/libc/thread/pthread_setcanceltype.c
+++ b/libc/thread/pthread_setcanceltype.c
@@ -19,8 +19,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/mem/alloca.h"
 #include "libc/thread/posixthread.internal.h"
 #include "libc/thread/thread.h"
diff --git a/libc/thread/pthread_setname_np.c b/libc/thread/pthread_setname_np.c
index 9f2894c05..84915ac92 100644
--- a/libc/thread/pthread_setname_np.c
+++ b/libc/thread/pthread_setname_np.c
@@ -23,8 +23,8 @@
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/syslib.internal.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/at.h"
diff --git a/libc/thread/pthread_timedjoin_np.c b/libc/thread/pthread_timedjoin_np.c
index c79428b8d..f814e038a 100644
--- a/libc/thread/pthread_timedjoin_np.c
+++ b/libc/thread/pthread_timedjoin_np.c
@@ -23,9 +23,9 @@
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/thread/posixthread.internal.h"
 #include "libc/thread/thread2.h"
 #include "libc/thread/tls.h"
diff --git a/libc/thread/sem_open.c b/libc/thread/sem_open.c
index 41ab6615f..9a3e5b2ce 100644
--- a/libc/thread/sem_open.c
+++ b/libc/thread/sem_open.c
@@ -24,7 +24,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/thread/setitimer.c b/libc/thread/setitimer.c
index 88d1c7b16..e713258f0 100644
--- a/libc/thread/setitimer.c
+++ b/libc/thread/setitimer.c
@@ -19,8 +19,8 @@
 #include "libc/calls/struct/itimerval.h"
 #include "libc/calls/struct/itimerval.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/errfuns.h"
 #include "libc/time.h"
 
diff --git a/libc/vga/readv-vga.c b/libc/vga/readv-vga.c
index 3f746e729..5aaa4562a 100644
--- a/libc/vga/readv-vga.c
+++ b/libc/vga/readv-vga.c
@@ -24,7 +24,7 @@
 │ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR        │
 │ OTHER DEALINGS IN THE SOFTWARE.                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/vga/vga.internal.h"
diff --git a/libc/vga/tty.greg.c b/libc/vga/tty.greg.c
index 4f84a240e..85ce5f74a 100644
--- a/libc/vga/tty.greg.c
+++ b/libc/vga/tty.greg.c
@@ -18,8 +18,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/bing.internal.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/directmap.internal.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/directmap.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/runtime/pc.internal.h"
 #include "libc/str/str.h"
 #include "libc/str/thompike.h"
diff --git a/libc/vga/writev-vga.c b/libc/vga/writev-vga.c
index 1c6d35e1e..f88e053c2 100644
--- a/libc/vga/writev-vga.c
+++ b/libc/vga/writev-vga.c
@@ -24,7 +24,7 @@
 │ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR        │
 │ OTHER DEALINGS IN THE SOFTWARE.                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/iovec.internal.h"
 #include "libc/dce.h"
diff --git a/libc/x/paginate.c b/libc/x/paginate.c
index 5b86705d0..a377208bc 100644
--- a/libc/x/paginate.c
+++ b/libc/x/paginate.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall_support-nt.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/mem/gc.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/x/xjoinpaths.c b/libc/x/xjoinpaths.c
index ce5281e43..4921d5404 100644
--- a/libc/x/xjoinpaths.c
+++ b/libc/x/xjoinpaths.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/str/str.h"
 #include "libc/x/x.h"
 
diff --git a/net/turfwar/blackholed.c b/net/turfwar/blackholed.c
index b21bc04b4..ccbd8a5ef 100644
--- a/net/turfwar/blackholed.c
+++ b/net/turfwar/blackholed.c
@@ -27,7 +27,7 @@
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/mem/mem.h"
 #include "libc/mem/sortedints.internal.h"
 #include "libc/runtime/runtime.h"
diff --git a/net/turfwar/turfwar.c b/net/turfwar/turfwar.c
index 5d9d2c768..41a37df79 100644
--- a/net/turfwar/turfwar.c
+++ b/net/turfwar/turfwar.c
@@ -35,7 +35,7 @@
 #include "libc/intrin/bsr.h"
 #include "libc/intrin/hilbert.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
diff --git a/test/libc/calls/clock_nanosleep_test.c b/test/libc/calls/clock_nanosleep_test.c
index 805dfacee..02ab5cdaa 100644
--- a/test/libc/calls/clock_nanosleep_test.c
+++ b/test/libc/calls/clock_nanosleep_test.c
@@ -22,8 +22,8 @@
 #include "libc/calls/struct/timespec.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/consts/clock.h"
 #include "libc/sysv/consts/itimer.h"
diff --git a/test/libc/calls/commandv_test.c b/test/libc/calls/commandv_test.c
index a86aaa43c..f2681cd4c 100644
--- a/test/libc/calls/commandv_test.c
+++ b/test/libc/calls/commandv_test.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
diff --git a/test/libc/calls/devfd_test.c b/test/libc/calls/devfd_test.c
index c5aec28a3..b2803cd61 100644
--- a/test/libc/calls/devfd_test.c
+++ b/test/libc/calls/devfd_test.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/dce.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/o.h"
 #include "libc/testlib/testlib.h"
diff --git a/test/libc/calls/ftruncate_test.c b/test/libc/calls/ftruncate_test.c
index 6d740f818..6c910df7e 100644
--- a/test/libc/calls/ftruncate_test.c
+++ b/test/libc/calls/ftruncate_test.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/stat.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/mem/gc.h"
 #include "libc/nexgen32e/vendor.internal.h"
diff --git a/test/libc/calls/pledge2_test.c b/test/libc/calls/pledge2_test.c
index e5d16dbea..17777975a 100644
--- a/test/libc/calls/pledge2_test.c
+++ b/test/libc/calls/pledge2_test.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall_support-sysv.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/promises.internal.h"
+#include "libc/intrin/promises.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sock/sock.h"
 #include "libc/stdio/stdio.h"
diff --git a/test/libc/calls/setrlimit_test.c b/test/libc/calls/setrlimit_test.c
index 041d6f606..7f840519d 100644
--- a/test/libc/calls/setrlimit_test.c
+++ b/test/libc/calls/setrlimit_test.c
@@ -22,8 +22,8 @@
 #include "libc/calls/struct/timespec.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/directmap.internal.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/directmap.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/rand.h"
diff --git a/test/libc/intrin/describeflags_test.c b/test/libc/intrin/describeflags_test.c
index 5475cdf72..14f2892a0 100644
--- a/test/libc/intrin/describeflags_test.c
+++ b/test/libc/intrin/describeflags_test.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/testlib/testlib.h"
 
diff --git a/test/libc/intrin/describegidlist_test.c b/test/libc/intrin/describegidlist_test.c
index 98c6a3408..f85f17f0c 100644
--- a/test/libc/intrin/describegidlist_test.c
+++ b/test/libc/intrin/describegidlist_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/groups.internal.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/testlib/testlib.h"
 
 TEST(DescribeGidList, test) {
diff --git a/test/libc/intrin/describesigset_test.c b/test/libc/intrin/describesigset_test.c
index 10410fb53..fc65ef61d 100644
--- a/test/libc/intrin/describesigset_test.c
+++ b/test/libc/intrin/describesigset_test.c
@@ -19,7 +19,7 @@
 #include "libc/calls/struct/sigset.h"
 #include "libc/calls/struct/sigset.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/sysv/consts/sig.h"
 #include "libc/testlib/testlib.h"
 
diff --git a/test/libc/intrin/dos2errno_test.c b/test/libc/intrin/dos2errno_test.c
index 14f8a2579..fb4e27aef 100644
--- a/test/libc/intrin/dos2errno_test.c
+++ b/test/libc/intrin/dos2errno_test.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/dos2errno.internal.h"
+#include "libc/intrin/dos2errno.h"
 #include "libc/nt/errors.h"
 #include "libc/sock/internal.h"
 #include "libc/str/str.h"
diff --git a/test/libc/intrin/mprotect_test.c b/test/libc/intrin/mprotect_test.c
index 8466d665b..a3df5a4b2 100644
--- a/test/libc/intrin/mprotect_test.c
+++ b/test/libc/intrin/mprotect_test.c
@@ -21,7 +21,7 @@
 #include "libc/calls/ucontext.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/log/log.h"
 #include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
diff --git a/test/libc/intrin/pthread_mutex_lock_test.c b/test/libc/intrin/pthread_mutex_lock_test.c
index b45d2a20a..e2e97cda1 100644
--- a/test/libc/intrin/pthread_mutex_lock_test.c
+++ b/test/libc/intrin/pthread_mutex_lock_test.c
@@ -21,7 +21,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/state.internal.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/log/check.h"
 #include "libc/macros.internal.h"
 #include "libc/math.h"
diff --git a/test/libc/mem/malloc_test.c b/test/libc/mem/malloc_test.c
index 228594367..18d2829ba 100644
--- a/test/libc/mem/malloc_test.c
+++ b/test/libc/mem/malloc_test.c
@@ -21,9 +21,9 @@
 #include "libc/calls/struct/timespec.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/cxaatexit.internal.h"
+#include "libc/intrin/cxaatexit.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
diff --git a/test/libc/mem/realpath_test.c b/test/libc/mem/realpath_test.c
index ac1be2cae..83dc43251 100644
--- a/test/libc/mem/realpath_test.c
+++ b/test/libc/mem/realpath_test.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
diff --git a/test/libc/nexgen32e/lz4decode_test.c b/test/libc/nexgen32e/lz4decode_test.c
index ce289468f..6afd50878 100644
--- a/test/libc/nexgen32e/lz4decode_test.c
+++ b/test/libc/nexgen32e/lz4decode_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/log/check.h"
 #include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
diff --git a/test/libc/proc/posix_spawn_test.c b/test/libc/proc/posix_spawn_test.c
index e83abb2a8..044c24dcf 100644
--- a/test/libc/proc/posix_spawn_test.c
+++ b/test/libc/proc/posix_spawn_test.c
@@ -33,7 +33,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
diff --git a/test/libc/proc/sched_getaffinity_test.c b/test/libc/proc/sched_getaffinity_test.c
index 6e2a7f65d..0ca0d8d53 100644
--- a/test/libc/proc/sched_getaffinity_test.c
+++ b/test/libc/proc/sched_getaffinity_test.c
@@ -22,7 +22,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/intrin/popcnt.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/proc/posix_spawn.h"
 #include "libc/runtime/runtime.h"
 #include "libc/testlib/subprocess.h"
diff --git a/test/libc/sock/inet_pton_test.c b/test/libc/sock/inet_pton_test.c
index ffc44b22e..c6f1dd313 100644
--- a/test/libc/sock/inet_pton_test.c
+++ b/test/libc/sock/inet_pton_test.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/sock/sock.h"
 #include "libc/sysv/consts/af.h"
 #include "libc/sysv/consts/inaddr.h"
diff --git a/test/libc/sock/nonblock_test.c b/test/libc/sock/nonblock_test.c
index 3d3259d47..117582a57 100644
--- a/test/libc/sock/nonblock_test.c
+++ b/test/libc/sock/nonblock_test.c
@@ -20,7 +20,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/syslib.internal.h"
 #include "libc/sock/sock.h"
diff --git a/test/libc/sock/socket_test.c b/test/libc/sock/socket_test.c
index b3a5e1d32..f79b0d7a7 100644
--- a/test/libc/sock/socket_test.c
+++ b/test/libc/sock/socket_test.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
-#include "libc/calls/struct/fd.internal.h"
+#include "libc/intrin/fds.h"
 #include "libc/dce.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/nt/winsock.h"
diff --git a/test/libc/stdio/palandprintf_test.c b/test/libc/stdio/palandprintf_test.c
index 9a67f6732..a9486703e 100644
--- a/test/libc/stdio/palandprintf_test.c
+++ b/test/libc/stdio/palandprintf_test.c
@@ -26,8 +26,8 @@
 └─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/pushpop.internal.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/pushpop.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/math.h"
 #include "libc/mem/gc.h"
diff --git a/test/libc/stdio/sprintf_s_test.c b/test/libc/stdio/sprintf_s_test.c
index 2d38cd53f..a6a448684 100644
--- a/test/libc/stdio/sprintf_s_test.c
+++ b/test/libc/stdio/sprintf_s_test.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/mem/gc.h"
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
diff --git a/test/libc/thread/pthread_detach_test.c b/test/libc/thread/pthread_detach_test.c
index bfbb9c9c5..f491a2da8 100644
--- a/test/libc/thread/pthread_detach_test.c
+++ b/test/libc/thread/pthread_detach_test.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/sigaction.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/sysv/consts/sa.h"
 #include "libc/sysv/consts/sig.h"
 #include "libc/testlib/testlib.h"
diff --git a/test/libc/thread/pthread_exit_test.c b/test/libc/thread/pthread_exit_test.c
index 2855702ae..133a81cab 100644
--- a/test/libc/thread/pthread_exit_test.c
+++ b/test/libc/thread/pthread_exit_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/cxxabi.h"
-#include "libc/intrin/cxaatexit.internal.h"
+#include "libc/intrin/cxaatexit.h"
 #include "libc/runtime/runtime.h"
 #include "libc/testlib/subprocess.h"
 #include "libc/testlib/testlib.h"
diff --git a/third_party/dlmalloc/dlmalloc_abort.c b/third_party/dlmalloc/dlmalloc_abort.c
index 0ca5135be..ef3effcb4 100644
--- a/third_party/dlmalloc/dlmalloc_abort.c
+++ b/third_party/dlmalloc/dlmalloc_abort.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/errno.h"
-#include "libc/intrin/describebacktrace.internal.h"
+#include "libc/intrin/describebacktrace.h"
 #include "libc/runtime/runtime.h"
 #include "third_party/dlmalloc/dlmalloc.h"
 
diff --git a/third_party/dlmalloc/threaded.inc b/third_party/dlmalloc/threaded.inc
index 9b87934e8..83d608b9b 100644
--- a/third_party/dlmalloc/threaded.inc
+++ b/third_party/dlmalloc/threaded.inc
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
 #include "libc/intrin/magicu.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/macros.internal.h"
 #include "libc/nexgen32e/rdtscp.h"
diff --git a/third_party/linenoise/linenoise.c b/third_party/linenoise/linenoise.c
index 8c7c0d144..ca9b35f87 100644
--- a/third_party/linenoise/linenoise.c
+++ b/third_party/linenoise/linenoise.c
@@ -140,8 +140,8 @@
 #include "libc/fmt/conv.h"
 #include "libc/serialize.h"
 #include "libc/intrin/bsr.h"
-#include "libc/intrin/nomultics.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/nomultics.h"
+#include "libc/intrin/strace.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
diff --git a/third_party/lua/lrepl.c b/third_party/lua/lrepl.c
index b56548a6b..3312918e9 100644
--- a/third_party/lua/lrepl.c
+++ b/third_party/lua/lrepl.c
@@ -30,7 +30,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/sigaction.h"
 #include "libc/errno.h"
-#include "libc/intrin/nomultics.internal.h"
+#include "libc/intrin/nomultics.h"
 #include "libc/log/check.h"
 #include "libc/macros.internal.h"
 #include "libc/mem/alg.h"
diff --git a/third_party/lua/lunix.c b/third_party/lua/lunix.c
index 8f6c36c17..9fd10961a 100644
--- a/third_party/lua/lunix.c
+++ b/third_party/lua/lunix.c
@@ -46,7 +46,7 @@
 #include "libc/fmt/magnumstrs.internal.h"
 #include "libc/intrin/atomic.h"
 #include "libc/serialize.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/limits.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
diff --git a/third_party/mbedtls/ecp.c b/third_party/mbedtls/ecp.c
index 4b696ef83..60870d240 100644
--- a/third_party/mbedtls/ecp.c
+++ b/third_party/mbedtls/ecp.c
@@ -16,7 +16,7 @@
 │ limitations under the License.                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "third_party/mbedtls/ecp.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
 #include "libc/runtime/runtime.h"
diff --git a/third_party/mbedtls/profile.h b/third_party/mbedtls/profile.h
index 8c8553e7b..3143d73eb 100644
--- a/third_party/mbedtls/profile.h
+++ b/third_party/mbedtls/profile.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_THIRD_PARTY_MBEDTLS_PROFILE_H_
 #define COSMOPOLITAN_THIRD_PARTY_MBEDTLS_PROFILE_H_
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/log/log.h"
 #include "libc/nexgen32e/bench.h"
 #include "libc/nexgen32e/rdtsc.h"
diff --git a/third_party/mbedtls/rsa.c b/third_party/mbedtls/rsa.c
index edc6ae58f..5ecfe67bb 100644
--- a/third_party/mbedtls/rsa.c
+++ b/third_party/mbedtls/rsa.c
@@ -16,7 +16,7 @@
 │ limitations under the License.                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "third_party/mbedtls/rsa.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/rand.h"
 #include "third_party/mbedtls/common.h"
diff --git a/third_party/mbedtls/test/lib.c b/third_party/mbedtls/test/lib.c
index 7e9de24be..fbe2fa9ab 100644
--- a/third_party/mbedtls/test/lib.c
+++ b/third_party/mbedtls/test/lib.c
@@ -22,8 +22,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
-#include "libc/intrin/describebacktrace.internal.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/describebacktrace.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/log/backtrace.internal.h"
 #include "libc/log/check.h"
diff --git a/third_party/mbedtls/test/test_suite_ssl.c b/third_party/mbedtls/test/test_suite_ssl.c
index 0c9f6e54c..6c3c7bb1e 100644
--- a/third_party/mbedtls/test/test_suite_ssl.c
+++ b/third_party/mbedtls/test/test_suite_ssl.c
@@ -20,7 +20,7 @@
 #include "libc/log/log.h"
 #include "libc/time.h"
 #include "libc/stdio/rand.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "third_party/mbedtls/test/test.inc"
 /*
  * *** THIS FILE WAS MACHINE GENERATED ***
diff --git a/third_party/nsync/common.c b/third_party/nsync/common.c
index 4b4b13d98..2b150401c 100644
--- a/third_party/nsync/common.c
+++ b/third_party/nsync/common.c
@@ -18,9 +18,9 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
-#include "libc/intrin/directmap.internal.h"
+#include "libc/intrin/directmap.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/extend.internal.h"
+#include "libc/intrin/extend.h"
 #include "libc/nt/enum/filemapflags.h"
 #include "libc/nt/enum/pageflags.h"
 #include "libc/nt/memory.h"
diff --git a/third_party/nsync/futex.c b/third_party/nsync/futex.c
index feb8c49ef..971501901 100644
--- a/third_party/nsync/futex.c
+++ b/third_party/nsync/futex.c
@@ -32,8 +32,8 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/atomic.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/ulock.h"
 #include "libc/intrin/weaken.h"
 #include "libc/limits.h"
diff --git a/third_party/nsync/mu_semaphore_gcd.c b/third_party/nsync/mu_semaphore_gcd.c
index 1f88d5e0d..088b50414 100644
--- a/third_party/nsync/mu_semaphore_gcd.c
+++ b/third_party/nsync/mu_semaphore_gcd.c
@@ -18,7 +18,7 @@
 #include "libc/assert.h"
 #include "libc/calls/sig.internal.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/intrin/weaken.h"
 #include "libc/runtime/clktck.h"
 #include "libc/runtime/syslib.internal.h"
diff --git a/third_party/nsync/mu_semaphore_sem.c b/third_party/nsync/mu_semaphore_sem.c
index 3eb8a22f6..44f8cb3c3 100644
--- a/third_party/nsync/mu_semaphore_sem.c
+++ b/third_party/nsync/mu_semaphore_sem.c
@@ -25,7 +25,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/f.h"
 #include "libc/sysv/consts/fd.h"
diff --git a/third_party/nsync/panic.c b/third_party/nsync/panic.c
index dcb09dd7b..10f9eddf8 100644
--- a/third_party/nsync/panic.c
+++ b/third_party/nsync/panic.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/errno.h"
-#include "libc/intrin/describebacktrace.internal.h"
+#include "libc/intrin/describebacktrace.h"
 #include "libc/runtime/runtime.h"
 #include "third_party/nsync/common.internal.h"
 
diff --git a/third_party/nsync/yield.c b/third_party/nsync/yield.c
index f15b29f6c..588d8650d 100644
--- a/third_party/nsync/yield.c
+++ b/third_party/nsync/yield.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/thread/thread.h"
 #include "third_party/nsync/common.internal.h"
 
diff --git a/third_party/python/Python/pystate.c b/third_party/python/Python/pystate.c
index 11dc33893..4bab4fc6e 100644
--- a/third_party/python/Python/pystate.c
+++ b/third_party/python/Python/pystate.c
@@ -6,7 +6,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "third_party/python/Include/pystate.h"
 #include "libc/errno.h"
-#include "libc/intrin/pushpop.internal.h"
+#include "libc/intrin/pushpop.h"
 #include "libc/dlopen/dlfcn.h"
 #include "third_party/python/Include/ceval.h"
 #include "third_party/python/Include/dictobject.h"
diff --git a/third_party/python/runpythonmodule.c b/third_party/python/runpythonmodule.c
index 1ce15f005..f3410c136 100644
--- a/third_party/python/runpythonmodule.c
+++ b/third_party/python/runpythonmodule.c
@@ -12,7 +12,7 @@
 #include "libc/calls/ucontext.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/intrin/weaken.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
diff --git a/third_party/regex/regerror.c b/third_party/regex/regerror.c
index 8564b2ed1..b922b9b59 100644
--- a/third_party/regex/regerror.c
+++ b/third_party/regex/regerror.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
 #include "third_party/regex/regex.h"
diff --git a/tool/build/compile.c b/tool/build/compile.c
index 8b2f35e16..68cc4c9ee 100644
--- a/tool/build/compile.c
+++ b/tool/build/compile.c
@@ -32,7 +32,7 @@
 #include "libc/fmt/itoa.h"
 #include "libc/fmt/libgen.h"
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/intrin/x86.h"
 #include "libc/limits.h"
 #include "libc/log/appendresourcereport.internal.h"
diff --git a/tool/build/dso/sandbox.c b/tool/build/dso/sandbox.c
index ee7ccc12b..01569dc46 100644
--- a/tool/build/dso/sandbox.c
+++ b/tool/build/dso/sandbox.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/pledge.h"
 #include "libc/calls/pledge.internal.h"
-#include "libc/intrin/promises.internal.h"
+#include "libc/intrin/promises.h"
 #include "libc/runtime/runtime.h"
 
 // runs pledge at glibc executable load time, e.g.
diff --git a/tool/build/elf2pe.c b/tool/build/elf2pe.c
index f438383ae..b1508a926 100644
--- a/tool/build/elf2pe.c
+++ b/tool/build/elf2pe.c
@@ -25,7 +25,7 @@
 #include "libc/elf/struct/shdr.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/intrin/dll.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/limits.h"
diff --git a/tool/build/helpop.c b/tool/build/helpop.c
index 399372a0f..9da096ca6 100644
--- a/tool/build/helpop.c
+++ b/tool/build/helpop.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
diff --git a/tool/build/lib/demangle.c b/tool/build/lib/demangle.c
index a2d11cd14..d2260fe3e 100644
--- a/tool/build/lib/demangle.c
+++ b/tool/build/lib/demangle.c
@@ -20,7 +20,7 @@
 #include "libc/assert.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/iovec.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/o.h"
diff --git a/tool/build/lib/eztls.c b/tool/build/lib/eztls.c
index 5ae728387..754d1a533 100644
--- a/tool/build/lib/eztls.c
+++ b/tool/build/lib/eztls.c
@@ -23,7 +23,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/macros.internal.h"
 #include "libc/sysv/consts/sig.h"
 #include "libc/thread/thread.h"
diff --git a/tool/build/lib/interner.c b/tool/build/lib/interner.c
index a287b1132..a491de30c 100644
--- a/tool/build/lib/interner.c
+++ b/tool/build/lib/interner.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "tool/build/lib/interner.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/crc32.h"
 #include "libc/runtime/runtime.h"
diff --git a/tool/build/lib/panel.c b/tool/build/lib/panel.c
index 976d49aa5..072836bef 100644
--- a/tool/build/lib/panel.c
+++ b/tool/build/lib/panel.c
@@ -19,7 +19,7 @@
 #include "tool/build/lib/panel.h"
 #include "libc/fmt/conv.h"
 #include "libc/intrin/bsr.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 #include "libc/str/unicode.h"
diff --git a/tool/build/pledge.c b/tool/build/pledge.c
index 874f76669..6968f7797 100644
--- a/tool/build/pledge.c
+++ b/tool/build/pledge.c
@@ -38,8 +38,8 @@
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/promises.internal.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/promises.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/macros.internal.h"
 #include "libc/math.h"
diff --git a/tool/build/runit.c b/tool/build/runit.c
index 3c0a55681..6c2a34fc5 100644
--- a/tool/build/runit.c
+++ b/tool/build/runit.c
@@ -26,7 +26,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/libgen.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
diff --git a/tool/decode/elf.c b/tool/decode/elf.c
index 741ad381f..4db9e45ab 100644
--- a/tool/decode/elf.c
+++ b/tool/decode/elf.c
@@ -26,7 +26,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/libgen.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
diff --git a/tool/decode/lib/asmcodegen.c b/tool/decode/lib/asmcodegen.c
index 1e4520a3c..e63ea97fd 100644
--- a/tool/decode/lib/asmcodegen.c
+++ b/tool/decode/lib/asmcodegen.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "tool/decode/lib/asmcodegen.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/stdio/stdio.h"
diff --git a/tool/decode/macho.c b/tool/decode/macho.c
index 736ad4078..9f358aaef 100644
--- a/tool/decode/macho.c
+++ b/tool/decode/macho.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/stat.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/libgen.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/macho.internal.h"
 #include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
diff --git a/tool/decode/pe2.c b/tool/decode/pe2.c
index 7660aeee8..06ac8c888 100644
--- a/tool/decode/pe2.c
+++ b/tool/decode/pe2.c
@@ -20,7 +20,7 @@
 #include "libc/calls/struct/stat.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/libgen.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/mem/gc.h"
 #include "libc/mem/mem.h"
 #include "libc/nt/struct/imagedosheader.internal.h"
diff --git a/tool/decode/zip.c b/tool/decode/zip.c
index e0f8101f4..6b4cf88b2 100644
--- a/tool/decode/zip.c
+++ b/tool/decode/zip.c
@@ -22,7 +22,7 @@
 #include "libc/fmt/libgen.h"
 #include "libc/fmt/wintime.internal.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
 #include "libc/mem/gc.h"
diff --git a/tool/net/redbean.c b/tool/net/redbean.c
index 64a599028..e86be3ab9 100644
--- a/tool/net/redbean.c
+++ b/tool/net/redbean.c
@@ -40,8 +40,8 @@
 #include "libc/intrin/atomic.h"
 #include "libc/intrin/bsr.h"
 #include "libc/intrin/likely.h"
-#include "libc/intrin/nomultics.internal.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/nomultics.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/log/appendresourcereport.internal.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
diff --git a/tool/plinko/lib/plinko.c b/tool/plinko/lib/plinko.c
index 3def139a0..181c3b838 100644
--- a/tool/plinko/lib/plinko.c
+++ b/tool/plinko/lib/plinko.c
@@ -22,7 +22,7 @@
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/errno.h"
 #include "libc/intrin/likely.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/log/countbranch.h"
 #include "libc/log/countexpr.h"
 #include "libc/log/log.h"
diff --git a/tool/plinko/lib/printf.c b/tool/plinko/lib/printf.c
index 09b7da750..b7e058011 100644
--- a/tool/plinko/lib/printf.c
+++ b/tool/plinko/lib/printf.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "tool/plinko/lib/printf.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/nexgen32e/rdtsc.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/tool/plinko/lib/read.c b/tool/plinko/lib/read.c
index 04dd889a0..ad94f6370 100644
--- a/tool/plinko/lib/read.c
+++ b/tool/plinko/lib/read.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/errno.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/strace.h"
 #include "libc/log/check.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/tool/viz/deathstar.c b/tool/viz/deathstar.c
index f06a827fd..a5d0621dc 100644
--- a/tool/viz/deathstar.c
+++ b/tool/viz/deathstar.c
@@ -1,7 +1,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/sigaction.h"
 #include "libc/calls/struct/termios.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/math.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
diff --git a/tool/viz/fixconsole.c b/tool/viz/fixconsole.c
index ea656d477..8bd23e075 100644
--- a/tool/viz/fixconsole.c
+++ b/tool/viz/fixconsole.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/dce.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/nt/console.h"
 #include "libc/nt/enum/consolemodeflags.h"
 #include "libc/nt/runtime.h"
diff --git a/tool/viz/fold.c b/tool/viz/fold.c
index 1663a3dfc..2fe852001 100644
--- a/tool/viz/fold.c
+++ b/tool/viz/fold.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
diff --git a/tool/viz/lib/formatstringtable-assembly.c b/tool/viz/lib/formatstringtable-assembly.c
index b126c60bc..456710dee 100644
--- a/tool/viz/lib/formatstringtable-assembly.c
+++ b/tool/viz/lib/formatstringtable-assembly.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/mem/gc.h"
 #include "libc/str/str.h"
 #include "libc/str/strwidth.h"
diff --git a/tool/viz/lib/formatstringtable-code.c b/tool/viz/lib/formatstringtable-code.c
index 1034dc875..71b36360c 100644
--- a/tool/viz/lib/formatstringtable-code.c
+++ b/tool/viz/lib/formatstringtable-code.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "tool/viz/lib/formatstringtable.h"
 
 void *FormatStringTableAsCode(long yn, long xn, const char *const T[yn][xn],
diff --git a/tool/viz/lib/formatstringtable.c b/tool/viz/lib/formatstringtable.c
index af74d3b3b..7c9152c1d 100644
--- a/tool/viz/lib/formatstringtable.c
+++ b/tool/viz/lib/formatstringtable.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "tool/viz/lib/formatstringtable.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/mem/mem.h"
 #include "libc/str/strwidth.h"
 
diff --git a/tool/viz/life.c b/tool/viz/life.c
index 8e223f894..bbf7df3d3 100644
--- a/tool/viz/life.c
+++ b/tool/viz/life.c
@@ -26,8 +26,8 @@
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/popcnt.h"
-#include "libc/intrin/safemacros.internal.h"
-#include "libc/intrin/xchg.internal.h"
+#include "libc/intrin/safemacros.h"
+#include "libc/intrin/xchg.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
diff --git a/tool/viz/memzoom.c b/tool/viz/memzoom.c
index 7793fd853..034ea4265 100644
--- a/tool/viz/memzoom.c
+++ b/tool/viz/memzoom.c
@@ -32,7 +32,7 @@
 #include "libc/intrin/bsf.h"
 #include "libc/intrin/bsr.h"
 #include "libc/intrin/hilbert.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
diff --git a/tool/viz/printansi.c b/tool/viz/printansi.c
index dd9ebaf59..849242540 100644
--- a/tool/viz/printansi.c
+++ b/tool/viz/printansi.c
@@ -29,7 +29,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
diff --git a/tool/viz/printdos2errno.c b/tool/viz/printdos2errno.c
index 7f06d581f..4218f6968 100644
--- a/tool/viz/printdos2errno.c
+++ b/tool/viz/printdos2errno.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/magnumstrs.internal.h"
-#include "libc/intrin/dos2errno.internal.h"
+#include "libc/intrin/dos2errno.h"
 #include "libc/intrin/kprintf.h"
 #include "libc/str/str.h"
 
diff --git a/tool/viz/printvideo.c b/tool/viz/printvideo.c
index ccaf445a8..f412911d4 100644
--- a/tool/viz/printvideo.c
+++ b/tool/viz/printvideo.c
@@ -42,8 +42,8 @@
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 #include "libc/intrin/kprintf.h"
-#include "libc/intrin/safemacros.internal.h"
-#include "libc/intrin/xchg.internal.h"
+#include "libc/intrin/safemacros.h"
+#include "libc/intrin/xchg.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
 #include "libc/macros.internal.h"
diff --git a/tool/viz/rlimit.c b/tool/viz/rlimit.c
index 3d3b84eb5..e4b4e4ae9 100644
--- a/tool/viz/rlimit.c
+++ b/tool/viz/rlimit.c
@@ -10,8 +10,8 @@
 #include "libc/calls/struct/rlimit.h"
 #include "libc/calls/calls.h"
 #include "libc/errno.h"
-#include "libc/intrin/describeflags.internal.h"
-#include "libc/intrin/strace.internal.h"
+#include "libc/intrin/describeflags.h"
+#include "libc/intrin/strace.h"
 #include "libc/log/color.internal.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
diff --git a/tool/viz/tailf.c b/tool/viz/tailf.c
index 9c97c516a..ed420d23e 100644
--- a/tool/viz/tailf.c
+++ b/tool/viz/tailf.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
-#include "libc/intrin/safemacros.internal.h"
+#include "libc/intrin/safemacros.h"
 #include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
diff --git a/tool/viz/virtualquery.c b/tool/viz/virtualquery.c
index 7168c7202..e1ce16cc1 100644
--- a/tool/viz/virtualquery.c
+++ b/tool/viz/virtualquery.c
@@ -19,7 +19,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
-#include "libc/intrin/describeflags.internal.h"
+#include "libc/intrin/describeflags.h"
 #include "libc/macros.internal.h"
 #include "libc/nt/enum/memflags.h"
 #include "libc/nt/memory.h"