diff --git a/.vscode/vscode.h b/.vscode/vscode.h
index 535d7a93..df52f069 100644
--- a/.vscode/vscode.h
+++ b/.vscode/vscode.h
@@ -79,7 +79,7 @@
 
 #define SWITCHEROO(...) 0
 
-extern unsigned g_loglevel;
+extern unsigned __log_level;
 
 typedef void * va_list;
 
diff --git a/ape/ape.lds b/ape/ape.lds
index e0d14658..1d9cf917 100644
--- a/ape/ape.lds
+++ b/ape/ape.lds
@@ -364,9 +364,10 @@ SECTIONS {
     PROVIDE_HIDDEN(edata = .);
   } :Ram
 
-  .zip : {
+  .zip . : {
     KEEP(*(SORT_BY_NAME(.zip.*)))
     . = ALIGN(PAGESIZE);
+    HIDDEN(_efile = .);
   }
 
   .bss . : {
@@ -540,7 +541,7 @@ HIDDEN(v_ape_highsectors =
 ZIPCONST(v_zip_cdoffset, __zip_start - IMAGE_BASE_VIRTUAL);
 ZIPCONST(v_zip_cdirsize, __zip_end - __zip_start);
 ZIPCONST(v_zip_records, v_zip_cdirsize / kZipCdirHdrLinkableSize);
-ZIPCONST(v_zip_commentsize, 0);
+ZIPCONST(v_zip_commentsize, _efile - __zip_end - kZipCdirHdrMinSize);
 
 #if SupportsXnu()
 /* Generates deterministic ID. */
diff --git a/ape/macros.internal.h b/ape/macros.internal.h
index 578f7a88..f620f826 100644
--- a/ape/macros.internal.h
+++ b/ape/macros.internal.h
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #ifndef APE_MACROS_H_
 #define APE_MACROS_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #ifdef __ASSEMBLER__
 /* clang-format off */
 
diff --git a/dsp/core/c161.h b/dsp/core/c161.h
index b6ea6097..d42b890f 100644
--- a/dsp/core/c161.h
+++ b/dsp/core/c161.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_DSP_CORE_C161_H_
 #define COSMOPOLITAN_DSP_CORE_C161_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 #define EXTRA_SHARP 2
diff --git a/dsp/core/c161s.h b/dsp/core/c161s.h
index 201b4544..bccdb80f 100644
--- a/dsp/core/c161s.h
+++ b/dsp/core/c161s.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_DSP_CORE_C161S_H_
 #define COSMOPOLITAN_DSP_CORE_C161S_H_
 #include "dsp/core/c161.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 forceinline pureconst artificial signed char C161S(signed char al,
diff --git a/dsp/core/double2byte.c b/dsp/core/double2byte.c
index 07a8e6d1..364b1440 100644
--- a/dsp/core/double2byte.c
+++ b/dsp/core/double2byte.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/core.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 
diff --git a/dsp/core/float2short.c b/dsp/core/float2short.c
index bb4e4785..7d879d3b 100644
--- a/dsp/core/float2short.c
+++ b/dsp/core/float2short.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/str/str.h"
 
diff --git a/dsp/core/getintegercoefficients.c b/dsp/core/getintegercoefficients.c
index ddf22a8c..ff3ee870 100644
--- a/dsp/core/getintegercoefficients.c
+++ b/dsp/core/getintegercoefficients.c
@@ -20,7 +20,7 @@
 #include "libc/assert.h"
 #include "libc/dce.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/str/str.h"
 
diff --git a/dsp/core/getintegercoefficients8.c b/dsp/core/getintegercoefficients8.c
index 6ef64977..ac6edbb6 100644
--- a/dsp/core/getintegercoefficients8.c
+++ b/dsp/core/getintegercoefficients8.c
@@ -19,7 +19,7 @@
 #include "dsp/core/core.h"
 #include "dsp/core/q.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/str/str.h"
 
diff --git a/dsp/core/half.h b/dsp/core/half.h
index 9a8fe8d1..98770219 100644
--- a/dsp/core/half.h
+++ b/dsp/core/half.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_DSP_CORE_HALF_H_
 #define COSMOPOLITAN_DSP_CORE_HALF_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 /**
diff --git a/dsp/core/ks8.h b/dsp/core/ks8.h
index 111480c3..eebe3811 100644
--- a/dsp/core/ks8.h
+++ b/dsp/core/ks8.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_DSP_CORE_KS8_H_
 #define COSMOPOLITAN_DSP_CORE_KS8_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 /**
diff --git a/dsp/core/kss8.h b/dsp/core/kss8.h
index 60f86ff9..64a8f884 100644
--- a/dsp/core/kss8.h
+++ b/dsp/core/kss8.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_DSP_CORE_KSS8_H_
 #define COSMOPOLITAN_DSP_CORE_KSS8_H_
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 /**
diff --git a/dsp/core/mulaw.S b/dsp/core/mulaw.S
index db4a7266..bff7e6b1 100644
--- a/dsp/core/mulaw.S
+++ b/dsp/core/mulaw.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 #define BIAS 0x84
 
diff --git a/dsp/core/q.h b/dsp/core/q.h
index 5d40c64c..ebc88184 100644
--- a/dsp/core/q.h
+++ b/dsp/core/q.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_DSP_CORE_Q_H_
 #define COSMOPOLITAN_DSP_CORE_Q_H_
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
diff --git a/dsp/core/sad16x8n.S b/dsp/core/sad16x8n.S
index 89a081dc..280ce3cc 100644
--- a/dsp/core/sad16x8n.S
+++ b/dsp/core/sad16x8n.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .align	16
 
 //	Mixes audio.
diff --git a/dsp/core/scalevolume.c b/dsp/core/scalevolume.c
index 44481a90..65087ff4 100644
--- a/dsp/core/scalevolume.c
+++ b/dsp/core/scalevolume.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/core.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/limits.h"
 
 /**
diff --git a/dsp/mpeg/clamp4int256-core.S b/dsp/mpeg/clamp4int256-core.S
index 36b33309..92e8fb6b 100644
--- a/dsp/mpeg/clamp4int256-core.S
+++ b/dsp/mpeg/clamp4int256-core.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 clamp4int256$core:
diff --git a/dsp/mpeg/mpeg1.c b/dsp/mpeg/mpeg1.c
index d0c8a30c..4ddadb7b 100644
--- a/dsp/mpeg/mpeg1.c
+++ b/dsp/mpeg/mpeg1.c
@@ -35,7 +35,7 @@
 #include "libc/bits/initializer.internal.h"
 #include "libc/fmt/conv.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
diff --git a/dsp/mpeg/slowrgb.c b/dsp/mpeg/slowrgb.c
index 2bfbafd5..b765295a 100644
--- a/dsp/mpeg/slowrgb.c
+++ b/dsp/mpeg/slowrgb.c
@@ -28,7 +28,7 @@
 │  SOFTWARE.                                                                   │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/mpeg/mpeg.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 asm(".ident\t\"\\n\\n\
 PL_MPEG (MIT License)\\n\
diff --git a/dsp/scale/gyarados.c b/dsp/scale/gyarados.c
index 12b44687..e642aca8 100644
--- a/dsp/scale/gyarados.c
+++ b/dsp/scale/gyarados.c
@@ -24,7 +24,7 @@
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/bsr.h"
diff --git a/dsp/scale/magikarp.c b/dsp/scale/magikarp.c
index bcdbf6f9..95858403 100644
--- a/dsp/scale/magikarp.c
+++ b/dsp/scale/magikarp.c
@@ -20,7 +20,7 @@
 #include "dsp/core/ks8.h"
 #include "dsp/core/kss8.h"
 #include "dsp/scale/cdecimate2xuint8x8.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/str/str.h"
 #include "libc/x/x.h"
diff --git a/dsp/tty/ident.c b/dsp/tty/ident.c
index 0cea4f1d..a263d11b 100644
--- a/dsp/tty/ident.c
+++ b/dsp/tty/ident.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/tty.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/bits/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/termios.h"
diff --git a/dsp/tty/mpsadbw.S b/dsp/tty/mpsadbw.S
index 478de0b4..9c193585 100644
--- a/dsp/tty/mpsadbw.S
+++ b/dsp/tty/mpsadbw.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	TODO(jart): write me
 
diff --git a/dsp/tty/rgb2ansi.c b/dsp/tty/rgb2ansi.c
index ea0f4b3b..9ffdb73e 100644
--- a/dsp/tty/rgb2ansi.c
+++ b/dsp/tty/rgb2ansi.c
@@ -22,7 +22,7 @@
 #include "libc/bits/initializer.internal.h"
 #include "libc/limits.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/str/str.h"
 
diff --git a/dsp/tty/rgb2ttyi2f.c b/dsp/tty/rgb2ttyi2f.c
index 7ee0904c..8c4ef41e 100644
--- a/dsp/tty/rgb2ttyi2f.c
+++ b/dsp/tty/rgb2ttyi2f.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/quant.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 struct TtyRgb rgb2ttyi2f_(int r, int g, int b) {
   return rgb2ttyf((__m128){r, g, b} / 255);
diff --git a/dsp/tty/rgb2xterm24.c b/dsp/tty/rgb2xterm24.c
index 1d38d06e..1d67a1f8 100644
--- a/dsp/tty/rgb2xterm24.c
+++ b/dsp/tty/rgb2xterm24.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/quant.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 struct TtyRgb rgb2xterm24_(int r, int g, int b) {
   return (struct TtyRgb){MAX(MIN(r, 255), 0), MAX(MIN(g, 255), 0),
diff --git a/dsp/tty/ttymove.c b/dsp/tty/ttymove.c
index bea47bd0..92afe991 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/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 
diff --git a/dsp/tty/ttyraster.c b/dsp/tty/ttyraster.c
index 80cfc4e5..fec1adf3 100644
--- a/dsp/tty/ttyraster.c
+++ b/dsp/tty/ttyraster.c
@@ -23,11 +23,11 @@
 #include "dsp/tty/windex.h"
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/runtime/runtime.h"
diff --git a/dsp/tty/ttyraw.c b/dsp/tty/ttyraw.c
index d4b93e4d..1007afbf 100644
--- a/dsp/tty/ttyraw.c
+++ b/dsp/tty/ttyraw.c
@@ -26,7 +26,7 @@
 #include "libc/calls/typedef/sigaction_f.h"
 #include "libc/calls/ucontext.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/gc.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/dsp/tty/windex-avx2.S b/dsp/tty/windex-avx2.S
index f2dcf536..77cbddf9 100644
--- a/dsp/tty/windex-avx2.S
+++ b/dsp/tty/windex-avx2.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns index of minimum uint16 in array.
diff --git a/dsp/tty/windex-sse4.S b/dsp/tty/windex-sse4.S
index 4b768c02..93ff50ea 100644
--- a/dsp/tty/windex-sse4.S
+++ b/dsp/tty/windex-sse4.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns index of minimum positive int16 in array.
diff --git a/dsp/tty/windex.S b/dsp/tty/windex.S
index 35e997c2..eeecba61 100644
--- a/dsp/tty/windex.S
+++ b/dsp/tty/windex.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/x86feature.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Dispatches to fastest windex() implementation.
diff --git a/examples/cplusplus.cc b/examples/cplusplus.cc
index dd6388a3..cada830d 100644
--- a/examples/cplusplus.cc
+++ b/examples/cplusplus.cc
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
 
diff --git a/examples/curl.c b/examples/curl.c
index 75d8a8a4..80bb5156 100644
--- a/examples/curl.c
+++ b/examples/curl.c
@@ -7,13 +7,13 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/dns/dns.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/fmt.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/gc.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sock/sock.h"
diff --git a/examples/dinlerp.c b/examples/dinlerp.c
index 17f8141a..4f22a061 100644
--- a/examples/dinlerp.c
+++ b/examples/dinlerp.c
@@ -20,7 +20,7 @@
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/gc.h"
diff --git a/examples/e820.c b/examples/e820.c
index 28d9919c..4178b190 100644
--- a/examples/e820.c
+++ b/examples/e820.c
@@ -8,7 +8,7 @@
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
 #include "libc/fmt/itoa.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/e820.internal.h"
 #include "libc/runtime/pc.internal.h"
 #include "libc/stdio/stdio.h"
diff --git a/examples/ispell.c b/examples/ispell.c
index 4524d17a..73165be8 100644
--- a/examples/ispell.c
+++ b/examples/ispell.c
@@ -15,7 +15,7 @@
 #include "libc/fmt/conv.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
diff --git a/examples/lstime.c b/examples/lstime.c
index ef1cf5ab..ffeebfd3 100644
--- a/examples/lstime.c
+++ b/examples/lstime.c
@@ -9,7 +9,7 @@
 #endif
 #include "libc/alg/alg.h"
 #include "libc/alg/arraylist2.internal.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/dirent.h"
 #include "libc/calls/struct/stat.h"
diff --git a/examples/mappy.c b/examples/mappy.c
index 299071ba..e9809688 100644
--- a/examples/mappy.c
+++ b/examples/mappy.c
@@ -9,7 +9,7 @@
 #endif
 #include "libc/bits/bits.h"
 #include "libc/calls/calls.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
 #include "libc/sysv/consts/map.h"
diff --git a/examples/nesemu1.cc b/examples/nesemu1.cc
index b5e5664b..df39e02f 100644
--- a/examples/nesemu1.cc
+++ b/examples/nesemu1.cc
@@ -13,7 +13,7 @@
 #include "libc/alg/arraylist2.internal.h"
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/itimerval.h"
 #include "libc/calls/struct/winsize.h"
@@ -23,7 +23,7 @@
 #include "libc/inttypes.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/ohmyplus/vector.h"
diff --git a/examples/package/lib/myasm.S b/examples/package/lib/myasm.S
index d74444fc..1711187f 100644
--- a/examples/package/lib/myasm.S
+++ b/examples/package/lib/myasm.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Example assembly function.
 //
diff --git a/examples/poll.c b/examples/poll.c
index 728dc509..024e5f2c 100644
--- a/examples/poll.c
+++ b/examples/poll.c
@@ -8,7 +8,7 @@
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/sock/sock.h"
 #include "libc/stdio/stdio.h"
 #include "libc/sysv/consts/fileno.h"
diff --git a/examples/printargs.c b/examples/printargs.c
index 5cad82cb..039205d5 100644
--- a/examples/printargs.c
+++ b/examples/printargs.c
@@ -8,7 +8,7 @@
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
diff --git a/examples/unbourne.c b/examples/unbourne.c
index 2bc18f37..bbff708d 100644
--- a/examples/unbourne.c
+++ b/examples/unbourne.c
@@ -1609,7 +1609,6 @@ wontreturn static void exraise(int e) {
   INTOFF;
   exception = e;
   longjmp(handler->loc, 1);
-  panic();
 }
 
 /*
diff --git a/libc/alg/replacestr.c b/libc/alg/replacestr.c
index 81717b56..ea4febe2 100644
--- a/libc/alg/replacestr.c
+++ b/libc/alg/replacestr.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/alg.h"
 #include "libc/alg/arraylist2.internal.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/alg/reverse.h b/libc/alg/reverse.internal.h
similarity index 94%
rename from libc/alg/reverse.h
rename to libc/alg/reverse.internal.h
index 598f6582..2f8c2083 100644
--- a/libc/alg/reverse.h
+++ b/libc/alg/reverse.internal.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_ALG_REVERSE_H_
 #define COSMOPOLITAN_LIBC_ALG_REVERSE_H_
-#include "libc/bits/xchg.h"
+#include "libc/bits/xchg.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 /**
@@ -11,7 +11,6 @@
  * @return pointer to start of array
  * @see ARRAYLEN()
  */
-#ifndef reverse
 #define reverse(ARRAY, COUNT)              \
   ({                                       \
     autotype(&(ARRAY)[0]) Array = (ARRAY); \
@@ -27,7 +26,6 @@
     }                                      \
     Array;                                 \
   })
-#endif /* reverse */
 
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_ALG_REVERSE_H_ */
diff --git a/libc/alg/shuffle.h b/libc/alg/shuffle.internal.h
similarity index 91%
rename from libc/alg/shuffle.h
rename to libc/alg/shuffle.internal.h
index 027675a4..46001d8c 100644
--- a/libc/alg/shuffle.h
+++ b/libc/alg/shuffle.internal.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_
 #define COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_
+#include "libc/bits/xchg.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
-#include "libc/bits/xchg.h"
 
 /**
  * Fisher-Yates shuffle.
@@ -11,7 +11,6 @@
  * @param n is the number of items in A
  * @see ARRAYLEN()
  */
-#ifndef shuffle
 #define shuffle(R, A, n)                      \
   do {                                        \
     autotype(A) Array = (A);                  \
@@ -19,7 +18,6 @@
       xchg(&Array[i], &Array[R() % (i + 1)]); \
     }                                         \
   } while (0)
-#endif /* shuffle */
 
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_RAND_SHUFFLE_H_ */
diff --git a/libc/alg/tarjan.c b/libc/alg/tarjan.c
index 721da2f8..d7109e1d 100644
--- a/libc/alg/tarjan.c
+++ b/libc/alg/tarjan.c
@@ -19,7 +19,7 @@
 #include "libc/alg/alg.h"
 #include "libc/assert.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 
 /**
diff --git a/libc/bits/abs.c b/libc/bits/abs.c
index 5348062e..a3627914 100644
--- a/libc/bits/abs.c
+++ b/libc/bits/abs.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 /**
  * Returns absolute value of x.
diff --git a/libc/bits/atomic_load.c b/libc/bits/atomic_load.c
index fbfcae7f..9f2ef57a 100644
--- a/libc/bits/atomic_load.c
+++ b/libc/bits/atomic_load.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/bits/atomic_store.c b/libc/bits/atomic_store.c
index 8075f8b8..74ddf68d 100644
--- a/libc/bits/atomic_store.c
+++ b/libc/bits/atomic_store.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/bits/emptytonull.c b/libc/bits/emptytonull.c
deleted file mode 100644
index d57e57ca..00000000
--- a/libc/bits/emptytonull.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
-
-/**
- * Returns string where empty string is made null.
- * @see nulltoempty()
- */
-const char *(emptytonull)(const char *s) {
-  return s && !*s ? 0 : s;
-}
diff --git a/libc/bits/firstnonnull.c b/libc/bits/firstnonnull.c
deleted file mode 100644
index f8416804..00000000
--- a/libc/bits/firstnonnull.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/runtime/runtime.h"
-
-/**
- * Returns a or b or aborts if both are null.
- */
-const char *(firstnonnull)(const char *a, const char *b) {
-  if (a) return a;
-  if (b) return b;
-  abort();
-}
diff --git a/libc/bits/isempty.c b/libc/bits/isempty.c
deleted file mode 100644
index 600429f3..00000000
--- a/libc/bits/isempty.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-
-/**
- * Returns true if s is empty string or null.
- */
-bool isempty(const char *s) {
-  return !s || !*s;
-}
diff --git a/libc/bits/nulltoempty.c b/libc/bits/nulltoempty.c
deleted file mode 100644
index e67b52d9..00000000
--- a/libc/bits/nulltoempty.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
-
-/**
- * Returns 𝑠 converting null to empty string.
- * @see emptytonull()
- */
-const char *(nulltoempty)(const char *s) {
-  return s ? s : "";
-}
diff --git a/libc/bits/pushpop.h b/libc/bits/pushpop.h
index 44dfd4ca..0040e7c7 100644
--- a/libc/bits/pushpop.h
+++ b/libc/bits/pushpop.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_BITS_PUSHPOP_H_
 #define COSMOPOLITAN_LIBC_BITS_PUSHPOP_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 #if !defined(__GNUC__) || defined(__STRICT_ANSI__)
diff --git a/libc/bits/rounddown.c b/libc/bits/rounddown.c
deleted file mode 100644
index ea80d1fc..00000000
--- a/libc/bits/rounddown.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
-
-/**
- * Rounds down 𝑤 to next two power 𝑘.
- */
-long(rounddown)(long w, long k) {
-  return ROUNDDOWN(w, k);
-}
diff --git a/libc/bits/roundup.c b/libc/bits/roundup.c
deleted file mode 100644
index d675bc5c..00000000
--- a/libc/bits/roundup.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
-
-/**
- * Rounds up 𝑤 to next two power 𝑘.
- */
-long(roundup)(long w, long k) {
-  return ROUNDUP(w, k);
-}
diff --git a/libc/bits/safemacros.h b/libc/bits/safemacros.internal.h
similarity index 83%
rename from libc/bits/safemacros.h
rename to libc/bits/safemacros.internal.h
index 01254d35..ac1c1e03 100644
--- a/libc/bits/safemacros.h
+++ b/libc/bits/safemacros.internal.h
@@ -1,23 +1,10 @@
 #ifndef COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_
 #define COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
-long min(long, long);
-long max(long, long);
-long roundup(long, long);
-long rounddown(long, long);
-bool isempty(const char *);
-const char *nulltoempty(const char *);
-const char *emptytonull(const char *);
-const char *firstnonnull(const char *, const char *);
-uint64_t(unsignedsubtract)(uint64_t, uint64_t) pureconst;
-
-#if !defined(__STRICT_ANSI__) && defined(__GNUC__) && \
-!defined(__VSCODE_INTELLISENSE__)
-
 #define min(x, y)              \
   ({                           \
     autotype(x) MinX = (x);    \
@@ -79,8 +66,6 @@ uint64_t(unsignedsubtract)(uint64_t, uint64_t) pureconst;
     UnsubA >= UnsubB ? UnsubA - UnsubB : ~UnsubB + UnsubA + 1; \
   })
 
-#endif /* GNU && !ANSI */
-
 COSMOPOLITAN_C_END_
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
 #endif /* COSMOPOLITAN_LIBC_BITS_SAFEMACROS_H_ */
diff --git a/libc/bits/unsignedsubtract.c b/libc/bits/unsignedsubtract.c
deleted file mode 100644
index 6d721cc9..00000000
--- a/libc/bits/unsignedsubtract.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
-
-/**
- * Subtracts unsigned integers w/ wraparound.
- */
-uint64_t(unsignedsubtract)(uint64_t x, uint64_t y) {
-  return unsignedsubtract(x, y);
-}
diff --git a/libc/bits/xchg.h b/libc/bits/xchg.internal.h
similarity index 100%
rename from libc/bits/xchg.h
rename to libc/bits/xchg.internal.h
diff --git a/libc/calls/atfork.c b/libc/calls/atfork.c
index 528e2745..73ce94a0 100644
--- a/libc/calls/atfork.c
+++ b/libc/calls/atfork.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/close.c b/libc/calls/close.c
index a12f8de9..85b1c73c 100644
--- a/libc/calls/close.c
+++ b/libc/calls/close.c
@@ -19,7 +19,7 @@
 #include "libc/bits/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/sock/internal.h"
 #include "libc/sysv/errfuns.h"
 #include "libc/zipos/zipos.internal.h"
diff --git a/libc/calls/commandv.c b/libc/calls/commandv.c
index 91246add..2162a15e 100644
--- a/libc/calls/commandv.c
+++ b/libc/calls/commandv.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/copyfd.c b/libc/calls/copyfd.c
index 7adee22a..7ef001d2 100644
--- a/libc/calls/copyfd.c
+++ b/libc/calls/copyfd.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/errno.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 /**
  * Copies data between file descriptors the slow way.
diff --git a/libc/calls/execve-sysv.c b/libc/calls/execve-sysv.c
index 2c77471a..28b84273 100644
--- a/libc/calls/execve-sysv.c
+++ b/libc/calls/execve-sysv.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/errno.h"
diff --git a/libc/calls/fstat-nt.c b/libc/calls/fstat-nt.c
index 82228d05..0e474f6e 100644
--- a/libc/calls/fstat-nt.c
+++ b/libc/calls/fstat-nt.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/fmt/conv.h"
diff --git a/libc/calls/g_fds_init.S b/libc/calls/g_fds_init.S
index 0ad2a52f..c08c217f 100644
--- a/libc/calls/g_fds_init.S
+++ b/libc/calls/g_fds_init.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.init.start 302,_init_g_fds
 	push	%rdi
diff --git a/libc/calls/getcwd-nt.c b/libc/calls/getcwd-nt.c
index db109370..5bc9cf56 100644
--- a/libc/calls/getcwd-nt.c
+++ b/libc/calls/getcwd-nt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/files.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
diff --git a/libc/calls/getdomainname.c b/libc/calls/getdomainname.c
index 011d3262..87dd1d74 100644
--- a/libc/calls/getdomainname.c
+++ b/libc/calls/getdomainname.c
@@ -20,7 +20,7 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/utsname.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/enum/computernameformat.h"
 #include "libc/nt/errors.h"
 #include "libc/nt/runtime.h"
diff --git a/libc/calls/getntsyspath.S b/libc/calls/getntsyspath.S
index 397e3129..3e4725e8 100644
--- a/libc/calls/getntsyspath.S
+++ b/libc/calls/getntsyspath.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Obtains WIN32 magic path, e.g. GetTempPathA.
diff --git a/libc/calls/gettemppatha-flunk.S b/libc/calls/gettemppatha-flunk.S
index 44b62f42..dc106521 100644
--- a/libc/calls/gettemppatha-flunk.S
+++ b/libc/calls/gettemppatha-flunk.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Calls GetTempPathA() w/ different API.
diff --git a/libc/calls/getuid.c b/libc/calls/getuid.c
index 3dd15f48..57a38808 100644
--- a/libc/calls/getuid.c
+++ b/libc/calls/getuid.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/accounting.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/internal.h b/libc/calls/internal.h
index caffaa84..0e53945f 100644
--- a/libc/calls/internal.h
+++ b/libc/calls/internal.h
@@ -9,7 +9,7 @@
 #include "libc/calls/struct/timeval.h"
 #include "libc/dce.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/struct/context.h"
 #include "libc/nt/struct/ntexceptionpointers.h"
 #include "libc/nt/struct/securityattributes.h"
diff --git a/libc/calls/ioctl.h b/libc/calls/ioctl.h
index 9236e782..4fe29ccd 100644
--- a/libc/calls/ioctl.h
+++ b/libc/calls/ioctl.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_CALLS_IOCTL_H_
 #define COSMOPOLITAN_LIBC_CALLS_IOCTL_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/sysv/consts/termios.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
@@ -18,6 +18,7 @@ int ioctl(int, uint64_t, void *);
 
 #define ioctl(FD, REQUEST, MEMORY) ioctl_dispatch(FD, REQUEST, MEMORY)
 
+#define __EQUIVALENT(X, Y) (__builtin_constant_p((X) == (Y)) && ((X) == (Y)))
 #define __IOCTL_DISPATCH(CMP, FD, REQUEST, MEMORY)                       \
   do {                                                                   \
     if (CMP(request, TIOCGWINSZ)) return ioctl_tiocgwinsz(FD, MEMORY);   \
@@ -39,7 +40,7 @@ int ioctl_tiocswinsz_nt(int, void *);
 int ioctl_default(int, uint64_t, void *);
 
 forceinline int ioctl_dispatch(int fd, uint64_t request, void *memory) {
-  __IOCTL_DISPATCH(EQUIVALENT, fd, request, memory);
+  __IOCTL_DISPATCH(__EQUIVALENT, fd, request, memory);
   return ioctl_default(fd, request, memory);
 }
 
diff --git a/libc/calls/isdebuggerpresent.c b/libc/calls/isdebuggerpresent.c
index d4096575..6847fd73 100644
--- a/libc/calls/isdebuggerpresent.c
+++ b/libc/calls/isdebuggerpresent.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/alg.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/dce.h"
diff --git a/libc/calls/kill-nt.c b/libc/calls/kill-nt.c
index 077d9747..f32ce449 100644
--- a/libc/calls/kill-nt.c
+++ b/libc/calls/kill-nt.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/console.h"
 #include "libc/nt/enum/ctrlevent.h"
 #include "libc/nt/process.h"
diff --git a/libc/calls/kntprioritycombos.c b/libc/calls/kntprioritycombos.c
index d0d6c378..5d9abe47 100644
--- a/libc/calls/kntprioritycombos.c
+++ b/libc/calls/kntprioritycombos.c
@@ -19,7 +19,7 @@
 #include "libc/bits/bits.h"
 #include "libc/calls/kntprioritycombos.internal.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/ffs.h"
 #include "libc/nt/enum/processcreationflags.h"
 #include "libc/nt/enum/threadpriority.h"
diff --git a/libc/calls/kntsystemdirectory.S b/libc/calls/kntsystemdirectory.S
index 40a64d28..6c20bde2 100644
--- a/libc/calls/kntsystemdirectory.S
+++ b/libc/calls/kntsystemdirectory.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 #define BYTES 64
diff --git a/libc/calls/kntwindowsdirectory.S b/libc/calls/kntwindowsdirectory.S
index bb8eafb4..95ff82aa 100644
--- a/libc/calls/kntwindowsdirectory.S
+++ b/libc/calls/kntwindowsdirectory.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 #define BYTES 64
diff --git a/libc/calls/ktmppath.S b/libc/calls/ktmppath.S
index 290c8277..7866690f 100644
--- a/libc/calls/ktmppath.S
+++ b/libc/calls/ktmppath.S
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/runtime.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 #define kTmpPathMax 80
 
diff --git a/libc/calls/madvise-nt.c b/libc/calls/madvise-nt.c
index a1c1aef0..6592ff70 100644
--- a/libc/calls/madvise-nt.c
+++ b/libc/calls/madvise-nt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/enum/offerpriority.h"
 #include "libc/nt/memory.h"
 #include "libc/nt/runtime.h"
diff --git a/libc/calls/mkntenvblock.c b/libc/calls/mkntenvblock.c
index 4fb63e6b..9884faea 100644
--- a/libc/calls/mkntenvblock.c
+++ b/libc/calls/mkntenvblock.c
@@ -19,7 +19,7 @@
 #include "libc/alg/arraylist2.internal.h"
 #include "libc/calls/ntspawn.h"
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/alloca.h"
 #include "libc/mem/mem.h"
 #include "libc/str/oldutf16.internal.h"
diff --git a/libc/calls/mkntpathat.c b/libc/calls/mkntpathat.c
index a94eee07..0925c2d1 100644
--- a/libc/calls/mkntpathat.c
+++ b/libc/calls/mkntpathat.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/files.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/at.h"
diff --git a/libc/calls/nanosleep-xnu.c b/libc/calls/nanosleep-xnu.c
index 3c5d84bd..6517cfcf 100644
--- a/libc/calls/nanosleep-xnu.c
+++ b/libc/calls/nanosleep-xnu.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/timeval.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/nexgen32e.h"
 #include "libc/sock/internal.h"
 
diff --git a/libc/calls/netbsdtramp.S b/libc/calls/netbsdtramp.S
index 80211c8b..e0493b16 100644
--- a/libc/calls/netbsdtramp.S
+++ b/libc/calls/netbsdtramp.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .privileged
 
 __restore_rt_netbsd:
diff --git a/libc/calls/nice.c b/libc/calls/nice.c
index b35b82b8..54603634 100644
--- a/libc/calls/nice.c
+++ b/libc/calls/nice.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/fmt/conv.h"
 #include "libc/sysv/consts/prio.h"
diff --git a/libc/calls/now.c b/libc/calls/now.c
index acaaaed3..d695255c 100644
--- a/libc/calls/now.c
+++ b/libc/calls/now.c
@@ -18,9 +18,10 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
 #include "libc/bits/initializer.internal.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/dce.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/rdtsc.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/nowl.S b/libc/calls/nowl.S
index 1ea325fc..09be0ff6 100644
--- a/libc/calls/nowl.S
+++ b/libc/calls/nowl.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/x86feature.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns timestamp without needing system calls.
 //
diff --git a/libc/calls/ntspawn.c b/libc/calls/ntspawn.c
index 1ee9b41d..99644a28 100644
--- a/libc/calls/ntspawn.c
+++ b/libc/calls/ntspawn.c
@@ -19,7 +19,7 @@
 #include "libc/bits/pushpop.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/ntspawn.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/enum/filemapflags.h"
 #include "libc/nt/enum/pageflags.h"
 #include "libc/nt/enum/processcreationflags.h"
diff --git a/libc/calls/onntconsoleevent_init.S b/libc/calls/onntconsoleevent_init.S
index b493e486..754fac4b 100644
--- a/libc/calls/onntconsoleevent_init.S
+++ b/libc/calls/onntconsoleevent_init.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.windows
 .source	__FILE__
 
diff --git a/libc/calls/onwincrash.S b/libc/calls/onwincrash.S
index 187c1606..ce4bfc96 100644
--- a/libc/calls/onwincrash.S
+++ b/libc/calls/onwincrash.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.windows
 .source	__FILE__
 
diff --git a/libc/calls/pipe-nt.c b/libc/calls/pipe-nt.c
index b86c959d..2dede30c 100644
--- a/libc/calls/pipe-nt.c
+++ b/libc/calls/pipe-nt.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/alg/reverse.h"
+#include "libc/alg/reverse.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/nt/createfile.h"
 #include "libc/nt/enum/accessmask.h"
diff --git a/libc/calls/pread.c b/libc/calls/pread.c
index ac769ed9..cd138221 100644
--- a/libc/calls/pread.c
+++ b/libc/calls/pread.c
@@ -22,7 +22,7 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/errfuns.h"
 #include "libc/zipos/zipos.internal.h"
diff --git a/libc/calls/preadv.c b/libc/calls/preadv.c
index f1813fc5..fa23cbdc 100644
--- a/libc/calls/preadv.c
+++ b/libc/calls/preadv.c
@@ -22,7 +22,7 @@
 #include "libc/calls/struct/iovec.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/sysv/consts/iov.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/pwrite.c b/libc/calls/pwrite.c
index d13be02e..d8a061d3 100644
--- a/libc/calls/pwrite.c
+++ b/libc/calls/pwrite.c
@@ -21,7 +21,7 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/sysv/errfuns.h"
 
 /**
diff --git a/libc/calls/pwritev.c b/libc/calls/pwritev.c
index 9125cb07..36a64587 100644
--- a/libc/calls/pwritev.c
+++ b/libc/calls/pwritev.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/iovec.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/sysv/consts/iov.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/readv-metal.c b/libc/calls/readv-metal.c
index d105ebc5..4215c95a 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/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/sched_setaffinity.c b/libc/calls/sched_setaffinity.c
index 8aaecf9a..9a40c69f 100644
--- a/libc/calls/sched_setaffinity.c
+++ b/libc/calls/sched_setaffinity.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/dce.h"
diff --git a/libc/calls/setegid.S b/libc/calls/setegid.S
index 922e63d2..ad971390 100644
--- a/libc/calls/setegid.S
+++ b/libc/calls/setegid.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Sets effective group ID.
diff --git a/libc/calls/seteuid.S b/libc/calls/seteuid.S
index 6e6cd554..c1723972 100644
--- a/libc/calls/seteuid.S
+++ b/libc/calls/seteuid.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Sets effective user ID.
diff --git a/libc/calls/setpriority-nt.c b/libc/calls/setpriority-nt.c
index 162f378e..cb762d0e 100644
--- a/libc/calls/setpriority-nt.c
+++ b/libc/calls/setpriority-nt.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/kntprioritycombos.internal.h"
 #include "libc/nt/process.h"
diff --git a/libc/calls/sigaction.c b/libc/calls/sigaction.c
index f57ae69b..ac36db97 100644
--- a/libc/calls/sigaction.c
+++ b/libc/calls/sigaction.c
@@ -31,7 +31,7 @@
 #include "libc/calls/ucontext.h"
 #include "libc/dce.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/sigenter-freebsd.c b/libc/calls/sigenter-freebsd.c
index 7acb710e..e933541e 100644
--- a/libc/calls/sigenter-freebsd.c
+++ b/libc/calls/sigenter-freebsd.c
@@ -22,7 +22,7 @@
 #include "libc/calls/struct/siginfo.h"
 #include "libc/calls/typedef/sigaction_f.h"
 #include "libc/calls/ucontext.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 union sigval_freebsd {
diff --git a/libc/calls/sigenter-netbsd.c b/libc/calls/sigenter-netbsd.c
index 46baac23..2931cfd3 100644
--- a/libc/calls/sigenter-netbsd.c
+++ b/libc/calls/sigenter-netbsd.c
@@ -22,7 +22,7 @@
 #include "libc/calls/struct/siginfo.h"
 #include "libc/calls/typedef/sigaction_f.h"
 #include "libc/calls/ucontext.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 #define RDI    0
diff --git a/libc/calls/sigenter-openbsd.c b/libc/calls/sigenter-openbsd.c
index 85e8fd29..61844f09 100644
--- a/libc/calls/sigenter-openbsd.c
+++ b/libc/calls/sigenter-openbsd.c
@@ -22,7 +22,7 @@
 #include "libc/calls/struct/siginfo.h"
 #include "libc/calls/typedef/sigaction_f.h"
 #include "libc/calls/ucontext.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 union sigval_openbsd {
diff --git a/libc/calls/sysinfo.c b/libc/calls/sysinfo.c
index 752d5b54..a5a555e5 100644
--- a/libc/calls/sysinfo.c
+++ b/libc/calls/sysinfo.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/sysinfo.h"
diff --git a/libc/calls/termios.h b/libc/calls/termios.h
index 9a6d6717..9dfef390 100644
--- a/libc/calls/termios.h
+++ b/libc/calls/termios.h
@@ -3,7 +3,6 @@
 #include "libc/calls/ioctl.h"
 #include "libc/calls/struct/termios.h"
 #include "libc/calls/struct/winsize.h"
-#include "libc/macros.h"
 #include "libc/sysv/consts/termios.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
@@ -34,9 +33,9 @@ int posix_openpt(int) nodiscard;
 
 #define tcsetattr(FD, OPT, TIO) tcsetattr_dispatch(FD, OPT, TIO)
 forceinline int tcsetattr_dispatch(int fd, int opt, const struct termios *tio) {
-  if (EQUIVALENT(opt, TCSANOW)) return ioctl(fd, TCSETS, (void *)tio);
-  if (EQUIVALENT(opt, TCSADRAIN)) return ioctl(fd, TCSETSW, (void *)tio);
-  if (EQUIVALENT(opt, TCSAFLUSH)) return ioctl(fd, TCSETSF, (void *)tio);
+  if (__EQUIVALENT(opt, TCSANOW)) return ioctl(fd, TCSETS, (void *)tio);
+  if (__EQUIVALENT(opt, TCSADRAIN)) return ioctl(fd, TCSETSW, (void *)tio);
+  if (__EQUIVALENT(opt, TCSAFLUSH)) return ioctl(fd, TCSETSF, (void *)tio);
   return (tcsetattr)(fd, opt, tio);
 }
 
diff --git a/libc/calls/termios.internal.h b/libc/calls/termios.internal.h
index c76a3467..0a44c6db 100644
--- a/libc/calls/termios.internal.h
+++ b/libc/calls/termios.internal.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_LIBC_CALLS_TERMIOS_INTERNAL_H_
 #define COSMOPOLITAN_LIBC_CALLS_TERMIOS_INTERNAL_H_
 #ifndef __STRICT_ANSI__
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/struct/metatermios.internal.h"
 #include "libc/calls/struct/termios.h"
 #include "libc/str/str.h"
diff --git a/libc/calls/vdprintf.c b/libc/calls/vdprintf.c
index 977d07b5..394280d2 100644
--- a/libc/calls/vdprintf.c
+++ b/libc/calls/vdprintf.c
@@ -20,7 +20,7 @@
 #include "libc/dce.h"
 #include "libc/fmt/fmt.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/files.h"
 #include "libc/sysv/errfuns.h"
 
diff --git a/libc/calls/wait4-nt.c b/libc/calls/wait4-nt.c
index d04156b0..a500eb72 100644
--- a/libc/calls/wait4-nt.c
+++ b/libc/calls/wait4-nt.c
@@ -20,7 +20,7 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/rusage.h"
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/accounting.h"
 #include "libc/nt/enum/status.h"
 #include "libc/nt/enum/wait.h"
diff --git a/libc/calls/winalarm.S b/libc/calls/winalarm.S
index 29275809..84055d2b 100644
--- a/libc/calls/winalarm.S
+++ b/libc/calls/winalarm.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.windows
 .source	__FILE__
 
diff --git a/libc/calls/wincrash_init.S b/libc/calls/wincrash_init.S
index 093ddf65..6bbe00f5 100644
--- a/libc/calls/wincrash_init.S
+++ b/libc/calls/wincrash_init.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.init.start 300,_init_wincrash
diff --git a/libc/crt/crt.S b/libc/crt/crt.S
index dc5dc3fb..beaf1e65 100644
--- a/libc/crt/crt.S
+++ b/libc/crt/crt.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 #include "libc/runtime/internal.h"
 .section .start,"ax",@progbits
diff --git a/libc/crypto/kaessbox.S b/libc/crypto/kaessbox.S
index 228ee04e..38e95a2c 100644
--- a/libc/crypto/kaessbox.S
+++ b/libc/crypto/kaessbox.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.rodata
 	.align	64			# for cacheline yoinking
diff --git a/libc/crypto/kaessboxinverse.S b/libc/crypto/kaessboxinverse.S
index 13957776..19456688 100644
--- a/libc/crypto/kaessboxinverse.S
+++ b/libc/crypto/kaessboxinverse.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.rodata
 	.align	64			# for cacheline yoinking
diff --git a/libc/dns/dnsnamecmp.c b/libc/dns/dnsnamecmp.c
index 07ae0a8d..81958aca 100644
--- a/libc/dns/dnsnamecmp.c
+++ b/libc/dns/dnsnamecmp.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/dns/dns.h"
 #include "libc/str/str.h"
 
diff --git a/libc/dns/getaddrinfo.c b/libc/dns/getaddrinfo.c
index f7b765e7..3443877e 100644
--- a/libc/dns/getaddrinfo.c
+++ b/libc/dns/getaddrinfo.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/dns/dns.h"
 #include "libc/dns/hoststxt.h"
diff --git a/libc/dns/gethoststxt.c b/libc/dns/gethoststxt.c
index 8844fa4b..f2420328 100644
--- a/libc/dns/gethoststxt.c
+++ b/libc/dns/gethoststxt.c
@@ -18,11 +18,11 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
 #include "libc/bits/pushpop.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/dce.h"
 #include "libc/dns/hoststxt.h"
 #include "libc/fmt/fmt.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/systeminfo.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
diff --git a/libc/dns/getresolvconf.c b/libc/dns/getresolvconf.c
index 7f5dee0e..a9035af9 100644
--- a/libc/dns/getresolvconf.c
+++ b/libc/dns/getresolvconf.c
@@ -20,7 +20,7 @@
 #include "libc/dce.h"
 #include "libc/dns/resolvconf.h"
 #include "libc/fmt/fmt.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sock/sock.h"
 #include "libc/stdio/stdio.h"
diff --git a/libc/dns/newaddrinfo.c b/libc/dns/newaddrinfo.c
index 7934df3d..8ee20a5f 100644
--- a/libc/dns/newaddrinfo.c
+++ b/libc/dns/newaddrinfo.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dns/dns.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/sock/sock.h"
 #include "libc/sysv/consts/af.h"
diff --git a/libc/fmt/dosdatetimetounix.c b/libc/fmt/dosdatetimetounix.c
index 0b3ec0f9..edf9facf 100644
--- a/libc/fmt/dosdatetimetounix.c
+++ b/libc/fmt/dosdatetimetounix.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/time/time.h"
 
 /**
diff --git a/libc/fmt/fcvt.c b/libc/fmt/fcvt.c
index 65086221..5d81ed54 100644
--- a/libc/fmt/fcvt.c
+++ b/libc/fmt/fcvt.c
@@ -17,7 +17,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/fmt/fmt.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/libc/fmt/imaxabs.c b/libc/fmt/imaxabs.c
index 2f0186bd..664d4d61 100644
--- a/libc/fmt/imaxabs.c
+++ b/libc/fmt/imaxabs.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 intmax_t(imaxabs)(intmax_t x) {
   return ABS(x);
diff --git a/libc/fmt/imaxabs.thunk.S b/libc/fmt/imaxabs.thunk.S
index 065e6449..6f402513 100644
--- a/libc/fmt/imaxabs.thunk.S
+++ b/libc/fmt/imaxabs.thunk.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 __imaxabs:
 	jmp	imaxabs
diff --git a/libc/fmt/itoa128radix10.greg.c b/libc/fmt/itoa128radix10.greg.c
index e2ae2139..824c4af2 100644
--- a/libc/fmt/itoa128radix10.greg.c
+++ b/libc/fmt/itoa128radix10.greg.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/alg/reverse.h"
+#include "libc/alg/reverse.internal.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 #include "libc/limits.h"
diff --git a/libc/fmt/itoa64.c b/libc/fmt/itoa64.c
index 056262ba..126e2183 100644
--- a/libc/fmt/itoa64.c
+++ b/libc/fmt/itoa64.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/alg/reverse.h"
+#include "libc/alg/reverse.internal.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 
diff --git a/libc/fmt/itoa64radix10.greg.c b/libc/fmt/itoa64radix10.greg.c
index 4444e9ac..182bc5dc 100644
--- a/libc/fmt/itoa64radix10.greg.c
+++ b/libc/fmt/itoa64radix10.greg.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/alg/reverse.h"
+#include "libc/alg/reverse.internal.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 #include "libc/limits.h"
diff --git a/libc/fmt/itoa64radix16.greg.c b/libc/fmt/itoa64radix16.greg.c
index f7645c9e..5d4e8565 100644
--- a/libc/fmt/itoa64radix16.greg.c
+++ b/libc/fmt/itoa64radix16.greg.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/bsr.h"
 
 size_t uint64toarray_radix16(uint64_t x, char b[hasatleast 17]) {
diff --git a/libc/fmt/itoa64radix8.c b/libc/fmt/itoa64radix8.c
index be395797..13c88242 100644
--- a/libc/fmt/itoa64radix8.c
+++ b/libc/fmt/itoa64radix8.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/alg/reverse.h"
+#include "libc/alg/reverse.internal.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 #include "libc/limits.h"
diff --git a/libc/fmt/labs.c b/libc/fmt/labs.c
index e0f47726..e3a1d391 100644
--- a/libc/fmt/labs.c
+++ b/libc/fmt/labs.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 long(labs)(long x) {
   return ABS(x);
diff --git a/libc/fmt/llabs.c b/libc/fmt/llabs.c
index 123fd1eb..5ded9754 100644
--- a/libc/fmt/llabs.c
+++ b/libc/fmt/llabs.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 long long(llabs)(long long x) {
   return ABS(x);
diff --git a/libc/fmt/strerror_r.c b/libc/fmt/strerror_r.c
index 65555e69..814869bc 100644
--- a/libc/fmt/strerror_r.c
+++ b/libc/fmt/strerror_r.c
@@ -16,11 +16,11 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/fmt/fmt.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/enum/formatmessageflags.h"
 #include "libc/nt/process.h"
 #include "libc/nt/runtime.h"
diff --git a/libc/fmt/unbing.c b/libc/fmt/unbing.c
index e58fa248..1f586ea5 100644
--- a/libc/fmt/unbing.c
+++ b/libc/fmt/unbing.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/alg.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/nexgen32e.h"
 #include "libc/str/str.h"
 
diff --git a/libc/fmt/vsnprintf.c b/libc/fmt/vsnprintf.c
index f7a69db5..10d51d34 100644
--- a/libc/fmt/vsnprintf.c
+++ b/libc/fmt/vsnprintf.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/dce.h"
 #include "libc/fmt/fmt.h"
 #include "libc/limits.h"
diff --git a/libc/intrin/addvdi3.S b/libc/intrin/addvdi3.S
index 72c0ceb7..cdebf6d3 100644
--- a/libc/intrin/addvdi3.S
+++ b/libc/intrin/addvdi3.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .privileged
 .alignfunc
diff --git a/libc/intrin/addvsi3.S b/libc/intrin/addvsi3.S
index 2902a280..0d6294ba 100644
--- a/libc/intrin/addvsi3.S
+++ b/libc/intrin/addvsi3.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .privileged
 .alignfunc
diff --git a/libc/intrin/addvti3.S b/libc/intrin/addvti3.S
index bfa28fdd..675dceba 100644
--- a/libc/intrin/addvti3.S
+++ b/libc/intrin/addvti3.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .privileged
 .alignfunc
diff --git a/libc/intrin/asan.c b/libc/intrin/asan.c
index 441634f8..8c3fd939 100644
--- a/libc/intrin/asan.c
+++ b/libc/intrin/asan.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/alg/reverse.h"
+#include "libc/alg/reverse.internal.h"
 #include "libc/bits/bits.h"
 #include "libc/bits/likely.h"
 #include "libc/bits/weaken.h"
@@ -24,7 +24,7 @@
 #include "libc/dce.h"
 #include "libc/intrin/asan.internal.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/hook/hook.internal.h"
 #include "libc/nt/enum/version.h"
 #include "libc/nt/runtime.h"
diff --git a/libc/intrin/mpsadbw.c b/libc/intrin/mpsadbw.c
index cca2076c..8b7d7a8b 100644
--- a/libc/intrin/mpsadbw.c
+++ b/libc/intrin/mpsadbw.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/mpsadbw.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/mpsadbws.S b/libc/intrin/mpsadbws.S
index 2957f0bc..bf8ca8fa 100644
--- a/libc/intrin/mpsadbws.S
+++ b/libc/intrin/mpsadbws.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Jump table for mpsadbw() with non-constexpr immediate parameter.
 //
diff --git a/libc/intrin/mulvdi3.S b/libc/intrin/mulvdi3.S
index 7e7a8ee2..fbf5752e 100644
--- a/libc/intrin/mulvdi3.S
+++ b/libc/intrin/mulvdi3.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .privileged
 .alignfunc
diff --git a/libc/intrin/mulvsi3.S b/libc/intrin/mulvsi3.S
index cae1e681..a55c9651 100644
--- a/libc/intrin/mulvsi3.S
+++ b/libc/intrin/mulvsi3.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .privileged
 .alignfunc
diff --git a/libc/intrin/mulvti3.S b/libc/intrin/mulvti3.S
index c41ffe73..d6f16331 100644
--- a/libc/intrin/mulvti3.S
+++ b/libc/intrin/mulvti3.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .privileged
 .alignfunc
diff --git a/libc/intrin/negvdi2.S b/libc/intrin/negvdi2.S
index 3ffb289b..b05f7bbd 100644
--- a/libc/intrin/negvdi2.S
+++ b/libc/intrin/negvdi2.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .privileged
 .alignfunc
diff --git a/libc/intrin/negvsi2.S b/libc/intrin/negvsi2.S
index b783398d..57390047 100644
--- a/libc/intrin/negvsi2.S
+++ b/libc/intrin/negvsi2.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .privileged
 .alignfunc
diff --git a/libc/intrin/negvti2.S b/libc/intrin/negvti2.S
index 73ff8b0e..39d3af16 100644
--- a/libc/intrin/negvti2.S
+++ b/libc/intrin/negvti2.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .privileged
 .alignfunc
diff --git a/libc/intrin/onarithmeticoverflow.S b/libc/intrin/onarithmeticoverflow.S
index 04c88004..b1a09b54 100644
--- a/libc/intrin/onarithmeticoverflow.S
+++ b/libc/intrin/onarithmeticoverflow.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .privileged
 .source	__FILE__
 
diff --git a/libc/intrin/pabsb.c b/libc/intrin/pabsb.c
index c12f059b..8eb89a38 100644
--- a/libc/intrin/pabsb.c
+++ b/libc/intrin/pabsb.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/pabsb.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/pabsd.c b/libc/intrin/pabsd.c
index 28825217..d9ab1560 100644
--- a/libc/intrin/pabsd.c
+++ b/libc/intrin/pabsd.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/pabsd.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/pabsw.c b/libc/intrin/pabsw.c
index ff4a5ec8..746fe000 100644
--- a/libc/intrin/pabsw.c
+++ b/libc/intrin/pabsw.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/pabsw.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/packssdw.c b/libc/intrin/packssdw.c
index a0c1e6ba..13f2b8ab 100644
--- a/libc/intrin/packssdw.c
+++ b/libc/intrin/packssdw.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/packssdw.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 /**
  * Casts ints to shorts w/ saturation.
diff --git a/libc/intrin/packsswb.c b/libc/intrin/packsswb.c
index a418c275..303164ce 100644
--- a/libc/intrin/packsswb.c
+++ b/libc/intrin/packsswb.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/packsswb.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/packusdw.c b/libc/intrin/packusdw.c
index eff3e061..000ba0e2 100644
--- a/libc/intrin/packusdw.c
+++ b/libc/intrin/packusdw.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/packusdw.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/packuswb.c b/libc/intrin/packuswb.c
index 440fef98..7ac7d14c 100644
--- a/libc/intrin/packuswb.c
+++ b/libc/intrin/packuswb.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/packuswb.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/paddsb.c b/libc/intrin/paddsb.c
index 2160458a..7662d6d5 100644
--- a/libc/intrin/paddsb.c
+++ b/libc/intrin/paddsb.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/paddsb.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/paddsw.c b/libc/intrin/paddsw.c
index 38e3a31c..25af3298 100644
--- a/libc/intrin/paddsw.c
+++ b/libc/intrin/paddsw.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/paddsw.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/paddusb.c b/libc/intrin/paddusb.c
index bcb1435a..72c84627 100644
--- a/libc/intrin/paddusb.c
+++ b/libc/intrin/paddusb.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/paddusb.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/paddusw.c b/libc/intrin/paddusw.c
index 334547ee..7cbcdbdd 100644
--- a/libc/intrin/paddusw.c
+++ b/libc/intrin/paddusw.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/paddusw.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/palignr.c b/libc/intrin/palignr.c
index 00cca3b3..79d73321 100644
--- a/libc/intrin/palignr.c
+++ b/libc/intrin/palignr.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/intrin/palignr.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 /**
  * Overlaps vectors.
diff --git a/libc/intrin/palignrs.S b/libc/intrin/palignrs.S
index b33d5594..218cfce6 100644
--- a/libc/intrin/palignrs.S
+++ b/libc/intrin/palignrs.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Jump table for palignr() with non-constexpr immediate parameter.
 //
diff --git a/libc/intrin/phaddsw.c b/libc/intrin/phaddsw.c
index 0e026761..40fc4b69 100644
--- a/libc/intrin/phaddsw.c
+++ b/libc/intrin/phaddsw.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/phaddsw.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 /**
  * Adds adjacent shorts w/ saturation.
diff --git a/libc/intrin/phsubsw.c b/libc/intrin/phsubsw.c
index 8d8c59d2..1e0f04bc 100644
--- a/libc/intrin/phsubsw.c
+++ b/libc/intrin/phsubsw.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/phsubsw.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 /**
  * Subtracts adjacent shorts w/ saturation.
diff --git a/libc/intrin/pmaddubsw.c b/libc/intrin/pmaddubsw.c
index d5d956ac..efef3092 100644
--- a/libc/intrin/pmaddubsw.c
+++ b/libc/intrin/pmaddubsw.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/pmaddubsw.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/pmaxsw.c b/libc/intrin/pmaxsw.c
index ae6efb9c..75471b36 100644
--- a/libc/intrin/pmaxsw.c
+++ b/libc/intrin/pmaxsw.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/pmaxsw.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/pmaxub.c b/libc/intrin/pmaxub.c
index cbdcda65..be0041da 100644
--- a/libc/intrin/pmaxub.c
+++ b/libc/intrin/pmaxub.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/pmaxub.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 /**
  * Returns minimum of 8-bit unsigned integers.
diff --git a/libc/intrin/pminsw.c b/libc/intrin/pminsw.c
index a66e61fc..6c5e7eb6 100644
--- a/libc/intrin/pminsw.c
+++ b/libc/intrin/pminsw.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/pminsw.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/pminub.c b/libc/intrin/pminub.c
index c5461536..497c25cf 100644
--- a/libc/intrin/pminub.c
+++ b/libc/intrin/pminub.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/pminub.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 /**
  * Returns minimum of 8-bit unsigned integers.
diff --git a/libc/intrin/psadbw.c b/libc/intrin/psadbw.c
index 76a14298..4f77eb8c 100644
--- a/libc/intrin/psadbw.c
+++ b/libc/intrin/psadbw.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/psadbw.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 /**
  * Computes sum of absolute differences.
diff --git a/libc/intrin/pslldqs.S b/libc/intrin/pslldqs.S
index 5c5302a7..f3e8eb34 100644
--- a/libc/intrin/pslldqs.S
+++ b/libc/intrin/pslldqs.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Jump table for pslldq() with non-constexpr immediate parameter.
 	.align	8
diff --git a/libc/intrin/psrldqs.S b/libc/intrin/psrldqs.S
index 9dbae8ee..d5b849c7 100644
--- a/libc/intrin/psrldqs.S
+++ b/libc/intrin/psrldqs.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Jump table for psrldq() with non-constexpr immediate parameter.
 	.align	8
diff --git a/libc/intrin/psubsb.c b/libc/intrin/psubsb.c
index 530f9e67..934f0e9e 100644
--- a/libc/intrin/psubsb.c
+++ b/libc/intrin/psubsb.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/psubsb.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/psubsw.c b/libc/intrin/psubsw.c
index 9aebdca7..0ca566ec 100644
--- a/libc/intrin/psubsw.c
+++ b/libc/intrin/psubsw.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/psubsw.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/psubusb.c b/libc/intrin/psubusb.c
index 5474af0c..93d3abbd 100644
--- a/libc/intrin/psubusb.c
+++ b/libc/intrin/psubusb.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/psubusb.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/psubusw.c b/libc/intrin/psubusw.c
index 7ed0e622..560960d3 100644
--- a/libc/intrin/psubusw.c
+++ b/libc/intrin/psubusw.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/psubusw.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/intrin/somanyasan.S b/libc/intrin/somanyasan.S
index ec11d436..5bd1076b 100644
--- a/libc/intrin/somanyasan.S
+++ b/libc/intrin/somanyasan.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.rodata.cst4
diff --git a/libc/intrin/subvdi3.S b/libc/intrin/subvdi3.S
index 53b464b4..a6f82659 100644
--- a/libc/intrin/subvdi3.S
+++ b/libc/intrin/subvdi3.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .privileged
 .alignfunc
diff --git a/libc/intrin/subvsi3.S b/libc/intrin/subvsi3.S
index 8fb2a187..99a4af1f 100644
--- a/libc/intrin/subvsi3.S
+++ b/libc/intrin/subvsi3.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .privileged
 .alignfunc
diff --git a/libc/intrin/subvti3.S b/libc/intrin/subvti3.S
index a85330cb..29ed27fb 100644
--- a/libc/intrin/subvti3.S
+++ b/libc/intrin/subvti3.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .privileged
 .alignfunc
diff --git a/libc/log/attachdebugger.c b/libc/log/attachdebugger.c
index c8677365..1544252b 100644
--- a/libc/log/attachdebugger.c
+++ b/libc/log/attachdebugger.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/fmt/fmt.h"
 #include "libc/log/gdb.h"
diff --git a/libc/log/backtrace2.c b/libc/log/backtrace2.c
index 8d28e0ea..bbfac5f9 100644
--- a/libc/log/backtrace2.c
+++ b/libc/log/backtrace2.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/alg.h"
 #include "libc/alg/bisectcarleft.internal.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/bits/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/sigbits.h"
diff --git a/libc/log/backtrace3.c b/libc/log/backtrace3.c
index 17f5eabd..956cefab 100644
--- a/libc/log/backtrace3.c
+++ b/libc/log/backtrace3.c
@@ -23,7 +23,7 @@
 #include "libc/fmt/fmt.h"
 #include "libc/fmt/itoa.h"
 #include "libc/log/backtrace.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/gc.internal.h"
 #include "libc/nexgen32e/stackframe.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/log/check.h b/libc/log/check.h
index f7b0b0f7..1f72317c 100644
--- a/libc/log/check.h
+++ b/libc/log/check.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_LIBC_LOG_CHECK_H_
 #define COSMOPOLITAN_LIBC_LOG_CHECK_H_
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 /**
  * @fileoverview Modern assertions, courtesy of Elgoog.
diff --git a/libc/log/checkfail.c b/libc/log/checkfail.c
index d22d6110..3c6fca62 100644
--- a/libc/log/checkfail.c
+++ b/libc/log/checkfail.c
@@ -17,7 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
+#include "libc/bits/weaken.h"
 #include "libc/calls/calls.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
diff --git a/libc/log/commandvenv.c b/libc/log/commandvenv.c
index 3318908b..5b1f1038 100644
--- a/libc/log/commandvenv.c
+++ b/libc/log/commandvenv.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/log/log.h"
 #include "libc/mem/mem.h"
diff --git a/libc/log/gdbexec.c b/libc/log/gdbexec.c
index d1df93bf..fc781f4e 100644
--- a/libc/log/gdbexec.c
+++ b/libc/log/gdbexec.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/fmt/fmt.h"
 #include "libc/log/gdb.h"
diff --git a/libc/log/getttysize.c b/libc/log/getttysize.c
index a9167231..b9ef3c65 100644
--- a/libc/log/getttysize.c
+++ b/libc/log/getttysize.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/termios.h"
 #include "libc/fmt/conv.h"
diff --git a/libc/log/isterminalinarticulate.c b/libc/log/isterminalinarticulate.c
index b1397135..7d302ca6 100644
--- a/libc/log/isterminalinarticulate.c
+++ b/libc/log/isterminalinarticulate.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/log/log.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/libc/log/log.h b/libc/log/log.h
index de79742e..170153b4 100644
--- a/libc/log/log.h
+++ b/libc/log/log.h
@@ -30,7 +30,7 @@
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
-extern FILE *g_logfile;
+extern FILE *__log_file;
 
 void perror(const char *) relegated;   /* print the last system error */
 void __die(void) relegated wontreturn; /* print backtrace and abort() */
@@ -53,11 +53,11 @@ bool IsRunningUnderMake(void);
 ╚────────────────────────────────────────────────────────────────────────────│*/
 #ifndef __STRICT_ANSI__
 
-extern unsigned g_loglevel; /* log level for runtime check */
+extern unsigned __log_level; /* log level for runtime check */
 
 #define LOGGABLE(LEVEL)                                          \
   ((!__builtin_constant_p(LEVEL) || (LEVEL) <= LOGGABLELEVEL) && \
-   (LEVEL) <= g_loglevel)
+   (LEVEL) <= __log_level)
 
 #define LOGF(FMT, ...)                                               \
   do {                                                               \
diff --git a/libc/log/logfile.initabi.c b/libc/log/logfile.initabi.c
index 38ac45bd..3e5936c3 100644
--- a/libc/log/logfile.initabi.c
+++ b/libc/log/logfile.initabi.c
@@ -19,6 +19,6 @@
 #include "libc/bits/initializer.internal.h"
 #include "libc/stdio/stdio.h"
 
-FILE *g_logfile;
+FILE *__log_file;
 
-INITIALIZER(401, _init_g_logfile, (g_logfile = stderr));
+INITIALIZER(401, _init_log_file, (__log_file = stderr));
diff --git a/libc/log/loglevel.S b/libc/log/loglevel.S
index d75e797a..a823b7e5 100644
--- a/libc/log/loglevel.S
+++ b/libc/log/loglevel.S
@@ -17,16 +17,16 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.bss
 	.align	4
-g_loglevel:
+__log_level:
 	.long	0
-	.endobj	g_loglevel,globl
+	.endobj	__log_level,globl
 	.previous
 
-	.init.start 200,_init_g_loglevel
-	movb	$kLogInfo,g_loglevel(%rip)
-	.init.end 200,_init_g_loglevel
+	.init.start 200,_init_log_level
+	movb	$kLogInfo,__log_level(%rip)
+	.init.end 200,_init_log_level
diff --git a/libc/log/oncrash.c b/libc/log/oncrash.c
index b22690e2..313aed3b 100644
--- a/libc/log/oncrash.c
+++ b/libc/log/oncrash.c
@@ -29,7 +29,7 @@
 #include "libc/log/gdb.h"
 #include "libc/log/internal.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/stackframe.h"
 #include "libc/runtime/internal.h"
 #include "libc/runtime/memtrack.h"
diff --git a/libc/log/oncrashthunks.S b/libc/log/oncrashthunks.S
index 6f0fad31..b5f31750 100644
--- a/libc/log/oncrashthunks.S
+++ b/libc/log/oncrashthunks.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	These function names make it a bit more obvious which signal
diff --git a/libc/log/onkill.c b/libc/log/onkill.c
index a6218eeb..f296ceca 100644
--- a/libc/log/onkill.c
+++ b/libc/log/onkill.c
@@ -22,7 +22,7 @@
 #include "libc/calls/struct/sigaction.h"
 #include "libc/dce.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/sa.h"
diff --git a/libc/log/showcrashreports.c b/libc/log/showcrashreports.c
index 3c3bc65c..d7a0b726 100644
--- a/libc/log/showcrashreports.c
+++ b/libc/log/showcrashreports.c
@@ -24,7 +24,7 @@
 #include "libc/log/internal.h"
 #include "libc/log/log.h"
 #include "libc/log/ubsan.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/signals.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/sa.h"
diff --git a/libc/log/somanyubsan.S b/libc/log/somanyubsan.S
index d2b0b494..9e481ef0 100644
--- a/libc/log/somanyubsan.S
+++ b/libc/log/somanyubsan.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 .source	__FILE__
 
diff --git a/libc/log/thunks/__check_fail_eq.S b/libc/log/thunks/__check_fail_eq.S
index 9c7e2bde..d79ab39d 100644
--- a/libc/log/thunks/__check_fail_eq.S
+++ b/libc/log/thunks/__check_fail_eq.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 .source	__FILE__
 
diff --git a/libc/log/thunks/__check_fail_ge.S b/libc/log/thunks/__check_fail_ge.S
index 14078b89..ed3f9d8d 100644
--- a/libc/log/thunks/__check_fail_ge.S
+++ b/libc/log/thunks/__check_fail_ge.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 .source	__FILE__
 
diff --git a/libc/log/thunks/__check_fail_gt.S b/libc/log/thunks/__check_fail_gt.S
index 2ad94b3f..b86c96a4 100644
--- a/libc/log/thunks/__check_fail_gt.S
+++ b/libc/log/thunks/__check_fail_gt.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 .source	__FILE__
 
diff --git a/libc/log/thunks/__check_fail_le.S b/libc/log/thunks/__check_fail_le.S
index 55d62611..e21fabf2 100644
--- a/libc/log/thunks/__check_fail_le.S
+++ b/libc/log/thunks/__check_fail_le.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 .source	__FILE__
 
diff --git a/libc/log/thunks/__check_fail_lt.S b/libc/log/thunks/__check_fail_lt.S
index 6060b8ed..ea2161ed 100644
--- a/libc/log/thunks/__check_fail_lt.S
+++ b/libc/log/thunks/__check_fail_lt.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 .source	__FILE__
 
diff --git a/libc/log/thunks/__check_fail_ndebug.S b/libc/log/thunks/__check_fail_ndebug.S
index 522ed14c..65a16c05 100644
--- a/libc/log/thunks/__check_fail_ndebug.S
+++ b/libc/log/thunks/__check_fail_ndebug.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 __check_fail_ndebug:
diff --git a/libc/log/thunks/__check_fail_ne.S b/libc/log/thunks/__check_fail_ne.S
index cfead633..a0a8afbc 100644
--- a/libc/log/thunks/__check_fail_ne.S
+++ b/libc/log/thunks/__check_fail_ne.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 .source	__FILE__
 
diff --git a/libc/log/vflogf.c b/libc/log/vflogf.c
index 2809abf5..32a3f2c5 100644
--- a/libc/log/vflogf.c
+++ b/libc/log/vflogf.c
@@ -101,7 +101,7 @@ void(vflogf)(unsigned level, const char *file, int line, FILE *f,
   bool issamesecond;
   char buf32[32], *buf32p;
   int64_t secs, nsec, dots;
-  if (!f) f = g_logfile;
+  if (!f) f = __log_file;
   if (fileno(f) == -1) return;
   t2 = nowl();
   secs = t2;
diff --git a/libc/macros.h b/libc/macros.internal.h
similarity index 100%
rename from libc/macros.h
rename to libc/macros.internal.h
diff --git a/libc/mem/calloc.S b/libc/mem/calloc.S
index 7e717536..ded1a095 100644
--- a/libc/mem/calloc.S
+++ b/libc/mem/calloc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 .source	__FILE__
 
diff --git a/libc/mem/cxx/free.S b/libc/mem/cxx/free.S
index 417f1525..72a92b52 100644
--- a/libc/mem/cxx/free.S
+++ b/libc/mem/cxx/free.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Frees memory the C++ way.
diff --git a/libc/mem/cxx/malloc.S b/libc/mem/cxx/malloc.S
index 7f67f4ef..a5e98e8c 100644
--- a/libc/mem/cxx/malloc.S
+++ b/libc/mem/cxx/malloc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Allocates memory the C++ way.
diff --git a/libc/mem/cxx/memalign.S b/libc/mem/cxx/memalign.S
index 5df4e079..dded5b42 100644
--- a/libc/mem/cxx/memalign.S
+++ b/libc/mem/cxx/memalign.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Allocates aligned memory the C++ way.
diff --git a/libc/mem/free.S b/libc/mem/free.S
index 224815fd..44af4076 100644
--- a/libc/mem/free.S
+++ b/libc/mem/free.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Free memory returned by malloc() & co.
diff --git a/libc/mem/hook/calloc.S b/libc/mem/hook/calloc.S
index 9512139d..b2c53734 100644
--- a/libc/mem/hook/calloc.S
+++ b/libc/mem/hook/calloc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.initbss 202,_init_calloc
diff --git a/libc/mem/hook/free.S b/libc/mem/hook/free.S
index 89aca147..e130ec1d 100644
--- a/libc/mem/hook/free.S
+++ b/libc/mem/hook/free.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.initbss 202,_init_free
diff --git a/libc/mem/hook/malloc.S b/libc/mem/hook/malloc.S
index d17d2a9f..b6df454a 100644
--- a/libc/mem/hook/malloc.S
+++ b/libc/mem/hook/malloc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.initbss 202,_init_malloc
diff --git a/libc/mem/hook/malloc_trim.S b/libc/mem/hook/malloc_trim.S
index 82a795bf..b98b2a64 100644
--- a/libc/mem/hook/malloc_trim.S
+++ b/libc/mem/hook/malloc_trim.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.initbss 202,_init_malloc_trim
diff --git a/libc/mem/hook/malloc_usable_size.S b/libc/mem/hook/malloc_usable_size.S
index 78ce01b5..ed8dffaf 100644
--- a/libc/mem/hook/malloc_usable_size.S
+++ b/libc/mem/hook/malloc_usable_size.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.initbss 202,_init_malloc_usable_size
diff --git a/libc/mem/hook/memalign.S b/libc/mem/hook/memalign.S
index e48fd945..70ad1bfa 100644
--- a/libc/mem/hook/memalign.S
+++ b/libc/mem/hook/memalign.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.initbss 202,_init_memalign
diff --git a/libc/mem/hook/posix_memalign.S b/libc/mem/hook/posix_memalign.S
index d928f709..750c606b 100644
--- a/libc/mem/hook/posix_memalign.S
+++ b/libc/mem/hook/posix_memalign.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.initbss 202,_init_posix_memalign
diff --git a/libc/mem/hook/pvalloc.S b/libc/mem/hook/pvalloc.S
index 07ef0c09..1b0f0acc 100644
--- a/libc/mem/hook/pvalloc.S
+++ b/libc/mem/hook/pvalloc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.initbss 202,_init_pvalloc
diff --git a/libc/mem/hook/realloc.S b/libc/mem/hook/realloc.S
index d9655685..18d0beba 100644
--- a/libc/mem/hook/realloc.S
+++ b/libc/mem/hook/realloc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.initbss 202,_init_realloc
diff --git a/libc/mem/hook/realloc_in_place.S b/libc/mem/hook/realloc_in_place.S
index 18ebf39d..374c6b46 100644
--- a/libc/mem/hook/realloc_in_place.S
+++ b/libc/mem/hook/realloc_in_place.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.initbss 202,_init_realloc_in_place
diff --git a/libc/mem/hook/valloc.S b/libc/mem/hook/valloc.S
index 05f75e3f..a55cbf24 100644
--- a/libc/mem/hook/valloc.S
+++ b/libc/mem/hook/valloc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.initbss 202,_init_valloc
diff --git a/libc/mem/malloc.S b/libc/mem/malloc.S
index 9c99155a..e678191c 100644
--- a/libc/mem/malloc.S
+++ b/libc/mem/malloc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Allocates uninitialized memory.
diff --git a/libc/mem/malloc_trim.S b/libc/mem/malloc_trim.S
index 0dcb648a..873f2755 100644
--- a/libc/mem/malloc_trim.S
+++ b/libc/mem/malloc_trim.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Releases freed memory back to system.
 //
diff --git a/libc/mem/malloc_usable_size.S b/libc/mem/malloc_usable_size.S
index f80d4264..c534fef6 100644
--- a/libc/mem/malloc_usable_size.S
+++ b/libc/mem/malloc_usable_size.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 .source	__FILE__
 
diff --git a/libc/mem/memalign.S b/libc/mem/memalign.S
index 7925ef72..247046e7 100644
--- a/libc/mem/memalign.S
+++ b/libc/mem/memalign.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 .source	__FILE__
 
diff --git a/libc/mem/posix_memalign.S b/libc/mem/posix_memalign.S
index 6867b0e4..f2b551d3 100644
--- a/libc/mem/posix_memalign.S
+++ b/libc/mem/posix_memalign.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Allocates aligned memory the POSIX way.
diff --git a/libc/mem/pvalloc.S b/libc/mem/pvalloc.S
index 2cc5c37d..5f4dc422 100644
--- a/libc/mem/pvalloc.S
+++ b/libc/mem/pvalloc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 .source	__FILE__
 
diff --git a/libc/mem/realloc.S b/libc/mem/realloc.S
index 3adff627..d0c53c37 100644
--- a/libc/mem/realloc.S
+++ b/libc/mem/realloc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 .source	__FILE__
 
diff --git a/libc/mem/realloc_in_place.S b/libc/mem/realloc_in_place.S
index c8f41f8f..ac7e5b97 100644
--- a/libc/mem/realloc_in_place.S
+++ b/libc/mem/realloc_in_place.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 .source	__FILE__
 
diff --git a/libc/mem/valloc.S b/libc/mem/valloc.S
index 8e11cced..8541aa7b 100644
--- a/libc/mem/valloc.S
+++ b/libc/mem/valloc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 .source	__FILE__
 
diff --git a/libc/nexgen32e/bsrmax.S b/libc/nexgen32e/bsrmax.S
index fb9a058b..122133dc 100644
--- a/libc/nexgen32e/bsrmax.S
+++ b/libc/nexgen32e/bsrmax.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns binary logarithm of integer 𝑥.
 //
diff --git a/libc/nexgen32e/bzero.S b/libc/nexgen32e/bzero.S
index 0ea9cb73..6bba2d4c 100644
--- a/libc/nexgen32e/bzero.S
+++ b/libc/nexgen32e/bzero.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Sets memory to zero.
 //
diff --git a/libc/nexgen32e/cescapec.S b/libc/nexgen32e/cescapec.S
index 1840dfdd..3ce5685e 100644
--- a/libc/nexgen32e/cescapec.S
+++ b/libc/nexgen32e/cescapec.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "ape/relocations.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Escapes byte for string literal.
 //
diff --git a/libc/nexgen32e/cmpsb.S b/libc/nexgen32e/cmpsb.S
index acd173e3..02538938 100644
--- a/libc/nexgen32e/cmpsb.S
+++ b/libc/nexgen32e/cmpsb.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Compares 8-bit signed integers.
 //
diff --git a/libc/nexgen32e/cmpsl.S b/libc/nexgen32e/cmpsl.S
index 9e0cfe21..d0aa1992 100644
--- a/libc/nexgen32e/cmpsl.S
+++ b/libc/nexgen32e/cmpsl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Compares 32-bit signed integers.
 //
diff --git a/libc/nexgen32e/cmpsq.S b/libc/nexgen32e/cmpsq.S
index 54edd800..bcb9f404 100644
--- a/libc/nexgen32e/cmpsq.S
+++ b/libc/nexgen32e/cmpsq.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Compares 64-bit signed integers.
 //
diff --git a/libc/nexgen32e/cmpsw.S b/libc/nexgen32e/cmpsw.S
index 021a3200..ff4a78e9 100644
--- a/libc/nexgen32e/cmpsw.S
+++ b/libc/nexgen32e/cmpsw.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Compares 16-bit signed integers.
 //
diff --git a/libc/nexgen32e/cmpub.S b/libc/nexgen32e/cmpub.S
index 7c949ec1..ca848a23 100644
--- a/libc/nexgen32e/cmpub.S
+++ b/libc/nexgen32e/cmpub.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Compares 8-bit unsigned integers.
 //
diff --git a/libc/nexgen32e/cmpul.S b/libc/nexgen32e/cmpul.S
index 51f7cf8f..fc4739b6 100644
--- a/libc/nexgen32e/cmpul.S
+++ b/libc/nexgen32e/cmpul.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Compares 32-bit unsigned integers.
 //
diff --git a/libc/nexgen32e/cmpuq.S b/libc/nexgen32e/cmpuq.S
index 1d6f348d..9c8e3014 100644
--- a/libc/nexgen32e/cmpuq.S
+++ b/libc/nexgen32e/cmpuq.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Compares 64-bit unsigned integers.
 //
diff --git a/libc/nexgen32e/cmpuw.S b/libc/nexgen32e/cmpuw.S
index 87a308ed..33f59a87 100644
--- a/libc/nexgen32e/cmpuw.S
+++ b/libc/nexgen32e/cmpuw.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Compares 16-bit unsigned integers.
 //
diff --git a/libc/nexgen32e/crc32-pclmul.S b/libc/nexgen32e/crc32-pclmul.S
index 4d75928f..0772eb78 100644
--- a/libc/nexgen32e/crc32-pclmul.S
+++ b/libc/nexgen32e/crc32-pclmul.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Computes Phil Katz CRC-32 w/ carryless multiply isa.
 //
diff --git a/libc/nexgen32e/crc32init.S b/libc/nexgen32e/crc32init.S
index 116129af..30205e4c 100644
--- a/libc/nexgen32e/crc32init.S
+++ b/libc/nexgen32e/crc32init.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Generates lookup table for computing CRC-32 byte-by-byte.
 //
diff --git a/libc/nexgen32e/div1000000000int64.S b/libc/nexgen32e/div1000000000int64.S
index 85821696..68276435 100644
--- a/libc/nexgen32e/div1000000000int64.S
+++ b/libc/nexgen32e/div1000000000int64.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Divides 64-bit signed integer by 1,000,000,000.
 //
diff --git a/libc/nexgen32e/div1000000int64.S b/libc/nexgen32e/div1000000int64.S
index 6fc38915..599414c2 100644
--- a/libc/nexgen32e/div1000000int64.S
+++ b/libc/nexgen32e/div1000000int64.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Divides 64-bit signed integer by 1,000,000.
 //
diff --git a/libc/nexgen32e/div10000int64.S b/libc/nexgen32e/div10000int64.S
index ae278b1f..ca4dadde 100644
--- a/libc/nexgen32e/div10000int64.S
+++ b/libc/nexgen32e/div10000int64.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Divides 64-bit signed integer by 10,000.
 //
diff --git a/libc/nexgen32e/div1000int64.S b/libc/nexgen32e/div1000int64.S
index 4e45b971..d74e5979 100644
--- a/libc/nexgen32e/div1000int64.S
+++ b/libc/nexgen32e/div1000int64.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Divides 64-bit signed integer by 1,000.
 //
diff --git a/libc/nexgen32e/div100int64.S b/libc/nexgen32e/div100int64.S
index c63400ef..f9525016 100644
--- a/libc/nexgen32e/div100int64.S
+++ b/libc/nexgen32e/div100int64.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Divides 64-bit signed integer by 100.
 //
diff --git a/libc/nexgen32e/div10int64.S b/libc/nexgen32e/div10int64.S
index 0cf78748..95eb4f8a 100644
--- a/libc/nexgen32e/div10int64.S
+++ b/libc/nexgen32e/div10int64.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Divides 64-bit signed integer by 10.
 //
diff --git a/libc/nexgen32e/djbsort-avx2.S b/libc/nexgen32e/djbsort-avx2.S
index d653a728..1cd7dec2 100644
--- a/libc/nexgen32e/djbsort-avx2.S
+++ b/libc/nexgen32e/djbsort-avx2.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	D.J. Bernstein's outrageously fast integer sorting algorithm.
diff --git a/libc/nexgen32e/environ.S b/libc/nexgen32e/environ.S
index 6f8036c4..c8b23bae 100644
--- a/libc/nexgen32e/environ.S
+++ b/libc/nexgen32e/environ.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 
 //	Environment variable pointer list.
diff --git a/libc/nexgen32e/errno.S b/libc/nexgen32e/errno.S
index 27e0296c..5e51e0f9 100644
--- a/libc/nexgen32e/errno.S
+++ b/libc/nexgen32e/errno.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Global variable for last error.
diff --git a/libc/nexgen32e/errnolocation.S b/libc/nexgen32e/errnolocation.S
index 562ccb6f..1b9ccbc0 100644
--- a/libc/nexgen32e/errnolocation.S
+++ b/libc/nexgen32e/errnolocation.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .keep.text # gdb needs it
 
diff --git a/libc/nexgen32e/explicit_bzero.S b/libc/nexgen32e/explicit_bzero.S
index 46166a7e..a7ecaf8d 100644
--- a/libc/nexgen32e/explicit_bzero.S
+++ b/libc/nexgen32e/explicit_bzero.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Sets memory to zero w/ accompanying non-optimizing macro.
 //
diff --git a/libc/nexgen32e/fentry.S b/libc/nexgen32e/fentry.S
index 8da24a65..297da31f 100644
--- a/libc/nexgen32e/fentry.S
+++ b/libc/nexgen32e/fentry.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .real
 .source	__FILE__
 .code16 # ∩ .code32 ∩ .code64
diff --git a/libc/nexgen32e/ffs.S b/libc/nexgen32e/ffs.S
index 503b9954..5231f070 100644
--- a/libc/nexgen32e/ffs.S
+++ b/libc/nexgen32e/ffs.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Finds lowest set bit in word.
 //
diff --git a/libc/nexgen32e/ffsl.S b/libc/nexgen32e/ffsl.S
index 25cef203..f6138045 100644
--- a/libc/nexgen32e/ffsl.S
+++ b/libc/nexgen32e/ffsl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Finds lowest set bit in word.
 //
diff --git a/libc/nexgen32e/g_argv.S b/libc/nexgen32e/g_argv.S
index 2946b012..c69a3f4f 100644
--- a/libc/nexgen32e/g_argv.S
+++ b/libc/nexgen32e/g_argv.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 
 	.initbss 300,_init_argv
diff --git a/libc/nexgen32e/g_auxv.S b/libc/nexgen32e/g_auxv.S
index e62ede3d..6486b358 100644
--- a/libc/nexgen32e/g_auxv.S
+++ b/libc/nexgen32e/g_auxv.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 
 	.initbss 300,_init_auxv
diff --git a/libc/nexgen32e/gc.S b/libc/nexgen32e/gc.S
index 5c2a6fee..a337e390 100644
--- a/libc/nexgen32e/gc.S
+++ b/libc/nexgen32e/gc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/dce.h"
 #include "libc/notice.inc"
 #define INITIAL_CAPACITY 4
diff --git a/libc/nexgen32e/gclongjmp.S b/libc/nexgen32e/gclongjmp.S
index d248814f..71332655 100644
--- a/libc/nexgen32e/gclongjmp.S
+++ b/libc/nexgen32e/gclongjmp.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Jumps up stack to previous setjmp() invocation.
 //
diff --git a/libc/nexgen32e/identity.S b/libc/nexgen32e/identity.S
index f74a3c2d..0708c553 100644
--- a/libc/nexgen32e/identity.S
+++ b/libc/nexgen32e/identity.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 
 //	The identity() function.
diff --git a/libc/nexgen32e/imapxlatab.S b/libc/nexgen32e/imapxlatab.S
index f5307dc1..753d740a 100644
--- a/libc/nexgen32e/imapxlatab.S
+++ b/libc/nexgen32e/imapxlatab.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.startup
 .align	8
 
diff --git a/libc/nexgen32e/kbase36.S b/libc/nexgen32e/kbase36.S
index 7b8a9f17..4b6486ad 100644
--- a/libc/nexgen32e/kbase36.S
+++ b/libc/nexgen32e/kbase36.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Base 36 Decoder Table.
 //
diff --git a/libc/nexgen32e/kcp437.S b/libc/nexgen32e/kcp437.S
index fa86458c..4dbd6aca 100644
--- a/libc/nexgen32e/kcp437.S
+++ b/libc/nexgen32e/kcp437.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .rodata
 .align	16
 .source	__FILE__
diff --git a/libc/nexgen32e/kcpuids.S b/libc/nexgen32e/kcpuids.S
index e6da54be..ddaee90e 100644
--- a/libc/nexgen32e/kcpuids.S
+++ b/libc/nexgen32e/kcpuids.S
@@ -18,10 +18,11 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/pc.internal.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/kcpuids.h"
 #include "libc/nexgen32e/x86feature.h"
 
+	.initbss 201,_init_kCpuids
 //	Globally precomputed CPUID.
 //
 //	This module lets us check CPUID in 0.06ns rather than 51.00ns.
@@ -30,7 +31,6 @@
 //	are quite toilsome.
 //
 //	@see	www.felixcloutier.com/x86/cpuid
-	.initbss 201,_init_kCpuids
 kCpuids:.long	0,0,0,0				# EAX=0 (Basic Processor Info)
 	.long	0,0,0,0				# EAX=1 (Processor Info)
 	.long	0,0,0,0				# EAX=2
diff --git a/libc/nexgen32e/kcrc32ctab.S b/libc/nexgen32e/kcrc32ctab.S
index 0e0defa0..7ec41907 100644
--- a/libc/nexgen32e/kcrc32ctab.S
+++ b/libc/nexgen32e/kcrc32ctab.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Castagnoli CRC32 ISCSI Polynomial
 //	x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1
diff --git a/libc/nexgen32e/khalfcache3.S b/libc/nexgen32e/khalfcache3.S
index 4c10a774..df3ec8a9 100644
--- a/libc/nexgen32e/khalfcache3.S
+++ b/libc/nexgen32e/khalfcache3.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.initbss 202,_init_kHalfCache3
 //	Half size of level 3 cache in bytes.
diff --git a/libc/nexgen32e/kreversebits.S b/libc/nexgen32e/kreversebits.S
index 44784c74..293f4142 100644
--- a/libc/nexgen32e/kreversebits.S
+++ b/libc/nexgen32e/kreversebits.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.rodata
 kReverseBits:
diff --git a/libc/nexgen32e/ksha256tab.S b/libc/nexgen32e/ksha256tab.S
index 7a9198f8..03e97828 100644
--- a/libc/nexgen32e/ksha256tab.S
+++ b/libc/nexgen32e/ksha256tab.S
@@ -7,7 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.rodata.cst16
 	.align	16
diff --git a/libc/nexgen32e/ksigsetempty.S b/libc/nexgen32e/ksigsetempty.S
index ee39533d..a73f071b 100644
--- a/libc/nexgen32e/ksigsetempty.S
+++ b/libc/nexgen32e/ksigsetempty.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Signal mask constant w/ no signal bits set.
 	.initbss 300,_init_kSigsetEmpty
diff --git a/libc/nexgen32e/ksigsetfull.S b/libc/nexgen32e/ksigsetfull.S
index 720646b8..4a973dbd 100644
--- a/libc/nexgen32e/ksigsetfull.S
+++ b/libc/nexgen32e/ksigsetfull.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Signal mask constant w/ every signal bit set.
 	.initbss 300,_init_kSigsetFull
diff --git a/libc/nexgen32e/kstarttsc.S b/libc/nexgen32e/kstarttsc.S
index b9fe316f..8822ae9c 100644
--- a/libc/nexgen32e/kstarttsc.S
+++ b/libc/nexgen32e/kstarttsc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Stores CPU Timestamp Counter at startup.
 //
diff --git a/libc/nexgen32e/ktolower.S b/libc/nexgen32e/ktolower.S
index 68ca851d..c7543333 100644
--- a/libc/nexgen32e/ktolower.S
+++ b/libc/nexgen32e/ktolower.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	ASCII uppercase → lowercase translation tables.
 //
diff --git a/libc/nexgen32e/llog10.S b/libc/nexgen32e/llog10.S
index fd33d641..869f0ca2 100644
--- a/libc/nexgen32e/llog10.S
+++ b/libc/nexgen32e/llog10.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Fast log₁₀ when 𝑥 is an integer.
 //
diff --git a/libc/nexgen32e/loadxmm.S b/libc/nexgen32e/loadxmm.S
index b9f4b07f..24628744 100644
--- a/libc/nexgen32e/loadxmm.S
+++ b/libc/nexgen32e/loadxmm.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .privileged
 
 //	Loads XMM registers from buffer.
diff --git a/libc/nexgen32e/lolendian.S b/libc/nexgen32e/lolendian.S
index 7c2c5491..3b7b7168 100644
--- a/libc/nexgen32e/lolendian.S
+++ b/libc/nexgen32e/lolendian.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	@fileoverview Byte-order conversion functions.
 //
diff --git a/libc/nexgen32e/longjmp.S b/libc/nexgen32e/longjmp.S
index 32354299..45aa3f48 100644
--- a/libc/nexgen32e/longjmp.S
+++ b/libc/nexgen32e/longjmp.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .privileged
 
 //	Loads previously saved processor state.
diff --git a/libc/nexgen32e/lzcnt.S b/libc/nexgen32e/lzcnt.S
index acce0409..fff23114 100644
--- a/libc/nexgen32e/lzcnt.S
+++ b/libc/nexgen32e/lzcnt.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Finds leading bits in 𝑥.
 //
diff --git a/libc/nexgen32e/lzcntl.S b/libc/nexgen32e/lzcntl.S
index fb325614..9fe6a781 100644
--- a/libc/nexgen32e/lzcntl.S
+++ b/libc/nexgen32e/lzcntl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Finds leading bits in 𝑥.
 //
diff --git a/libc/nexgen32e/macros.internal.inc b/libc/nexgen32e/macros.internal.inc
index 0b997508..10ff923a 100644
--- a/libc/nexgen32e/macros.internal.inc
+++ b/libc/nexgen32e/macros.internal.inc
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/x86feature.h"
 
 //	Broadcast byte literal to vector, e.g.
diff --git a/libc/nexgen32e/mcount.S b/libc/nexgen32e/mcount.S
index aee886b3..5d0653ee 100644
--- a/libc/nexgen32e/mcount.S
+++ b/libc/nexgen32e/mcount.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .real
 .source	__FILE__
 .code16 # ∩ .code32 ∩ .code64
diff --git a/libc/nexgen32e/memcpy.S b/libc/nexgen32e/memcpy.S
index b7b26911..ac9c9e35 100644
--- a/libc/nexgen32e/memcpy.S
+++ b/libc/nexgen32e/memcpy.S
@@ -28,7 +28,7 @@
 	It's so easy that even a child could use it, and they do.
 */
 #include "libc/nexgen32e/x86feature.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Copies memory.
 //
diff --git a/libc/nexgen32e/memeqmask.S b/libc/nexgen32e/memeqmask.S
index 2db3b591..6276bdc9 100644
--- a/libc/nexgen32e/memeqmask.S
+++ b/libc/nexgen32e/memeqmask.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Creates bit mask of which bytes are the same.
 //
diff --git a/libc/nexgen32e/memjmpinit.S b/libc/nexgen32e/memjmpinit.S
index 6ea6e713..2b5ebb1e 100644
--- a/libc/nexgen32e/memjmpinit.S
+++ b/libc/nexgen32e/memjmpinit.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/x86feature.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.startup
 
 //	Initializes jump table for memset() and memcpy().
diff --git a/libc/nexgen32e/memmove.S b/libc/nexgen32e/memmove.S
index 33f63143..4de34b5a 100644
--- a/libc/nexgen32e/memmove.S
+++ b/libc/nexgen32e/memmove.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Copies memory.
 //
diff --git a/libc/nexgen32e/mempcpy.S b/libc/nexgen32e/mempcpy.S
index 51ba0bef..4c61b234 100644
--- a/libc/nexgen32e/mempcpy.S
+++ b/libc/nexgen32e/mempcpy.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Copies memory.
diff --git a/libc/nexgen32e/memrchr.S b/libc/nexgen32e/memrchr.S
index 03abb4fc..b8296a37 100644
--- a/libc/nexgen32e/memrchr.S
+++ b/libc/nexgen32e/memrchr.S
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Searches for last instance of byte in memory region.
 //
diff --git a/libc/nexgen32e/memrchr16.S b/libc/nexgen32e/memrchr16.S
index 055ef4ad..57dbd6a0 100644
--- a/libc/nexgen32e/memrchr16.S
+++ b/libc/nexgen32e/memrchr16.S
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Searches for last instance of uint16_t in memory region.
 //
diff --git a/libc/nexgen32e/memrchr32.S b/libc/nexgen32e/memrchr32.S
index d30ce2c2..fbdd7937 100644
--- a/libc/nexgen32e/memrchr32.S
+++ b/libc/nexgen32e/memrchr32.S
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Searches for last instance of wchar_t in memory region.
 //
diff --git a/libc/nexgen32e/memset.S b/libc/nexgen32e/memset.S
index 8860123b..e9ac3899 100644
--- a/libc/nexgen32e/memset.S
+++ b/libc/nexgen32e/memset.S
@@ -22,7 +22,7 @@
 	which is about 110 GBps. */
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/nexgen32e/macros.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Sets memory.
 //
diff --git a/libc/nexgen32e/missingno.S b/libc/nexgen32e/missingno.S
index 9c9db592..1bffd54b 100644
--- a/libc/nexgen32e/missingno.S
+++ b/libc/nexgen32e/missingno.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .real
 .source	__FILE__
 .code16 # ∩ .code32 ∩ .code64
diff --git a/libc/nexgen32e/nt2sysv.S b/libc/nexgen32e/nt2sysv.S
index 3ea1f369..a01c207a 100644
--- a/libc/nexgen32e/nt2sysv.S
+++ b/libc/nexgen32e/nt2sysv.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.windows
 
 //	Translates function call from code built w/ MS-style compiler.
diff --git a/libc/nexgen32e/program_invocation_name.S b/libc/nexgen32e/program_invocation_name.S
index dd6823ea..454fb412 100644
--- a/libc/nexgen32e/program_invocation_name.S
+++ b/libc/nexgen32e/program_invocation_name.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Supplies argv[0] the GNU way.
 	.initbss 300,_init_program_invocation_name
diff --git a/libc/nexgen32e/rem1000000000int64.S b/libc/nexgen32e/rem1000000000int64.S
index 98a7c7de..4a8ab74d 100644
--- a/libc/nexgen32e/rem1000000000int64.S
+++ b/libc/nexgen32e/rem1000000000int64.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥 % 1,000,000,000.
 //
diff --git a/libc/nexgen32e/rem1000000int64.S b/libc/nexgen32e/rem1000000int64.S
index 20150445..37fbbd57 100644
--- a/libc/nexgen32e/rem1000000int64.S
+++ b/libc/nexgen32e/rem1000000int64.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥 % 1,000,000.
 //
diff --git a/libc/nexgen32e/rem10000int64.S b/libc/nexgen32e/rem10000int64.S
index fbe793fb..cd34b88b 100644
--- a/libc/nexgen32e/rem10000int64.S
+++ b/libc/nexgen32e/rem10000int64.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥 % 10,000.
 //
diff --git a/libc/nexgen32e/rem1000int64.S b/libc/nexgen32e/rem1000int64.S
index 9b16a2a5..825c1e64 100644
--- a/libc/nexgen32e/rem1000int64.S
+++ b/libc/nexgen32e/rem1000int64.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥 % 1,000.
 //
diff --git a/libc/nexgen32e/rem100int64.S b/libc/nexgen32e/rem100int64.S
index 7e1aadf5..e5566e65 100644
--- a/libc/nexgen32e/rem100int64.S
+++ b/libc/nexgen32e/rem100int64.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥 % 100.
 //
diff --git a/libc/nexgen32e/rem10int64.S b/libc/nexgen32e/rem10int64.S
index 181ac31f..8ae95ca7 100644
--- a/libc/nexgen32e/rem10int64.S
+++ b/libc/nexgen32e/rem10int64.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥 % 10.
 //
diff --git a/libc/nexgen32e/rldecode.S b/libc/nexgen32e/rldecode.S
index 5d5cc4de..b44fb8da 100644
--- a/libc/nexgen32e/rldecode.S
+++ b/libc/nexgen32e/rldecode.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.startup
 
 //	Seventeen byte decompressor.
diff --git a/libc/nexgen32e/savexmm.S b/libc/nexgen32e/savexmm.S
index 0bfde8c5..b6156bfb 100644
--- a/libc/nexgen32e/savexmm.S
+++ b/libc/nexgen32e/savexmm.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .privileged
 
 //	Stores XMM registers to buffer.
diff --git a/libc/nexgen32e/setjmp.S b/libc/nexgen32e/setjmp.S
index c29167ab..5b3d00eb 100644
--- a/libc/nexgen32e/setjmp.S
+++ b/libc/nexgen32e/setjmp.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Saves caller CPU state to cacheline.
 //
diff --git a/libc/nexgen32e/slowcall.S b/libc/nexgen32e/slowcall.S
index 1bb9a54e..755e98c1 100644
--- a/libc/nexgen32e/slowcall.S
+++ b/libc/nexgen32e/slowcall.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 
 //	Applies no-clobber guarantee to System Five function call.
diff --git a/libc/nexgen32e/strcpyzbw.S b/libc/nexgen32e/strcpyzbw.S
index 0d6e220d..641ca6a9 100644
--- a/libc/nexgen32e/strcpyzbw.S
+++ b/libc/nexgen32e/strcpyzbw.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	TODO(jart): pmovzxbw and vpunpcklbw
 strcpyzbw:
diff --git a/libc/nexgen32e/strcspn.S b/libc/nexgen32e/strcspn.S
index 91438913..5c6fba29 100644
--- a/libc/nexgen32e/strcspn.S
+++ b/libc/nexgen32e/strcspn.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns prefix length, consisting of chars not in reject.
 //
diff --git a/libc/nexgen32e/strlen.S b/libc/nexgen32e/strlen.S
index f9f3c44f..cab8bcf7 100644
--- a/libc/nexgen32e/strlen.S
+++ b/libc/nexgen32e/strlen.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns length of NUL-terminated string.
 //
diff --git a/libc/nexgen32e/strsak.S b/libc/nexgen32e/strsak.S
index 94a7c83d..7789ecb5 100644
--- a/libc/nexgen32e/strsak.S
+++ b/libc/nexgen32e/strsak.S
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/nexgen32e/macros.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns length of NUL-terminated string w/ security blankets.
diff --git a/libc/nexgen32e/strsak16.S b/libc/nexgen32e/strsak16.S
index 46ff5b33..acd0c41e 100644
--- a/libc/nexgen32e/strsak16.S
+++ b/libc/nexgen32e/strsak16.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/x86feature.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns pointer to first instance of character.
 //
diff --git a/libc/nexgen32e/strsak32.S b/libc/nexgen32e/strsak32.S
index 7d30a98b..296c84b9 100644
--- a/libc/nexgen32e/strsak32.S
+++ b/libc/nexgen32e/strsak32.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/x86feature.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns pointer to first instance of character.
 //
diff --git a/libc/nexgen32e/strstr-sse42.S b/libc/nexgen32e/strstr-sse42.S
index 0c884e31..1bb75db7 100644
--- a/libc/nexgen32e/strstr-sse42.S
+++ b/libc/nexgen32e/strstr-sse42.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/pcmpstr.inc"
 #include "libc/nexgen32e/strstr.inc"
 
diff --git a/libc/nexgen32e/strstr16-sse42.S b/libc/nexgen32e/strstr16-sse42.S
index 1d9fb474..c72d78f2 100644
--- a/libc/nexgen32e/strstr16-sse42.S
+++ b/libc/nexgen32e/strstr16-sse42.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/pcmpstr.inc"
 #include "libc/nexgen32e/strstr.inc"
 
diff --git a/libc/nexgen32e/tinydivsi.greg.S b/libc/nexgen32e/tinydivsi.greg.S
index 0d4551ac..c1d53657 100644
--- a/libc/nexgen32e/tinydivsi.greg.S
+++ b/libc/nexgen32e/tinydivsi.greg.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Support code for fast integer division by Si units.
 //
diff --git a/libc/nexgen32e/tinystrlen.greg.S b/libc/nexgen32e/tinystrlen.greg.S
index 7b5371b6..2bb9cd23 100644
--- a/libc/nexgen32e/tinystrlen.greg.S
+++ b/libc/nexgen32e/tinystrlen.greg.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	8-bit strlen that's tiny and near optimal if data's tiny.
 //
diff --git a/libc/nexgen32e/tinystrlen16.greg.S b/libc/nexgen32e/tinystrlen16.greg.S
index f575ae84..dafa416a 100644
--- a/libc/nexgen32e/tinystrlen16.greg.S
+++ b/libc/nexgen32e/tinystrlen16.greg.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	16-bit strlen that's tiny and near optimal if data's tiny.
 //
diff --git a/libc/nexgen32e/tinystrncmp.ncabi.S b/libc/nexgen32e/tinystrncmp.ncabi.S
index 270f97f1..4f196316 100644
--- a/libc/nexgen32e/tinystrncmp.ncabi.S
+++ b/libc/nexgen32e/tinystrncmp.ncabi.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Compares strings w/ limit & no-clobber greg abi.
 //
diff --git a/libc/nexgen32e/tinystrnlen.greg.S b/libc/nexgen32e/tinystrnlen.greg.S
index cfaf37dd..19407429 100644
--- a/libc/nexgen32e/tinystrnlen.greg.S
+++ b/libc/nexgen32e/tinystrnlen.greg.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	8-bit strnlen that's tiny and near optimal if data's tiny.
 //
diff --git a/libc/nexgen32e/tinystrnlen16.greg.S b/libc/nexgen32e/tinystrnlen16.greg.S
index 923466dd..86e33181 100644
--- a/libc/nexgen32e/tinystrnlen16.greg.S
+++ b/libc/nexgen32e/tinystrnlen16.greg.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	16-bit strnlen that's tiny and near optimal if data's tiny.
 //
diff --git a/libc/nexgen32e/tinywcslen.greg.S b/libc/nexgen32e/tinywcslen.greg.S
index 59c71f81..018590c8 100644
--- a/libc/nexgen32e/tinywcslen.greg.S
+++ b/libc/nexgen32e/tinywcslen.greg.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	32-bit strlen that's tiny and near optimal if data's tiny.
 //
diff --git a/libc/nexgen32e/tinywcsnlen.greg.S b/libc/nexgen32e/tinywcsnlen.greg.S
index 135457cb..cfa7c7e7 100644
--- a/libc/nexgen32e/tinywcsnlen.greg.S
+++ b/libc/nexgen32e/tinywcsnlen.greg.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	32-bit strnlen that's tiny and near optimal if data's tiny.
 //
diff --git a/libc/nexgen32e/tzcnt.S b/libc/nexgen32e/tzcnt.S
index e22c148b..e709d02a 100644
--- a/libc/nexgen32e/tzcnt.S
+++ b/libc/nexgen32e/tzcnt.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Finds lowest set bit in 𝑥.
diff --git a/libc/nexgen32e/tzcntl.S b/libc/nexgen32e/tzcntl.S
index c7f2aa5e..5d0993b3 100644
--- a/libc/nexgen32e/tzcntl.S
+++ b/libc/nexgen32e/tzcntl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Finds lowest set bit in 𝑥.
 //
diff --git a/libc/nexgen32e/zip.S b/libc/nexgen32e/zip.S
index 01210ec7..0d377877 100644
--- a/libc/nexgen32e/zip.S
+++ b/libc/nexgen32e/zip.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "ape/relocations.h"
 #include "libc/zip.h"
 
diff --git a/libc/nt/nt.mk b/libc/nt/nt.mk
index 759a5073..dfb10d2b 100644
--- a/libc/nt/nt.mk
+++ b/libc/nt/nt.mk
@@ -162,7 +162,7 @@ $(LIBC_NT_NTDLL_A_OBJS):				\
 o/libc/nt/ntdllimport.inc:				\
 		ape/relocations.h			\
 		libc/nt/ntdllimport.h			\
-		libc/macros.h				\
+		libc/macros.internal.h			\
 		libc/macros.internal.inc		\
 		libc/macros-cpp.internal.inc
 
diff --git a/libc/nt/ntdllimport.S b/libc/nt/ntdllimport.S
index 1fd5bf04..b0572aa7 100644
--- a/libc/nt/ntdllimport.S
+++ b/libc/nt/ntdllimport.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nt/enum/status.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	@fileoverview NTDLL.DLL Non-Mandatory Importer
 //
diff --git a/libc/nt/ntdllimport.h b/libc/nt/ntdllimport.h
index 4b228512..170b1b04 100644
--- a/libc/nt/ntdllimport.h
+++ b/libc/nt/ntdllimport.h
@@ -19,7 +19,7 @@
 #ifndef COSMOPOLITAN_LIBC_NT_NTDLLIMPORT_H_
 #define COSMOPOLITAN_LIBC_NT_NTDLLIMPORT_H_
 #include "ape/relocations.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #ifdef __ASSEMBLER__
 /* clang-format off */
 
diff --git a/libc/rand/g_rando.S b/libc/rand/g_rando.S
index a29f2971..ab9d3bc2 100644
--- a/libc/rand/g_rando.S
+++ b/libc/rand/g_rando.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.bss
 	.align	8
diff --git a/libc/rand/getrandom.c b/libc/rand/getrandom.c
index 95403ffe..81464207 100644
--- a/libc/rand/getrandom.c
+++ b/libc/rand/getrandom.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/errno.h"
 #include "libc/rand/rand.h"
diff --git a/libc/rand/strfry.c b/libc/rand/strfry.c
index dcd2fe4c..bcae5309 100644
--- a/libc/rand/strfry.c
+++ b/libc/rand/strfry.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/alg/shuffle.h"
+#include "libc/alg/shuffle.internal.h"
 #include "libc/rand/rand.h"
 #include "libc/str/str.h"
 
diff --git a/libc/runtime/abort.S b/libc/runtime/abort.S
index 1c6f6476..2d7bf3e0 100644
--- a/libc/runtime/abort.S
+++ b/libc/runtime/abort.S
@@ -20,7 +20,7 @@
 #include "libc/runtime/internal.h"
 #include "libc/sysv/consts/sig.h"
 #include "libc/sysv/consts/nr.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .privileged
 
 //	Terminates program abnormally.
diff --git a/libc/runtime/assertfail.c b/libc/runtime/assertfail.c
index 319c3b9e..bfbf58eb 100644
--- a/libc/runtime/assertfail.c
+++ b/libc/runtime/assertfail.c
@@ -21,7 +21,7 @@
 #include "libc/bits/weaken.h"
 #include "libc/dce.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/alloca.h"
 #include "libc/nt/runtime.h"
 #include "libc/sysv/consts/nr.h"
diff --git a/libc/runtime/brk.c b/libc/runtime/brk.c
index 6e95b684..481ae5b8 100644
--- a/libc/runtime/brk.c
+++ b/libc/runtime/brk.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/calls/calls.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/consts/map.h"
 #include "libc/sysv/consts/prot.h"
diff --git a/libc/runtime/construct.S b/libc/runtime/construct.S
index 01ce4d4c..a127b9b1 100644
--- a/libc/runtime/construct.S
+++ b/libc/runtime/construct.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.startup
 .source	__FILE__
 
diff --git a/libc/runtime/cosmo.S b/libc/runtime/cosmo.S
index 46d25a0a..86cac845 100644
--- a/libc/runtime/cosmo.S
+++ b/libc/runtime/cosmo.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 #include "libc/sysv/consts/prot.h"
 #include "libc/sysv/consts/map.h"
diff --git a/libc/runtime/cxaatexit.c b/libc/runtime/cxaatexit.c
index 444c611b..d0e04bb0 100644
--- a/libc/runtime/cxaatexit.c
+++ b/libc/runtime/cxaatexit.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/bits/weaken.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/bsf.h"
 #include "libc/nexgen32e/bsr.h"
diff --git a/libc/runtime/directmap-metal.c b/libc/runtime/directmap-metal.c
index 1d751ad3..3dbaebdd 100644
--- a/libc/runtime/directmap-metal.c
+++ b/libc/runtime/directmap-metal.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/directmap.internal.h"
 #include "libc/runtime/pc.internal.h"
 #include "libc/str/str.h"
diff --git a/libc/runtime/directmap-nt.c b/libc/runtime/directmap-nt.c
index 464fdf53..aaa69afd 100644
--- a/libc/runtime/directmap-nt.c
+++ b/libc/runtime/directmap-nt.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/enum/filemapflags.h"
 #include "libc/nt/enum/pageflags.h"
 #include "libc/nt/memory.h"
diff --git a/libc/runtime/dsohandle.S b/libc/runtime/dsohandle.S
index a4c9382c..698c09d9 100644
--- a/libc/runtime/dsohandle.S
+++ b/libc/runtime/dsohandle.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 .source	__FILE__
 
diff --git a/libc/runtime/efimain.greg.c b/libc/runtime/efimain.greg.c
index 5737ba15..e6ac87bc 100644
--- a/libc/runtime/efimain.greg.c
+++ b/libc/runtime/efimain.greg.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/efi.h"
 #include "libc/nt/thunk/msabi.h"
 #include "libc/runtime/e820.internal.h"
diff --git a/libc/runtime/ezmap.c b/libc/runtime/ezmap.c
index 90dd3f7f..48d994bd 100644
--- a/libc/runtime/ezmap.c
+++ b/libc/runtime/ezmap.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/limits.h"
 #include "libc/runtime/ezmap.internal.h"
diff --git a/libc/runtime/findcombinary.c b/libc/runtime/findcombinary.c
index 6b69f144..6aeba1bc 100644
--- a/libc/runtime/findcombinary.c
+++ b/libc/runtime/findcombinary.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/auxv.h"
diff --git a/libc/runtime/finddebugbinary.c b/libc/runtime/finddebugbinary.c
index 3b5a37d8..9ff07c09 100644
--- a/libc/runtime/finddebugbinary.c
+++ b/libc/runtime/finddebugbinary.c
@@ -17,10 +17,10 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/errno.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/runtime/symbols.internal.h"
 #include "libc/str/str.h"
diff --git a/libc/runtime/fork-nt.c b/libc/runtime/fork-nt.c
index a1b8ad79..35ba4624 100644
--- a/libc/runtime/fork-nt.c
+++ b/libc/runtime/fork-nt.c
@@ -22,7 +22,7 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/ntspawn.h"
 #include "libc/fmt/itoa.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/nt2sysv.h"
 #include "libc/nt/dll.h"
 #include "libc/nt/enum/filemapflags.h"
diff --git a/libc/runtime/fpreset.S b/libc/runtime/fpreset.S
index b012d084..8aad2260 100644
--- a/libc/runtime/fpreset.S
+++ b/libc/runtime/fpreset.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Re-initializes FPU.
diff --git a/libc/runtime/ftrace-hook.S b/libc/runtime/ftrace-hook.S
index da962abe..24c114ef 100644
--- a/libc/runtime/ftrace-hook.S
+++ b/libc/runtime/ftrace-hook.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .privileged
 
 ftrace_hook:
diff --git a/libc/runtime/ftrace.c b/libc/runtime/ftrace.c
index 1c38e8cb..293b6b2f 100644
--- a/libc/runtime/ftrace.c
+++ b/libc/runtime/ftrace.c
@@ -18,13 +18,13 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/bisectcarleft.internal.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/sigset.h"
 #include "libc/dce.h"
 #include "libc/intrin/repmovsb.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/stackframe.h"
 #include "libc/nt/files.h"
 #include "libc/nt/runtime.h"
diff --git a/libc/runtime/g_argc.S b/libc/runtime/g_argc.S
index d824b00f..2c4d1b21 100644
--- a/libc/runtime/g_argc.S
+++ b/libc/runtime/g_argc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 
 	.initbss 300,_init_argc
diff --git a/libc/runtime/getdosargv.c b/libc/runtime/getdosargv.c
index 3dcc5042..699f1d1a 100644
--- a/libc/runtime/getdosargv.c
+++ b/libc/runtime/getdosargv.c
@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
 #include "libc/bits/pushpop.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/runtime/internal.h"
 #include "libc/str/str.h"
 #include "libc/str/tpenc.h"
diff --git a/libc/runtime/getpagesize.S b/libc/runtime/getpagesize.S
index 4c046a46..f837fbb6 100644
--- a/libc/runtime/getpagesize.S
+++ b/libc/runtime/getpagesize.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns granularity of memory manager.
diff --git a/libc/runtime/grow.c b/libc/runtime/grow.c
index 56c9ebb6..6bf247c4 100644
--- a/libc/runtime/grow.c
+++ b/libc/runtime/grow.c
@@ -20,7 +20,7 @@
 #include "libc/bits/bits.h"
 #include "libc/bits/weaken.h"
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/libc/runtime/init.S b/libc/runtime/init.S
index 933b680e..c48d8254 100644
--- a/libc/runtime/init.S
+++ b/libc/runtime/init.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/internal.h"
 #include "libc/sysv/consts/prot.h"
 #include "libc/dce.h"
diff --git a/libc/runtime/interruptiblecall.c b/libc/runtime/interruptiblecall.c
index 6574d45d..e5cbd35e 100644
--- a/libc/runtime/interruptiblecall.c
+++ b/libc/runtime/interruptiblecall.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/interruptiblecall.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/runtime/isheap.c b/libc/runtime/isheap.c
index 77028140..9308d235 100644
--- a/libc/runtime/isheap.c
+++ b/libc/runtime/isheap.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/memtrack.h"
 #include "libc/runtime/runtime.h"
 
diff --git a/libc/runtime/jmpstack.S b/libc/runtime/jmpstack.S
index 04bb2468..7044ad3b 100644
--- a/libc/runtime/jmpstack.S
+++ b/libc/runtime/jmpstack.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Switches stack.
 //
diff --git a/libc/runtime/memtrack.c b/libc/runtime/memtrack.c
index 46a7924a..78e8ba30 100644
--- a/libc/runtime/memtrack.c
+++ b/libc/runtime/memtrack.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/memtrack.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/libc/runtime/memtrack.h b/libc/runtime/memtrack.h
index eab6a19e..8f7e71a9 100644
--- a/libc/runtime/memtrack.h
+++ b/libc/runtime/memtrack.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_LIBC_RUNTIME_MEMTRACK_H_
 #define COSMOPOLITAN_LIBC_RUNTIME_MEMTRACK_H_
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/enum/version.h"
 #include "libc/runtime/runtime.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
diff --git a/libc/runtime/mman.greg.c b/libc/runtime/mman.greg.c
index c3625bbb..020dd7df 100644
--- a/libc/runtime/mman.greg.c
+++ b/libc/runtime/mman.greg.c
@@ -35,7 +35,7 @@
 #include "ape/relocations.h"
 #include "libc/elf/def.h"
 #include "libc/elf/struct/phdr.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/uart.internal.h"
 #include "libc/runtime/e820.internal.h"
 #include "libc/runtime/metalprintf.internal.h"
diff --git a/libc/runtime/mmap.c b/libc/runtime/mmap.c
index 67123193..3992db5c 100644
--- a/libc/runtime/mmap.c
+++ b/libc/runtime/mmap.c
@@ -22,7 +22,7 @@
 #include "libc/calls/internal.h"
 #include "libc/dce.h"
 #include "libc/intrin/asan.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/rand/rand.h"
 #include "libc/runtime/directmap.internal.h"
 #include "libc/runtime/memtrack.h"
diff --git a/libc/runtime/msync-nt.c b/libc/runtime/msync-nt.c
index 72a309b1..51601d7e 100644
--- a/libc/runtime/msync-nt.c
+++ b/libc/runtime/msync-nt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/files.h"
 #include "libc/nt/memory.h"
 #include "libc/runtime/memtrack.h"
diff --git a/libc/runtime/msync.c b/libc/runtime/msync.c
index 060ce9a0..fde0b2b9 100644
--- a/libc/runtime/msync.c
+++ b/libc/runtime/msync.c
@@ -20,7 +20,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/sysv/consts/msync.h"
 
 /**
diff --git a/libc/runtime/munmap.c b/libc/runtime/munmap.c
index 3309882e..0b983170 100644
--- a/libc/runtime/munmap.c
+++ b/libc/runtime/munmap.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/directmap.internal.h"
 #include "libc/runtime/memtrack.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/runtime/peekall.S b/libc/runtime/peekall.S
index 816290dc..04d2ef9d 100644
--- a/libc/runtime/peekall.S
+++ b/libc/runtime/peekall.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "ape/relocations.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Loads all pages from program image into memory.
diff --git a/libc/runtime/progname.S b/libc/runtime/progname.S
index 6e0e2b20..d10a9401 100644
--- a/libc/runtime/progname.S
+++ b/libc/runtime/progname.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Provides argv[0] The BSD Way.
diff --git a/libc/runtime/program_invocation_short_name.S b/libc/runtime/program_invocation_short_name.S
index da4c678f..ee0c2d87 100644
--- a/libc/runtime/program_invocation_short_name.S
+++ b/libc/runtime/program_invocation_short_name.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Supplies basename(argv[0]) The GNU Way.
diff --git a/libc/runtime/runtime.h b/libc/runtime/runtime.h
index f342f434..7e76a8ae 100644
--- a/libc/runtime/runtime.h
+++ b/libc/runtime/runtime.h
@@ -43,7 +43,6 @@ void exit(int) wontreturn;
 void _exit(int) libcesque wontreturn;
 void _Exit(int) libcesque wontreturn;
 void abort(void) wontreturn noinstrument;
-void panic(void) wontreturn noinstrument privileged;
 void triplf(void) wontreturn noinstrument privileged;
 int __cxa_atexit(void *, void *, void *) libcesque;
 int atfork(void *, void *) libcesque;
diff --git a/libc/runtime/setstack.S b/libc/runtime/setstack.S
index 284766f7..fd2ae7a2 100644
--- a/libc/runtime/setstack.S
+++ b/libc/runtime/setstack.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Switches stack.
 //
diff --git a/libc/runtime/untrackmemoryintervals.c b/libc/runtime/untrackmemoryintervals.c
index 3db62e81..8d9dc885 100644
--- a/libc/runtime/untrackmemoryintervals.c
+++ b/libc/runtime/untrackmemoryintervals.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/memtrack.h"
 
 int UntrackMemoryIntervals(void *addr, size_t size) {
diff --git a/libc/runtime/valist.c b/libc/runtime/valist.c
index 06a59048..ea8e764d 100644
--- a/libc/runtime/valist.c
+++ b/libc/runtime/valist.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/valist.h"
 
 static void *__va_arg_mem(struct __va_list *ap, size_t sz, size_t align) {
diff --git a/libc/runtime/vfork.S b/libc/runtime/vfork.S
index db274348..8af42732 100644
--- a/libc/runtime/vfork.S
+++ b/libc/runtime/vfork.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .privileged
 
 //	Forks process without copying page tables.
diff --git a/libc/runtime/weakfree.S b/libc/runtime/weakfree.S
index ba0f2c5e..d9499e27 100644
--- a/libc/runtime/weakfree.S
+++ b/libc/runtime/weakfree.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Thunks free() if it's linked, otherwise do nothing.
diff --git a/libc/runtime/winmain.greg.c b/libc/runtime/winmain.greg.c
index d3e9d2d3..77844de9 100644
--- a/libc/runtime/winmain.greg.c
+++ b/libc/runtime/winmain.greg.c
@@ -22,7 +22,7 @@
 #include "libc/calls/internal.h"
 #include "libc/dce.h"
 #include "libc/fmt/fmt.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/console.h"
 #include "libc/nt/enum/consolemodeflags.h"
 #include "libc/nt/enum/filemapflags.h"
diff --git a/libc/sock/epoll.c b/libc/sock/epoll.c
index 83da9089..b48c1803 100644
--- a/libc/sock/epoll.c
+++ b/libc/sock/epoll.c
@@ -37,7 +37,7 @@
 #include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nt/enum/accessmask.h"
 #include "libc/nt/enum/afd.h"
diff --git a/libc/sock/iovec2nt.c b/libc/sock/iovec2nt.c
index ba35fcd3..4c0fdbf8 100644
--- a/libc/sock/iovec2nt.c
+++ b/libc/sock/iovec2nt.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/calls/struct/iovec.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/sock/internal.h"
 #include "libc/sysv/consts/iov.h"
 
diff --git a/libc/sock/poll-nt.c b/libc/sock/poll-nt.c
index f566a3b3..f8318fb0 100644
--- a/libc/sock/poll-nt.c
+++ b/libc/sock/poll-nt.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
 #include "libc/calls/internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/struct/pollfd.h"
 #include "libc/nt/winsock.h"
 #include "libc/sock/internal.h"
diff --git a/libc/sock/select-nt.c b/libc/sock/select-nt.c
index 971e2726..ba21cd6d 100644
--- a/libc/sock/select-nt.c
+++ b/libc/sock/select-nt.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/popcnt.h"
 #include "libc/calls/internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nt/winsock.h"
 #include "libc/sock/internal.h"
diff --git a/libc/sock/sendfile.c b/libc/sock/sendfile.c
index fde33bad..fa092c5e 100644
--- a/libc/sock/sendfile.c
+++ b/libc/sock/sendfile.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/dce.h"
diff --git a/libc/stdio/dirstream.c b/libc/stdio/dirstream.c
index 42a9abc7..77940a08 100644
--- a/libc/stdio/dirstream.c
+++ b/libc/stdio/dirstream.c
@@ -20,7 +20,7 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/dirent.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nt/enum/fileflagandattributes.h"
 #include "libc/nt/enum/filetype.h"
diff --git a/libc/stdio/fclose.c b/libc/stdio/fclose.c
index da3bb2bb..cd75a500 100644
--- a/libc/stdio/fclose.c
+++ b/libc/stdio/fclose.c
@@ -37,7 +37,7 @@
 int fclose(FILE *f) {
   int rc;
   if (!f) return 0;
-  _fflushunregister(f);
+  __fflush_unregister(f);
   fflush(f);
   if (!f->nofree) {
     free_s(&f->buf);
diff --git a/libc/stdio/fdopen.c b/libc/stdio/fdopen.c
index e1d45d26..7a6ceb65 100644
--- a/libc/stdio/fdopen.c
+++ b/libc/stdio/fdopen.c
@@ -42,7 +42,7 @@ FILE *fdopen(int fd, const char *mode) {
     f->size = BUFSIZ;
     if ((f->buf = valloc(f->size))) {
       if ((f->iomode & O_ACCMODE) != O_RDONLY) {
-        _fflushregister(f);
+        __fflush_register(f);
       }
       return f;
     }
diff --git a/libc/stdio/fflush.c b/libc/stdio/fflush.c
index f1665259..18d120fb 100644
--- a/libc/stdio/fflush.c
+++ b/libc/stdio/fflush.c
@@ -20,7 +20,7 @@
 #include "libc/bits/bits.h"
 #include "libc/bits/pushpop.h"
 #include "libc/calls/calls.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/fflush.internal.h"
@@ -39,8 +39,8 @@ int fflush(FILE *f) {
   int res, wrote;
   res = 0;
   if (!f) {
-    for (i = g_fflush.handles.i; i; --i) {
-      if ((f = g_fflush.handles.p[i - 1])) {
+    for (i = __fflush.handles.i; i; --i) {
+      if ((f = __fflush.handles.p[i - 1])) {
         if ((wrote = fflush(f)) != -1) {
           res += wrote;
         } else {
@@ -61,10 +61,10 @@ int fflush(FILE *f) {
   return res;
 }
 
-textstartup int _fflushregister(FILE *f) {
+textstartup int __fflush_register(FILE *f) {
   size_t i;
   struct StdioFlush *sf;
-  sf = &g_fflush;
+  sf = &__fflush;
   if (!sf->handles.p) {
     sf->handles.p = &sf->handles_initmem[0];
     pushmov(&sf->handles.n, ARRAYLEN(sf->handles_initmem));
@@ -79,10 +79,10 @@ textstartup int _fflushregister(FILE *f) {
   return append(&sf->handles, &f);
 }
 
-void _fflushunregister(FILE *f) {
+void __fflush_unregister(FILE *f) {
   size_t i;
   struct StdioFlush *sf;
-  sf = &g_fflush;
+  sf = &__fflush;
   sf = pushpop(sf);
   for (i = sf->handles.i; i; --i) {
     if (sf->handles.p[i - 1] == f) {
diff --git a/libc/stdio/fflush.internal.h b/libc/stdio/fflush.internal.h
index e5c8bd71..d49156dd 100644
--- a/libc/stdio/fflush.internal.h
+++ b/libc/stdio/fflush.internal.h
@@ -14,7 +14,7 @@ struct StdioFlush {
   FILE *handles_initmem[8];
 };
 
-extern struct StdioFlush g_fflush;
+extern struct StdioFlush __fflush hidden;
 
 COSMOPOLITAN_C_END_
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
diff --git a/libc/stdio/g_fflush.c b/libc/stdio/flushers.c
similarity index 98%
rename from libc/stdio/g_fflush.c
rename to libc/stdio/flushers.c
index 80139bd9..3b7c976b 100644
--- a/libc/stdio/g_fflush.c
+++ b/libc/stdio/flushers.c
@@ -18,4 +18,4 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/stdio/fflush.internal.h"
 
-struct StdioFlush g_fflush;
+struct StdioFlush __fflush;
diff --git a/libc/stdio/flushlbf.c b/libc/stdio/flushlbf.c
index 01166e0b..a714b255 100644
--- a/libc/stdio/flushlbf.c
+++ b/libc/stdio/flushlbf.c
@@ -25,9 +25,9 @@
  */
 void _flushlbf(void) {
   int i;
-  for (i = 0; i < g_fflush.handles.i; ++i) {
-    if (g_fflush.handles.p[i]->bufmode == _IOLBF) {
-      fflush(g_fflush.handles.p[i]);
+  for (i = 0; i < __fflush.handles.i; ++i) {
+    if (__fflush.handles.p[i]->bufmode == _IOLBF) {
+      fflush(__fflush.handles.p[i]);
     }
   }
 }
diff --git a/libc/stdio/fputs.c b/libc/stdio/fputs.c
index 49c4ea2e..cfc89ab1 100644
--- a/libc/stdio/fputs.c
+++ b/libc/stdio/fputs.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/errno.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
 
diff --git a/libc/stdio/fseeko.S b/libc/stdio/fseeko.S
index 76f53bf1..e9d0373e 100644
--- a/libc/stdio/fseeko.S
+++ b/libc/stdio/fseeko.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fseeko:	jmp	fseek
diff --git a/libc/stdio/ftello.S b/libc/stdio/ftello.S
index bec17bbf..d763fac1 100644
--- a/libc/stdio/ftello.S
+++ b/libc/stdio/ftello.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 ftello:	jmp	ftell
diff --git a/libc/stdio/g_stdio.c b/libc/stdio/g_stdio.c
deleted file mode 100644
index 17b47749..00000000
--- a/libc/stdio/g_stdio.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/stdio/internal.h"
-
-hidden FILE g_stdio[3];
diff --git a/libc/stdio/get_current_dir_name.c b/libc/stdio/get_current_dir_name.c
index 00597375..f9fdd0bd 100644
--- a/libc/stdio/get_current_dir_name.c
+++ b/libc/stdio/get_current_dir_name.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/stdio/getc.S b/libc/stdio/getc.S
index 82adab4c..a86ec2b7 100644
--- a/libc/stdio/getc.S
+++ b/libc/stdio/getc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 .source	__FILE__
 
diff --git a/libc/stdio/getchar.S b/libc/stdio/getchar.S
index b46fcee4..f65c831a 100644
--- a/libc/stdio/getchar.S
+++ b/libc/stdio/getchar.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Reads uint8_t from standard input.
diff --git a/libc/stdio/getdelim.c b/libc/stdio/getdelim.c
index 6cbf0252..8001703e 100644
--- a/libc/stdio/getdelim.c
+++ b/libc/stdio/getdelim.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/errno.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/stdio/internal.h"
 #include "libc/stdio/stdio.h"
diff --git a/libc/stdio/getwc.S b/libc/stdio/getwc.S
index 4d3911ff..3f22a614 100644
--- a/libc/stdio/getwc.S
+++ b/libc/stdio/getwc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 getwc:	jmp	fgetwc
diff --git a/libc/stdio/getwchar.S b/libc/stdio/getwchar.S
index 358f7eee..a51d8f41 100644
--- a/libc/stdio/getwchar.S
+++ b/libc/stdio/getwchar.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Reads Thompson-Pike encoded varint from standard input.
diff --git a/libc/stdio/internal.h b/libc/stdio/internal.h
index 745b94a0..d70e7e51 100644
--- a/libc/stdio/internal.h
+++ b/libc/stdio/internal.h
@@ -4,13 +4,12 @@
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
-extern FILE g_stdio[3];
 extern unsigned char g_stdinbuf[BUFSIZ];
 extern unsigned char g_stdoutbuf[BUFSIZ];
 extern unsigned char g_stderrbuf[BUFSIZ];
 
-int _fflushregister(FILE *) hidden;
-void _fflushunregister(FILE *) hidden;
+int __fflush_register(FILE *) hidden;
+void __fflush_unregister(FILE *) hidden;
 
 int __freadbuf(FILE *) hidden;
 int __fwritebuf(FILE *) hidden;
diff --git a/libc/stdio/putc.S b/libc/stdio/putc.S
index 69c8e8a1..27fd1cd3 100644
--- a/libc/stdio/putc.S
+++ b/libc/stdio/putc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 putc:	jmp	fputc
diff --git a/libc/stdio/putwc.S b/libc/stdio/putwc.S
index a2d5f31d..de67ea0e 100644
--- a/libc/stdio/putwc.S
+++ b/libc/stdio/putwc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Writes wide character to stream.
diff --git a/libc/stdio/g_stdbuf.c b/libc/stdio/stdbuf.c
similarity index 100%
rename from libc/stdio/g_stdbuf.c
rename to libc/stdio/stdbuf.c
diff --git a/libc/stdio/g_stderr_init.S b/libc/stdio/stderr-init.S
similarity index 93%
rename from libc/stdio/g_stderr_init.S
rename to libc/stdio/stderr-init.S
index 156805c7..373a98ab 100644
--- a/libc/stdio/g_stderr_init.S
+++ b/libc/stdio/stderr-init.S
@@ -20,22 +20,22 @@
 #include "libc/dce.h"
 #include "libc/calls/calls.h"
 #include "libc/sysv/consts/fileno.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
-	.init.start 400,_init_g_stderr
-	ezlea	g_stderr,ax
+	.init.start 400,_init_stderr
+	ezlea	__stderr,ax
 	push	$_IOLBF
 	pop	(%rax)				#→ f.fd
 	push	STDERR_FILENO
 	pop	12(%rax)
 	mov	O_WRONLY,%edx
 	mov	%edx,4(%rax)			#→ f.iomode
-	ezlea	g_stderr_buf,cx
+	ezlea	__stderr_buf,cx
 	mov	%rcx,24(%rax)			#→ f.buf
 	movl	$BUFSIZ,32(%rax)		#→ f.size
 	ezlea	__fwritebuf,cx
 	mov	%rcx,%rdx
 	mov	%rdx,48(%rax)			#→ f.writer
 	mov	%rax,stderr(%rip)
-	.init.end 400,_init_g_stderr,globl,hidden
+	.init.end 400,_init_stderr,globl,hidden
diff --git a/libc/stdio/g_stderr.c b/libc/stdio/stderr.c
similarity index 89%
rename from libc/stdio/g_stderr.c
rename to libc/stdio/stderr.c
index 6b1de57a..9529789e 100644
--- a/libc/stdio/g_stderr.c
+++ b/libc/stdio/stderr.c
@@ -19,18 +19,18 @@
 #include "libc/stdio/internal.h"
 #include "libc/stdio/stdio.h"
 
-STATIC_YOINK("_init_g_stderr");
+STATIC_YOINK("_init_stderr");
 
 /**
  * Pointer to standard error stream.
  */
 FILE *stderr;
 
-hidden FILE g_stderr;
-hidden unsigned char g_stderr_buf[BUFSIZ];
+hidden FILE __stderr;
+hidden unsigned char __stderr_buf[BUFSIZ];
 
-static textstartup void _init_g_stderr2() {
-  _fflushregister(stderr);
+static textstartup void __stderr_init() {
+  __fflush_register(stderr);
 }
 
-const void *const g_stderr_ctor[] initarray = {_init_g_stderr2};
+const void *const __stderr_ctor[] initarray = {__stderr_init};
diff --git a/libc/stdio/g_stdin_init.S b/libc/stdio/stdin-init.S
similarity index 93%
rename from libc/stdio/g_stdin_init.S
rename to libc/stdio/stdin-init.S
index ffd34bc8..8f05aa1f 100644
--- a/libc/stdio/g_stdin_init.S
+++ b/libc/stdio/stdin-init.S
@@ -20,18 +20,18 @@
 #include "libc/dce.h"
 #include "libc/calls/calls.h"
 #include "libc/sysv/consts/fileno.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
-	.init.start 400,_init_g_stdin
-	ezlea	g_stdin,ax
+	.init.start 400,_init_stdin
+	ezlea	__stdin,ax
 	mov	O_RDONLY,%edx
 	mov	%edx,4(%rax)			#→ f.iomode
-	ezlea	g_stdin_buf,cx
+	ezlea	__stdin_buf,cx
 	mov	%rcx,24(%rax)			#→ f.buf
 	movl	$BUFSIZ,32(%rax)		#→ f.size
 	ezlea	__freadbuf,cx
 	mov	%rcx,%rdx
 	mov	%rdx,40(%rax)			#→ f.reader
 	mov	%rax,stdin(%rip)
-	.init.end 400,_init_g_stdin,globl,hidden
+	.init.end 400,_init_stdin,globl,hidden
diff --git a/libc/stdio/g_stdin.c b/libc/stdio/stdin.c
similarity index 89%
rename from libc/stdio/g_stdin.c
rename to libc/stdio/stdin.c
index ae532994..716a0b61 100644
--- a/libc/stdio/g_stdin.c
+++ b/libc/stdio/stdin.c
@@ -19,18 +19,18 @@
 #include "libc/stdio/internal.h"
 #include "libc/stdio/stdio.h"
 
-STATIC_YOINK("_init_g_stdin");
+STATIC_YOINK("_init_stdin");
 
 /**
  * Pointer to standard input stream.
  */
 FILE *stdin;
 
-hidden FILE g_stdin;
-hidden unsigned char g_stdin_buf[BUFSIZ];
+hidden FILE __stdin;
+hidden unsigned char __stdin_buf[BUFSIZ];
 
-static textstartup void g_stdin_init() {
-  _fflushregister(stdin);
+static textstartup void __stdin_init() {
+  __fflush_register(stdin);
 }
 
-const void *const g_stdin_ctor[] initarray = {g_stdin_init};
+const void *const __stdin_ctor[] initarray = {__stdin_init};
diff --git a/libc/stdio/g_stdout_init.S b/libc/stdio/stdout-init.S
similarity index 93%
rename from libc/stdio/g_stdout_init.S
rename to libc/stdio/stdout-init.S
index 37a14556..39b1f5d1 100644
--- a/libc/stdio/g_stdout_init.S
+++ b/libc/stdio/stdout-init.S
@@ -20,20 +20,20 @@
 #include "libc/dce.h"
 #include "libc/calls/calls.h"
 #include "libc/sysv/consts/fileno.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
-	.init.start 400,_init_g_stdout
-	ezlea	g_stdout,ax
+	.init.start 400,_init_stdout
+	ezlea	__stdout,ax
 	push	STDOUT_FILENO
 	pop	12(%rax)			#→ f.fd
 	mov	O_WRONLY,%edx
 	mov	%edx,4(%rax)			#→ f.iomode
-	ezlea	g_stdout_buf,cx
+	ezlea	__stdout_buf,cx
 	mov	%rcx,24(%rax)			#→ f.buf
 	movl	$BUFSIZ,32(%rax)		#→ f.size
 	ezlea	__fwritebuf,cx
 	mov	%rcx,%rdx
 	mov	%rdx,48(%rax)			#→ f.writer
 	mov	%rax,stdout(%rip)
-	.init.end 400,_init_g_stdout,globl,hidden
+	.init.end 400,_init_stdout,globl,hidden
diff --git a/libc/stdio/g_stdout.c b/libc/stdio/stdout.c
similarity index 90%
rename from libc/stdio/g_stdout.c
rename to libc/stdio/stdout.c
index 761fd2f4..41227ad1 100644
--- a/libc/stdio/g_stdout.c
+++ b/libc/stdio/stdout.c
@@ -22,24 +22,24 @@
 #include "libc/stdio/internal.h"
 #include "libc/stdio/stdio.h"
 
-STATIC_YOINK("_init_g_stdout");
+STATIC_YOINK("_init_stdout");
 
 /**
  * Pointer to standard output stream.
  */
 FILE *stdout;
 
-hidden FILE g_stdout;
-hidden unsigned char g_stdout_buf[BUFSIZ];
+hidden FILE __stdout;
+hidden unsigned char __stdout_buf[BUFSIZ];
 
-static textstartup void _init_g_stdout2() {
+static textstartup void __stdout_init() {
   struct FILE *sf;
   sf = stdout;
   asm("" : "+r"(sf));
   if (IsWindows() || ischardev(pushpop(sf->fd))) {
     sf->bufmode = _IOLBF;
   }
-  _fflushregister(sf);
+  __fflush_register(sf);
 }
 
-const void *const g_stdout_ctor[] initarray = {_init_g_stdout2};
+const void *const __stdout_ctor[] initarray = {__stdout_init};
diff --git a/libc/stdio/unlocked/clearerr_unlocked.S b/libc/stdio/unlocked/clearerr_unlocked.S
index 11b14464..a1da3548 100644
--- a/libc/stdio/unlocked/clearerr_unlocked.S
+++ b/libc/stdio/unlocked/clearerr_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 clearerr_unlocked:
diff --git a/libc/stdio/unlocked/feof_unlocked.S b/libc/stdio/unlocked/feof_unlocked.S
index 33139938..a3a80c1a 100644
--- a/libc/stdio/unlocked/feof_unlocked.S
+++ b/libc/stdio/unlocked/feof_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 feof_unlocked:
diff --git a/libc/stdio/unlocked/ferror_unlocked.S b/libc/stdio/unlocked/ferror_unlocked.S
index 5eaf65a4..e6598fbe 100644
--- a/libc/stdio/unlocked/ferror_unlocked.S
+++ b/libc/stdio/unlocked/ferror_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 ferror_unlocked:
diff --git a/libc/stdio/unlocked/fflush_unlocked.S b/libc/stdio/unlocked/fflush_unlocked.S
index a8cf7463..280d0802 100644
--- a/libc/stdio/unlocked/fflush_unlocked.S
+++ b/libc/stdio/unlocked/fflush_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fflush_unlocked:
diff --git a/libc/stdio/unlocked/fgetc_unlocked.S b/libc/stdio/unlocked/fgetc_unlocked.S
index 99790f22..f4c77bc3 100644
--- a/libc/stdio/unlocked/fgetc_unlocked.S
+++ b/libc/stdio/unlocked/fgetc_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fgetc_unlocked:
diff --git a/libc/stdio/unlocked/fgets_unlocked.S b/libc/stdio/unlocked/fgets_unlocked.S
index a70b3247..7521d8c4 100644
--- a/libc/stdio/unlocked/fgets_unlocked.S
+++ b/libc/stdio/unlocked/fgets_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fgets_unlocked:
diff --git a/libc/stdio/unlocked/fgetwc_unlocked.S b/libc/stdio/unlocked/fgetwc_unlocked.S
index 4e482afa..52bbb7a9 100644
--- a/libc/stdio/unlocked/fgetwc_unlocked.S
+++ b/libc/stdio/unlocked/fgetwc_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fgetwc_unlocked:
diff --git a/libc/stdio/unlocked/fgetws_unlocked.S b/libc/stdio/unlocked/fgetws_unlocked.S
index 06f18041..02b1dd7e 100644
--- a/libc/stdio/unlocked/fgetws_unlocked.S
+++ b/libc/stdio/unlocked/fgetws_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fgetws_unlocked:
diff --git a/libc/stdio/unlocked/fileno_unlocked.S b/libc/stdio/unlocked/fileno_unlocked.S
index 5d732160..f90be612 100644
--- a/libc/stdio/unlocked/fileno_unlocked.S
+++ b/libc/stdio/unlocked/fileno_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fileno_unlocked:
diff --git a/libc/stdio/unlocked/fputc_unlocked.S b/libc/stdio/unlocked/fputc_unlocked.S
index 6128e9d0..7c357889 100644
--- a/libc/stdio/unlocked/fputc_unlocked.S
+++ b/libc/stdio/unlocked/fputc_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fputc_unlocked:
diff --git a/libc/stdio/unlocked/fputs_unlocked.S b/libc/stdio/unlocked/fputs_unlocked.S
index b888c221..2adf2102 100644
--- a/libc/stdio/unlocked/fputs_unlocked.S
+++ b/libc/stdio/unlocked/fputs_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fputs_unlocked:
diff --git a/libc/stdio/unlocked/fputwc_unlocked.S b/libc/stdio/unlocked/fputwc_unlocked.S
index fdc91f6a..1b505fab 100644
--- a/libc/stdio/unlocked/fputwc_unlocked.S
+++ b/libc/stdio/unlocked/fputwc_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fputwc_unlocked:
diff --git a/libc/stdio/unlocked/fputws_unlocked.S b/libc/stdio/unlocked/fputws_unlocked.S
index 60d78429..611be6ab 100644
--- a/libc/stdio/unlocked/fputws_unlocked.S
+++ b/libc/stdio/unlocked/fputws_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fputws_unlocked:
diff --git a/libc/stdio/unlocked/fread_unlocked.S b/libc/stdio/unlocked/fread_unlocked.S
index 59c160a3..3cbb0615 100644
--- a/libc/stdio/unlocked/fread_unlocked.S
+++ b/libc/stdio/unlocked/fread_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fread_unlocked:
diff --git a/libc/stdio/unlocked/fwrite_unlocked.S b/libc/stdio/unlocked/fwrite_unlocked.S
index d4b0490e..d296e283 100644
--- a/libc/stdio/unlocked/fwrite_unlocked.S
+++ b/libc/stdio/unlocked/fwrite_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fwrite_unlocked:
diff --git a/libc/stdio/unlocked/getc_unlocked.S b/libc/stdio/unlocked/getc_unlocked.S
index 91116401..1d6e9c75 100644
--- a/libc/stdio/unlocked/getc_unlocked.S
+++ b/libc/stdio/unlocked/getc_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 getc_unlocked:
diff --git a/libc/stdio/unlocked/getchar_unlocked.S b/libc/stdio/unlocked/getchar_unlocked.S
index 3eaeb59c..ebb6b764 100644
--- a/libc/stdio/unlocked/getchar_unlocked.S
+++ b/libc/stdio/unlocked/getchar_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 getchar_unlocked:
diff --git a/libc/stdio/unlocked/getwc_unlocked.S b/libc/stdio/unlocked/getwc_unlocked.S
index 1c73921d..a0243870 100644
--- a/libc/stdio/unlocked/getwc_unlocked.S
+++ b/libc/stdio/unlocked/getwc_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 getwc_unlocked:
diff --git a/libc/stdio/unlocked/getwchar_unlocked.S b/libc/stdio/unlocked/getwchar_unlocked.S
index 4a3f770d..bb6710a5 100644
--- a/libc/stdio/unlocked/getwchar_unlocked.S
+++ b/libc/stdio/unlocked/getwchar_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 getwchar_unlocked:
diff --git a/libc/stdio/unlocked/putc_unlocked.S b/libc/stdio/unlocked/putc_unlocked.S
index 1cc02367..842d740e 100644
--- a/libc/stdio/unlocked/putc_unlocked.S
+++ b/libc/stdio/unlocked/putc_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 putc_unlocked:
diff --git a/libc/stdio/unlocked/putchar_unlocked.S b/libc/stdio/unlocked/putchar_unlocked.S
index b2346255..df0b807e 100644
--- a/libc/stdio/unlocked/putchar_unlocked.S
+++ b/libc/stdio/unlocked/putchar_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 putchar_unlocked:
diff --git a/libc/stdio/unlocked/putwc_unlocked.S b/libc/stdio/unlocked/putwc_unlocked.S
index 6a0f5312..3890a2d6 100644
--- a/libc/stdio/unlocked/putwc_unlocked.S
+++ b/libc/stdio/unlocked/putwc_unlocked.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 putwc_unlocked:
diff --git a/libc/stdio/unlocked/putwchar_unlocked.S b/libc/stdio/unlocked/putwchar_unlocked.S
index f29bca0b..5e7f38eb 100644
--- a/libc/stdio/unlocked/putwchar_unlocked.S
+++ b/libc/stdio/unlocked/putwchar_unlocked.S
@@ -17,7 +17,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 putwchar_unlocked:
diff --git a/libc/str/crc32.S b/libc/str/crc32.S
index ecb11a82..889dd400 100644
--- a/libc/str/crc32.S
+++ b/libc/str/crc32.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Computes Phil Katz CRC-32 used by zip/zlib/gzip/etc.
 //
diff --git a/libc/str/crc32c.S b/libc/str/crc32c.S
index 12d1f615..85af9eff 100644
--- a/libc/str/crc32c.S
+++ b/libc/str/crc32c.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/notice.inc"
 
diff --git a/libc/str/crc32z.c b/libc/str/crc32z.c
index 19259aeb..683e5f7b 100644
--- a/libc/str/crc32z.c
+++ b/libc/str/crc32z.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/nexgen32e/crc32.h"
 #include "libc/nexgen32e/x86feature.h"
 
diff --git a/libc/str/iswctype.c b/libc/str/iswctype.c
index d78f7e49..531f4022 100644
--- a/libc/str/iswctype.c
+++ b/libc/str/iswctype.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 #define ALNUM  1
diff --git a/libc/str/kx86processormodels.c b/libc/str/kx86processormodels.c
index 53845ed7..bfaa5a1e 100644
--- a/libc/str/kx86processormodels.c
+++ b/libc/str/kx86processormodels.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/x86info.h"
 
 hidden const struct X86ProcessorModel kX86ProcessorModels[] = {
diff --git a/libc/str/mbtowc.c b/libc/str/mbtowc.c
index 8e5160f4..7c923f4f 100644
--- a/libc/str/mbtowc.c
+++ b/libc/str/mbtowc.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "libc/str/tpdecode.internal.h"
 
diff --git a/libc/str/rindex.S b/libc/str/rindex.S
index 7f5bf723..3fb36e2d 100644
--- a/libc/str/rindex.S
+++ b/libc/str/rindex.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns pointer to last instance of character the BSD way.
diff --git a/libc/str/strcmp8to16i.internal.h b/libc/str/strcmp8to16i.internal.h
index 7841377c..bf065b6b 100644
--- a/libc/str/strcmp8to16i.internal.h
+++ b/libc/str/strcmp8to16i.internal.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_LIBC_STR_STRCMP8TO16I_H_
 #define COSMOPOLITAN_LIBC_STR_STRCMP8TO16I_H_
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/oldutf16.internal.h"
 #include "libc/str/str.h"
 #include "libc/str/tpdecode.internal.h"
diff --git a/libc/str/strlcat.c b/libc/str/strlcat.c
index 44ce1878..79d77919 100644
--- a/libc/str/strlcat.c
+++ b/libc/str/strlcat.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/str/strlcpy.c b/libc/str/strlcpy.c
index 03af3f0f..05eafaf0 100644
--- a/libc/str/strlcpy.c
+++ b/libc/str/strlcpy.c
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
-#include "libc/macros.h"
+#include "libc/bits/safemacros.internal.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/str/strsignal.c b/libc/str/strsignal.c
index dbd16f8e..a999c589 100644
--- a/libc/str/strsignal.c
+++ b/libc/str/strsignal.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 static const char kSig[4] = "SIG";
diff --git a/libc/str/tpenc.S b/libc/str/tpenc.S
index c4aa9fca..542d3dc8 100644
--- a/libc/str/tpenc.S
+++ b/libc/str/tpenc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Encodes Thompson-Pike varint.
diff --git a/libc/str/undeflate.c b/libc/str/undeflate.c
index b79ed1e5..d849417d 100644
--- a/libc/str/undeflate.c
+++ b/libc/str/undeflate.c
@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
 #include "libc/intrin/repmovsb.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/kompressor.h"
 #include "libc/str/str.h"
 #include "libc/str/undeflate.h"
diff --git a/libc/stubs/abort.S b/libc/stubs/abort.S
index 446c0587..a6b47d08 100644
--- a/libc/stubs/abort.S
+++ b/libc/stubs/abort.S
@@ -26,6 +26,6 @@
 //	@mode	long,legacy,real
 abort:	push	%bp
 	mov	%sp,%bp
-	rlcall	panic
+	rlcall	__panic
 	int3
 	.endfn	abort,weak
diff --git a/libc/stubs/assertfail.S b/libc/stubs/assertfail.S
index 18edb1e5..fa791e22 100644
--- a/libc/stubs/assertfail.S
+++ b/libc/stubs/assertfail.S
@@ -30,6 +30,6 @@ __assert_fail:
 	int3
 	push	%bp
 	mov	%sp,%bp
-	rlcall	panic
+	rlcall	__panic
 	int3
 	.endfn	__assert_fail,weak
diff --git a/libc/stubs/cxapurevirtual.S b/libc/stubs/cxapurevirtual.S
index 680b5925..ec4b0e19 100644
--- a/libc/stubs/cxapurevirtual.S
+++ b/libc/stubs/cxapurevirtual.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Did you call a virtual method from a destructor?
diff --git a/libc/stubs/debugbreak.S b/libc/stubs/debugbreak.S
index 1d0f0104..ffe0aae5 100644
--- a/libc/stubs/debugbreak.S
+++ b/libc/stubs/debugbreak.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .real
 .source	__FILE__
 .code16 # ∩ .code32 ∩ .code64
diff --git a/libc/stubs/gcov.S b/libc/stubs/gcov.S
index c653c414..a934fc37 100644
--- a/libc/stubs/gcov.S
+++ b/libc/stubs/gcov.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Magic words to unbreak build if GCOV flags are passed.
diff --git a/libc/stubs/instrumentation.S b/libc/stubs/instrumentation.S
index 18014f9b..f7654bbf 100644
--- a/libc/stubs/instrumentation.S
+++ b/libc/stubs/instrumentation.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	@fileoverview Function Instrumentation No-Op Runtime
diff --git a/libc/stubs/panic.S b/libc/stubs/panic.S
index 883aa05a..daa19b4d 100644
--- a/libc/stubs/panic.S
+++ b/libc/stubs/panic.S
@@ -16,17 +16,18 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .real
 .source	__FILE__
 .code16 # ∩ .code32 ∩ .code64
 
 //	Aborts or hard blocks instruction pointer.
 //	@mode	long,legacy,real
-panic:	push	%bp
+__panic:
+	push	%bp
 	mov	%sp,%bp
 	.softicebp
 	cli
 1:	hlt
 	jmp	1b
-	.endfn	panic,weak
+	.endfn	__panic,weak
diff --git a/libc/stubs/retpoline.S b/libc/stubs/retpoline.S
index ecdd42bf..3e3330b5 100644
--- a/libc/stubs/retpoline.S
+++ b/libc/stubs/retpoline.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	See -mfunction-return=thunk
 __x86_return_thunk:
diff --git a/libc/stubs/stackchkguard.S b/libc/stubs/stackchkguard.S
index 1667a19d..ef31ac6d 100644
--- a/libc/stubs/stackchkguard.S
+++ b/libc/stubs/stackchkguard.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/notice.inc"
 .source	__FILE__
 
diff --git a/libc/stubs/typeinfo.S b/libc/stubs/typeinfo.S
index f1e09b70..89124acd 100644
--- a/libc/stubs/typeinfo.S
+++ b/libc/stubs/typeinfo.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	__cxxabiv1::__function_type_info (?)
diff --git a/libc/stubs/xnu.S b/libc/stubs/xnu.S
index 68ed799a..83506016 100644
--- a/libc/stubs/xnu.S
+++ b/libc/stubs/xnu.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 _xnu:	ud2
diff --git a/libc/sysv/consts/syscon.internal.h b/libc/sysv/consts/syscon.internal.h
index 3fe31d09..25ee8337 100644
--- a/libc/sysv/consts/syscon.internal.h
+++ b/libc/sysv/consts/syscon.internal.h
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 .macro	.syscon	group:req name:req linux:req xnu:req freebsd:req openbsd:req netbsd:req windows:req
 	yoink	_init_systemfive
diff --git a/libc/sysv/errfuns/e2big.S b/libc/sysv/errfuns/e2big.S
index c897e206..a68faf68 100644
--- a/libc/sysv/errfuns/e2big.S
+++ b/libc/sysv/errfuns/e2big.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 e2big:	.leafprologue
diff --git a/libc/sysv/errfuns/eacces.S b/libc/sysv/errfuns/eacces.S
index c44933cf..4c9bdab5 100644
--- a/libc/sysv/errfuns/eacces.S
+++ b/libc/sysv/errfuns/eacces.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eacces:	.leafprologue
diff --git a/libc/sysv/errfuns/eaddrinuse.S b/libc/sysv/errfuns/eaddrinuse.S
index b5f98231..d6085da6 100644
--- a/libc/sysv/errfuns/eaddrinuse.S
+++ b/libc/sysv/errfuns/eaddrinuse.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eaddrinuse:
diff --git a/libc/sysv/errfuns/eaddrnotavail.S b/libc/sysv/errfuns/eaddrnotavail.S
index 81ff87bd..59089305 100644
--- a/libc/sysv/errfuns/eaddrnotavail.S
+++ b/libc/sysv/errfuns/eaddrnotavail.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eaddrnotavail:
diff --git a/libc/sysv/errfuns/eadv.S b/libc/sysv/errfuns/eadv.S
index 98f7e5c3..a29be6ad 100644
--- a/libc/sysv/errfuns/eadv.S
+++ b/libc/sysv/errfuns/eadv.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eadv:	.leafprologue
diff --git a/libc/sysv/errfuns/eafnosupport.S b/libc/sysv/errfuns/eafnosupport.S
index 23b73cf5..8eb3fd1e 100644
--- a/libc/sysv/errfuns/eafnosupport.S
+++ b/libc/sysv/errfuns/eafnosupport.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eafnosupport:
diff --git a/libc/sysv/errfuns/eagain.S b/libc/sysv/errfuns/eagain.S
index cc58aec9..28e7464c 100644
--- a/libc/sysv/errfuns/eagain.S
+++ b/libc/sysv/errfuns/eagain.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eagain:	.leafprologue
diff --git a/libc/sysv/errfuns/ealready.S b/libc/sysv/errfuns/ealready.S
index e9a0c7c3..34921de3 100644
--- a/libc/sysv/errfuns/ealready.S
+++ b/libc/sysv/errfuns/ealready.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ealready:
diff --git a/libc/sysv/errfuns/ebade.S b/libc/sysv/errfuns/ebade.S
index 6bb9f353..d736ef2a 100644
--- a/libc/sysv/errfuns/ebade.S
+++ b/libc/sysv/errfuns/ebade.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ebade:	.leafprologue
diff --git a/libc/sysv/errfuns/ebadf.S b/libc/sysv/errfuns/ebadf.S
index a2fffa1b..b07b871e 100644
--- a/libc/sysv/errfuns/ebadf.S
+++ b/libc/sysv/errfuns/ebadf.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ebadf:	.leafprologue
diff --git a/libc/sysv/errfuns/ebadfd.S b/libc/sysv/errfuns/ebadfd.S
index 0e574a88..f81b9725 100644
--- a/libc/sysv/errfuns/ebadfd.S
+++ b/libc/sysv/errfuns/ebadfd.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ebadfd:	.leafprologue
diff --git a/libc/sysv/errfuns/ebadmsg.S b/libc/sysv/errfuns/ebadmsg.S
index 6ba760be..8d95e738 100644
--- a/libc/sysv/errfuns/ebadmsg.S
+++ b/libc/sysv/errfuns/ebadmsg.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ebadmsg:
diff --git a/libc/sysv/errfuns/ebadr.S b/libc/sysv/errfuns/ebadr.S
index 5480f512..69cbfbbe 100644
--- a/libc/sysv/errfuns/ebadr.S
+++ b/libc/sysv/errfuns/ebadr.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ebadr:	.leafprologue
diff --git a/libc/sysv/errfuns/ebadrqc.S b/libc/sysv/errfuns/ebadrqc.S
index 4298c908..0a955024 100644
--- a/libc/sysv/errfuns/ebadrqc.S
+++ b/libc/sysv/errfuns/ebadrqc.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ebadrqc:
diff --git a/libc/sysv/errfuns/ebadslt.S b/libc/sysv/errfuns/ebadslt.S
index bba860a0..a32b67f8 100644
--- a/libc/sysv/errfuns/ebadslt.S
+++ b/libc/sysv/errfuns/ebadslt.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ebadslt:
diff --git a/libc/sysv/errfuns/ebusy.S b/libc/sysv/errfuns/ebusy.S
index edebc47f..064ef7fa 100644
--- a/libc/sysv/errfuns/ebusy.S
+++ b/libc/sysv/errfuns/ebusy.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ebusy:	.leafprologue
diff --git a/libc/sysv/errfuns/ecanceled.S b/libc/sysv/errfuns/ecanceled.S
index 6ca71ea4..cfacf15e 100644
--- a/libc/sysv/errfuns/ecanceled.S
+++ b/libc/sysv/errfuns/ecanceled.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ecanceled:
diff --git a/libc/sysv/errfuns/echild.S b/libc/sysv/errfuns/echild.S
index a2f10ed4..a276788e 100644
--- a/libc/sysv/errfuns/echild.S
+++ b/libc/sysv/errfuns/echild.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 echild:	.leafprologue
diff --git a/libc/sysv/errfuns/echrng.S b/libc/sysv/errfuns/echrng.S
index 29a8a092..ef21edf0 100644
--- a/libc/sysv/errfuns/echrng.S
+++ b/libc/sysv/errfuns/echrng.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 echrng:	.leafprologue
diff --git a/libc/sysv/errfuns/ecomm.S b/libc/sysv/errfuns/ecomm.S
index b256f9c3..18d5f0f4 100644
--- a/libc/sysv/errfuns/ecomm.S
+++ b/libc/sysv/errfuns/ecomm.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ecomm:	.leafprologue
diff --git a/libc/sysv/errfuns/econnaborted.S b/libc/sysv/errfuns/econnaborted.S
index 687b2bda..40bce5cf 100644
--- a/libc/sysv/errfuns/econnaborted.S
+++ b/libc/sysv/errfuns/econnaborted.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 econnaborted:
diff --git a/libc/sysv/errfuns/econnrefused.S b/libc/sysv/errfuns/econnrefused.S
index 9065beb3..f63ff40a 100644
--- a/libc/sysv/errfuns/econnrefused.S
+++ b/libc/sysv/errfuns/econnrefused.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 econnrefused:
diff --git a/libc/sysv/errfuns/econnreset.S b/libc/sysv/errfuns/econnreset.S
index 1d5f4afa..41916df8 100644
--- a/libc/sysv/errfuns/econnreset.S
+++ b/libc/sysv/errfuns/econnreset.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 econnreset:
diff --git a/libc/sysv/errfuns/edeadlk.S b/libc/sysv/errfuns/edeadlk.S
index 2ec5d81d..fac28d47 100644
--- a/libc/sysv/errfuns/edeadlk.S
+++ b/libc/sysv/errfuns/edeadlk.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 edeadlk:
diff --git a/libc/sysv/errfuns/edestaddrreq.S b/libc/sysv/errfuns/edestaddrreq.S
index 400aabed..d395ecde 100644
--- a/libc/sysv/errfuns/edestaddrreq.S
+++ b/libc/sysv/errfuns/edestaddrreq.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 edestaddrreq:
diff --git a/libc/sysv/errfuns/edom.S b/libc/sysv/errfuns/edom.S
index 35cf7b3c..2981c500 100644
--- a/libc/sysv/errfuns/edom.S
+++ b/libc/sysv/errfuns/edom.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 edom:	.leafprologue
diff --git a/libc/sysv/errfuns/edotdot.S b/libc/sysv/errfuns/edotdot.S
index ef5cad2b..8995b7b2 100644
--- a/libc/sysv/errfuns/edotdot.S
+++ b/libc/sysv/errfuns/edotdot.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 edotdot:
diff --git a/libc/sysv/errfuns/edquot.S b/libc/sysv/errfuns/edquot.S
index 01bfce66..f8952ead 100644
--- a/libc/sysv/errfuns/edquot.S
+++ b/libc/sysv/errfuns/edquot.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 edquot:	.leafprologue
diff --git a/libc/sysv/errfuns/eexist.S b/libc/sysv/errfuns/eexist.S
index 6fe7e525..63d376c6 100644
--- a/libc/sysv/errfuns/eexist.S
+++ b/libc/sysv/errfuns/eexist.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eexist:	.leafprologue
diff --git a/libc/sysv/errfuns/efault.S b/libc/sysv/errfuns/efault.S
index 6f77c7eb..a96bb91b 100644
--- a/libc/sysv/errfuns/efault.S
+++ b/libc/sysv/errfuns/efault.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 efault:	.leafprologue
diff --git a/libc/sysv/errfuns/efbig.S b/libc/sysv/errfuns/efbig.S
index 07cc1e71..b54c708e 100644
--- a/libc/sysv/errfuns/efbig.S
+++ b/libc/sysv/errfuns/efbig.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 efbig:	.leafprologue
diff --git a/libc/sysv/errfuns/ehostdown.S b/libc/sysv/errfuns/ehostdown.S
index 34916f59..353efb7d 100644
--- a/libc/sysv/errfuns/ehostdown.S
+++ b/libc/sysv/errfuns/ehostdown.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ehostdown:
diff --git a/libc/sysv/errfuns/ehostunreach.S b/libc/sysv/errfuns/ehostunreach.S
index abebdfa1..822ebf20 100644
--- a/libc/sysv/errfuns/ehostunreach.S
+++ b/libc/sysv/errfuns/ehostunreach.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ehostunreach:
diff --git a/libc/sysv/errfuns/ehwpoison.S b/libc/sysv/errfuns/ehwpoison.S
index c62f349c..4a802b07 100644
--- a/libc/sysv/errfuns/ehwpoison.S
+++ b/libc/sysv/errfuns/ehwpoison.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ehwpoison:
diff --git a/libc/sysv/errfuns/eidrm.S b/libc/sysv/errfuns/eidrm.S
index a0012a17..7d8559b3 100644
--- a/libc/sysv/errfuns/eidrm.S
+++ b/libc/sysv/errfuns/eidrm.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eidrm:	.leafprologue
diff --git a/libc/sysv/errfuns/eilseq.S b/libc/sysv/errfuns/eilseq.S
index 83c094f6..ce61f2d5 100644
--- a/libc/sysv/errfuns/eilseq.S
+++ b/libc/sysv/errfuns/eilseq.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eilseq:	.leafprologue
diff --git a/libc/sysv/errfuns/einprogress.S b/libc/sysv/errfuns/einprogress.S
index ba8565c2..382cfdac 100644
--- a/libc/sysv/errfuns/einprogress.S
+++ b/libc/sysv/errfuns/einprogress.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 einprogress:
diff --git a/libc/sysv/errfuns/eintr.S b/libc/sysv/errfuns/eintr.S
index ae9586a5..cc85d086 100644
--- a/libc/sysv/errfuns/eintr.S
+++ b/libc/sysv/errfuns/eintr.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eintr:	.leafprologue
diff --git a/libc/sysv/errfuns/einval.S b/libc/sysv/errfuns/einval.S
index 524b377f..76c4c3cf 100644
--- a/libc/sysv/errfuns/einval.S
+++ b/libc/sysv/errfuns/einval.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 einval:	.leafprologue
diff --git a/libc/sysv/errfuns/eio.S b/libc/sysv/errfuns/eio.S
index 7c3a77e1..b1c6039f 100644
--- a/libc/sysv/errfuns/eio.S
+++ b/libc/sysv/errfuns/eio.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eio:	.leafprologue
diff --git a/libc/sysv/errfuns/eisconn.S b/libc/sysv/errfuns/eisconn.S
index 237e28ea..59ecc99f 100644
--- a/libc/sysv/errfuns/eisconn.S
+++ b/libc/sysv/errfuns/eisconn.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eisconn:
diff --git a/libc/sysv/errfuns/eisdir.S b/libc/sysv/errfuns/eisdir.S
index 60569871..6b98de9c 100644
--- a/libc/sysv/errfuns/eisdir.S
+++ b/libc/sysv/errfuns/eisdir.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eisdir:	.leafprologue
diff --git a/libc/sysv/errfuns/eisnam.S b/libc/sysv/errfuns/eisnam.S
index 770d4d1f..228efd6b 100644
--- a/libc/sysv/errfuns/eisnam.S
+++ b/libc/sysv/errfuns/eisnam.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eisnam:	.leafprologue
diff --git a/libc/sysv/errfuns/ekeyexpired.S b/libc/sysv/errfuns/ekeyexpired.S
index 2de69c5c..f7c5eaf1 100644
--- a/libc/sysv/errfuns/ekeyexpired.S
+++ b/libc/sysv/errfuns/ekeyexpired.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ekeyexpired:
diff --git a/libc/sysv/errfuns/ekeyrejected.S b/libc/sysv/errfuns/ekeyrejected.S
index e1037488..e2fa25a9 100644
--- a/libc/sysv/errfuns/ekeyrejected.S
+++ b/libc/sysv/errfuns/ekeyrejected.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ekeyrejected:
diff --git a/libc/sysv/errfuns/ekeyrevoked.S b/libc/sysv/errfuns/ekeyrevoked.S
index c22dfedb..86a6e1df 100644
--- a/libc/sysv/errfuns/ekeyrevoked.S
+++ b/libc/sysv/errfuns/ekeyrevoked.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 ekeyrevoked:
diff --git a/libc/sysv/errfuns/el2hlt.S b/libc/sysv/errfuns/el2hlt.S
index 2b5d46bd..73e8d895 100644
--- a/libc/sysv/errfuns/el2hlt.S
+++ b/libc/sysv/errfuns/el2hlt.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 el2hlt:	.leafprologue
diff --git a/libc/sysv/errfuns/el2nsync.S b/libc/sysv/errfuns/el2nsync.S
index f3861319..dcf62b85 100644
--- a/libc/sysv/errfuns/el2nsync.S
+++ b/libc/sysv/errfuns/el2nsync.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 el2nsync:
diff --git a/libc/sysv/errfuns/el3hlt.S b/libc/sysv/errfuns/el3hlt.S
index c24f2d43..103ab8dd 100644
--- a/libc/sysv/errfuns/el3hlt.S
+++ b/libc/sysv/errfuns/el3hlt.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 el3hlt:	.leafprologue
diff --git a/libc/sysv/errfuns/el3rst.S b/libc/sysv/errfuns/el3rst.S
index 2dd7efb2..7e51df53 100644
--- a/libc/sysv/errfuns/el3rst.S
+++ b/libc/sysv/errfuns/el3rst.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 el3rst:	.leafprologue
diff --git a/libc/sysv/errfuns/elibacc.S b/libc/sysv/errfuns/elibacc.S
index 5c3368d3..d17542dc 100644
--- a/libc/sysv/errfuns/elibacc.S
+++ b/libc/sysv/errfuns/elibacc.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 elibacc:
diff --git a/libc/sysv/errfuns/elibbad.S b/libc/sysv/errfuns/elibbad.S
index 2c5ac728..8abe0bb5 100644
--- a/libc/sysv/errfuns/elibbad.S
+++ b/libc/sysv/errfuns/elibbad.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 elibbad:
diff --git a/libc/sysv/errfuns/elibexec.S b/libc/sysv/errfuns/elibexec.S
index 996db5e0..f28be8fd 100644
--- a/libc/sysv/errfuns/elibexec.S
+++ b/libc/sysv/errfuns/elibexec.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 elibexec:
diff --git a/libc/sysv/errfuns/elibmax.S b/libc/sysv/errfuns/elibmax.S
index 2ec5bd91..607093b3 100644
--- a/libc/sysv/errfuns/elibmax.S
+++ b/libc/sysv/errfuns/elibmax.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 elibmax:
diff --git a/libc/sysv/errfuns/elibscn.S b/libc/sysv/errfuns/elibscn.S
index b996f70e..c1b28eeb 100644
--- a/libc/sysv/errfuns/elibscn.S
+++ b/libc/sysv/errfuns/elibscn.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 elibscn:
diff --git a/libc/sysv/errfuns/elnrng.S b/libc/sysv/errfuns/elnrng.S
index aa57cf5a..b7693fb0 100644
--- a/libc/sysv/errfuns/elnrng.S
+++ b/libc/sysv/errfuns/elnrng.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 elnrng:	.leafprologue
diff --git a/libc/sysv/errfuns/eloop.S b/libc/sysv/errfuns/eloop.S
index d8708bd5..6fdc0c4f 100644
--- a/libc/sysv/errfuns/eloop.S
+++ b/libc/sysv/errfuns/eloop.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eloop:	.leafprologue
diff --git a/libc/sysv/errfuns/emediumtype.S b/libc/sysv/errfuns/emediumtype.S
index 886b0b4c..40db5733 100644
--- a/libc/sysv/errfuns/emediumtype.S
+++ b/libc/sysv/errfuns/emediumtype.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 emediumtype:
diff --git a/libc/sysv/errfuns/emfile.S b/libc/sysv/errfuns/emfile.S
index 9972d483..eff8409c 100644
--- a/libc/sysv/errfuns/emfile.S
+++ b/libc/sysv/errfuns/emfile.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 emfile:	.leafprologue
diff --git a/libc/sysv/errfuns/emlink.S b/libc/sysv/errfuns/emlink.S
index e8cd47f3..5b3b21d9 100644
--- a/libc/sysv/errfuns/emlink.S
+++ b/libc/sysv/errfuns/emlink.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 emlink:	.leafprologue
diff --git a/libc/sysv/errfuns/emsgsize.S b/libc/sysv/errfuns/emsgsize.S
index 00c7362d..46231a27 100644
--- a/libc/sysv/errfuns/emsgsize.S
+++ b/libc/sysv/errfuns/emsgsize.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 emsgsize:
diff --git a/libc/sysv/errfuns/emultihop.S b/libc/sysv/errfuns/emultihop.S
index ae6682b5..b91426f3 100644
--- a/libc/sysv/errfuns/emultihop.S
+++ b/libc/sysv/errfuns/emultihop.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 emultihop:
diff --git a/libc/sysv/errfuns/enametoolong.S b/libc/sysv/errfuns/enametoolong.S
index 4e5f5425..a5829366 100644
--- a/libc/sysv/errfuns/enametoolong.S
+++ b/libc/sysv/errfuns/enametoolong.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enametoolong:
diff --git a/libc/sysv/errfuns/enavail.S b/libc/sysv/errfuns/enavail.S
index ac0e2c8a..521f690c 100644
--- a/libc/sysv/errfuns/enavail.S
+++ b/libc/sysv/errfuns/enavail.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enavail:
diff --git a/libc/sysv/errfuns/enetdown.S b/libc/sysv/errfuns/enetdown.S
index ccf5100e..118aa603 100644
--- a/libc/sysv/errfuns/enetdown.S
+++ b/libc/sysv/errfuns/enetdown.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enetdown:
diff --git a/libc/sysv/errfuns/enetreset.S b/libc/sysv/errfuns/enetreset.S
index 36a662b9..88ec850f 100644
--- a/libc/sysv/errfuns/enetreset.S
+++ b/libc/sysv/errfuns/enetreset.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enetreset:
diff --git a/libc/sysv/errfuns/enetunreach.S b/libc/sysv/errfuns/enetunreach.S
index 9210508c..a9d905e1 100644
--- a/libc/sysv/errfuns/enetunreach.S
+++ b/libc/sysv/errfuns/enetunreach.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enetunreach:
diff --git a/libc/sysv/errfuns/enfile.S b/libc/sysv/errfuns/enfile.S
index 90115f4a..eb2acb5f 100644
--- a/libc/sysv/errfuns/enfile.S
+++ b/libc/sysv/errfuns/enfile.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enfile:	.leafprologue
diff --git a/libc/sysv/errfuns/enoano.S b/libc/sysv/errfuns/enoano.S
index 4d44cb3b..f67174be 100644
--- a/libc/sysv/errfuns/enoano.S
+++ b/libc/sysv/errfuns/enoano.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enoano:	.leafprologue
diff --git a/libc/sysv/errfuns/enobufs.S b/libc/sysv/errfuns/enobufs.S
index 69550b42..cf9fbab5 100644
--- a/libc/sysv/errfuns/enobufs.S
+++ b/libc/sysv/errfuns/enobufs.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enobufs:
diff --git a/libc/sysv/errfuns/enocsi.S b/libc/sysv/errfuns/enocsi.S
index d883cb1b..62b180e9 100644
--- a/libc/sysv/errfuns/enocsi.S
+++ b/libc/sysv/errfuns/enocsi.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enocsi:	.leafprologue
diff --git a/libc/sysv/errfuns/enodata.S b/libc/sysv/errfuns/enodata.S
index 0e1bf0f4..ce83cd69 100644
--- a/libc/sysv/errfuns/enodata.S
+++ b/libc/sysv/errfuns/enodata.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enodata:
diff --git a/libc/sysv/errfuns/enodev.S b/libc/sysv/errfuns/enodev.S
index 8c5af55c..31cf7ea1 100644
--- a/libc/sysv/errfuns/enodev.S
+++ b/libc/sysv/errfuns/enodev.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enodev:	.leafprologue
diff --git a/libc/sysv/errfuns/enoent.S b/libc/sysv/errfuns/enoent.S
index 5ca75730..e454d29a 100644
--- a/libc/sysv/errfuns/enoent.S
+++ b/libc/sysv/errfuns/enoent.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enoent:	.leafprologue
diff --git a/libc/sysv/errfuns/enoexec.S b/libc/sysv/errfuns/enoexec.S
index 88fdd4fd..f3ef662b 100644
--- a/libc/sysv/errfuns/enoexec.S
+++ b/libc/sysv/errfuns/enoexec.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enoexec:
diff --git a/libc/sysv/errfuns/enokey.S b/libc/sysv/errfuns/enokey.S
index 5cff9fba..2dee4cd3 100644
--- a/libc/sysv/errfuns/enokey.S
+++ b/libc/sysv/errfuns/enokey.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enokey:	.leafprologue
diff --git a/libc/sysv/errfuns/enolck.S b/libc/sysv/errfuns/enolck.S
index 0ec78654..fc535dc1 100644
--- a/libc/sysv/errfuns/enolck.S
+++ b/libc/sysv/errfuns/enolck.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enolck:	.leafprologue
diff --git a/libc/sysv/errfuns/enolink.S b/libc/sysv/errfuns/enolink.S
index 99aa12cf..30d71fca 100644
--- a/libc/sysv/errfuns/enolink.S
+++ b/libc/sysv/errfuns/enolink.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enolink:
diff --git a/libc/sysv/errfuns/enomedium.S b/libc/sysv/errfuns/enomedium.S
index 33e54d91..6788bb69 100644
--- a/libc/sysv/errfuns/enomedium.S
+++ b/libc/sysv/errfuns/enomedium.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enomedium:
diff --git a/libc/sysv/errfuns/enomem.S b/libc/sysv/errfuns/enomem.S
index 3fe37508..6830592d 100644
--- a/libc/sysv/errfuns/enomem.S
+++ b/libc/sysv/errfuns/enomem.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enomem:	.leafprologue
diff --git a/libc/sysv/errfuns/enomsg.S b/libc/sysv/errfuns/enomsg.S
index 757aea3a..e20dbe12 100644
--- a/libc/sysv/errfuns/enomsg.S
+++ b/libc/sysv/errfuns/enomsg.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enomsg:	.leafprologue
diff --git a/libc/sysv/errfuns/enonet.S b/libc/sysv/errfuns/enonet.S
index d8082af4..483b81c4 100644
--- a/libc/sysv/errfuns/enonet.S
+++ b/libc/sysv/errfuns/enonet.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enonet:	.leafprologue
diff --git a/libc/sysv/errfuns/enopkg.S b/libc/sysv/errfuns/enopkg.S
index 1f26a26e..ab0a56c3 100644
--- a/libc/sysv/errfuns/enopkg.S
+++ b/libc/sysv/errfuns/enopkg.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enopkg:	.leafprologue
diff --git a/libc/sysv/errfuns/enoprotoopt.S b/libc/sysv/errfuns/enoprotoopt.S
index d67e4811..a10c0d1a 100644
--- a/libc/sysv/errfuns/enoprotoopt.S
+++ b/libc/sysv/errfuns/enoprotoopt.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enoprotoopt:
diff --git a/libc/sysv/errfuns/enospc.S b/libc/sysv/errfuns/enospc.S
index 6a3452d0..226af480 100644
--- a/libc/sysv/errfuns/enospc.S
+++ b/libc/sysv/errfuns/enospc.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enospc:	.leafprologue
diff --git a/libc/sysv/errfuns/enosr.S b/libc/sysv/errfuns/enosr.S
index 4f94e227..6f81fa5d 100644
--- a/libc/sysv/errfuns/enosr.S
+++ b/libc/sysv/errfuns/enosr.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enosr:	.leafprologue
diff --git a/libc/sysv/errfuns/enostr.S b/libc/sysv/errfuns/enostr.S
index 008ebf24..56d80b56 100644
--- a/libc/sysv/errfuns/enostr.S
+++ b/libc/sysv/errfuns/enostr.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enostr:	.leafprologue
diff --git a/libc/sysv/errfuns/enosys.S b/libc/sysv/errfuns/enosys.S
index 89da367e..5b17c8dd 100644
--- a/libc/sysv/errfuns/enosys.S
+++ b/libc/sysv/errfuns/enosys.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enosys:	.leafprologue
diff --git a/libc/sysv/errfuns/enotblk.S b/libc/sysv/errfuns/enotblk.S
index 943c87e7..142230a3 100644
--- a/libc/sysv/errfuns/enotblk.S
+++ b/libc/sysv/errfuns/enotblk.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enotblk:
diff --git a/libc/sysv/errfuns/enotconn.S b/libc/sysv/errfuns/enotconn.S
index c1010f10..9203834f 100644
--- a/libc/sysv/errfuns/enotconn.S
+++ b/libc/sysv/errfuns/enotconn.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enotconn:
diff --git a/libc/sysv/errfuns/enotdir.S b/libc/sysv/errfuns/enotdir.S
index e204f392..7f81664a 100644
--- a/libc/sysv/errfuns/enotdir.S
+++ b/libc/sysv/errfuns/enotdir.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enotdir:
diff --git a/libc/sysv/errfuns/enotempty.S b/libc/sysv/errfuns/enotempty.S
index 20ed8e51..2bbbbe45 100644
--- a/libc/sysv/errfuns/enotempty.S
+++ b/libc/sysv/errfuns/enotempty.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enotempty:
diff --git a/libc/sysv/errfuns/enotnam.S b/libc/sysv/errfuns/enotnam.S
index 23628f84..097f1520 100644
--- a/libc/sysv/errfuns/enotnam.S
+++ b/libc/sysv/errfuns/enotnam.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enotnam:
diff --git a/libc/sysv/errfuns/enotrecoverable.S b/libc/sysv/errfuns/enotrecoverable.S
index dcffb12e..d50bd8ac 100644
--- a/libc/sysv/errfuns/enotrecoverable.S
+++ b/libc/sysv/errfuns/enotrecoverable.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enotrecoverable:
diff --git a/libc/sysv/errfuns/enotsock.S b/libc/sysv/errfuns/enotsock.S
index b917618e..cf6ce3b1 100644
--- a/libc/sysv/errfuns/enotsock.S
+++ b/libc/sysv/errfuns/enotsock.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enotsock:
diff --git a/libc/sysv/errfuns/enotsup.S b/libc/sysv/errfuns/enotsup.S
index a64b84ac..4ea31b10 100644
--- a/libc/sysv/errfuns/enotsup.S
+++ b/libc/sysv/errfuns/enotsup.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enotsup:
diff --git a/libc/sysv/errfuns/enotty.S b/libc/sysv/errfuns/enotty.S
index a53172d2..5710e3eb 100644
--- a/libc/sysv/errfuns/enotty.S
+++ b/libc/sysv/errfuns/enotty.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enotty:	.leafprologue
diff --git a/libc/sysv/errfuns/enotuniq.S b/libc/sysv/errfuns/enotuniq.S
index d361c48e..212db238 100644
--- a/libc/sysv/errfuns/enotuniq.S
+++ b/libc/sysv/errfuns/enotuniq.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enotuniq:
diff --git a/libc/sysv/errfuns/enxio.S b/libc/sysv/errfuns/enxio.S
index ec2a8a23..b6a1cd05 100644
--- a/libc/sysv/errfuns/enxio.S
+++ b/libc/sysv/errfuns/enxio.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 enxio:	.leafprologue
diff --git a/libc/sysv/errfuns/eopnotsupp.S b/libc/sysv/errfuns/eopnotsupp.S
index 0312b76c..1cb69fbd 100644
--- a/libc/sysv/errfuns/eopnotsupp.S
+++ b/libc/sysv/errfuns/eopnotsupp.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eopnotsupp:
diff --git a/libc/sysv/errfuns/eoverflow.S b/libc/sysv/errfuns/eoverflow.S
index 5d63b71c..4f92fbd5 100644
--- a/libc/sysv/errfuns/eoverflow.S
+++ b/libc/sysv/errfuns/eoverflow.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eoverflow:
diff --git a/libc/sysv/errfuns/eownerdead.S b/libc/sysv/errfuns/eownerdead.S
index 5c4845ac..bd8841f1 100644
--- a/libc/sysv/errfuns/eownerdead.S
+++ b/libc/sysv/errfuns/eownerdead.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eownerdead:
diff --git a/libc/sysv/errfuns/eperm.S b/libc/sysv/errfuns/eperm.S
index 9e1719dd..dd01b6f2 100644
--- a/libc/sysv/errfuns/eperm.S
+++ b/libc/sysv/errfuns/eperm.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eperm:	.leafprologue
diff --git a/libc/sysv/errfuns/epfnosupport.S b/libc/sysv/errfuns/epfnosupport.S
index dade790f..c3c8b53c 100644
--- a/libc/sysv/errfuns/epfnosupport.S
+++ b/libc/sysv/errfuns/epfnosupport.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 epfnosupport:
diff --git a/libc/sysv/errfuns/epipe.S b/libc/sysv/errfuns/epipe.S
index f0eb5a08..60507558 100644
--- a/libc/sysv/errfuns/epipe.S
+++ b/libc/sysv/errfuns/epipe.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 epipe:	.leafprologue
diff --git a/libc/sysv/errfuns/eproto.S b/libc/sysv/errfuns/eproto.S
index 65ac042c..e92a3d62 100644
--- a/libc/sysv/errfuns/eproto.S
+++ b/libc/sysv/errfuns/eproto.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eproto:	.leafprologue
diff --git a/libc/sysv/errfuns/eprotonosupport.S b/libc/sysv/errfuns/eprotonosupport.S
index 2968aae4..72eaf04a 100644
--- a/libc/sysv/errfuns/eprotonosupport.S
+++ b/libc/sysv/errfuns/eprotonosupport.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eprotonosupport:
diff --git a/libc/sysv/errfuns/eprototype.S b/libc/sysv/errfuns/eprototype.S
index 78cefc6c..a5991f15 100644
--- a/libc/sysv/errfuns/eprototype.S
+++ b/libc/sysv/errfuns/eprototype.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eprototype:
diff --git a/libc/sysv/errfuns/erange.S b/libc/sysv/errfuns/erange.S
index fd72d11a..2f410002 100644
--- a/libc/sysv/errfuns/erange.S
+++ b/libc/sysv/errfuns/erange.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 erange:	.leafprologue
diff --git a/libc/sysv/errfuns/eremchg.S b/libc/sysv/errfuns/eremchg.S
index 3f681ebe..3a32d312 100644
--- a/libc/sysv/errfuns/eremchg.S
+++ b/libc/sysv/errfuns/eremchg.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eremchg:
diff --git a/libc/sysv/errfuns/eremote.S b/libc/sysv/errfuns/eremote.S
index ee74ad58..e59f60d5 100644
--- a/libc/sysv/errfuns/eremote.S
+++ b/libc/sysv/errfuns/eremote.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eremote:
diff --git a/libc/sysv/errfuns/eremoteio.S b/libc/sysv/errfuns/eremoteio.S
index a57e5f30..de0bae9a 100644
--- a/libc/sysv/errfuns/eremoteio.S
+++ b/libc/sysv/errfuns/eremoteio.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eremoteio:
diff --git a/libc/sysv/errfuns/erestart.S b/libc/sysv/errfuns/erestart.S
index d06e1f01..86332af1 100644
--- a/libc/sysv/errfuns/erestart.S
+++ b/libc/sysv/errfuns/erestart.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 erestart:
diff --git a/libc/sysv/errfuns/erfkill.S b/libc/sysv/errfuns/erfkill.S
index ae50849c..bed98ca5 100644
--- a/libc/sysv/errfuns/erfkill.S
+++ b/libc/sysv/errfuns/erfkill.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 erfkill:
diff --git a/libc/sysv/errfuns/erofs.S b/libc/sysv/errfuns/erofs.S
index c3e08ca6..ddedebc9 100644
--- a/libc/sysv/errfuns/erofs.S
+++ b/libc/sysv/errfuns/erofs.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 erofs:	.leafprologue
diff --git a/libc/sysv/errfuns/eshutdown.S b/libc/sysv/errfuns/eshutdown.S
index 225826f9..2cbe5943 100644
--- a/libc/sysv/errfuns/eshutdown.S
+++ b/libc/sysv/errfuns/eshutdown.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eshutdown:
diff --git a/libc/sysv/errfuns/esocktnosupport.S b/libc/sysv/errfuns/esocktnosupport.S
index bedd8787..03d7e2c8 100644
--- a/libc/sysv/errfuns/esocktnosupport.S
+++ b/libc/sysv/errfuns/esocktnosupport.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 esocktnosupport:
diff --git a/libc/sysv/errfuns/espipe.S b/libc/sysv/errfuns/espipe.S
index 8de24faf..79fe0c90 100644
--- a/libc/sysv/errfuns/espipe.S
+++ b/libc/sysv/errfuns/espipe.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 espipe:	.leafprologue
diff --git a/libc/sysv/errfuns/esrch.S b/libc/sysv/errfuns/esrch.S
index 234b1efc..d4dd14a4 100644
--- a/libc/sysv/errfuns/esrch.S
+++ b/libc/sysv/errfuns/esrch.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 esrch:	.leafprologue
diff --git a/libc/sysv/errfuns/esrmnt.S b/libc/sysv/errfuns/esrmnt.S
index f5b84b31..794a4e7f 100644
--- a/libc/sysv/errfuns/esrmnt.S
+++ b/libc/sysv/errfuns/esrmnt.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 esrmnt:	.leafprologue
diff --git a/libc/sysv/errfuns/estale.S b/libc/sysv/errfuns/estale.S
index 333c02be..b89c5859 100644
--- a/libc/sysv/errfuns/estale.S
+++ b/libc/sysv/errfuns/estale.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 estale:	.leafprologue
diff --git a/libc/sysv/errfuns/estrpipe.S b/libc/sysv/errfuns/estrpipe.S
index 7808a413..15156b25 100644
--- a/libc/sysv/errfuns/estrpipe.S
+++ b/libc/sysv/errfuns/estrpipe.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 estrpipe:
diff --git a/libc/sysv/errfuns/etime.S b/libc/sysv/errfuns/etime.S
index 69025d51..4ab7872b 100644
--- a/libc/sysv/errfuns/etime.S
+++ b/libc/sysv/errfuns/etime.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 etime:	.leafprologue
diff --git a/libc/sysv/errfuns/etimedout.S b/libc/sysv/errfuns/etimedout.S
index d15262af..10260eca 100644
--- a/libc/sysv/errfuns/etimedout.S
+++ b/libc/sysv/errfuns/etimedout.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 etimedout:
diff --git a/libc/sysv/errfuns/etoomanyrefs.S b/libc/sysv/errfuns/etoomanyrefs.S
index 676bec0f..28fd32b5 100644
--- a/libc/sysv/errfuns/etoomanyrefs.S
+++ b/libc/sysv/errfuns/etoomanyrefs.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 etoomanyrefs:
diff --git a/libc/sysv/errfuns/etxtbsy.S b/libc/sysv/errfuns/etxtbsy.S
index a2714716..75ce6c84 100644
--- a/libc/sysv/errfuns/etxtbsy.S
+++ b/libc/sysv/errfuns/etxtbsy.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 etxtbsy:
diff --git a/libc/sysv/errfuns/euclean.S b/libc/sysv/errfuns/euclean.S
index 75d57259..1f960a7e 100644
--- a/libc/sysv/errfuns/euclean.S
+++ b/libc/sysv/errfuns/euclean.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 euclean:
diff --git a/libc/sysv/errfuns/eunatch.S b/libc/sysv/errfuns/eunatch.S
index bea1f37c..a88f75f7 100644
--- a/libc/sysv/errfuns/eunatch.S
+++ b/libc/sysv/errfuns/eunatch.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eunatch:
diff --git a/libc/sysv/errfuns/eusers.S b/libc/sysv/errfuns/eusers.S
index de6b3e7b..57c71de1 100644
--- a/libc/sysv/errfuns/eusers.S
+++ b/libc/sysv/errfuns/eusers.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 eusers:	.leafprologue
diff --git a/libc/sysv/errfuns/exdev.S b/libc/sysv/errfuns/exdev.S
index 030ff539..b0a43ec5 100644
--- a/libc/sysv/errfuns/exdev.S
+++ b/libc/sysv/errfuns/exdev.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 exdev:	.leafprologue
diff --git a/libc/sysv/errfuns/exfull.S b/libc/sysv/errfuns/exfull.S
index 5a0365af..aa552dec 100644
--- a/libc/sysv/errfuns/exfull.S
+++ b/libc/sysv/errfuns/exfull.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .text.unlikely
 
 exfull:	.leafprologue
diff --git a/libc/sysv/g_syscount.S b/libc/sysv/g_syscount.S
index a30297eb..65bf841a 100644
--- a/libc/sysv/g_syscount.S
+++ b/libc/sysv/g_syscount.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	RII System Five system call counter.
diff --git a/libc/sysv/gen.sh b/libc/sysv/gen.sh
index 3d24ee7e..b450111c 100644
--- a/libc/sysv/gen.sh
+++ b/libc/sysv/gen.sh
@@ -46,7 +46,7 @@ errfun() {
   NAME="$1"
   ERRNO="$2"
   {
-    printf '#include "libc/macros.h"\n.text.unlikely\n\n'
+    printf '#include "libc/macros.internal.h"\n.text.unlikely\n\n'
     printf '%s:' "$NAME"
     if [ "${#NAME}" -gt 6 ]; then
       printf '\n'
diff --git a/libc/sysv/restorert.S b/libc/sysv/restorert.S
index 40021fef..2b2c7693 100644
--- a/libc/sysv/restorert.S
+++ b/libc/sysv/restorert.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .privileged
 .source	__FILE__
 
diff --git a/libc/sysv/syscall.S b/libc/sysv/syscall.S
index 40db1ea0..f1136edb 100644
--- a/libc/sysv/syscall.S
+++ b/libc/sysv/syscall.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Performs raw System Five system call.
diff --git a/libc/sysv/systemfive.S b/libc/sysv/systemfive.S
index a5345d6f..b6b7a20e 100644
--- a/libc/sysv/systemfive.S
+++ b/libc/sysv/systemfive.S
@@ -20,7 +20,7 @@
 #include "libc/sysv/consts/prot.h"
 #include "libc/sysv/consts/nr.h"
 #include "libc/sysv/consts/map.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 /*                                           ▄▄▄
                        ▄▄▄                    ▀▓▓▒▄
diff --git a/libc/sysv/sysv.mk b/libc/sysv/sysv.mk
index c5d27476..1b01db90 100644
--- a/libc/sysv/sysv.mk
+++ b/libc/sysv/sysv.mk
@@ -65,7 +65,7 @@ $(LIBC_SYSV_A_OBJS):					\
 
 o/libc/sysv/consts/syscon.internal.inc:			\
 		libc/sysv/consts/syscon.internal.h	\
-		libc/macros.h				\
+		libc/macros.internal.h			\
 		libc/macros-cpp.internal.inc		\
 		libc/macros.internal.inc
 
diff --git a/libc/testlib/bench.S b/libc/testlib/bench.S
index b98a8b17..ddc286dd 100644
--- a/libc/testlib/bench.S
+++ b/libc/testlib/bench.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .yoink	testlib_runallbenchmarks
 .source	__FILE__
 
diff --git a/libc/testlib/benchrunner.c b/libc/testlib/benchrunner.c
index 66a3abe9..f11633a0 100644
--- a/libc/testlib/benchrunner.c
+++ b/libc/testlib/benchrunner.c
@@ -54,6 +54,6 @@ void testlib_runallbenchmarks(void) {
   peekall();
   mlockall(MCL_CURRENT);
   nice(-1);
-  g_loglevel = kLogWarn;
+  __log_level = kLogWarn;
   testlib_runtestcases(__bench_start, __bench_end, testlib_benchwarmup);
 }
diff --git a/libc/testlib/combo.S b/libc/testlib/combo.S
index 2d484b4d..2e85aa9a 100644
--- a/libc/testlib/combo.S
+++ b/libc/testlib/combo.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Decentralized section for test combo registration.
diff --git a/libc/testlib/comborunner.c b/libc/testlib/comborunner.c
index efaba883..2436c5f2 100644
--- a/libc/testlib/comborunner.c
+++ b/libc/testlib/comborunner.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/fmt.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
diff --git a/libc/testlib/ezbench.h b/libc/testlib/ezbench.h
index 428b5b74..259e66c0 100644
--- a/libc/testlib/ezbench.h
+++ b/libc/testlib/ezbench.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_TESTLIB_EZBENCH_H_
 #define COSMOPOLITAN_LIBC_TESTLIB_EZBENCH_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/testlib/bench.h"
 #include "libc/testlib/testlib.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
diff --git a/libc/testlib/fixture.S b/libc/testlib/fixture.S
index 5b5f85ad..143a2ee5 100644
--- a/libc/testlib/fixture.S
+++ b/libc/testlib/fixture.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Decentralized section for test fixture registration.
diff --git a/libc/testlib/formatint.c b/libc/testlib/formatint.c
index 8967de56..c3c5cda0 100644
--- a/libc/testlib/formatint.c
+++ b/libc/testlib/formatint.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
 #include "libc/fmt/fmt.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/testlib/testlib.h"
 
diff --git a/libc/testlib/formatstr.c b/libc/testlib/formatstr.c
index 7a33874f..0757f67c 100644
--- a/libc/testlib/formatstr.c
+++ b/libc/testlib/formatstr.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/str/str.h"
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
diff --git a/libc/testlib/hyperion.S b/libc/testlib/hyperion.S
index a2290d7e..a28828c6 100644
--- a/libc/testlib/hyperion.S
+++ b/libc/testlib/hyperion.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .rodata
 
diff --git a/libc/testlib/showerror_.c b/libc/testlib/showerror_.c
index 3fce2195..9404f13f 100644
--- a/libc/testlib/showerror_.c
+++ b/libc/testlib/showerror_.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/errno.h"
 #include "libc/fmt/fmt.h"
diff --git a/libc/testlib/testcase.S b/libc/testlib/testcase.S
index ab3fed3b..e300155f 100644
--- a/libc/testlib/testcase.S
+++ b/libc/testlib/testcase.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Decentralized section for test testcase registration.
diff --git a/libc/testlib/testmain.c b/libc/testlib/testmain.c
index 75b572d3..3220673d 100644
--- a/libc/testlib/testmain.c
+++ b/libc/testlib/testmain.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/log/log.h"
 #include "libc/nexgen32e/x86feature.h"
@@ -55,7 +55,7 @@ static testonly void GetOpts(int argc, char *argv[]) {
         runbenchmarks_ = true;
         break;
       case 'v':
-        ++g_loglevel;
+        ++__log_level;
         break;
       case '?':
       case 'h':
@@ -70,7 +70,7 @@ static testonly void GetOpts(int argc, char *argv[]) {
  * Generic test program main function.
  */
 testonly int main(int argc, char *argv[]) {
-  g_loglevel = kLogInfo;
+  __log_level = kLogInfo;
   GetOpts(argc, argv);
   showcrashreports();
   g_testlib_shoulddebugbreak = IsDebuggerPresent(false);
diff --git a/libc/testlib/testrunner.c b/libc/testlib/testrunner.c
index 806c367d..74f41d78 100644
--- a/libc/testlib/testrunner.c
+++ b/libc/testlib/testrunner.c
@@ -22,7 +22,7 @@
 #include "libc/errno.h"
 #include "libc/fmt/fmt.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/process.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
diff --git a/libc/testlib/thrashcodecache.S b/libc/testlib/thrashcodecache.S
index 6812b306..df22785a 100644
--- a/libc/testlib/thrashcodecache.S
+++ b/libc/testlib/thrashcodecache.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 .testonly
 
diff --git a/libc/testlib/thunks/assert_eq.S b/libc/testlib/thunks/assert_eq.S
index 31a7e1d5..a9b36c4d 100644
--- a/libc/testlib/thunks/assert_eq.S
+++ b/libc/testlib/thunks/assert_eq.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.text.unlikely
diff --git a/libc/testlib/thunks/assert_false.S b/libc/testlib/thunks/assert_false.S
index a5192dd5..76dc877d 100644
--- a/libc/testlib/thunks/assert_false.S
+++ b/libc/testlib/thunks/assert_false.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.text.unlikely
diff --git a/libc/testlib/thunks/assert_ne.S b/libc/testlib/thunks/assert_ne.S
index 4d5e31ec..9181df21 100644
--- a/libc/testlib/thunks/assert_ne.S
+++ b/libc/testlib/thunks/assert_ne.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.text.unlikely
diff --git a/libc/testlib/thunks/assert_true.S b/libc/testlib/thunks/assert_true.S
index d185f4d1..0ca3685e 100644
--- a/libc/testlib/thunks/assert_true.S
+++ b/libc/testlib/thunks/assert_true.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.text.unlikely
diff --git a/libc/testlib/thunks/expect_eq.S b/libc/testlib/thunks/expect_eq.S
index 71db4e4c..ef5c8ece 100644
--- a/libc/testlib/thunks/expect_eq.S
+++ b/libc/testlib/thunks/expect_eq.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.text.unlikely
diff --git a/libc/testlib/thunks/expect_false.S b/libc/testlib/thunks/expect_false.S
index 919acb73..afe05989 100644
--- a/libc/testlib/thunks/expect_false.S
+++ b/libc/testlib/thunks/expect_false.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.text.unlikely
diff --git a/libc/testlib/thunks/expect_ne.S b/libc/testlib/thunks/expect_ne.S
index ec932aa6..ea191ebf 100644
--- a/libc/testlib/thunks/expect_ne.S
+++ b/libc/testlib/thunks/expect_ne.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.text.unlikely
diff --git a/libc/testlib/thunks/expect_true.S b/libc/testlib/thunks/expect_true.S
index 228a4738..5366b5be 100644
--- a/libc/testlib/thunks/expect_true.S
+++ b/libc/testlib/thunks/expect_true.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.text.unlikely
diff --git a/libc/testlib/thunks/free.S b/libc/testlib/thunks/free.S
index d33a0852..9b2ae53c 100644
--- a/libc/testlib/thunks/free.S
+++ b/libc/testlib/thunks/free.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Delegates to free().
diff --git a/libc/testlib/thunks/jump.S b/libc/testlib/thunks/jump.S
index b2f993e7..76bba472 100644
--- a/libc/testlib/thunks/jump.S
+++ b/libc/testlib/thunks/jump.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.text.unlikely
diff --git a/libc/testlib/ugly.h b/libc/testlib/ugly.h
index bf216daa..e8c58e59 100644
--- a/libc/testlib/ugly.h
+++ b/libc/testlib/ugly.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_LIBC_TESTLIB_UGLY_H_
 #define COSMOPOLITAN_LIBC_TESTLIB_UGLY_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 
 #define __TEST_ARRAY(S) \
diff --git a/libc/time/alarm.c b/libc/time/alarm.c
index db4b48c4..584f77d1 100644
--- a/libc/time/alarm.c
+++ b/libc/time/alarm.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/calls/struct/itimerval.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/itimer.h"
diff --git a/libc/time/kmonthname.S b/libc/time/kmonthname.S
index 2428b103..e37f267d 100644
--- a/libc/time/kmonthname.S
+++ b/libc/time/kmonthname.S
@@ -7,7 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	extern const char kMonthName[12][10];
 	.section .rodata,"a",@progbits
diff --git a/libc/time/kmonthnameshort.S b/libc/time/kmonthnameshort.S
index 281f0b81..c616f15c 100644
--- a/libc/time/kmonthnameshort.S
+++ b/libc/time/kmonthnameshort.S
@@ -7,7 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Type #1:
 //	  - Indexable C-String Array
diff --git a/libc/time/kweekdayname.S b/libc/time/kweekdayname.S
index 3e6e2708..1cfc2925 100644
--- a/libc/time/kweekdayname.S
+++ b/libc/time/kweekdayname.S
@@ -7,7 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	extern const char kWeekdayName[7][10];
 	.section .rodata,"a",@progbits
diff --git a/libc/time/kweekdaynameshort.S b/libc/time/kweekdaynameshort.S
index 81f1a12d..a7b7677d 100644
--- a/libc/time/kweekdaynameshort.S
+++ b/libc/time/kweekdaynameshort.S
@@ -7,7 +7,7 @@
 │   • http://creativecommons.org/publicdomain/zero/1.0/            │
 ╚─────────────────────────────────────────────────────────────────*/
 #endif
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Type #1:
 //	  - Indexable C-String Array
diff --git a/libc/time/localtime.c b/libc/time/localtime.c
index 1fa7587d..bf3dc946 100644
--- a/libc/time/localtime.c
+++ b/libc/time/localtime.c
@@ -3,7 +3,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/initializer.internal.h"
 #include "libc/calls/calls.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/nexgen32e.h"
diff --git a/libc/time/strftime.c b/libc/time/strftime.c
index d9f7933d..77e76e14 100644
--- a/libc/time/strftime.c
+++ b/libc/time/strftime.c
@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/calls/calls.h"
 #include "libc/fmt/fmt.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/nexgen32e.h"
 #include "libc/time/struct/tm.h"
 #include "libc/time/time.h"
diff --git a/libc/time/strptime.c b/libc/time/strptime.c
index a3ff98e8..b2789ed2 100644
--- a/libc/time/strptime.c
+++ b/libc/time/strptime.c
@@ -26,7 +26,7 @@
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "libc/time/struct/tm.h"
 #include "libc/time/time.h"
diff --git a/libc/tinymath/acos.S b/libc/tinymath/acos.S
index 7e98c2ed..44ccfc2d 100644
--- a/libc/tinymath/acos.S
+++ b/libc/tinymath/acos.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns arc cosine of 𝑥.
 //
diff --git a/libc/tinymath/acosf.S b/libc/tinymath/acosf.S
index 4a351f8c..e743d07d 100644
--- a/libc/tinymath/acosf.S
+++ b/libc/tinymath/acosf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns arc cosine of 𝑥.
diff --git a/libc/tinymath/acosl.S b/libc/tinymath/acosl.S
index c8354326..0950e95c 100644
--- a/libc/tinymath/acosl.S
+++ b/libc/tinymath/acosl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns arc cosine of 𝑥.
diff --git a/libc/tinymath/asin.S b/libc/tinymath/asin.S
index a360d2bd..88952dcd 100644
--- a/libc/tinymath/asin.S
+++ b/libc/tinymath/asin.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns arc sine of 𝑥.
diff --git a/libc/tinymath/asinf.S b/libc/tinymath/asinf.S
index d9b3a85e..fe4a6f69 100644
--- a/libc/tinymath/asinf.S
+++ b/libc/tinymath/asinf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns arc sine of 𝑥.
diff --git a/libc/tinymath/asinl.S b/libc/tinymath/asinl.S
index 8c8d05e4..e37eb1cc 100644
--- a/libc/tinymath/asinl.S
+++ b/libc/tinymath/asinl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns arc sine of 𝑥.
diff --git a/libc/tinymath/atan.S b/libc/tinymath/atan.S
index c4e714ac..6945b9bd 100644
--- a/libc/tinymath/atan.S
+++ b/libc/tinymath/atan.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns arc tangent of 𝑥.
diff --git a/libc/tinymath/atan2.S b/libc/tinymath/atan2.S
index 7802ca1d..161f7591 100644
--- a/libc/tinymath/atan2.S
+++ b/libc/tinymath/atan2.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns arc tangent of 𝑦/𝑥.
diff --git a/libc/tinymath/atan2f.S b/libc/tinymath/atan2f.S
index ff64dc7d..0dc8fb65 100644
--- a/libc/tinymath/atan2f.S
+++ b/libc/tinymath/atan2f.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns arc tangent of 𝑦/𝑥.
diff --git a/libc/tinymath/atan2l.S b/libc/tinymath/atan2l.S
index 009e99da..c49e8571 100644
--- a/libc/tinymath/atan2l.S
+++ b/libc/tinymath/atan2l.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns arc tangent of 𝑦/𝑥.
diff --git a/libc/tinymath/atanf.S b/libc/tinymath/atanf.S
index cffe1ca1..e80e5ae3 100644
--- a/libc/tinymath/atanf.S
+++ b/libc/tinymath/atanf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns arc tangent of 𝑥.
diff --git a/libc/tinymath/atanl.S b/libc/tinymath/atanl.S
index 990ae508..a1963876 100644
--- a/libc/tinymath/atanl.S
+++ b/libc/tinymath/atanl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns arc tangent of 𝑥.
diff --git a/libc/tinymath/c2rangr.S b/libc/tinymath/c2rangr.S
index e23ec047..1f779e7c 100644
--- a/libc/tinymath/c2rangr.S
+++ b/libc/tinymath/c2rangr.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/pc.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Computes transcedental trigonometry op w/ reactive scaling.
diff --git a/libc/tinymath/cabs.S b/libc/tinymath/cabs.S
index d42e9d8e..b41359a5 100644
--- a/libc/tinymath/cabs.S
+++ b/libc/tinymath/cabs.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns absolute value of complex number.
diff --git a/libc/tinymath/cabsf.S b/libc/tinymath/cabsf.S
index c031a169..9489744f 100644
--- a/libc/tinymath/cabsf.S
+++ b/libc/tinymath/cabsf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 cabsf:	push	%rbp
diff --git a/libc/tinymath/cabsl.S b/libc/tinymath/cabsl.S
index fd0df845..0ea2da18 100644
--- a/libc/tinymath/cabsl.S
+++ b/libc/tinymath/cabsl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 cabsl:	push	%rbp
diff --git a/libc/tinymath/carg.S b/libc/tinymath/carg.S
index f7394786..3d0f5ecc 100644
--- a/libc/tinymath/carg.S
+++ b/libc/tinymath/carg.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 carg:	push	%rbp
diff --git a/libc/tinymath/cargf.S b/libc/tinymath/cargf.S
index 3531b0a2..9c86b8d4 100644
--- a/libc/tinymath/cargf.S
+++ b/libc/tinymath/cargf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 cargf:	push	%rbp
diff --git a/libc/tinymath/cargl.S b/libc/tinymath/cargl.S
index 4828e71e..a8fa5ec1 100644
--- a/libc/tinymath/cargl.S
+++ b/libc/tinymath/cargl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 cargl:	push	%rbp
diff --git a/libc/tinymath/cbrt.S b/libc/tinymath/cbrt.S
index 34b299d7..dd5695ae 100644
--- a/libc/tinymath/cbrt.S
+++ b/libc/tinymath/cbrt.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns cube root of 𝑥.
 //
diff --git a/libc/tinymath/cbrtf.S b/libc/tinymath/cbrtf.S
index 0a9b50d3..4c5b615e 100644
--- a/libc/tinymath/cbrtf.S
+++ b/libc/tinymath/cbrtf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns cube root of 𝑥.
 //
diff --git a/libc/tinymath/cbrtl.S b/libc/tinymath/cbrtl.S
index e5aaebd3..96c4c57c 100644
--- a/libc/tinymath/cbrtl.S
+++ b/libc/tinymath/cbrtl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns cube root of 𝑥.
 //
diff --git a/libc/tinymath/ceil.S b/libc/tinymath/ceil.S
index 45dd764b..750b9978 100644
--- a/libc/tinymath/ceil.S
+++ b/libc/tinymath/ceil.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 ceil:	.leafprologue
diff --git a/libc/tinymath/ceilf.S b/libc/tinymath/ceilf.S
index 793f3e09..bddf3046 100644
--- a/libc/tinymath/ceilf.S
+++ b/libc/tinymath/ceilf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 ceilf:	.leafprologue
diff --git a/libc/tinymath/ceill.S b/libc/tinymath/ceill.S
index a4b0b76c..f1a12e89 100644
--- a/libc/tinymath/ceill.S
+++ b/libc/tinymath/ceill.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 ceill:	.profilable
diff --git a/libc/tinymath/cimag.S b/libc/tinymath/cimag.S
index 143c774a..7c4cd24b 100644
--- a/libc/tinymath/cimag.S
+++ b/libc/tinymath/cimag.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 cimag:	.leafprologue
diff --git a/libc/tinymath/cimagf.S b/libc/tinymath/cimagf.S
index 3244a824..a4c962c4 100644
--- a/libc/tinymath/cimagf.S
+++ b/libc/tinymath/cimagf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 cimagf:	push	%rbp
diff --git a/libc/tinymath/cimagl.S b/libc/tinymath/cimagl.S
index 5afc5166..9c562c0a 100644
--- a/libc/tinymath/cimagl.S
+++ b/libc/tinymath/cimagl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 cimagl:	push	%rbp
diff --git a/libc/tinymath/conj.S b/libc/tinymath/conj.S
index 552dccfe..6ae4fc03 100644
--- a/libc/tinymath/conj.S
+++ b/libc/tinymath/conj.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 conj:	.leafprologue
diff --git a/libc/tinymath/conjf.S b/libc/tinymath/conjf.S
index 2448d729..7040cdce 100644
--- a/libc/tinymath/conjf.S
+++ b/libc/tinymath/conjf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 conjf:	.profilable
diff --git a/libc/tinymath/conjl.S b/libc/tinymath/conjl.S
index aa80b4ad..21aedc4b 100644
--- a/libc/tinymath/conjl.S
+++ b/libc/tinymath/conjl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 conjl:	.profilable
diff --git a/libc/tinymath/copysign.S b/libc/tinymath/copysign.S
index eb60dccc..bbfed88b 100644
--- a/libc/tinymath/copysign.S
+++ b/libc/tinymath/copysign.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥 with same sign as 𝑦.
 //
diff --git a/libc/tinymath/copysignf.S b/libc/tinymath/copysignf.S
index 0fd97c26..58b92ee0 100644
--- a/libc/tinymath/copysignf.S
+++ b/libc/tinymath/copysignf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥 with same sign as 𝑦.
 //
diff --git a/libc/tinymath/copysignl.S b/libc/tinymath/copysignl.S
index 79d1909b..ff57ab1c 100644
--- a/libc/tinymath/copysignl.S
+++ b/libc/tinymath/copysignl.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/pc.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥 with same sign as 𝑦.
 //
diff --git a/libc/tinymath/cos.S b/libc/tinymath/cos.S
index 86ed5d4f..79e42d96 100644
--- a/libc/tinymath/cos.S
+++ b/libc/tinymath/cos.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns cosine of 𝑥.
diff --git a/libc/tinymath/cosf.S b/libc/tinymath/cosf.S
index 4a1513e4..2ef0679a 100644
--- a/libc/tinymath/cosf.S
+++ b/libc/tinymath/cosf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns cosine of 𝑥.
diff --git a/libc/tinymath/cosl.S b/libc/tinymath/cosl.S
index ff185a9d..e74490c5 100644
--- a/libc/tinymath/cosl.S
+++ b/libc/tinymath/cosl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns cosine of 𝑥.
diff --git a/libc/tinymath/cprojf.S b/libc/tinymath/cprojf.S
index ede39368..c4e7b6df 100644
--- a/libc/tinymath/cprojf.S
+++ b/libc/tinymath/cprojf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 cprojf:	push	%rbp
diff --git a/libc/tinymath/cprojl.S b/libc/tinymath/cprojl.S
index d5c04e7b..bafbfb81 100644
--- a/libc/tinymath/cprojl.S
+++ b/libc/tinymath/cprojl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Projects into Rienmann sphere.
diff --git a/libc/tinymath/creal.S b/libc/tinymath/creal.S
index db6f80e5..b5c91c80 100644
--- a/libc/tinymath/creal.S
+++ b/libc/tinymath/creal.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 creal:	ret
diff --git a/libc/tinymath/crealf.S b/libc/tinymath/crealf.S
index 89a52fb4..db1688ff 100644
--- a/libc/tinymath/crealf.S
+++ b/libc/tinymath/crealf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 crealf:	push	%rbp
diff --git a/libc/tinymath/creall.S b/libc/tinymath/creall.S
index 42b54759..1628cdc7 100644
--- a/libc/tinymath/creall.S
+++ b/libc/tinymath/creall.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 creall:	push	%rbp
diff --git a/libc/tinymath/d2ld2.S b/libc/tinymath/d2ld2.S
index 3121cb2d..c064587c 100644
--- a/libc/tinymath/d2ld2.S
+++ b/libc/tinymath/d2ld2.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Thunks double(*fn)(double,double) -> long double fn.
diff --git a/libc/tinymath/exp.S b/libc/tinymath/exp.S
index 484cc2bb..ae4ff393 100644
--- a/libc/tinymath/exp.S
+++ b/libc/tinymath/exp.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑒^x.
 //
diff --git a/libc/tinymath/exp10.S b/libc/tinymath/exp10.S
index e907e05a..29ae89b8 100644
--- a/libc/tinymath/exp10.S
+++ b/libc/tinymath/exp10.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 10^x.
 //
diff --git a/libc/tinymath/exp10f.S b/libc/tinymath/exp10f.S
index 756d7c20..bd32d10c 100644
--- a/libc/tinymath/exp10f.S
+++ b/libc/tinymath/exp10f.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns 10^x.
diff --git a/libc/tinymath/exp10l.S b/libc/tinymath/exp10l.S
index e31c36c7..a78c7704 100644
--- a/libc/tinymath/exp10l.S
+++ b/libc/tinymath/exp10l.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 10^x.
 //
diff --git a/libc/tinymath/exp2.S b/libc/tinymath/exp2.S
index 13f065e4..03ac644b 100644
--- a/libc/tinymath/exp2.S
+++ b/libc/tinymath/exp2.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 2^𝑥.
 //
diff --git a/libc/tinymath/exp2f.S b/libc/tinymath/exp2f.S
index fc7fc16a..f00bf06f 100644
--- a/libc/tinymath/exp2f.S
+++ b/libc/tinymath/exp2f.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns 2^𝑥.
diff --git a/libc/tinymath/exp2l.S b/libc/tinymath/exp2l.S
index 3f96e549..73802722 100644
--- a/libc/tinymath/exp2l.S
+++ b/libc/tinymath/exp2l.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 2^𝑥.
 //
diff --git a/libc/tinymath/expf.S b/libc/tinymath/expf.S
index b7ae553c..14171a0f 100644
--- a/libc/tinymath/expf.S
+++ b/libc/tinymath/expf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns 𝑒^x.
diff --git a/libc/tinymath/expl.S b/libc/tinymath/expl.S
index d36bed80..f22cbecc 100644
--- a/libc/tinymath/expl.S
+++ b/libc/tinymath/expl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑒^x.
 //
diff --git a/libc/tinymath/expm1.S b/libc/tinymath/expm1.S
index 5b9e2819..37be04e6 100644
--- a/libc/tinymath/expm1.S
+++ b/libc/tinymath/expm1.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑒^x-1.
 //
diff --git a/libc/tinymath/expm1f.S b/libc/tinymath/expm1f.S
index 8b1753b0..92e5fe37 100644
--- a/libc/tinymath/expm1f.S
+++ b/libc/tinymath/expm1f.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns 𝑒^x-1.
diff --git a/libc/tinymath/expm1l.S b/libc/tinymath/expm1l.S
index f13020a4..d12f779d 100644
--- a/libc/tinymath/expm1l.S
+++ b/libc/tinymath/expm1l.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/pc.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑒^x-1.
 //
diff --git a/libc/tinymath/f2ld2.S b/libc/tinymath/f2ld2.S
index b45b4adc..1773da10 100644
--- a/libc/tinymath/f2ld2.S
+++ b/libc/tinymath/f2ld2.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Thunks float(*fn)(float,float) -> long double fn.
 //
diff --git a/libc/tinymath/fabs.S b/libc/tinymath/fabs.S
index d0023f5f..2c55d1aa 100644
--- a/libc/tinymath/fabs.S
+++ b/libc/tinymath/fabs.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns absolute value of 𝑥.
 //
diff --git a/libc/tinymath/fabsf.S b/libc/tinymath/fabsf.S
index 54a40e34..6ecad697 100644
--- a/libc/tinymath/fabsf.S
+++ b/libc/tinymath/fabsf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns absolute value of 𝑥.
diff --git a/libc/tinymath/fabsl.S b/libc/tinymath/fabsl.S
index 35a4c3d7..eb77c7e7 100644
--- a/libc/tinymath/fabsl.S
+++ b/libc/tinymath/fabsl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns absolute value of 𝑥.
diff --git a/libc/tinymath/floor.S b/libc/tinymath/floor.S
index 2b82684e..a117c553 100644
--- a/libc/tinymath/floor.S
+++ b/libc/tinymath/floor.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	vroundsd $_MM_FROUND_TO_NEG_INF|_MM_FROUND_NO_EXC,%xmm0,%xmm0,%xmm0
diff --git a/libc/tinymath/floorf.S b/libc/tinymath/floorf.S
index 2b251ef7..4bf4ef56 100644
--- a/libc/tinymath/floorf.S
+++ b/libc/tinymath/floorf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 floorf:	.leafprologue
diff --git a/libc/tinymath/floorl.S b/libc/tinymath/floorl.S
index b31c68c2..a6d0d0d7 100644
--- a/libc/tinymath/floorl.S
+++ b/libc/tinymath/floorl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 floorl:	.profilable
diff --git a/libc/tinymath/fmod.S b/libc/tinymath/fmod.S
index 012265b1..5762bcbd 100644
--- a/libc/tinymath/fmod.S
+++ b/libc/tinymath/fmod.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	fmod [sic] does (𝑥 rem 𝑦) w/ round()-style rounding.
 //
diff --git a/libc/tinymath/fmodf.S b/libc/tinymath/fmodf.S
index 4fb048cc..68464a30 100644
--- a/libc/tinymath/fmodf.S
+++ b/libc/tinymath/fmodf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 fmodf:	ezlea	fmodl,ax
diff --git a/libc/tinymath/fmodl.S b/libc/tinymath/fmodl.S
index 239186d8..b3d87215 100644
--- a/libc/tinymath/fmodl.S
+++ b/libc/tinymath/fmodl.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/pc.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	fmod [sic] does (𝑥 rem 𝑦) w/ round()-style rounding.
 //
diff --git a/libc/tinymath/frexp.S b/libc/tinymath/frexp.S
index 53fc8a63..e42bb1d8 100644
--- a/libc/tinymath/frexp.S
+++ b/libc/tinymath/frexp.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 frexp:	.leafprologue
diff --git a/libc/tinymath/ilogb.S b/libc/tinymath/ilogb.S
index fff7764e..44d3e2a7 100644
--- a/libc/tinymath/ilogb.S
+++ b/libc/tinymath/ilogb.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns log₂𝑥 exponent part of double.
 //
diff --git a/libc/tinymath/ilogbf.S b/libc/tinymath/ilogbf.S
index b9138150..26b29fb1 100644
--- a/libc/tinymath/ilogbf.S
+++ b/libc/tinymath/ilogbf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns log₂x exponent part of float.
 //
diff --git a/libc/tinymath/ilogbl.S b/libc/tinymath/ilogbl.S
index 939f53f6..2d276301 100644
--- a/libc/tinymath/ilogbl.S
+++ b/libc/tinymath/ilogbl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns log₂x exponent part of long double.
 //
diff --git a/libc/tinymath/ldexp.S b/libc/tinymath/ldexp.S
index 026fabd4..7fd15407 100644
--- a/libc/tinymath/ldexp.S
+++ b/libc/tinymath/ldexp.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥 × 2ʸ.
 //
diff --git a/libc/tinymath/ldexpf.S b/libc/tinymath/ldexpf.S
index b30945a1..7014b412 100644
--- a/libc/tinymath/ldexpf.S
+++ b/libc/tinymath/ldexpf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns 𝑥 × 2ʸ.
diff --git a/libc/tinymath/ldexpl.S b/libc/tinymath/ldexpl.S
index 3dc4fed4..7aa6ae2f 100644
--- a/libc/tinymath/ldexpl.S
+++ b/libc/tinymath/ldexpl.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/pc.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥 × 2ʸ.
 //
diff --git a/libc/tinymath/log.S b/libc/tinymath/log.S
index f666cb6d..88ff30fd 100644
--- a/libc/tinymath/log.S
+++ b/libc/tinymath/log.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns natural logarithm of 𝑥.
 //
diff --git a/libc/tinymath/log10.S b/libc/tinymath/log10.S
index 40da8088..88e72971 100644
--- a/libc/tinymath/log10.S
+++ b/libc/tinymath/log10.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Calculates log₁₀𝑥.
diff --git a/libc/tinymath/log10f.S b/libc/tinymath/log10f.S
index 0e7dab94..70719015 100644
--- a/libc/tinymath/log10f.S
+++ b/libc/tinymath/log10f.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Calculates log₁₀𝑥.
diff --git a/libc/tinymath/log10l.S b/libc/tinymath/log10l.S
index f0b3bdda..644e899f 100644
--- a/libc/tinymath/log10l.S
+++ b/libc/tinymath/log10l.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Calculates log₁₀𝑥.
diff --git a/libc/tinymath/log1p.S b/libc/tinymath/log1p.S
index fcb45fbf..f8f4e886 100644
--- a/libc/tinymath/log1p.S
+++ b/libc/tinymath/log1p.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns log(𝟷+𝑥).
 //
diff --git a/libc/tinymath/log1pf.S b/libc/tinymath/log1pf.S
index 96f0d282..1d8c023a 100644
--- a/libc/tinymath/log1pf.S
+++ b/libc/tinymath/log1pf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns log(𝟷+𝑥).
 //
diff --git a/libc/tinymath/log1pl.S b/libc/tinymath/log1pl.S
index 981138a7..29082fc6 100644
--- a/libc/tinymath/log1pl.S
+++ b/libc/tinymath/log1pl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns log(𝟷+𝑥).
diff --git a/libc/tinymath/log2.S b/libc/tinymath/log2.S
index 00b9fca3..378f0f66 100644
--- a/libc/tinymath/log2.S
+++ b/libc/tinymath/log2.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Calculates log₂𝑥.
 //
diff --git a/libc/tinymath/log2f.S b/libc/tinymath/log2f.S
index ed26731c..1c9527cb 100644
--- a/libc/tinymath/log2f.S
+++ b/libc/tinymath/log2f.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Calculates log₂𝑥.
diff --git a/libc/tinymath/log2l.S b/libc/tinymath/log2l.S
index c275a7fd..764dc1cd 100644
--- a/libc/tinymath/log2l.S
+++ b/libc/tinymath/log2l.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Calculates log₂𝑥.
 //
diff --git a/libc/tinymath/logb.S b/libc/tinymath/logb.S
index 59d6f66d..9f85a250 100644
--- a/libc/tinymath/logb.S
+++ b/libc/tinymath/logb.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns log₂ₓ exponent part of double.
 //
diff --git a/libc/tinymath/logbf.S b/libc/tinymath/logbf.S
index c5100a8b..333cb99e 100644
--- a/libc/tinymath/logbf.S
+++ b/libc/tinymath/logbf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns log₂ₓ exponent part of float.
 //
diff --git a/libc/tinymath/logbl.S b/libc/tinymath/logbl.S
index 723211bd..9c78f30b 100644
--- a/libc/tinymath/logbl.S
+++ b/libc/tinymath/logbl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns log₂ₓ exponent part of long double.
 //
diff --git a/libc/tinymath/logf.S b/libc/tinymath/logf.S
index bc7fd261..a3acff19 100644
--- a/libc/tinymath/logf.S
+++ b/libc/tinymath/logf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns natural logarithm of 𝑥.
diff --git a/libc/tinymath/logl.S b/libc/tinymath/logl.S
index cce5c97c..e98ea494 100644
--- a/libc/tinymath/logl.S
+++ b/libc/tinymath/logl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns natural logarithm of 𝑥.
 //
diff --git a/libc/tinymath/lrint.S b/libc/tinymath/lrint.S
index 655dffdc..f2423df3 100644
--- a/libc/tinymath/lrint.S
+++ b/libc/tinymath/lrint.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 lrint:	cvtsd2siq %xmm0,%rax
diff --git a/libc/tinymath/lrintf.S b/libc/tinymath/lrintf.S
index 248bcf48..ac7e9e5f 100644
--- a/libc/tinymath/lrintf.S
+++ b/libc/tinymath/lrintf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 lrintf:	cvtss2siq %xmm0,%rax
diff --git a/libc/tinymath/lrintl.S b/libc/tinymath/lrintl.S
index f39b2f1b..e874c749 100644
--- a/libc/tinymath/lrintl.S
+++ b/libc/tinymath/lrintl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 lrintl:	push	%rbp
diff --git a/libc/tinymath/lround.S b/libc/tinymath/lround.S
index dcf33059..866685bb 100644
--- a/libc/tinymath/lround.S
+++ b/libc/tinymath/lround.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Rounds to nearest integer, away from zero.
diff --git a/libc/tinymath/lroundf.S b/libc/tinymath/lroundf.S
index ea03131e..5e9dd382 100644
--- a/libc/tinymath/lroundf.S
+++ b/libc/tinymath/lroundf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Rounds to nearest integer, away from zero.
diff --git a/libc/tinymath/lroundl.S b/libc/tinymath/lroundl.S
index ff5dd4b9..c8dac6f1 100644
--- a/libc/tinymath/lroundl.S
+++ b/libc/tinymath/lroundl.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/pc.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 lroundl:
diff --git a/libc/tinymath/nearbyint.S b/libc/tinymath/nearbyint.S
index 8f468bb3..e79ef582 100644
--- a/libc/tinymath/nearbyint.S
+++ b/libc/tinymath/nearbyint.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 nearbyint:
diff --git a/libc/tinymath/nearbyintf.S b/libc/tinymath/nearbyintf.S
index 6b47b514..b56d9964 100644
--- a/libc/tinymath/nearbyintf.S
+++ b/libc/tinymath/nearbyintf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 nearbyintf:
diff --git a/libc/tinymath/nearbyintl.S b/libc/tinymath/nearbyintl.S
index 70df2522..9c9307dd 100644
--- a/libc/tinymath/nearbyintl.S
+++ b/libc/tinymath/nearbyintl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 nearbyintl:
diff --git a/libc/tinymath/pow.S b/libc/tinymath/pow.S
index 091e9faa..a4158f41 100644
--- a/libc/tinymath/pow.S
+++ b/libc/tinymath/pow.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns 𝑥^𝑦.
diff --git a/libc/tinymath/powf.S b/libc/tinymath/powf.S
index a9f6e29a..d2e03491 100644
--- a/libc/tinymath/powf.S
+++ b/libc/tinymath/powf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥^𝑦.
 //
diff --git a/libc/tinymath/powi.S b/libc/tinymath/powi.S
index a563ed33..ffed0678 100644
--- a/libc/tinymath/powi.S
+++ b/libc/tinymath/powi.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥^𝑦.
 //
diff --git a/libc/tinymath/powif.S b/libc/tinymath/powif.S
index 8bb9a040..aa3b3c05 100644
--- a/libc/tinymath/powif.S
+++ b/libc/tinymath/powif.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥^𝑦.
 //
diff --git a/libc/tinymath/powil.S b/libc/tinymath/powil.S
index ce3a25a8..a4875306 100644
--- a/libc/tinymath/powil.S
+++ b/libc/tinymath/powil.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥^𝑦.
 //
diff --git a/libc/tinymath/powl.S b/libc/tinymath/powl.S
index f9445e71..c6246b07 100644
--- a/libc/tinymath/powl.S
+++ b/libc/tinymath/powl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns 𝑥^𝑦.
 //
diff --git a/libc/tinymath/remainder.S b/libc/tinymath/remainder.S
index ce08dd95..3558e291 100644
--- a/libc/tinymath/remainder.S
+++ b/libc/tinymath/remainder.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	remainder(𝑥,𝑦) means (𝑥 rem 𝑦) w/ rint()-style rounding.
diff --git a/libc/tinymath/remainderf.S b/libc/tinymath/remainderf.S
index 6883424f..7427c6ae 100644
--- a/libc/tinymath/remainderf.S
+++ b/libc/tinymath/remainderf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 remainderf:
diff --git a/libc/tinymath/remainderl.S b/libc/tinymath/remainderl.S
index a98f987f..bd14ae99 100644
--- a/libc/tinymath/remainderl.S
+++ b/libc/tinymath/remainderl.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/pc.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 remainderl:
diff --git a/libc/tinymath/rint.S b/libc/tinymath/rint.S
index fd4ca0a9..07e5a4a3 100644
--- a/libc/tinymath/rint.S
+++ b/libc/tinymath/rint.S
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/bits/smmintrin.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Rounds to nearest integer.
diff --git a/libc/tinymath/rintf.S b/libc/tinymath/rintf.S
index f50c2a3e..858e358c 100644
--- a/libc/tinymath/rintf.S
+++ b/libc/tinymath/rintf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 rintf:	.leafprologue
diff --git a/libc/tinymath/rintl.S b/libc/tinymath/rintl.S
index b7f54869..adc97bad 100644
--- a/libc/tinymath/rintl.S
+++ b/libc/tinymath/rintl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Rounds to nearest integer.
diff --git a/libc/tinymath/round.S b/libc/tinymath/round.S
index 1f502e2a..e47e79de 100644
--- a/libc/tinymath/round.S
+++ b/libc/tinymath/round.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/bits/smmintrin.internal.h"
 #include "libc/nexgen32e/x86feature.h"
 .source	__FILE__
diff --git a/libc/tinymath/roundf.S b/libc/tinymath/roundf.S
index 1c1a2656..b873d920 100644
--- a/libc/tinymath/roundf.S
+++ b/libc/tinymath/roundf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/bits/smmintrin.internal.h"
 #include "libc/nexgen32e/x86feature.h"
 .source	__FILE__
diff --git a/libc/tinymath/roundl.S b/libc/tinymath/roundl.S
index d22894cd..db45f999 100644
--- a/libc/tinymath/roundl.S
+++ b/libc/tinymath/roundl.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/pc.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Rounds to nearest integer, away from zero.
 //
diff --git a/libc/tinymath/scalb.S b/libc/tinymath/scalb.S
index e0125003..53333b6d 100644
--- a/libc/tinymath/scalb.S
+++ b/libc/tinymath/scalb.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns 𝑥 × 2ʸ.
diff --git a/libc/tinymath/scalbf.S b/libc/tinymath/scalbf.S
index 951c6df2..b7acc2c4 100644
--- a/libc/tinymath/scalbf.S
+++ b/libc/tinymath/scalbf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns 𝑥 × 2ʸ.
diff --git a/libc/tinymath/scalbl.S b/libc/tinymath/scalbl.S
index 692e9ea6..a0ae41ae 100644
--- a/libc/tinymath/scalbl.S
+++ b/libc/tinymath/scalbl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns 𝑥 × 2ʸ.
diff --git a/libc/tinymath/signbit.S b/libc/tinymath/signbit.S
index 266b4678..a588c7ef 100644
--- a/libc/tinymath/signbit.S
+++ b/libc/tinymath/signbit.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 signbit:
diff --git a/libc/tinymath/signbitf.S b/libc/tinymath/signbitf.S
index 5796af2c..d9c96da5 100644
--- a/libc/tinymath/signbitf.S
+++ b/libc/tinymath/signbitf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 signbitf:
diff --git a/libc/tinymath/signbitl.S b/libc/tinymath/signbitl.S
index 86178d33..737f4d2c 100644
--- a/libc/tinymath/signbitl.S
+++ b/libc/tinymath/signbitl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 signbitl:
diff --git a/libc/tinymath/significand.S b/libc/tinymath/significand.S
index 55997b56..f49868c1 100644
--- a/libc/tinymath/significand.S
+++ b/libc/tinymath/significand.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 significand:
diff --git a/libc/tinymath/significandf.S b/libc/tinymath/significandf.S
index a36b0be9..d539f557 100644
--- a/libc/tinymath/significandf.S
+++ b/libc/tinymath/significandf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 significandf:
diff --git a/libc/tinymath/significandl.S b/libc/tinymath/significandl.S
index 2c4c0483..a022ffaa 100644
--- a/libc/tinymath/significandl.S
+++ b/libc/tinymath/significandl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 significandl:
diff --git a/libc/tinymath/sin.S b/libc/tinymath/sin.S
index 1e4ab0cb..3a46f190 100644
--- a/libc/tinymath/sin.S
+++ b/libc/tinymath/sin.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns sine of 𝑥.
diff --git a/libc/tinymath/sincos.S b/libc/tinymath/sincos.S
index 6704acd4..38a3203e 100644
--- a/libc/tinymath/sincos.S
+++ b/libc/tinymath/sincos.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns sine and cosine of 𝑥.
diff --git a/libc/tinymath/sincosf.S b/libc/tinymath/sincosf.S
index 8e73f091..41cf7838 100644
--- a/libc/tinymath/sincosf.S
+++ b/libc/tinymath/sincosf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns sine and cosine of 𝑥.
diff --git a/libc/tinymath/sincosl.S b/libc/tinymath/sincosl.S
index 09097fea..2f0d491e 100644
--- a/libc/tinymath/sincosl.S
+++ b/libc/tinymath/sincosl.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/pc.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns sine and cosine of 𝑥.
diff --git a/libc/tinymath/sinf.S b/libc/tinymath/sinf.S
index b292e045..6f5051f6 100644
--- a/libc/tinymath/sinf.S
+++ b/libc/tinymath/sinf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns sine of 𝑥.
diff --git a/libc/tinymath/sinl.S b/libc/tinymath/sinl.S
index 4aebcb9b..843abcef 100644
--- a/libc/tinymath/sinl.S
+++ b/libc/tinymath/sinl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns sine of 𝑥.
 //
diff --git a/libc/tinymath/sqrt.S b/libc/tinymath/sqrt.S
index 1f791516..fd5427f1 100644
--- a/libc/tinymath/sqrt.S
+++ b/libc/tinymath/sqrt.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns square root of 𝑥.
 //
diff --git a/libc/tinymath/sqrtf.S b/libc/tinymath/sqrtf.S
index 6247e71f..36947b01 100644
--- a/libc/tinymath/sqrtf.S
+++ b/libc/tinymath/sqrtf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Returns square root of 𝑥.
 //
diff --git a/libc/tinymath/sqrtl.S b/libc/tinymath/sqrtl.S
index 2a10debc..b8584b32 100644
--- a/libc/tinymath/sqrtl.S
+++ b/libc/tinymath/sqrtl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns square root of 𝑥.
diff --git a/libc/tinymath/tan.S b/libc/tinymath/tan.S
index 2fd8309a..3df3bc76 100644
--- a/libc/tinymath/tan.S
+++ b/libc/tinymath/tan.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns tangent of 𝑥.
diff --git a/libc/tinymath/tanf.S b/libc/tinymath/tanf.S
index 052ed2a5..348e42b4 100644
--- a/libc/tinymath/tanf.S
+++ b/libc/tinymath/tanf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns tangent of 𝑥.
diff --git a/libc/tinymath/tanl.S b/libc/tinymath/tanl.S
index e7808a9a..40d707fd 100644
--- a/libc/tinymath/tanl.S
+++ b/libc/tinymath/tanl.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/pc.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Returns tangent of 𝑥.
diff --git a/libc/tinymath/trunc.S b/libc/tinymath/trunc.S
index 1d1c5e88..4cee5bb5 100644
--- a/libc/tinymath/trunc.S
+++ b/libc/tinymath/trunc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Rounds to integer, toward zero.
diff --git a/libc/tinymath/truncf.S b/libc/tinymath/truncf.S
index ee4a9bfa..7cc1510a 100644
--- a/libc/tinymath/truncf.S
+++ b/libc/tinymath/truncf.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 truncf:	.leafprologue
diff --git a/libc/tinymath/truncl.S b/libc/tinymath/truncl.S
index 8f6c6cc5..f8af463c 100644
--- a/libc/tinymath/truncl.S
+++ b/libc/tinymath/truncl.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 truncl:	.profilable
diff --git a/libc/unicode/kcombiningchars.S b/libc/unicode/kcombiningchars.S
index 111b497d..6909e9f4 100644
--- a/libc/unicode/kcombiningchars.S
+++ b/libc/unicode/kcombiningchars.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/sysv/consts/nr.h"
 #include "libc/sysv/consts/madv.h"
 
diff --git a/libc/unicode/setlocale.c b/libc/unicode/setlocale.c
index 14303ef7..2a61d163 100644
--- a/libc/unicode/setlocale.c
+++ b/libc/unicode/setlocale.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/unicode/locale.h"
 
 /**
diff --git a/libc/unicode/strnwidth.c b/libc/unicode/strnwidth.c
index 31cb356a..431b9378 100644
--- a/libc/unicode/strnwidth.c
+++ b/libc/unicode/strnwidth.c
@@ -19,7 +19,7 @@
 #include "libc/intrin/pcmpgtb.h"
 #include "libc/intrin/pmovmskb.h"
 #include "libc/intrin/psubb.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/bsf.h"
 #include "libc/str/str.h"
 #include "libc/str/thompike.h"
diff --git a/libc/unicode/strnwidth16.c b/libc/unicode/strnwidth16.c
index b2f7f2ee..d5df7d97 100644
--- a/libc/unicode/strnwidth16.c
+++ b/libc/unicode/strnwidth16.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/str/oldutf16.internal.h"
 #include "libc/str/str.h"
 #include "libc/unicode/unicode.h"
diff --git a/libc/unicode/strwidth16.c b/libc/unicode/strwidth16.c
index 71a38dc1..85fca583 100644
--- a/libc/unicode/strwidth16.c
+++ b/libc/unicode/strwidth16.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/limits.h"
 #include "libc/unicode/unicode.h"
 
diff --git a/libc/x/filecmp.c b/libc/x/filecmp.c
index be7e8943..39077015 100644
--- a/libc/x/filecmp.c
+++ b/libc/x/filecmp.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/alg.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/errno.h"
 #include "libc/str/str.h"
diff --git a/libc/x/replaceuser.c b/libc/x/replaceuser.c
index 4b18d8fe..44ca2b20 100644
--- a/libc/x/replaceuser.c
+++ b/libc/x/replaceuser.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/x/xjoinpaths.c b/libc/x/xjoinpaths.c
index dbb68bd6..d16a18a0 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/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/str/str.h"
 #include "libc/x/x.h"
 
diff --git a/libc/zip.h b/libc/zip.h
index 7aa91532..c7d5ae97 100644
--- a/libc/zip.h
+++ b/libc/zip.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_LIBC_ZIP_H_
 #define COSMOPOLITAN_LIBC_ZIP_H_
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 
 /**
diff --git a/libc/zipos/get.c b/libc/zipos/get.c
index d0b71309..b9ae1047 100644
--- a/libc/zipos/get.c
+++ b/libc/zipos/get.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/limits.h"
diff --git a/libc/zipos/open.c b/libc/zipos/open.c
index 44ebd2fd..3847a5c9 100644
--- a/libc/zipos/open.c
+++ b/libc/zipos/open.c
@@ -24,7 +24,7 @@
 #include "libc/calls/struct/stat.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/crc32.h"
 #include "libc/runtime/runtime.h"
diff --git a/libc/zipos/read.c b/libc/zipos/read.c
index d54b4c60..6db49ee9 100644
--- a/libc/zipos/read.c
+++ b/libc/zipos/read.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/str/str.h"
diff --git a/libc/zipos/stat-impl.c b/libc/zipos/stat-impl.c
index bcba7291..170eb1b5 100644
--- a/libc/zipos/stat-impl.c
+++ b/libc/zipos/stat-impl.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/str/str.h"
diff --git a/libc/zipos/zipos.S b/libc/zipos/zipos.S
index fab9caa8..44259a17 100644
--- a/libc/zipos/zipos.S
+++ b/libc/zipos/zipos.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	static_yoink this symbol for open(zip:...) support.
 	zip_uri_support = 0
diff --git a/net/http/negotiatehttprequest.c b/net/http/negotiatehttprequest.c
index fa58546d..ea26e0ce 100644
--- a/net/http/negotiatehttprequest.c
+++ b/net/http/negotiatehttprequest.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/sock/sock.h"
 #include "libc/str/str.h"
diff --git a/net/http/uricspn-avx.S b/net/http/uricspn-avx.S
index de6dad47..e03f71a9 100644
--- a/net/http/uricspn-avx.S
+++ b/net/http/uricspn-avx.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Verifies buffer contains only URI characters.
 //
diff --git a/net/http/urislice2cstr.c b/net/http/urislice2cstr.c
index a3d6e983..0633af2d 100644
--- a/net/http/urislice2cstr.c
+++ b/net/http/urislice2cstr.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "net/http/uri.h"
 
diff --git a/test/dsp/core/float2short_test.c b/test/dsp/core/float2short_test.c
index d0c259c6..0d229565 100644
--- a/test/dsp/core/float2short_test.c
+++ b/test/dsp/core/float2short_test.c
@@ -19,7 +19,7 @@
 #include "dsp/core/core.h"
 #include "dsp/mpeg/mpeg.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/rand/rand.h"
 #include "libc/runtime/buffer.h"
 #include "libc/testlib/ezbench.h"
diff --git a/test/dsp/core/getintegercoefficients_test.c b/test/dsp/core/getintegercoefficients_test.c
index 70888455..d06496de 100644
--- a/test/dsp/core/getintegercoefficients_test.c
+++ b/test/dsp/core/getintegercoefficients_test.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/core.h"
 #include "dsp/core/q.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/gc.h"
 #include "libc/str/str.h"
 #include "libc/testlib/ezbench.h"
diff --git a/test/dsp/core/scalevolume_test.c b/test/dsp/core/scalevolume_test.c
index e308dd36..5edeafb0 100644
--- a/test/dsp/core/scalevolume_test.c
+++ b/test/dsp/core/scalevolume_test.c
@@ -20,7 +20,7 @@
 #include "dsp/mpeg/mpeg.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/rand/rand.h"
 #include "libc/runtime/buffer.h"
diff --git a/test/dsp/scale/scale_test.c b/test/dsp/scale/scale_test.c
index 0ba91e37..7394e7a3 100644
--- a/test/dsp/scale/scale_test.c
+++ b/test/dsp/scale/scale_test.c
@@ -22,7 +22,7 @@
 #include "dsp/core/half.h"
 #include "dsp/scale/scale.h"
 #include "libc/fmt/bing.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
diff --git a/test/dsp/tty/windex_test.c b/test/dsp/tty/windex_test.c
index bdfb49e5..89562a53 100644
--- a/test/dsp/tty/windex_test.c
+++ b/test/dsp/tty/windex_test.c
@@ -20,7 +20,7 @@
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/runtime/gc.h"
diff --git a/test/libc/alg/bisectcarleft_test.c b/test/libc/alg/bisectcarleft_test.c
index 6344530d..1068dd08 100644
--- a/test/libc/alg/bisectcarleft_test.c
+++ b/test/libc/alg/bisectcarleft_test.c
@@ -19,7 +19,7 @@
 #include "libc/alg/alg.h"
 #include "libc/alg/bisectcarleft.internal.h"
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/testlib/testlib.h"
 
diff --git a/test/libc/alg/djbsort_test.c b/test/libc/alg/djbsort_test.c
index ed86fc73..6e866f26 100644
--- a/test/libc/alg/djbsort_test.c
+++ b/test/libc/alg/djbsort_test.c
@@ -19,7 +19,7 @@
 #include "libc/alg/alg.h"
 #include "libc/limits.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/nexgen32e.h"
 #include "libc/nexgen32e/x86feature.h"
diff --git a/test/libc/alg/qsort_test.c b/test/libc/alg/qsort_test.c
index b7d6bdfe..ac7c5fb2 100644
--- a/test/libc/alg/qsort_test.c
+++ b/test/libc/alg/qsort_test.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/alg.h"
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 #include "libc/testlib/testlib.h"
diff --git a/test/libc/alg/reverse_test.c b/test/libc/alg/reverse_test.c
index d10b4e0d..6803d8db 100644
--- a/test/libc/alg/reverse_test.c
+++ b/test/libc/alg/reverse_test.c
@@ -16,9 +16,9 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/alg/reverse.h"
+#include "libc/alg/reverse.internal.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/testlib/testlib.h"
 
 TEST(reverse, test) {
diff --git a/test/libc/alg/tarjan_test.c b/test/libc/alg/tarjan_test.c
index 9eadc0b8..924c638d 100644
--- a/test/libc/alg/tarjan_test.c
+++ b/test/libc/alg/tarjan_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/alg.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/testlib/testlib.h"
 
 STATIC_YOINK("realloc");
@@ -98,7 +98,7 @@ TEST(tarjan, testHeaders) {
       [LIBC_INTEGRAL] = "libc/integral.h",
       [LIBC_KEYWORDS] = "libc/keywords.h",
       [LIBC_DCE] = "libc/dce.h",
-      [LIBC_MACROS] = "libc/macros.h",
+      [LIBC_MACROS] = "libc/macros.internal.h",
       [LIBC_MACROS_CPP] = "libc/macros-cpp.inc",
   };
   int edges[][2] = {
@@ -117,7 +117,7 @@ TEST(tarjan, testHeaders) {
   EXPECT_STREQ("libc/integral.h", vertices[sorted[1]]);
   EXPECT_STREQ("libc/keywords.h", vertices[sorted[2]]);
   EXPECT_STREQ("libc/macros-cpp.inc", vertices[sorted[3]]);
-  EXPECT_STREQ("libc/macros.h", vertices[sorted[4]]);
+  EXPECT_STREQ("libc/macros.internal.h", vertices[sorted[4]]);
   EXPECT_STREQ("libc/bits/bits.h", vertices[sorted[5]]);
   EXPECT_STREQ("libc/str/str.h", vertices[sorted[6]]);
 }
diff --git a/test/libc/bits/integralarithmetic_test.c b/test/libc/bits/integralarithmetic_test.c
index 62902d1a..017b2b28 100644
--- a/test/libc/bits/integralarithmetic_test.c
+++ b/test/libc/bits/integralarithmetic_test.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/testlib/testlib.h"
 
 #define ROR(w, k) (CheckUnsigned(w) >> (k) | (w) << (sizeof(w) * 8 - (k)))
diff --git a/test/libc/bits/rounddown2pow_test.c b/test/libc/bits/rounddown2pow_test.c
index e1e5c243..0d2b8d27 100644
--- a/test/libc/bits/rounddown2pow_test.c
+++ b/test/libc/bits/rounddown2pow_test.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/nexgen32e/bsr.h"
 #include "libc/testlib/testlib.h"
diff --git a/test/libc/bits/roundup2pow_test.c b/test/libc/bits/roundup2pow_test.c
index bfbdaed5..dad3c729 100644
--- a/test/libc/bits/roundup2pow_test.c
+++ b/test/libc/bits/roundup2pow_test.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/nexgen32e/bsr.h"
 #include "libc/testlib/testlib.h"
diff --git a/test/libc/bits/unsignedsubtract_test.c b/test/libc/bits/unsignedsubtract_test.c
deleted file mode 100644
index 18ff4596..00000000
--- a/test/libc/bits/unsignedsubtract_test.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
-│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
-╞══════════════════════════════════════════════════════════════════════════════╡
-│ Copyright 2020 Justine Alexandra Roberts Tunney                              │
-│                                                                              │
-│ Permission to use, copy, modify, and/or distribute this software for         │
-│ any purpose with or without fee is hereby granted, provided that the         │
-│ above copyright notice and this permission notice appear in all copies.      │
-│                                                                              │
-│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ PERFORMANCE OF THIS SOFTWARE.                                                │
-╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
-#include "libc/testlib/testlib.h"
-
-TEST(unsignedsubtract, testMacro) {
-  EXPECT_EQ(5ul, unsignedsubtract(7ul, 2ul));
-  EXPECT_EQ(18ul, unsignedsubtract(2ul, 0xfffffffffffffff0ul));
-}
-
-TEST(unsignedsubtract, testLinked) {
-  EXPECT_EQ(5ul, (unsignedsubtract)(7ul, 2ul));
-  EXPECT_EQ(18ul, (unsignedsubtract)(2ul, 0xfffffffffffffff0ul));
-}
diff --git a/test/libc/calls/commandv_test.c b/test/libc/calls/commandv_test.c
index 329f8c6c..eee748d5 100644
--- a/test/libc/calls/commandv_test.c
+++ b/test/libc/calls/commandv_test.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/dirent.h"
 #include "libc/calls/struct/stat.h"
diff --git a/test/libc/calls/fcntl_test.c b/test/libc/calls/fcntl_test.c
index 22fa325d..be6293ca 100644
--- a/test/libc/calls/fcntl_test.c
+++ b/test/libc/calls/fcntl_test.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/fmt/fmt.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/consts/f.h"
 #include "libc/sysv/consts/o.h"
diff --git a/test/libc/calls/fork_test.c b/test/libc/calls/fork_test.c
index 470e5b31..d70f9320 100644
--- a/test/libc/calls/fork_test.c
+++ b/test/libc/calls/fork_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/consts/map.h"
 #include "libc/sysv/consts/msync.h"
diff --git a/test/libc/calls/getcwd_test.c b/test/libc/calls/getcwd_test.c
index 2d14c841..41350712 100644
--- a/test/libc/calls/getcwd_test.c
+++ b/test/libc/calls/getcwd_test.c
@@ -21,7 +21,7 @@
 #include "libc/fmt/conv.h"
 #include "libc/fmt/fmt.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/gc.h"
 #include "libc/testlib/testlib.h"
 #include "libc/x/x.h"
diff --git a/test/libc/fmt/palandprintf_test.c b/test/libc/fmt/palandprintf_test.c
index 25db155e..b7baeae1 100644
--- a/test/libc/fmt/palandprintf_test.c
+++ b/test/libc/fmt/palandprintf_test.c
@@ -25,7 +25,7 @@
 │ THE SOFTWARE.                                                                │
 └─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/pushpop.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/errno.h"
 #include "libc/fmt/fmt.h"
 #include "libc/fmt/itoa.h"
diff --git a/test/libc/fmt/sprintf_s_test.c b/test/libc/fmt/sprintf_s_test.c
index ca515240..e8cafe6f 100644
--- a/test/libc/fmt/sprintf_s_test.c
+++ b/test/libc/fmt/sprintf_s_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/fmt.h"
 #include "libc/runtime/gc.h"
 #include "libc/testlib/testlib.h"
diff --git a/test/libc/intrin/pmulhrsw_test.c b/test/libc/intrin/pmulhrsw_test.c
index db8ee3af..2ddda913 100644
--- a/test/libc/intrin/pmulhrsw_test.c
+++ b/test/libc/intrin/pmulhrsw_test.c
@@ -19,7 +19,7 @@
 #include "dsp/core/q.h"
 #include "libc/intrin/pmulhrsw.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "libc/testlib/testlib.h"
 #include "tool/viz/lib/formatstringtable-testlib.h"
diff --git a/test/libc/mem/malloc_test.c b/test/libc/mem/malloc_test.c
index 8ca662f0..39384cec 100644
--- a/test/libc/mem/malloc_test.c
+++ b/test/libc/mem/malloc_test.c
@@ -17,10 +17,10 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/rand/rand.h"
 #include "libc/runtime/memtrack.h"
diff --git a/test/libc/nexgen32e/crc32_test.c b/test/libc/nexgen32e/crc32_test.c
index 5e2f3f06..1c30338d 100644
--- a/test/libc/nexgen32e/crc32_test.c
+++ b/test/libc/nexgen32e/crc32_test.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/crc32.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/str/str.h"
diff --git a/test/libc/nexgen32e/lz4decode_test.c b/test/libc/nexgen32e/lz4decode_test.c
index 0caf6ff5..9d78ecad 100644
--- a/test/libc/nexgen32e/lz4decode_test.c
+++ b/test/libc/nexgen32e/lz4decode_test.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/log/check.h"
 #include "libc/mem/mem.h"
diff --git a/test/libc/nexgen32e/memmove_test.c b/test/libc/nexgen32e/memmove_test.c
index 74072f4c..8f564e68 100644
--- a/test/libc/nexgen32e/memmove_test.c
+++ b/test/libc/nexgen32e/memmove_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/rand/rand.h"
 #include "libc/str/str.h"
diff --git a/test/libc/runtime/carsort_test.c b/test/libc/runtime/carsort_test.c
index fd096064..45577e75 100644
--- a/test/libc/runtime/carsort_test.c
+++ b/test/libc/runtime/carsort_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/alg.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/rand/rand.h"
 #include "libc/runtime/carsort.h"
 #include "libc/str/str.h"
diff --git a/test/libc/runtime/grow_test.c b/test/libc/runtime/grow_test.c
index 8f613369..dd118e0f 100644
--- a/test/libc/runtime/grow_test.c
+++ b/test/libc/runtime/grow_test.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/pushpop.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
diff --git a/test/libc/runtime/mmap_test.c b/test/libc/runtime/mmap_test.c
index 445de77a..b0d86e08 100644
--- a/test/libc/runtime/mmap_test.c
+++ b/test/libc/runtime/mmap_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/bits/xchg.h"
+#include "libc/bits/xchg.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/fmt/fmt.h"
 #include "libc/log/log.h"
diff --git a/test/libc/sock/inet_pton_test.c b/test/libc/sock/inet_pton_test.c
index 8229b5fd..1963fb14 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/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/sock/sock.h"
 #include "libc/sysv/consts/af.h"
 #include "libc/sysv/consts/inaddr.h"
diff --git a/test/libc/sock/poll_test.c b/test/libc/sock/poll_test.c
index 7d85df01..09095ae3 100644
--- a/test/libc/sock/poll_test.c
+++ b/test/libc/sock/poll_test.c
@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
 #include "libc/calls/calls.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/gc.h"
 #include "libc/sock/sock.h"
 #include "libc/stdio/stdio.h"
diff --git a/test/libc/str/sigset_test.c b/test/libc/str/sigset_test.c
index d5c78d66..7cb0d58e 100644
--- a/test/libc/str/sigset_test.c
+++ b/test/libc/str/sigset_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/sigbits.h"
 #include "libc/str/str.h"
diff --git a/test/libc/str/strcmp_test.c b/test/libc/str/strcmp_test.c
index 693ebd37..d51b8566 100644
--- a/test/libc/str/strcmp_test.c
+++ b/test/libc/str/strcmp_test.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/cachesize.h"
 #include "libc/nexgen32e/x86feature.h"
diff --git a/test/libc/str/strlen_test.c b/test/libc/str/strlen_test.c
index 30eb3330..db32b8bb 100644
--- a/test/libc/str/strlen_test.c
+++ b/test/libc/str/strlen_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/bsr.h"
 #include "libc/nexgen32e/tinystrlen.internal.h"
diff --git a/test/libc/str/undeflate_test.c b/test/libc/str/undeflate_test.c
index 9f26d593..fd7664b0 100644
--- a/test/libc/str/undeflate_test.c
+++ b/test/libc/str/undeflate_test.c
@@ -20,7 +20,7 @@
 #include "libc/calls/struct/stat.h"
 #include "libc/errno.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/crc32.h"
 #include "libc/runtime/gc.h"
@@ -93,6 +93,7 @@ TEST(undeflate, testEmbeddedCompressedZipFile_theHardWay) {
   ASSERT_GE(ZIP_CDIR_RECORDS(cd), 1);
   for (i = 0, cf = map + ZIP_CDIR_OFFSET(cd); i < ZIP_CDIR_RECORDS(cd);
        ++i, cf += ZIP_CFILE_HDRSIZE(cf)) {
+    fprintf(stderr, "%.*s\n", ZIP_CFILE_NAMESIZE(cf), ZIP_CFILE_NAME(cf));
     if (strncmp("libc/testlib/hyperion.txt", ZIP_CFILE_NAME(cf),
                 ZIP_CFILE_NAMESIZE(cf)) == 0) {
       lf = map + ZIP_CFILE_OFFSET(cf);
diff --git a/test/libc/time/clock_gettime_test.c b/test/libc/time/clock_gettime_test.c
index 07de62b7..5cf33e94 100644
--- a/test/libc/time/clock_gettime_test.c
+++ b/test/libc/time/clock_gettime_test.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/struct/timespec.h"
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/gc.h"
 #include "libc/stdio/stdio.h"
 #include "libc/sysv/consts/clock.h"
diff --git a/test/libc/xed/x86ild_lib.c b/test/libc/xed/x86ild_lib.c
index 88c87f08..57ebbc30 100644
--- a/test/libc/xed/x86ild_lib.c
+++ b/test/libc/xed/x86ild_lib.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/bing.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/gc.h"
 #include "libc/str/str.h"
 #include "libc/testlib/testlib.h"
diff --git a/test/net/http/uriparse_test.c b/test/net/http/uriparse_test.c
index 4b7f3b90..833c799f 100644
--- a/test/net/http/uriparse_test.c
+++ b/test/net/http/uriparse_test.c
@@ -20,7 +20,7 @@
 #include "libc/bits/initializer.internal.h"
 #include "libc/errno.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/gc.h"
 #include "libc/stdio/stdio.h"
diff --git a/test/tool/build/lib/asmdown_test.c b/test/tool/build/lib/asmdown_test.c
index fe457a7f..eee69258 100644
--- a/test/tool/build/lib/asmdown_test.c
+++ b/test/tool/build/lib/asmdown_test.c
@@ -23,7 +23,7 @@
 TEST(ParseAsmdown, test) {
   struct Asmdown *ad;
   const char *s = "\
-#include \"libc/macros.h\"\n\
+#include \"libc/macros.internal.h\"\n\
 .source	__FILE__\n\
 \n\
 /	Returns absolute value of double.\n\
@@ -86,7 +86,7 @@ tinymath_acos:\n\
 TEST(ParseAsmdown, testAlias) {
   struct Asmdown *ad;
   const char *s = "\
-#include \"libc/macros.h\"\n\
+#include \"libc/macros.internal.h\"\n\
 .source	__FILE__\n\
 \n\
 /	Returns arc cosine of 𝑥.\n\
@@ -136,7 +136,7 @@ tinymath_acos:\n\
 TEST(ParseAsmdown, testClangIsEvil) {
   struct Asmdown *ad;
   const char *s = "\
-#include \"libc/macros.h\"\n\
+#include \"libc/macros.internal.h\"\n\
 .source	__FILE__\n\
 \n\
 //	Returns arc cosine of 𝑥.\n\
diff --git a/test/tool/build/lib/bitscan_test.c b/test/tool/build/lib/bitscan_test.c
index 650c4fed..d2e8a19b 100644
--- a/test/tool/build/lib/bitscan_test.c
+++ b/test/tool/build/lib/bitscan_test.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/testlib/testlib.h"
 #include "test/tool/build/lib/numbers.h"
 #include "tool/build/lib/bitscan.h"
diff --git a/test/tool/build/lib/bsu_test.c b/test/tool/build/lib/bsu_test.c
index 6c9b0b4a..8a7593bf 100644
--- a/test/tool/build/lib/bsu_test.c
+++ b/test/tool/build/lib/bsu_test.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
 #include "libc/testlib/testlib.h"
diff --git a/test/tool/build/lib/optest.c b/test/tool/build/lib/optest.c
index 85a0decf..35a4c0c7 100644
--- a/test/tool/build/lib/optest.c
+++ b/test/tool/build/lib/optest.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/weaken.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
 #include "test/tool/build/lib/numbers.h"
diff --git a/test/tool/viz/lib/fun_test.c b/test/tool/viz/lib/fun_test.c
index d38ecc73..e97b3ac8 100644
--- a/test/tool/viz/lib/fun_test.c
+++ b/test/tool/viz/lib/fun_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/rand/rand.h"
 #include "libc/runtime/gc.h"
 #include "libc/str/str.h"
diff --git a/test/tool/viz/lib/ycbcr2rgb2_test.c b/test/tool/viz/lib/ycbcr2rgb2_test.c
index 9625be25..ac63a5b3 100644
--- a/test/tool/viz/lib/ycbcr2rgb2_test.c
+++ b/test/tool/viz/lib/ycbcr2rgb2_test.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/mpeg/mpeg.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/rand/rand.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
diff --git a/third_party/chibicc/as.c b/third_party/chibicc/as.c
index c154db24..ce33af3b 100644
--- a/third_party/chibicc/as.c
+++ b/third_party/chibicc/as.c
@@ -22,7 +22,7 @@
 #include "libc/fmt/conv.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/bsr.h"
 #include "libc/runtime/runtime.h"
diff --git a/third_party/chibicc/chibicc.h b/third_party/chibicc/chibicc.h
index 2d51e3c5..aef946e1 100644
--- a/third_party/chibicc/chibicc.h
+++ b/third_party/chibicc/chibicc.h
@@ -12,7 +12,7 @@
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/bsf.h"
 #include "libc/nexgen32e/bsr.h"
diff --git a/third_party/chibicc/test/vla_test.c b/third_party/chibicc/test/vla_test.c
index 870e0477..b5010645 100644
--- a/third_party/chibicc/test/vla_test.c
+++ b/third_party/chibicc/test/vla_test.c
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "third_party/chibicc/test/test.h"
 
 int index1d(int xn, int p[xn], int x) {
diff --git a/third_party/compiler_rt/comprt.S b/third_party/compiler_rt/comprt.S
index 215364d8..8591b108 100644
--- a/third_party/compiler_rt/comprt.S
+++ b/third_party/compiler_rt/comprt.S
@@ -1,4 +1,4 @@
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Nop ref this to force pull the license into linkage.
 	.section .yoink
diff --git a/third_party/dlmalloc/dlmalloc.c b/third_party/dlmalloc/dlmalloc.c
index 978b701b..4bf1b981 100644
--- a/third_party/dlmalloc/dlmalloc.c
+++ b/third_party/dlmalloc/dlmalloc.c
@@ -1,5 +1,5 @@
 #include "libc/bits/initializer.internal.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/bits/weaken.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/sysinfo.h"
@@ -7,7 +7,7 @@
 #include "libc/fmt/conv.h"
 #include "libc/intrin/asan.internal.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nt/systeminfo.h"
 #include "libc/runtime/runtime.h"
diff --git a/third_party/dlmalloc/initdlmalloc.S b/third_party/dlmalloc/initdlmalloc.S
index 248ed8f4..5ef5a91f 100644
--- a/third_party/dlmalloc/initdlmalloc.S
+++ b/third_party/dlmalloc/initdlmalloc.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 //	Sneak ahead ctor list b/c runtime weakly links malloc.
diff --git a/third_party/duktape/dukhexdectab.S b/third_party/duktape/dukhexdectab.S
index 88f90464..ec9f6035 100644
--- a/third_party/duktape/dukhexdectab.S
+++ b/third_party/duktape/dukhexdectab.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.initbss 300,_init_duk_hex_dectab
 duk_hex_dectab:
diff --git a/third_party/getopt/initgetopt.S b/third_party/getopt/initgetopt.S
index 5ba920cc..457c31ee 100644
--- a/third_party/getopt/initgetopt.S
+++ b/third_party/getopt/initgetopt.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 .source	__FILE__
 
 	.init.start 201,_init_getopt
diff --git a/third_party/regex/regerror.c b/third_party/regex/regerror.c
index e8a5bc88..b9762b1c 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/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/fmt.h"
 #include "libc/str/str.h"
 #include "third_party/regex/regex.h"
diff --git a/third_party/stb/idct-sse.S b/third_party/stb/idct-sse.S
index 0dc09583..0ab2c1a1 100644
--- a/third_party/stb/idct-sse.S
+++ b/third_party/stb/idct-sse.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Computes inverse discrete cosine transform.
 //
diff --git a/third_party/stb/stb_image.c b/third_party/stb/stb_image.c
index de10cfa0..e80805b1 100644
--- a/third_party/stb/stb_image.c
+++ b/third_party/stb/stb_image.c
@@ -23,7 +23,7 @@
 #include "libc/limits.h"
 #include "libc/log/gdb.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/x86feature.h"
diff --git a/third_party/stb/stb_image_resize.c b/third_party/stb/stb_image_resize.c
index 6d30d49f..233accf7 100644
--- a/third_party/stb/stb_image_resize.c
+++ b/third_party/stb/stb_image_resize.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
diff --git a/third_party/stb/stb_image_write.c b/third_party/stb/stb_image_write.c
index 8bc167ae..771ce614 100644
--- a/third_party/stb/stb_image_write.c
+++ b/third_party/stb/stb_image_write.c
@@ -123,7 +123,7 @@
 #include "libc/fmt/conv.h"
 #include "libc/fmt/fmt.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/nexgen32e.h"
diff --git a/third_party/stb/ycbcr-sse2.S b/third_party/stb/ycbcr-sse2.S
index 1415ee80..9c0e495a 100644
--- a/third_party/stb/ycbcr-sse2.S
+++ b/third_party/stb/ycbcr-sse2.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.align	16
 stbi__YCbCr_to_RGB_row$sse2:
diff --git a/third_party/stb/ycbcr.c b/third_party/stb/ycbcr.c
index 6d9cfaeb..a2053fda 100644
--- a/third_party/stb/ycbcr.c
+++ b/third_party/stb/ycbcr.c
@@ -19,7 +19,7 @@
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "third_party/stb/internal.h"
 
diff --git a/third_party/xed/x86ild.greg.c b/third_party/xed/x86ild.greg.c
index be3fada1..92179484 100644
--- a/third_party/xed/x86ild.greg.c
+++ b/third_party/xed/x86ild.greg.c
@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/bsr.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/third_party/xed/x86tab.S b/third_party/xed/x86tab.S
index 74fd0d89..2abb847f 100644
--- a/third_party/xed/x86tab.S
+++ b/third_party/xed/x86tab.S
@@ -16,7 +16,7 @@
 │ See the License for the specific language governing permissions and          │
 │ limitations under the License.                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Phash tables for instruction length decoding.
 //	@see	build/rle.py for more context here
diff --git a/third_party/zlib/adler32.c b/third_party/zlib/adler32.c
index 7cac2d3f..228cd268 100644
--- a/third_party/zlib/adler32.c
+++ b/third_party/zlib/adler32.c
@@ -9,7 +9,7 @@
 #include "libc/dce.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "third_party/zlib/internal.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/zutil.internal.h"
 
 asm(".ident\t\"\\n\\n\
 zlib (zlib License)\\n\
diff --git a/third_party/zlib/chunkcopy.h b/third_party/zlib/chunkcopy.internal.h
similarity index 99%
rename from third_party/zlib/chunkcopy.h
rename to third_party/zlib/chunkcopy.internal.h
index cc12ba0f..1439fe6a 100644
--- a/third_party/zlib/chunkcopy.h
+++ b/third_party/zlib/chunkcopy.internal.h
@@ -1,7 +1,7 @@
 #ifndef THIRD_PARTY_ZLIB_CHUNKCOPY_H
 #define THIRD_PARTY_ZLIB_CHUNKCOPY_H
 #include "libc/bits/emmintrin.internal.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/zutil.internal.h"
 
 asm(".ident\t\"\\n\\n\
 Chromium (BSD-3 License)\\n\
diff --git a/third_party/zlib/crc32.c b/third_party/zlib/crc32.c
index 11a12313..42e2b67b 100644
--- a/third_party/zlib/crc32.c
+++ b/third_party/zlib/crc32.c
@@ -9,9 +9,9 @@
 #include "libc/dce.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/str/str.h"
-#include "third_party/zlib/deflate.h"
+#include "third_party/zlib/deflate.internal.h"
 #include "third_party/zlib/internal.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/zutil.internal.h"
 
 asm(".ident\t\"\\n\\n\
 zlib (zlib License)\\n\
diff --git a/third_party/zlib/crc32concat.c b/third_party/zlib/crc32concat.c
index 32a4979b..e5594f42 100644
--- a/third_party/zlib/crc32concat.c
+++ b/third_party/zlib/crc32concat.c
@@ -6,9 +6,9 @@
 │ Use of this source code is governed by the BSD-style licenses that can       │
 │ be found in the third_party/zlib/LICENSE file.                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "third_party/zlib/deflate.h"
+#include "third_party/zlib/deflate.internal.h"
 #include "third_party/zlib/internal.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/zutil.internal.h"
 
 asm(".ident\t\"\\n\\n\
 zlib (zlib License)\\n\
diff --git a/third_party/zlib/crcfold.c b/third_party/zlib/crcfold.c
index a022a611..6dde2962 100644
--- a/third_party/zlib/crcfold.c
+++ b/third_party/zlib/crcfold.c
@@ -11,7 +11,7 @@
 #include "libc/bits/wmmintrin.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
-#include "third_party/zlib/deflate.h"
+#include "third_party/zlib/deflate.internal.h"
 #include "third_party/zlib/internal.h"
 
 #ifndef __llvm__
diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c
index 0370b368..59dc2d6b 100644
--- a/third_party/zlib/deflate.c
+++ b/third_party/zlib/deflate.c
@@ -7,13 +7,13 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/x86feature.h"
 #include "libc/str/str.h"
-#include "third_party/zlib/deflate.h"
+#include "third_party/zlib/deflate.internal.h"
 #include "third_party/zlib/internal.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/zutil.internal.h"
 
 asm(".ident\t\"\\n\\n\
 inflate 1.2.11 (zlib License)\\n\
diff --git a/third_party/zlib/deflate.h b/third_party/zlib/deflate.internal.h
similarity index 96%
rename from third_party/zlib/deflate.h
rename to third_party/zlib/deflate.internal.h
index 452f8c48..1b17ffd5 100644
--- a/third_party/zlib/deflate.h
+++ b/third_party/zlib/deflate.internal.h
@@ -1,6 +1,6 @@
 #ifndef DEFLATE_H
 #define DEFLATE_H
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/zutil.internal.h"
 
 /* define NO_GZIP when compiling if you want to disable gzip header and
    trailer creation by deflate(). NO_GZIP would be used to avoid linking
@@ -40,12 +40,12 @@
 #ifdef GZIP
 #define GZIP_STATE 57 /* gzip header -> BUSY_STATE | EXTRA_STATE */
 #endif
-#define EXTRA_STATE 69   /* gzip extra block -> NAME_STATE */
-#define NAME_STATE 73    /* gzip file name -> COMMENT_STATE */
-#define COMMENT_STATE 91 /* gzip comment -> HCRC_STATE */
-#define HCRC_STATE 103   /* gzip header CRC -> BUSY_STATE */
-#define BUSY_STATE 113   /* deflate -> FINISH_STATE */
-#define FINISH_STATE 666 /* stream complete */
+#define EXTRA_STATE   69  /* gzip extra block -> NAME_STATE */
+#define NAME_STATE    73  /* gzip file name -> COMMENT_STATE */
+#define COMMENT_STATE 91  /* gzip comment -> HCRC_STATE */
+#define HCRC_STATE    103 /* gzip header CRC -> BUSY_STATE */
+#define BUSY_STATE    113 /* deflate -> FINISH_STATE */
+#define FINISH_STATE  666 /* stream complete */
 
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
@@ -64,8 +64,8 @@ typedef struct ct_data_s {
 
 #define Freq fc.freq
 #define Code fc.code
-#define Dad dl.dad
-#define Len dl.len
+#define Dad  dl.dad
+#define Len  dl.len
 
 typedef struct static_tree_desc_s static_tree_desc;
 
diff --git a/third_party/zlib/deflateinit.S b/third_party/zlib/deflateinit.S
index 14924427..4035a92b 100644
--- a/third_party/zlib/deflateinit.S
+++ b/third_party/zlib/deflateinit.S
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "third_party/zlib/zlib.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 deflateInit:
 	mov	$Z_DEFLATED,%edx
diff --git a/third_party/zlib/deflatesse.c b/third_party/zlib/deflatesse.c
index 72d6e41f..1b870ffe 100644
--- a/third_party/zlib/deflatesse.c
+++ b/third_party/zlib/deflatesse.c
@@ -7,9 +7,9 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/emmintrin.internal.h"
 #include "libc/str/str.h"
-#include "third_party/zlib/deflate.h"
+#include "third_party/zlib/deflate.internal.h"
 #include "third_party/zlib/internal.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/zutil.internal.h"
 
 asm(".ident\t\"\\n\\n\
 zlib » sse2 fill window (zlib License)\\n\
diff --git a/third_party/zlib/infback.c b/third_party/zlib/infback.c
index 42274587..34ffa8e5 100644
--- a/third_party/zlib/infback.c
+++ b/third_party/zlib/infback.c
@@ -6,11 +6,11 @@
 │ be found in the third_party/zlib/LICENSE file.                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/str/str.h"
-#include "third_party/zlib/inffast.h"
-#include "third_party/zlib/inflate.h"
-#include "third_party/zlib/inftrees.h"
+#include "third_party/zlib/inffast.internal.h"
+#include "third_party/zlib/inflate.internal.h"
+#include "third_party/zlib/inftrees.internal.h"
 #include "third_party/zlib/internal.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/zutil.internal.h"
 
 asm(".ident\t\"\\n\\n\
 zlib (zlib License)\\n\
diff --git a/third_party/zlib/inffast.c b/third_party/zlib/inffast.c
index 71e62f05..177a39a0 100644
--- a/third_party/zlib/inffast.c
+++ b/third_party/zlib/inffast.c
@@ -5,10 +5,10 @@
 │ Use of this source code is governed by the BSD-style licenses that can       │
 │ be found in the third_party/zlib/LICENSE file.                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "third_party/zlib/inffast.h"
-#include "third_party/zlib/inflate.h"
-#include "third_party/zlib/inftrees.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/inffast.internal.h"
+#include "third_party/zlib/inflate.internal.h"
+#include "third_party/zlib/inftrees.internal.h"
+#include "third_party/zlib/zutil.internal.h"
 
 asm(".ident\t\"\\n\\n\
 zlib (zlib License)\\n\
diff --git a/third_party/zlib/inffast.h b/third_party/zlib/inffast.internal.h
similarity index 95%
rename from third_party/zlib/inffast.h
rename to third_party/zlib/inffast.internal.h
index 5b8456d9..8fd191bf 100644
--- a/third_party/zlib/inffast.h
+++ b/third_party/zlib/inffast.internal.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_THIRD_PARTY_ZLIB_INFFAST_H_
 #define COSMOPOLITAN_THIRD_PARTY_ZLIB_INFFAST_H_
-#include "third_party/zlib/inffast.h"
+#include "third_party/zlib/inffast.internal.h"
 #include "third_party/zlib/zlib.h"
 
 /* INFLATE_FAST_MIN_INPUT: the minimum number of input bytes needed so that
diff --git a/third_party/zlib/inffastchunk.c b/third_party/zlib/inffastchunk.c
index cce9be3f..58363b8d 100644
--- a/third_party/zlib/inffastchunk.c
+++ b/third_party/zlib/inffastchunk.c
@@ -6,12 +6,12 @@
 │ be found in the third_party/zlib/LICENSE file.                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "third_party/zlib/chunkcopy.h"
-#include "third_party/zlib/inffast.h"
-#include "third_party/zlib/inflate.h"
-#include "third_party/zlib/inftrees.h"
+#include "third_party/zlib/chunkcopy.internal.h"
+#include "third_party/zlib/inffast.internal.h"
+#include "third_party/zlib/inflate.internal.h"
+#include "third_party/zlib/inftrees.internal.h"
 #include "third_party/zlib/zlib.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/zutil.internal.h"
 
 asm(".ident\t\"\\n\\n\
 zlib (zlib License)\\n\
diff --git a/third_party/zlib/inffixed.c b/third_party/zlib/inffixed.c
index 12df5d1c..54b19fb4 100644
--- a/third_party/zlib/inffixed.c
+++ b/third_party/zlib/inffixed.c
@@ -1,11 +1,11 @@
-#include "third_party/zlib/inftrees.h"
+#include "third_party/zlib/inftrees.internal.h"
 
 /**
  * @fileoverview tables for decoding fixed codes
  * @note generated by makefixed()
  */
 
-const struct zcode kZlibLenfix[512] = {
+hidden const struct zcode kZlibLenfix[512] = {
     {96, 7, 0},   {0, 8, 80},   {0, 8, 16},   {20, 8, 115}, {18, 7, 31},
     {0, 8, 112},  {0, 8, 48},   {0, 9, 192},  {16, 7, 10},  {0, 8, 96},
     {0, 8, 32},   {0, 9, 160},  {0, 8, 0},    {0, 8, 128},  {0, 8, 64},
@@ -111,7 +111,7 @@ const struct zcode kZlibLenfix[512] = {
     {0, 8, 79},   {0, 9, 255},
 };
 
-const struct zcode kZlibDistfix[32] = {
+hidden const struct zcode kZlibDistfix[32] = {
     {16, 5, 1},    {23, 5, 257},  {19, 5, 17},    {27, 5, 4097},  {17, 5, 5},
     {25, 5, 1025}, {21, 5, 65},   {29, 5, 16385}, {16, 5, 3},     {24, 5, 513},
     {20, 5, 33},   {28, 5, 8193}, {18, 5, 9},     {26, 5, 2049},  {22, 5, 129},
diff --git a/third_party/zlib/inflate.c b/third_party/zlib/inflate.c
index 3c880012..c7fbae98 100644
--- a/third_party/zlib/inflate.c
+++ b/third_party/zlib/inflate.c
@@ -6,12 +6,12 @@
 │ be found in the third_party/zlib/LICENSE file.                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/str/str.h"
-#include "third_party/zlib/chunkcopy.h"
-#include "third_party/zlib/inffast.h"
-#include "third_party/zlib/inflate.h"
-#include "third_party/zlib/inftrees.h"
+#include "third_party/zlib/chunkcopy.internal.h"
+#include "third_party/zlib/inffast.internal.h"
+#include "third_party/zlib/inflate.internal.h"
+#include "third_party/zlib/inftrees.internal.h"
 #include "third_party/zlib/internal.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/zutil.internal.h"
 
 asm(".ident\t\"\\n\\n\
 zlib (zlib License)\\n\
diff --git a/third_party/zlib/inflate.h b/third_party/zlib/inflate.internal.h
similarity index 99%
rename from third_party/zlib/inflate.h
rename to third_party/zlib/inflate.internal.h
index 6a68de87..9a1ed86a 100644
--- a/third_party/zlib/inflate.h
+++ b/third_party/zlib/inflate.internal.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_THIRD_PARTY_ZLIB_INFLATE_H_
 #define COSMOPOLITAN_THIRD_PARTY_ZLIB_INFLATE_H_
-#include "third_party/zlib/inftrees.h"
+#include "third_party/zlib/inftrees.internal.h"
 #include "third_party/zlib/zlib.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
diff --git a/third_party/zlib/inflateinit.S b/third_party/zlib/inflateinit.S
index a6cac3e7..520698ed 100644
--- a/third_party/zlib/inflateinit.S
+++ b/third_party/zlib/inflateinit.S
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "third_party/zlib/zutil.h"
-#include "libc/macros.h"
+#include "third_party/zlib/zutil.internal.h"
+#include "libc/macros.internal.h"
 
 inflateInit:
 	mov	$DEF_WBITS,%esi
diff --git a/third_party/zlib/inftrees.c b/third_party/zlib/inftrees.c
index b839d900..25fb853e 100644
--- a/third_party/zlib/inftrees.c
+++ b/third_party/zlib/inftrees.c
@@ -5,8 +5,8 @@
 │ Use of this source code is governed by the BSD-style licenses that can       │
 │ be found in the third_party/zlib/LICENSE file.                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "third_party/zlib/inftrees.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/inftrees.internal.h"
+#include "third_party/zlib/zutil.internal.h"
 
 asm(".ident\t\"\\n\\n\
 inflate 1.2.11 (zlib License)\\n\
diff --git a/third_party/zlib/inftrees.h b/third_party/zlib/inftrees.internal.h
similarity index 100%
rename from third_party/zlib/inftrees.h
rename to third_party/zlib/inftrees.internal.h
diff --git a/third_party/zlib/internal.h b/third_party/zlib/internal.h
index c5efe640..3888cfc0 100644
--- a/third_party/zlib/internal.h
+++ b/third_party/zlib/internal.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_THIRD_PARTY_ZLIB_INTERNAL_H_
 #define COSMOPOLITAN_THIRD_PARTY_ZLIB_INTERNAL_H_
-#include "third_party/zlib/deflate.h"
+#include "third_party/zlib/deflate.internal.h"
 
 #define Z_CRC32_SSE42_MINIMUM_LENGTH 64
 #define Z_CRC32_SSE42_CHUNKSIZE_MASK 15
diff --git a/third_party/zlib/kdistcode.S b/third_party/zlib/kdistcode.S
index 820ac36d..16508dfa 100644
--- a/third_party/zlib/kdistcode.S
+++ b/third_party/zlib/kdistcode.S
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "third_party/zlib/deflate.h"
-#include "libc/macros.h"
+#include "third_party/zlib/deflate.internal.h"
+#include "libc/macros.internal.h"
 
 	.initbss 300,_init_kZlibDistCode
 kZlibDistCode:
diff --git a/third_party/zlib/klengthcode.S b/third_party/zlib/klengthcode.S
index 7173b9d1..436e2383 100644
--- a/third_party/zlib/klengthcode.S
+++ b/third_party/zlib/klengthcode.S
@@ -16,8 +16,8 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "third_party/zlib/zutil.h"
-#include "libc/macros.h"
+#include "third_party/zlib/zutil.internal.h"
+#include "libc/macros.internal.h"
 
 	.initbss 300,_init_kZlibLengthCode
 kZlibLengthCode:
diff --git a/third_party/zlib/kstaticdtree.c b/third_party/zlib/kstaticdtree.c
index 40cac3a8..390d9ef7 100644
--- a/third_party/zlib/kstaticdtree.c
+++ b/third_party/zlib/kstaticdtree.c
@@ -1,6 +1,6 @@
 #include "third_party/zlib/internal.h"
 
-const ct_data kZlibStaticDtree[D_CODES] = {
+hidden const ct_data kZlibStaticDtree[D_CODES] = {
     {{0}, {5}},  {{16}, {5}}, {{8}, {5}},  {{24}, {5}}, {{4}, {5}},
     {{20}, {5}}, {{12}, {5}}, {{28}, {5}}, {{2}, {5}},  {{18}, {5}},
     {{10}, {5}}, {{26}, {5}}, {{6}, {5}},  {{22}, {5}}, {{14}, {5}},
diff --git a/third_party/zlib/kstaticltree.c b/third_party/zlib/kstaticltree.c
index 675eac03..f5f6ec10 100644
--- a/third_party/zlib/kstaticltree.c
+++ b/third_party/zlib/kstaticltree.c
@@ -1,6 +1,6 @@
 #include "third_party/zlib/internal.h"
 
-const ct_data kZlibStaticLtree[L_CODES + 2] = {
+hidden const ct_data kZlibStaticLtree[L_CODES + 2] = {
     {{12}, {8}},  {{140}, {8}}, {{76}, {8}},  {{204}, {8}}, {{44}, {8}},
     {{172}, {8}}, {{108}, {8}}, {{236}, {8}}, {{28}, {8}},  {{156}, {8}},
     {{92}, {8}},  {{220}, {8}}, {{60}, {8}},  {{188}, {8}}, {{124}, {8}},
diff --git a/third_party/zlib/treeconst.c b/third_party/zlib/treeconst.c
index 37fa4100..001205a3 100644
--- a/third_party/zlib/treeconst.c
+++ b/third_party/zlib/treeconst.c
@@ -1,12 +1,12 @@
 /* header created automatically with -DGEN_TREES_H */
 #include "third_party/zlib/internal.h"
 
-const int kZlibBaseLength[LENGTH_CODES] = {
+hidden const int kZlibBaseLength[LENGTH_CODES] = {
     0,  1,  2,  3,  4,  5,  6,  7,  8,   10,  12,  14,  16,  20, 24,
     28, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 0,
 };
 
-const int kZlibBaseDist[D_CODES] = {
+hidden const int kZlibBaseDist[D_CODES] = {
     0,    1,    2,    3,    4,    6,    8,    12,    16,    24,
     32,   48,   64,   96,   128,  192,  256,  384,   512,   768,
     1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576,
diff --git a/third_party/zlib/trees.c b/third_party/zlib/trees.c
index 48ab9f05..b1ce6456 100644
--- a/third_party/zlib/trees.c
+++ b/third_party/zlib/trees.c
@@ -7,7 +7,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
-#include "third_party/zlib/deflate.h"
+#include "third_party/zlib/deflate.internal.h"
 #include "third_party/zlib/internal.h"
 
 asm(".ident\t\"\\n\\n\
@@ -822,7 +822,9 @@ void _tr_stored_block(struct DeflateState *s, charf *buf, uint64_t stored_len,
 /**
  * Flushes bits in bit buffer to pending output (leaves at most 7 bits)
  */
-void _tr_flush_bits(struct DeflateState *s) { bi_flush(s); }
+void _tr_flush_bits(struct DeflateState *s) {
+  bi_flush(s);
+}
 
 /**
  * Sends one empty static block to give enough lookahead for inflate.
diff --git a/third_party/zlib/zalloc.c b/third_party/zlib/zalloc.c
index ab6c5b10..e791f50e 100644
--- a/third_party/zlib/zalloc.c
+++ b/third_party/zlib/zalloc.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/weaken.h"
 #include "libc/mem/mem.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/zutil.internal.h"
 
 void *zcalloc(void *opaque, unsigned items, unsigned size) {
   return weaken(malloc)(items * size);
diff --git a/third_party/zlib/zutil.c b/third_party/zlib/zutil.c
index ea02e1be..43b8407e 100644
--- a/third_party/zlib/zutil.c
+++ b/third_party/zlib/zutil.c
@@ -6,7 +6,7 @@
 │ be found in the third_party/zlib/LICENSE file.                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/mem/mem.h"
-#include "third_party/zlib/zutil.h"
+#include "third_party/zlib/zutil.internal.h"
 
 asm(".ident\t\"\\n\\n\
 zlib (zlib License)\\n\
@@ -26,7 +26,9 @@ const char *const z_errmsg[10] = {
     (const char *)"",
 };
 
-const char *zlibVersion() { return ZLIB_VERSION; }
+const char *zlibVersion() {
+  return ZLIB_VERSION;
+}
 
 uLong zlibCompileFlags() {
   uLong flags;
@@ -125,4 +127,6 @@ void z_error(char *m) {
  * Exported to allow conversion of error code to string for compress()
  * and uncompress()
  */
-const char *zError(int err) { return ERR_MSG(err); }
+const char *zError(int err) {
+  return ERR_MSG(err);
+}
diff --git a/third_party/zlib/zutil.h b/third_party/zlib/zutil.internal.h
similarity index 96%
rename from third_party/zlib/zutil.h
rename to third_party/zlib/zutil.internal.h
index 02ac9fa2..388fbf3d 100644
--- a/third_party/zlib/zutil.h
+++ b/third_party/zlib/zutil.internal.h
@@ -12,7 +12,7 @@
 /* The three kinds of block type */
 #define STORED_BLOCK 0
 #define STATIC_TREES 1
-#define DYN_TREES 2
+#define DYN_TREES    2
 
 /* The minimum and maximum match lengths */
 #define MIN_MATCH 3
@@ -32,7 +32,7 @@ COSMOPOLITAN_C_START_
    define "local" for the non-static meaning of "static", for readability
    (compile with -Dlocal if your debugger can't find static symbols) */
 
-extern const char *const z_errmsg[10]; /* indexed by 2-zlib_error */
+extern const char *const z_errmsg[10] hidden; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
 
 #define ERR_MSG(err) z_errmsg[Z_NEED_DICT - (err)]
diff --git a/tool/build/ar.c b/tool/build/ar.c
index 1ab48e1f..487d6ef8 100644
--- a/tool/build/ar.c
+++ b/tool/build/ar.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/arraylist2.internal.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/stat.h"
@@ -27,7 +27,7 @@
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sock/sock.h"
 #include "libc/stdio/stdio.h"
diff --git a/tool/build/blinkenlights.c b/tool/build/blinkenlights.c
index 1a1b9515..ccc3ad85 100644
--- a/tool/build/blinkenlights.c
+++ b/tool/build/blinkenlights.c
@@ -21,7 +21,7 @@
 #include "libc/alg/arraylist2.internal.h"
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/ioctl.h"
 #include "libc/calls/struct/iovec.h"
@@ -40,7 +40,7 @@
 #include "libc/log/check.h"
 #include "libc/log/color.internal.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/gc.h"
@@ -2773,7 +2773,7 @@ static void GetOpts(int argc, char *argv[]) {
         memset(&g_high, 0, sizeof(g_high));
         break;
       case 'v':
-        ++g_loglevel;
+        ++__log_level;
         break;
       case 'L':
         strcpy(logpath, optarg);
@@ -2790,8 +2790,8 @@ static void GetOpts(int argc, char *argv[]) {
         PrintUsage(EX_USAGE, stderr);
     }
   }
-  g_logfile = fopen(logpath, "a");
-  setvbuf(g_logfile, xmalloc(PAGESIZE), _IOLBF, PAGESIZE);
+  __log_file = fopen(logpath, "a");
+  setvbuf(__log_file, xmalloc(PAGESIZE), _IOLBF, PAGESIZE);
 }
 
 static int OpenDevTty(void) {
diff --git a/tool/build/calculator.c b/tool/build/calculator.c
index 2a314ece..8e87d82c 100644
--- a/tool/build/calculator.c
+++ b/tool/build/calculator.c
@@ -20,7 +20,7 @@
 #include "libc/limits.h"
 #include "libc/log/color.internal.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/rand/rand.h"
diff --git a/tool/build/compile.c b/tool/build/compile.c
index 0ea18f0a..c5079ee6 100644
--- a/tool/build/compile.c
+++ b/tool/build/compile.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/copyfile.h"
 #include "libc/calls/sigbits.h"
diff --git a/tool/build/dis.c b/tool/build/dis.c
index 9bd17419..401792e4 100644
--- a/tool/build/dis.c
+++ b/tool/build/dis.c
@@ -25,7 +25,7 @@
 #include "libc/elf/struct/sym.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/struct/importobjectheader.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
diff --git a/tool/build/emucrt/emucrt.S b/tool/build/emucrt/emucrt.S
index 98b1a8e6..6c814268 100644
--- a/tool/build/emucrt/emucrt.S
+++ b/tool/build/emucrt/emucrt.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.section .start,"ax",@progbits
 emucrt:	bofram	9f
diff --git a/tool/build/helpop.c b/tool/build/helpop.c
index 8c4f3405..5d419452 100644
--- a/tool/build/helpop.c
+++ b/tool/build/helpop.c
@@ -16,9 +16,9 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
diff --git a/tool/build/lib/buffer.c b/tool/build/lib/buffer.c
index 1202b2c4..631af841 100644
--- a/tool/build/lib/buffer.c
+++ b/tool/build/lib/buffer.c
@@ -20,7 +20,7 @@
 #include "libc/calls/calls.h"
 #include "libc/errno.h"
 #include "libc/fmt/fmt.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/fmt.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
diff --git a/tool/build/lib/cga.c b/tool/build/lib/cga.c
index d22465de..74b1b914 100644
--- a/tool/build/lib/cga.c
+++ b/tool/build/lib/cga.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/itoa.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "tool/build/lib/buffer.h"
 #include "tool/build/lib/cga.h"
diff --git a/tool/build/lib/cvt.c b/tool/build/lib/cvt.c
index 1c2968a2..7a85bb26 100644
--- a/tool/build/lib/cvt.c
+++ b/tool/build/lib/cvt.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "tool/build/lib/cvt.h"
 #include "tool/build/lib/endian.h"
diff --git a/tool/build/lib/demangle.c b/tool/build/lib/demangle.c
index 89422226..5206651e 100644
--- a/tool/build/lib/demangle.c
+++ b/tool/build/lib/demangle.c
@@ -17,10 +17,10 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/iovec.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sock/sock.h"
 #include "libc/str/str.h"
diff --git a/tool/build/lib/dis.c b/tool/build/lib/dis.c
index aaca950e..315d82d9 100644
--- a/tool/build/lib/dis.c
+++ b/tool/build/lib/dis.c
@@ -18,13 +18,13 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/alg.h"
 #include "libc/alg/arraylist2.internal.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/bing.internal.h"
 #include "libc/fmt/fmt.h"
 #include "libc/fmt/itoa.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
diff --git a/tool/build/lib/disarg.c b/tool/build/lib/disarg.c
index c957e960..76a576c0 100644
--- a/tool/build/lib/disarg.c
+++ b/tool/build/lib/disarg.c
@@ -21,7 +21,7 @@
 #include "libc/fmt/itoa.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "tool/build/lib/demangle.h"
 #include "tool/build/lib/dis.h"
diff --git a/tool/build/lib/diself.c b/tool/build/lib/diself.c
index 6231d6c2..2fa5f9d0 100644
--- a/tool/build/lib/diself.c
+++ b/tool/build/lib/diself.c
@@ -21,7 +21,7 @@
 #include "libc/elf/struct/sym.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 #include "tool/build/lib/dis.h"
diff --git a/tool/build/lib/elfwriter.c b/tool/build/lib/elfwriter.c
index 74521170..9910f561 100644
--- a/tool/build/lib/elfwriter.c
+++ b/tool/build/lib/elfwriter.c
@@ -20,7 +20,7 @@
 #include "libc/assert.h"
 #include "libc/calls/calls.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/fmt.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/gc.h"
diff --git a/tool/build/lib/errnos.S b/tool/build/lib/errnos.S
index 7ed4edac..e55c7d25 100644
--- a/tool/build/lib/errnos.S
+++ b/tool/build/lib/errnos.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.macro	.errno	local:req linux:req
 	.globl	\local
diff --git a/tool/build/lib/instruction.c b/tool/build/lib/instruction.c
index 59f09594..038d12d2 100644
--- a/tool/build/lib/instruction.c
+++ b/tool/build/lib/instruction.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/bsf.h"
 #include "libc/str/str.h"
 #include "third_party/xed/x86.h"
diff --git a/tool/build/lib/interner.c b/tool/build/lib/interner.c
index 0f68d55e..820c24d9 100644
--- a/tool/build/lib/interner.c
+++ b/tool/build/lib/interner.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/arraylist.internal.h"
 #include "libc/alg/arraylist2.internal.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/crc32.h"
 #include "libc/str/str.h"
diff --git a/tool/build/lib/iovs.h b/tool/build/lib/iovs.h
index 09089a84..06da7890 100644
--- a/tool/build/lib/iovs.h
+++ b/tool/build/lib/iovs.h
@@ -1,7 +1,7 @@
 #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_IOVS_H_
 #define COSMOPOLITAN_TOOL_BUILD_LIB_IOVS_H_
 #include "libc/calls/struct/iovec.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
diff --git a/tool/build/lib/loader.c b/tool/build/lib/loader.c
index e1d5ddce..1e424d30 100644
--- a/tool/build/lib/loader.c
+++ b/tool/build/lib/loader.c
@@ -23,7 +23,7 @@
 #include "libc/elf/struct/phdr.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/vendor.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
diff --git a/tool/build/lib/machine.c b/tool/build/lib/machine.c
index b88f35d4..c6478ce4 100644
--- a/tool/build/lib/machine.c
+++ b/tool/build/lib/machine.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/rand/rand.h"
 #include "libc/runtime/runtime.h"
 #include "tool/build/lib/abp.h"
diff --git a/tool/build/lib/mda.c b/tool/build/lib/mda.c
index c466aab6..52b9ab67 100644
--- a/tool/build/lib/mda.c
+++ b/tool/build/lib/mda.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "tool/build/lib/buffer.h"
 #include "tool/build/lib/mda.h"
diff --git a/tool/build/lib/memory.c b/tool/build/lib/memory.c
index 7e4d20bf..e8a8cc68 100644
--- a/tool/build/lib/memory.c
+++ b/tool/build/lib/memory.c
@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 #include "libc/x/x.h"
diff --git a/tool/build/lib/message.c b/tool/build/lib/message.c
index d32a9e77..299e1ed3 100644
--- a/tool/build/lib/message.c
+++ b/tool/build/lib/message.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
diff --git a/tool/build/lib/panel.c b/tool/build/lib/panel.c
index ca6b1828..a0ee6527 100644
--- a/tool/build/lib/panel.c
+++ b/tool/build/lib/panel.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/conv.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
diff --git a/tool/build/lib/persist.c b/tool/build/lib/persist.c
index 942a1f32..59c565ba 100644
--- a/tool/build/lib/persist.c
+++ b/tool/build/lib/persist.c
@@ -19,7 +19,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/bsr.h"
 #include "libc/runtime/gc.h"
 #include "libc/sock/sock.h"
diff --git a/tool/build/lib/pml4tfmt.c b/tool/build/lib/pml4tfmt.c
index 5cd57baf..a4324f75 100644
--- a/tool/build/lib/pml4tfmt.c
+++ b/tool/build/lib/pml4tfmt.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/x/x.h"
 #include "tool/build/lib/buffer.h"
diff --git a/tool/build/lib/pty.c b/tool/build/lib/pty.c
index 833df35b..99cf8b73 100644
--- a/tool/build/lib/pty.c
+++ b/tool/build/lib/pty.c
@@ -19,12 +19,12 @@
 #include "libc/alg/arraylist2.internal.h"
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/bsr.h"
 #include "libc/runtime/runtime.h"
diff --git a/tool/build/lib/reset.c b/tool/build/lib/reset.c
index 26f14e14..f5bd60c9 100644
--- a/tool/build/lib/reset.c
+++ b/tool/build/lib/reset.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
diff --git a/tool/build/lib/sse.c b/tool/build/lib/sse.c
index 4b37992c..f75f1724 100644
--- a/tool/build/lib/sse.c
+++ b/tool/build/lib/sse.c
@@ -92,7 +92,7 @@
 #include "libc/intrin/punpcklqdq.h"
 #include "libc/intrin/punpcklwd.h"
 #include "libc/intrin/pxor.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "tool/build/lib/case.h"
 #include "tool/build/lib/machine.h"
 #include "tool/build/lib/memory.h"
diff --git a/tool/build/lib/ssefloat.c b/tool/build/lib/ssefloat.c
index 030f957d..22935f22 100644
--- a/tool/build/lib/ssefloat.c
+++ b/tool/build/lib/ssefloat.c
@@ -24,7 +24,7 @@
 #include "libc/intrin/shufpd.h"
 #include "libc/intrin/shufps.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/str/str.h"
 #include "tool/build/lib/endian.h"
diff --git a/tool/build/lib/stack.c b/tool/build/lib/stack.c
index d8057f61..0ebe775d 100644
--- a/tool/build/lib/stack.c
+++ b/tool/build/lib/stack.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "tool/build/lib/address.h"
 #include "tool/build/lib/endian.h"
 #include "tool/build/lib/memory.h"
diff --git a/tool/build/lib/string.c b/tool/build/lib/string.c
index 8c883c4a..33638808 100644
--- a/tool/build/lib/string.c
+++ b/tool/build/lib/string.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"
 #include "tool/build/lib/address.h"
diff --git a/tool/build/lib/syscall.c b/tool/build/lib/syscall.c
index bb6d9d1a..554dab97 100644
--- a/tool/build/lib/syscall.c
+++ b/tool/build/lib/syscall.c
@@ -33,7 +33,7 @@
 #include "libc/fmt/fmt.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/vendor.internal.h"
 #include "libc/runtime/gc.h"
diff --git a/tool/build/lz4toasm.c b/tool/build/lz4toasm.c
index 78747bf0..5f9489a8 100644
--- a/tool/build/lz4toasm.c
+++ b/tool/build/lz4toasm.c
@@ -21,7 +21,7 @@
 #include "libc/fmt/conv.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/kompressor.h"
 #include "libc/nexgen32e/lz4.h"
diff --git a/tool/build/mkdeps.c b/tool/build/mkdeps.c
index 41384bf5..0ebffa57 100644
--- a/tool/build/mkdeps.c
+++ b/tool/build/mkdeps.c
@@ -22,14 +22,14 @@
 #include "libc/alg/bisectcarleft.internal.h"
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/errno.h"
 #include "libc/fmt/fmt.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/crc32.h"
 #include "libc/runtime/ezmap.internal.h"
 #include "libc/runtime/gc.h"
diff --git a/tool/build/package.c b/tool/build/package.c
index 9d9671aa..26fe5de9 100644
--- a/tool/build/package.c
+++ b/tool/build/package.c
@@ -22,7 +22,7 @@
 #include "libc/alg/bisectcarleft.internal.h"
 #include "libc/assert.h"
 #include "libc/bits/bswap.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/elf/def.h"
@@ -32,7 +32,7 @@
 #include "libc/fmt/conv.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/bsr.h"
 #include "libc/nexgen32e/kompressor.h"
@@ -227,7 +227,7 @@ void GetOpts(struct Package *pkg, struct Packages *deps, int argc,
   while ((opt = getopt(argc, argv, "vho:d:")) != -1) {
     switch (opt) {
       case 'v':
-        g_loglevel = kLogDebug;
+        __log_level = kLogDebug;
         break;
       case 'o':
         pkg->path = concat(&pkg->strings, optarg, strlen(optarg) + 1);
diff --git a/tool/build/refactor.c b/tool/build/refactor.c
index 0c83034e..f08e7cde 100644
--- a/tool/build/refactor.c
+++ b/tool/build/refactor.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/alg.h"
 #include "libc/assert.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/dirent.h"
 #include "libc/calls/struct/stat.h"
diff --git a/tool/build/runit.c b/tool/build/runit.c
index 0e43bc03..5964840b 100644
--- a/tool/build/runit.c
+++ b/tool/build/runit.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/alg.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/sigbits.h"
 #include "libc/calls/struct/flock.h"
@@ -465,7 +465,7 @@ int RunRemoteTestsInParallel(char *hosts[], int count) {
 
 int main(int argc, char *argv[]) {
   showcrashreports();
-  /* g_loglevel = kLogDebug; */
+  /* __log_level = kLogDebug; */
   if (argc > 1 &&
       (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0)) {
     ShowUsage(stdout, 0);
diff --git a/tool/build/runitd.c b/tool/build/runitd.c
index 0af4789b..1ee3e27f 100644
--- a/tool/build/runitd.c
+++ b/tool/build/runitd.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/sigbits.h"
 #include "libc/calls/struct/sigaction.h"
@@ -28,7 +28,7 @@
 #include "libc/fmt/fmt.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nt/runtime.h"
 #include "libc/paths.h"
 #include "libc/runtime/gc.h"
@@ -435,7 +435,7 @@ void Daemonize(void) {
 
 int main(int argc, char *argv[]) {
   showcrashreports();
-  /* g_loglevel = kLogDebug; */
+  /* __log_level = kLogDebug; */
   GetOpts(argc, argv);
   CHECK_NE(-1, (g_devnullfd = open("/dev/null", O_RDWR)));
   defer(close_s, &g_devnullfd);
diff --git a/tool/build/x86combos.c b/tool/build/x86combos.c
index 2d2b7dd2..a2145940 100644
--- a/tool/build/x86combos.c
+++ b/tool/build/x86combos.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/o.h"
diff --git a/tool/build/zipobj.c b/tool/build/zipobj.c
index f80c4e6f..76c842ec 100644
--- a/tool/build/zipobj.c
+++ b/tool/build/zipobj.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/arraylist.internal.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/calls/struct/timespec.h"
@@ -27,7 +27,7 @@
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/alloca.h"
 #include "libc/nexgen32e/crc32.h"
 #include "libc/nt/enum/fileflagandattributes.h"
diff --git a/tool/decode/elf.c b/tool/decode/elf.c
index 2d7a09ba..1948ae7d 100644
--- a/tool/decode/elf.c
+++ b/tool/decode/elf.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/elf/elf.h"
@@ -26,7 +26,7 @@
 #include "libc/fmt/conv.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
 #include "libc/sysv/consts/map.h"
diff --git a/tool/decode/lib/asmcodegen.c b/tool/decode/lib/asmcodegen.c
index a2a42523..04798cf3 100644
--- a/tool/decode/lib/asmcodegen.c
+++ b/tool/decode/lib/asmcodegen.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/fmt.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/gc.h"
diff --git a/tool/decode/lib/bitabuilder.c b/tool/decode/lib/bitabuilder.c
index b2d7523c..c803b870 100644
--- a/tool/decode/lib/bitabuilder.c
+++ b/tool/decode/lib/bitabuilder.c
@@ -19,7 +19,7 @@
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
diff --git a/tool/decode/lib/pollnames.S b/tool/decode/lib/pollnames.S
index f6bdd716..04468259 100644
--- a/tool/decode/lib/pollnames.S
+++ b/tool/decode/lib/pollnames.S
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "ape/relocations.h"
 #include "ape/relocations.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.Lrows = 0			# w/ 2 cols
 
diff --git a/tool/decode/macho.c b/tool/decode/macho.c
index 419c3118..a587a374 100644
--- a/tool/decode/macho.c
+++ b/tool/decode/macho.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/fmt/conv.h"
diff --git a/tool/decode/mkcombos.c b/tool/decode/mkcombos.c
index d4bdd0c9..750929d2 100644
--- a/tool/decode/mkcombos.c
+++ b/tool/decode/mkcombos.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/fmt/conv.h"
 #include "libc/log/check.h"
diff --git a/tool/decode/mkwides.c b/tool/decode/mkwides.c
index 52ffa481..062bbe3b 100644
--- a/tool/decode/mkwides.c
+++ b/tool/decode/mkwides.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/fmt.h"
 #include "libc/log/check.h"
 #include "libc/mem/mem.h"
diff --git a/tool/decode/pe2.c b/tool/decode/pe2.c
index fe1e9c08..d932329d 100644
--- a/tool/decode/pe2.c
+++ b/tool/decode/pe2.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/fmt/conv.h"
diff --git a/tool/decode/x86opinfo.c b/tool/decode/x86opinfo.c
index 0fc23d94..97f289c4 100644
--- a/tool/decode/x86opinfo.c
+++ b/tool/decode/x86opinfo.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
diff --git a/tool/decode/zip.c b/tool/decode/zip.c
index 011076b6..58f7b79a 100644
--- a/tool/decode/zip.c
+++ b/tool/decode/zip.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
 #include "libc/fmt/conv.h"
diff --git a/tool/hash/crctab.c b/tool/hash/crctab.c
index 65612d79..4b9fdffd 100644
--- a/tool/hash/crctab.c
+++ b/tool/hash/crctab.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
 #include "libc/fmt/conv.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/crc32.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
diff --git a/tool/net/echoserver.c b/tool/net/echoserver.c
index 81e1342f..8184d260 100644
--- a/tool/net/echoserver.c
+++ b/tool/net/echoserver.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/arraylist.internal.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/errno.h"
diff --git a/tool/net/redbean.c b/tool/net/redbean.c
index 376e1fdd..4419f855 100644
--- a/tool/net/redbean.c
+++ b/tool/net/redbean.c
@@ -19,7 +19,7 @@
 #include "libc/alg/arraylist2.internal.h"
 #include "libc/bits/bits.h"
 #include "libc/bits/bswap.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/iovec.h"
 #include "libc/calls/struct/itimerval.h"
@@ -30,7 +30,7 @@
 #include "libc/fmt/itoa.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/crc32.h"
@@ -374,7 +374,7 @@ void GetOpts(int argc, char *argv[]) {
   while ((opt = getopt(argc, argv, "zhduvml:p:w:r:c:L:P:U:G:B:")) != -1) {
     switch (opt) {
       case 'v':
-        g_loglevel++;
+        __log_level++;
         break;
       case 'd':
         daemonize = true;
diff --git a/tool/viz/basicidea.c b/tool/viz/basicidea.c
index a6a4f0cc..c5e5e17b 100644
--- a/tool/viz/basicidea.c
+++ b/tool/viz/basicidea.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/core.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/ioctl.h"
 #include "libc/calls/struct/winsize.h"
@@ -25,7 +25,7 @@
 #include "libc/fmt/fmt.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/gc.h"
diff --git a/tool/viz/deathstar.c b/tool/viz/deathstar.c
index 344052a2..9f56c891 100644
--- a/tool/viz/deathstar.c
+++ b/tool/viz/deathstar.c
@@ -1,11 +1,11 @@
 #include "dsp/tty/tty.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/termios.h"
 #include "libc/log/check.h"
 #include "libc/log/color.internal.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
diff --git a/tool/viz/derasterize.c b/tool/viz/derasterize.c
index af52d594..26784aeb 100644
--- a/tool/viz/derasterize.c
+++ b/tool/viz/derasterize.c
@@ -27,7 +27,7 @@
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/x86feature.h"
diff --git a/tool/viz/double2int.c b/tool/viz/double2int.c
index 0ede5642..c7a7fd92 100644
--- a/tool/viz/double2int.c
+++ b/tool/viz/double2int.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/gc.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
diff --git a/tool/viz/fold.c b/tool/viz/fold.c
index b07c305d..23347552 100644
--- a/tool/viz/fold.c
+++ b/tool/viz/fold.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/errno.h"
 #include "libc/fmt/conv.h"
 #include "libc/runtime/runtime.h"
diff --git a/tool/viz/generatematrix.c b/tool/viz/generatematrix.c
index 407cfdb8..fff8eaf1 100644
--- a/tool/viz/generatematrix.c
+++ b/tool/viz/generatematrix.c
@@ -16,13 +16,13 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/conv.h"
 #include "libc/fmt/fmt.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/rand/lcg.internal.h"
diff --git a/tool/viz/int2float.c b/tool/viz/int2float.c
index 392b447c..222b135d 100644
--- a/tool/viz/int2float.c
+++ b/tool/viz/int2float.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
 #include "libc/limits.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/gc.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
diff --git a/tool/viz/lib/bilinearscale.c b/tool/viz/lib/bilinearscale.c
index ad536492..57f9787a 100644
--- a/tool/viz/lib/bilinearscale.c
+++ b/tool/viz/lib/bilinearscale.c
@@ -19,7 +19,7 @@
 #include "dsp/core/twixt8.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/bsr.h"
diff --git a/tool/viz/lib/dither.c b/tool/viz/lib/dither.c
index a7fb182e..db1f0c8e 100644
--- a/tool/viz/lib/dither.c
+++ b/tool/viz/lib/dither.c
@@ -21,7 +21,7 @@
 #include "libc/bits/morton.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/gc.h"
diff --git a/tool/viz/lib/doublechrominance.S b/tool/viz/lib/doublechrominance.S
index f871eacc..e62aed0b 100644
--- a/tool/viz/lib/doublechrominance.S
+++ b/tool/viz/lib/doublechrominance.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 //	Duplicates chrominance samples horizontally, e.g.
 //
diff --git a/tool/viz/lib/formatstringtable-assembly.c b/tool/viz/lib/formatstringtable-assembly.c
index 3946c12f..7942137c 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/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/itoa.h"
 #include "libc/runtime/gc.h"
 #include "libc/str/str.h"
diff --git a/tool/viz/lib/formatstringtable-code.c b/tool/viz/lib/formatstringtable-code.c
index cfaea706..1fbfe724 100644
--- a/tool/viz/lib/formatstringtable-code.c
+++ b/tool/viz/lib/formatstringtable-code.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/itoa.h"
 #include "tool/viz/lib/formatstringtable.h"
 
diff --git a/tool/viz/lib/formatstringtable-testlib.h b/tool/viz/lib/formatstringtable-testlib.h
index 8fccae85..389efc13 100644
--- a/tool/viz/lib/formatstringtable-testlib.h
+++ b/tool/viz/lib/formatstringtable-testlib.h
@@ -1,6 +1,6 @@
 #ifndef COSMOPOLITAN_TOOL_VIZ_LIB_FORMATSTRINGTABLE_TESTLIB_H_
 #define COSMOPOLITAN_TOOL_VIZ_LIB_FORMATSTRINGTABLE_TESTLIB_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/str/str.h"
 #include "libc/testlib/testlib.h"
 #include "tool/viz/lib/formatstringtable.h"
diff --git a/tool/viz/lib/formatstringtable.c b/tool/viz/lib/formatstringtable.c
index c08c430f..96f1f2ac 100644
--- a/tool/viz/lib/formatstringtable.c
+++ b/tool/viz/lib/formatstringtable.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/unicode/unicode.h"
 #include "tool/viz/lib/formatstringtable.h"
 
diff --git a/tool/viz/lib/gaussian.c b/tool/viz/lib/gaussian.c
index 010381d8..46568a79 100644
--- a/tool/viz/lib/gaussian.c
+++ b/tool/viz/lib/gaussian.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/xmmintrin.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
diff --git a/tool/viz/lib/getxtermcodes.c b/tool/viz/lib/getxtermcodes.c
index 6e6d1679..2214ce77 100644
--- a/tool/viz/lib/getxtermcodes.c
+++ b/tool/viz/lib/getxtermcodes.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/quant.h"
 #include "libc/bits/xmmintrin.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "tool/viz/lib/graphic.h"
 
 void getxtermcodes(struct TtyRgb *p, const struct Graphic *g) {
diff --git a/tool/viz/lib/perlin3.c b/tool/viz/lib/perlin3.c
index 09ad7346..18bf13d6 100644
--- a/tool/viz/lib/perlin3.c
+++ b/tool/viz/lib/perlin3.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/bits.h"
 #include "libc/bits/initializer.internal.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "tool/viz/lib/graphic.h"
 
diff --git a/tool/viz/lib/sharpen.c b/tool/viz/lib/sharpen.c
index 82b1d1a9..fc020a61 100644
--- a/tool/viz/lib/sharpen.c
+++ b/tool/viz/lib/sharpen.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/core/ks8.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
diff --git a/tool/viz/lib/sobel.c b/tool/viz/lib/sobel.c
index 8608614c..a7cdaeb5 100644
--- a/tool/viz/lib/sobel.c
+++ b/tool/viz/lib/sobel.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/nexgen32e.h"
diff --git a/tool/viz/lib/stringbuilder.c b/tool/viz/lib/stringbuilder.c
index 4b8baffe..e4edb3fe 100644
--- a/tool/viz/lib/stringbuilder.c
+++ b/tool/viz/lib/stringbuilder.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 #include "libc/x/x.h"
diff --git a/tool/viz/lib/thunks/expect_matrixeq.S b/tool/viz/lib/thunks/expect_matrixeq.S
index d8aeca6a..1ea6332c 100644
--- a/tool/viz/lib/thunks/expect_matrixeq.S
+++ b/tool/viz/lib/thunks/expect_matrixeq.S
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 
 	.text.unlikely
 testlib_showerror_expect_matrixeq:
diff --git a/tool/viz/lib/unsharp.c b/tool/viz/lib/unsharp.c
index 743989fc..56cfbe3a 100644
--- a/tool/viz/lib/unsharp.c
+++ b/tool/viz/lib/unsharp.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
 #include "libc/sysv/errfuns.h"
diff --git a/tool/viz/lib/writetoframebuffer.c b/tool/viz/lib/writetoframebuffer.c
index 1792f65a..93058205 100644
--- a/tool/viz/lib/writetoframebuffer.c
+++ b/tool/viz/lib/writetoframebuffer.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "tool/viz/lib/graphic.h"
 
 void WriteToFrameBuffer(size_t dyn, size_t dxn, unsigned char dst[dyn][dxn][4],
diff --git a/tool/viz/lib/ycbcr2rgb3.c b/tool/viz/lib/ycbcr2rgb3.c
index 126d1ef3..fbe987d9 100644
--- a/tool/viz/lib/ycbcr2rgb3.c
+++ b/tool/viz/lib/ycbcr2rgb3.c
@@ -32,7 +32,7 @@
 #include "libc/intrin/pmulhrsw.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/gc.internal.h"
diff --git a/tool/viz/life.c b/tool/viz/life.c
index 755e240e..672516b4 100644
--- a/tool/viz/life.c
+++ b/tool/viz/life.c
@@ -20,8 +20,8 @@
 #include "dsp/scale/scale.h"
 #include "libc/bits/bits.h"
 #include "libc/bits/popcnt.h"
-#include "libc/bits/safemacros.h"
-#include "libc/bits/xchg.h"
+#include "libc/bits/safemacros.internal.h"
+#include "libc/bits/xchg.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/ioctl.h"
 #include "libc/calls/struct/stat.h"
@@ -34,7 +34,7 @@
 #include "libc/fmt/itoa.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/nt2sysv.h"
 #include "libc/nt/comdlg.h"
diff --git a/tool/viz/magikarp.c b/tool/viz/magikarp.c
index df34240c..196d4f2e 100644
--- a/tool/viz/magikarp.c
+++ b/tool/viz/magikarp.c
@@ -26,7 +26,7 @@
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/bsr.h"
diff --git a/tool/viz/memzoom.c b/tool/viz/memzoom.c
index a4a84a17..f70fad40 100644
--- a/tool/viz/memzoom.c
+++ b/tool/viz/memzoom.c
@@ -20,7 +20,7 @@
 #include "libc/bits/bits.h"
 #include "libc/bits/hilbert.h"
 #include "libc/bits/morton.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/ioctl.h"
 #include "libc/calls/struct/sigaction.h"
@@ -33,7 +33,7 @@
 #include "libc/fmt/conv.h"
 #include "libc/fmt/itoa.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/nexgen32e/bsf.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sock/sock.h"
diff --git a/tool/viz/printansi.c b/tool/viz/printansi.c
index 1d5f38f2..f66ac2d3 100644
--- a/tool/viz/printansi.c
+++ b/tool/viz/printansi.c
@@ -23,7 +23,7 @@
 #include "dsp/tty/tty.h"
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/ioctl.h"
 #include "libc/calls/struct/stat.h"
@@ -33,7 +33,7 @@
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/rand/rand.h"
@@ -159,7 +159,7 @@ static void GetOpts(int *argc, char *argv[]) {
         g_flags.blocks = kTtyBlocksUnicode;
         break;
       case 'v':
-        ++g_loglevel;
+        ++__log_level;
         break;
       case '?':
         PrintUsage(EXIT_SUCCESS, stdout);
diff --git a/tool/viz/printimage.c b/tool/viz/printimage.c
index 6c543e9a..132fb7a1 100644
--- a/tool/viz/printimage.c
+++ b/tool/viz/printimage.c
@@ -23,7 +23,7 @@
 #include "dsp/tty/tty.h"
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/ioctl.h"
 #include "libc/calls/struct/stat.h"
@@ -33,7 +33,7 @@
 #include "libc/limits.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/rand/rand.h"
@@ -165,7 +165,7 @@ static void GetOpts(int *argc, char *argv[]) {
         g_flags.blocks = kTtyBlocksUnicode;
         break;
       case 'v':
-        ++g_loglevel;
+        ++__log_level;
         break;
       case '?':
         PrintUsage(EXIT_SUCCESS, stdout);
diff --git a/tool/viz/printpeb.c b/tool/viz/printpeb.c
index 1d55913d..8c6151d0 100644
--- a/tool/viz/printpeb.c
+++ b/tool/viz/printpeb.c
@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/dce.h"
diff --git a/tool/viz/printvideo.c b/tool/viz/printvideo.c
index 31537533..df6aba50 100644
--- a/tool/viz/printvideo.c
+++ b/tool/viz/printvideo.c
@@ -27,8 +27,8 @@
 #include "libc/alg/arraylist.internal.h"
 #include "libc/assert.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/safemacros.h"
-#include "libc/bits/xchg.h"
+#include "libc/bits/safemacros.internal.h"
+#include "libc/bits/xchg.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/ioctl.h"
@@ -49,7 +49,7 @@
 #include "libc/fmt/itoa.h"
 #include "libc/log/check.h"
 #include "libc/log/log.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/bench.h"
@@ -491,9 +491,9 @@ static bool TrySpeaker(const char *prog, char *const *args) {
   CHECK_NE(-1, pipe2(pipefds, O_CLOEXEC));
   if (!(playpid_ = fork())) {
     dup2(pipefds[0], 0);
-    dup2(fileno(g_logfile), 1);
-    dup2(fileno(g_logfile), 2);
-    close(fileno(g_logfile));
+    dup2(fileno(__log_file), 1);
+    dup2(fileno(__log_file), 2);
+    close(fileno(__log_file));
     execv(prog, args);
     abort();
   }
@@ -1314,7 +1314,7 @@ static void GetOpts(int argc, char *argv[]) {
         yes_ = true;
         break;
       case 'v':
-        ++g_loglevel;
+        ++__log_level;
         break;
       case 'L':
         snprintf(logpath_, sizeof(logpath_), "%s", optarg);
@@ -1492,7 +1492,7 @@ int main(int argc, char *argv[]) {
     xsigaction(SIGPIPE, OnSigPipe, 0, 0, NULL);
     if (ttyraw(kTtyLfToCrLf) != -1) ttymode_ = true;
     __cxa_atexit(OnExit, NULL, NULL);
-    g_logfile = fopen(logpath_, "a");
+    __log_file = fopen(logpath_, "a");
     if (ischardev(infd_) && ischardev(outfd_)) {
       /* CHECK_NE(-1, fcntl(infd_, F_SETFL, O_NONBLOCK)); */
     } else if (infd_ != outfd_) {
diff --git a/tool/viz/tabalign.c b/tool/viz/tabalign.c
index d2b54cd6..6c0e4fdd 100644
--- a/tool/viz/tabalign.c
+++ b/tool/viz/tabalign.c
@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/arraylist.internal.h"
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/fmt/conv.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
diff --git a/tool/viz/tailf.c b/tool/viz/tailf.c
index a65fa8cf..b8d00451 100644
--- a/tool/viz/tailf.c
+++ b/tool/viz/tailf.c
@@ -16,10 +16,10 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/bits/safemacros.h"
+#include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/runtime/runtime.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
diff --git a/tool/viz/upscalefloat.c b/tool/viz/upscalefloat.c
index f3533ba6..6bdd087f 100644
--- a/tool/viz/upscalefloat.c
+++ b/tool/viz/upscalefloat.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/stat.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
diff --git a/tool/viz/upscaleint.c b/tool/viz/upscaleint.c
index bbcf8b9c..c757b070 100644
--- a/tool/viz/upscaleint.c
+++ b/tool/viz/upscaleint.c
@@ -21,7 +21,7 @@
 #include "libc/calls/struct/stat.h"
 #include "libc/limits.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
diff --git a/tool/viz/xterm256effective.c b/tool/viz/xterm256effective.c
index d18915cf..f0b223b0 100644
--- a/tool/viz/xterm256effective.c
+++ b/tool/viz/xterm256effective.c
@@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "dsp/tty/quant.h"
 #include "libc/bits/bits.h"
-#include "libc/bits/xchg.h"
+#include "libc/bits/xchg.internal.h"
 #include "libc/fmt/fmt.h"
 #include "libc/math.h"
 #include "libc/runtime/runtime.h"
diff --git a/tool/viz/xterm256effective2.c b/tool/viz/xterm256effective2.c
index 06ccdcd5..9bc23fe4 100644
--- a/tool/viz/xterm256effective2.c
+++ b/tool/viz/xterm256effective2.c
@@ -19,7 +19,7 @@
 #include "dsp/tty/quant.h"
 #include "libc/fmt/fmt.h"
 #include "libc/log/check.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"