Clean up more code

- Found some bugs in LLVM compiler-rt library
- The useless LIBC_STUBS package is now deleted
- Improve the overflow checking story even further
- Get chibicc tests working in MODE=dbg mode again
- The libc/isystem/ headers now have correctly named guards

libc/isystem/assert.h

@@ -1,4 +1,4 @@
-#ifndef LIBC_ISYSTEM_ASSERT_H_
-#define LIBC_ISYSTEM_ASSERT_H_
+#ifndef _ASSERT_H
+#define _ASSERT_H
 #include "libc/assert.h"
-#endif
+#endif /* _ASSERT_H */

libc/isystem/byteswap.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_BYTESWAP_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_BYTESWAP_H_
+#ifndef _BYTESWAP_H
+#define _BYTESWAP_H
 #include "libc/intrin/bswap.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_BYTESWAP_H_ */
+#endif /* _BYTESWAP_H */

libc/isystem/complex.h

@@ -1,6 +1,6 @@
-#ifndef LIBC_ISYSTEM_COMPLEX_H_
-#define LIBC_ISYSTEM_COMPLEX_H_
+#ifndef _COMPLEX_H
+#define _COMPLEX_H
 #include "libc/complex.h"
 #include "libc/imag.internal.h"
 #include "libc/math.h"
-#endif
+#endif /* _COMPLEX_H */

libc/isystem/cosmo.h

@@ -30,6 +30,7 @@
 #include "libc/calls/struct/timespec.h"
 #include "libc/calls/struct/timeval.h"
 #include "libc/dce.h"
+#include "libc/elf/elf.h"
 #include "libc/fmt/itoa.h"
 #include "libc/fmt/leb128.h"
 #include "libc/intrin/bsf.h"

libc/isystem/cpio.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CPIO_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_CPIO_H_
+#ifndef _CPIO_H
+#define _CPIO_H
 #include "libc/sysv/consts/c.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CPIO_H_ */
+#endif /* _CPIO_H */

libc/isystem/cpuid.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CPUID_INTERNAL_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_CPUID_INTERNAL_H_
+#ifndef _CPUID_H
+#define _CPUID_H
 #include "third_party/intel/cpuid.internal.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CPUID_INTERNAL_H_ */
+#endif /* _CPUID_H */

libc/isystem/crypt.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_CRYPT_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_CRYPT_H_
+#ifndef _CRYPT_H
+#define _CRYPT_H
 #include "third_party/musl/crypt.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_CRYPT_H_ */
+#endif /* _CRYPT_H */

libc/isystem/ctype.h

@@ -1,4 +1,4 @@
-#ifndef LIBC_ISYSTEM_CTYPE_H_
-#define LIBC_ISYSTEM_CTYPE_H_
+#ifndef _CTYPE_H
+#define _CTYPE_H
 #include "libc/str/str.h"
-#endif
+#endif /* _CTYPE_H */

libc/isystem/dirent.h

@@ -1,7 +1,7 @@
-#ifndef LIBC_ISYSTEM_DIRENT_H_
-#define LIBC_ISYSTEM_DIRENT_H_
+#ifndef _DIRENT_H
+#define _DIRENT_H
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/dirent.h"
 #include "libc/calls/weirdtypes.h"
 #include "libc/sysv/consts/dt.h"
-#endif
+#endif /* _DIRENT_H */

libc/isystem/dlfcn.h

@@ -1,4 +1,4 @@
-#ifndef LIBC_ISYSTEM_SYS_DLFCN_H_
-#define LIBC_ISYSTEM_SYS_DLFCN_H_
+#ifndef _DLFCN_H
+#define _DLFCN_H
 #include "libc/runtime/dlfcn.h"
-#endif
+#endif /* _DLFCN_H */

libc/isystem/dog.py

@@ -1,4 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_DOG_PY_
-#define COSMOPOLITAN_LIBC_ISYSTEM_DOG_PY_
-#include "third_party/intel/dog.py"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_DOG_PY_ */

libc/isystem/elf.h

@@ -1,4 +1,22 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_ELF_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_ELF_H_
-#include "libc/elf/elf.h"
-#endif
+#ifndef _ELF_H
+#define _ELF_H
+#include "libc/elf/def.h"
+#include "libc/elf/scalar.h"
+#include "libc/elf/struct/auxv.h"
+#include "libc/elf/struct/chdr.h"
+#include "libc/elf/struct/dyn.h"
+#include "libc/elf/struct/ehdr.h"
+#include "libc/elf/struct/lib.h"
+#include "libc/elf/struct/move.h"
+#include "libc/elf/struct/nhdr.h"
+#include "libc/elf/struct/phdr.h"
+#include "libc/elf/struct/rel.h"
+#include "libc/elf/struct/rela.h"
+#include "libc/elf/struct/shdr.h"
+#include "libc/elf/struct/sym.h"
+#include "libc/elf/struct/syminfo.h"
+#include "libc/elf/struct/verdaux.h"
+#include "libc/elf/struct/verdef.h"
+#include "libc/elf/struct/vernaux.h"
+#include "libc/elf/struct/verneed.h"
+#endif /* _ELF_H */

libc/isystem/endian.h

@@ -1,5 +1,5 @@
-#ifndef LIBC_ISYSTEM_ENDIAN_H_
-#define LIBC_ISYSTEM_ENDIAN_H_
+#ifndef _ENDIAN_H
+#define _ENDIAN_H
 #include "libc/intrin/newbie.h"
 #include "libc/sysv/consts/endian.h"
-#endif /* LIBC_ISYSTEM_ENDIAN_H_ */
+#endif /* _ENDIAN_H */

libc/isystem/err.h

@@ -1,4 +1,4 @@
-#ifndef LIBC_ISYSTEM_ERR_H_
-#define LIBC_ISYSTEM_ERR_H_
+#ifndef _ERR_H
+#define _ERR_H
 #include "libc/log/bsd.h"
-#endif
+#endif /* _ERR_H */

libc/isystem/errno.h

@@ -1,4 +1,4 @@
-#ifndef LIBC_ISYSTEM_ERRNO_H_
-#define LIBC_ISYSTEM_ERRNO_H_
+#ifndef _ERRNO_H
+#define _ERRNO_H
 #include "libc/errno.h"
-#endif
+#endif /* _ERRNO_H */

libc/isystem/fcntl.h

@@ -1,5 +1,5 @@
-#ifndef LIBC_ISYSTEM_SYS_FCNTL_H_
-#define LIBC_ISYSTEM_SYS_FCNTL_H_
+#ifndef _FCNTL_H
+#define _FCNTL_H
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/flock.h"
 #include "libc/calls/weirdtypes.h"
@@ -10,4 +10,4 @@
 #include "libc/sysv/consts/posix.h"
 #include "libc/sysv/consts/s.h"
 #include "libc/sysv/consts/splice.h"
-#endif
+#endif /* _FCNTL_H */

libc/isystem/features.h

@@ -1,5 +1,5 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_FEATURES_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_FEATURES_H_
+#ifndef _FEATURES_H
+#define _FEATURES_H
 
 #if defined(_ALL_SOURCE) && !defined(_GNU_SOURCE)
 #define _GNU_SOURCE 1
@@ -35,4 +35,4 @@
 #define _Noreturn
 #endif
 
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_FEATURES_H_ */
+#endif /* _FEATURES_H */

libc/isystem/fenv.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_FENV_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_FENV_H_
+#ifndef _FENV_H
+#define _FENV_H
 #include "libc/runtime/fenv.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_FENV_H_ */
+#endif /* _FENV_H */

libc/isystem/float.h

@@ -1,5 +1,5 @@
-#ifndef LIBC_ISYSTEM_FLOAT_H_
-#define LIBC_ISYSTEM_FLOAT_H_
+#ifndef _FLOAT_H
+#define _FLOAT_H
 #include "libc/math.h"
 #include "libc/runtime/fenv.h"
-#endif
+#endif /* _FLOAT_H */

libc/isystem/fnmatch.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_FNMATCH_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_FNMATCH_H_
+#ifndef _FNMATCH_H
+#define _FNMATCH_H
 #include "third_party/musl/fnmatch.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_FNMATCH_H_ */
+#endif /* _FNMATCH_H */

libc/isystem/ftw.h

@@ -1,6 +1,6 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_FTW_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_FTW_H_
+#ifndef _FTW_H
+#define _FTW_H
 #include "libc/calls/weirdtypes.h"
 #include "libc/sysv/consts/s.h"
 #include "third_party/musl/ftw.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_FTW_H_ */
+#endif /* _FTW_H */

libc/isystem/fun.py

@@ -1,4 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_FUN_PY_
-#define COSMOPOLITAN_LIBC_ISYSTEM_FUN_PY_
-#include "third_party/intel/fun.py"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_FUN_PY_ */

libc/isystem/getopt.h

@@ -1,4 +1,4 @@
-#ifndef LIBC_ISYSTEM_GETOPT_H_
-#define LIBC_ISYSTEM_GETOPT_H_
+#ifndef _GETOPT_H
+#define _GETOPT_H
 #include "third_party/getopt/getopt.h"
-#endif
+#endif /* _GETOPT_H */

libc/isystem/glob.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_GLOB_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_GLOB_H_
+#ifndef _GLOB_H
+#define _GLOB_H
 #include "third_party/musl/glob.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_GLOB_H_ */
+#endif /* _GLOB_H */

libc/isystem/grp.h

@@ -1,5 +1,5 @@
-#ifndef LIBC_ISYSTEM_GRP_H_
-#define LIBC_ISYSTEM_GRP_H_
+#ifndef _GRP_H
+#define _GRP_H
 #include "libc/calls/calls.h"
 #include "third_party/musl/passwd.h"
-#endif
+#endif /* _GRP_H */

libc/isystem/iconv.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_ICONV_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_ICONV_H_
+#ifndef _ICONV_H
+#define _ICONV_H
 #include "libc/stdio/iconv.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_ICONV_H_ */
+#endif /* _ICONV_H */

libc/isystem/inttypes.h

@@ -1,7 +1,7 @@
-#ifndef LIBC_ISYSTEM_INTTYPES_H_
-#define LIBC_ISYSTEM_INTTYPES_H_
+#ifndef _INTTYPES_H
+#define _INTTYPES_H
 #include "libc/fmt/conv.h"
 #include "libc/inttypes.h"
 #include "libc/limits.h"
 #include "libc/literal.h"
-#endif /* LIBC_ISYSTEM_INTTYPES_H_ */
+#endif /* _INTTYPES_H */

libc/isystem/iso646.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_ISO646_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_ISO646_H_
+#ifndef _ISO646_H
+#define _ISO646_H
 #include "libc/iso646.internal.h"
-#endif
+#endif /* _ISO646_H */

libc/isystem/langinfo.h

@@ -1,6 +1,6 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_LANGINFO_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_LANGINFO_H_
+#ifndef _LANGINFO_H
+#define _LANGINFO_H
 #include "libc/str/langinfo.h"
 #include "libc/str/locale.h"
 #include "libc/str/nltypes.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_LANGINFO_H_ */
+#endif /* _LANGINFO_H */

libc/isystem/libgen.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_LIBGEN_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_LIBGEN_H_
+#ifndef _LIBGEN_H
+#define _LIBGEN_H
 #include "libc/fmt/conv.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_LIBGEN_H_ */
+#endif /* _LIBGEN_H */

libc/isystem/limits.h

@@ -1,9 +1,9 @@
-#ifndef LIBC_ISYSTEM_LIMITS_H_
-#define LIBC_ISYSTEM_LIMITS_H_
+#ifndef _LIMITS_H
+#define _LIMITS_H
 #include "libc/limits.h"
 #include "libc/sysv/consts/_posix.h"
 #include "libc/sysv/consts/iov.h"
 #include "libc/sysv/consts/limits.h"
 #include "libc/sysv/consts/xopen.h"
 #include "libc/thread/thread.h"
-#endif
+#endif /* _LIMITS_H */

libc/isystem/locale.h

@@ -1,5 +1,5 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_LOCALE_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_LOCALE_H_
+#ifndef _LOCALE_H
+#define _LOCALE_H
 #include "libc/str/locale.h"
 #include "libc/str/unicode.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_LOCALE_H_ */
+#endif /* _LOCALE_H */

libc/isystem/malloc.h

@@ -1,4 +1,4 @@
-#ifndef LIBC_ISYSTEM_MALLOC_H_
-#define LIBC_ISYSTEM_MALLOC_H_
+#ifndef _MALLOC_H
+#define _MALLOC_H
 #include "libc/mem/mem.h"
-#endif
+#endif /* _MALLOC_H */

libc/isystem/math.h

@@ -1,4 +1,4 @@
-#ifndef LIBC_ISYSTEM_MATH_H_
-#define LIBC_ISYSTEM_MATH_H_
+#ifndef _MATH_H
+#define _MATH_H
 #include "libc/math.h"
-#endif
+#endif /* _MATH_H */

libc/isystem/memory.h

@@ -1,5 +1,5 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_MEMORY_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_MEMORY_H_
+#ifndef _MEMORY_H
+#define _MEMORY_H
 #include "libc/mem/alg.h"
 #include "libc/str/str.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_MEMORY_H_ */
+#endif /* _MEMORY_H */

libc/isystem/netdb.h

@@ -1,5 +1,5 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_NETDB_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_NETDB_H_
+#ifndef _NETDB_H
+#define _NETDB_H
 #include "libc/dns/dns.h"
 #include "libc/dns/ent.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_NETDB_H_ */
+#endif /* _NETDB_H */

libc/isystem/setjmp.h

@@ -1,4 +1,4 @@
-#ifndef LIBC_ISYSTEM_SETJMP_H_
-#define LIBC_ISYSTEM_SETJMP_H_
+#ifndef _SETJMP_H
+#define _SETJMP_H
 #include "libc/runtime/runtime.h"
-#endif
+#endif /* _SETJMP_H */

libc/isystem/signal.h

@@ -1,5 +1,5 @@
-#ifndef LIBC_ISYSTEM_SIGNAL_H_
-#define LIBC_ISYSTEM_SIGNAL_H_
+#ifndef _SIGNAL_H
+#define _SIGNAL_H
 #include "libc/calls/calls.h"
 #include "libc/calls/sigtimedwait.h"
 #include "libc/calls/struct/sigaction.h"
@@ -7,4 +7,4 @@
 #include "libc/sysv/consts/sa.h"
 #include "libc/sysv/consts/sicode.h"
 #include "libc/sysv/consts/ss.h"
-#endif
+#endif /* _SIGNAL_H */

libc/isystem/stdalign.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_STDALIGN_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_STDALIGN_H_
+#ifndef _STDALIGN_H
+#define _STDALIGN_H
 #include "libc/stdalign.internal.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_STDALIGN_H_ */
+#endif /* _STDALIGN_H */

libc/isystem/stdarg.h

@@ -1,3 +1,3 @@
-#ifndef LIBC_ISYSTEM_STDARG_H_
-#define LIBC_ISYSTEM_STDARG_H_
-#endif
+#ifndef _STDARG_H
+#define _STDARG_H
+#endif /* _STDARG_H */

libc/isystem/stdatomic.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_STDATOMIC_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_STDATOMIC_H_
+#ifndef _STDATOMIC_H
+#define _STDATOMIC_H
 #include "libc/intrin/atomic.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_STDATOMIC_H_ */
+#endif /* _STDATOMIC_H */

libc/isystem/stdbool.h

@@ -1,3 +1,3 @@
-#ifndef LIBC_ISYSTEM_STDBOOL_H_
-#define LIBC_ISYSTEM_STDBOOL_H_
-#endif
+#ifndef _STDBOOL_H
+#define _STDBOOL_H
+#endif /* _STDBOOL_H */

libc/isystem/stdckdint.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_STDCKDINT_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_STDCKDINT_H_
+#ifndef _STDCKDINT_H
+#define _STDCKDINT_H
 #include "libc/stdckdint.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_STDCKDINT_H_ */
+#endif /* _STDCKDINT_H */

libc/isystem/stddef.h

@@ -1,3 +1,3 @@
-#ifndef LIBC_ISYSTEM_STDDEF_H_
-#define LIBC_ISYSTEM_STDDEF_H_
-#endif
+#ifndef _STDDEF_H
+#define _STDDEF_H
+#endif /* _STDDEF_H */

libc/isystem/stdint.h

@@ -1,6 +1,6 @@
-#ifndef LIBC_ISYSTEM_STDINT_H_
-#define LIBC_ISYSTEM_STDINT_H_
+#ifndef _STDINT_H
+#define _STDINT_H
 #include "libc/inttypes.h"
 #include "libc/limits.h"
 #include "libc/literal.h"
-#endif
+#endif /* _STDINT_H */

libc/isystem/stdio.h

@@ -1,11 +1,10 @@
-#ifndef LIBC_ISYSTEM_STDIO_H_
-#define LIBC_ISYSTEM_STDIO_H_
+#ifndef _STDIO_H
+#define _STDIO_H
 #include "libc/calls/calls.h"
-#include "libc/stdio/dprintf.h"
 #include "libc/calls/weirdtypes.h"
 #include "libc/fmt/fmt.h"
-#include "libc/mem/fmt.h"
+#include "libc/stdio/dprintf.h"
 #include "libc/stdio/stdio.h"
 #include "libc/stdio/temp.h"
 #include "third_party/musl/tempnam.h"
-#endif
+#endif /* _STDIO_H */

libc/isystem/stdio_ext.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_STDIO_EXT_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_STDIO_EXT_H_
+#ifndef _STDIO_EXT_H
+#define _STDIO_EXT_H
 #include "libc/stdio/stdio_ext.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_STDIO_EXT_H_ */
+#endif /* _STDIO_EXT_H */

libc/isystem/stdlib.h

@@ -1,5 +1,5 @@
-#ifndef LIBC_ISYSTEM_STDLIB_H_
-#define LIBC_ISYSTEM_STDLIB_H_
+#ifndef _STDLIB_H
+#define _STDLIB_H
 #include "libc/calls/calls.h"
 #include "libc/calls/termios.h"
 #include "libc/fmt/conv.h"
@@ -15,4 +15,4 @@
 #include "third_party/getopt/getopt.h"
 #include "third_party/musl/crypt.h"
 #include "third_party/musl/rand48.h"
-#endif
+#endif /* _STDLIB_H */

libc/isystem/stdnoreturn.h

@@ -1,10 +1,11 @@
-#ifndef LIBC_ISYSTEM_STDNORETURN_H_
-#define LIBC_ISYSTEM_STDNORETURN_H_
-
-COSMOPOLITAN_C_START_
-
-#define noreturn wontreturn
-
-COSMOPOLITAN_C_END_
-
+#ifndef _STDNORETURN_H
+#define _STDNORETURN_H
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112
+#define noreturn _Noreturn
+#elif (defined(__has_attribute) && __has_attribute(__noreturn__)) || \
+    (defined(__GNUC__) && __GNUC__ * 100 + __GNUC_MINOR__ >= 208)
+#define noreturn __attribute__((__noreturn__))
+#else
+#define noreturn
 #endif
+#endif /* _STDNORETURN_H */

libc/isystem/string.h

@@ -1,6 +1,6 @@
-#ifndef LIBC_ISYSTEM_STRING_H_
-#define LIBC_ISYSTEM_STRING_H_
+#ifndef _STRING_H
+#define _STRING_H
 #include "libc/mem/alg.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
-#endif
+#endif /* _STRING_H */

libc/isystem/strings.h

@@ -1,5 +1,5 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_STRINGS_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_STRINGS_H_
+#ifndef _STRINGS_H
+#define _STRINGS_H
 #include "libc/nexgen32e/ffs.h"
 #include "libc/str/locale.h"
 #include "libc/str/str.h"
@@ -8,4 +8,4 @@
 #include "libc/nexgen32e/ffs.h"
 #endif
 
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_STRINGS_H_ */
+#endif /* _STRINGS_H */

libc/isystem/sysexits.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_SYSEXITS_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_SYSEXITS_H_
+#ifndef _SYSEXITS_H
+#define _SYSEXITS_H
 #include "libc/sysv/consts/ex.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_SYSEXITS_H_ */
+#endif /* _SYSEXITS_H */

libc/isystem/syslog.h

@@ -1,5 +1,5 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_SYSLOG_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_SYSLOG_H_
+#ifndef _SYSLOG_H
+#define _SYSLOG_H
 #include "libc/sock/syslog.h"
 #include "libc/sysv/consts/log.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_SYSLOG_H_ */
+#endif /* _SYSLOG_H */

libc/isystem/termios.h

@@ -1,7 +1,7 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_TERMIOS_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_TERMIOS_H_
+#ifndef _TERMIOS_H
+#define _TERMIOS_H
 #include "libc/calls/termios.h"
 #include "libc/calls/weirdtypes.h"
 #include "libc/sysv/consts/baud.internal.h"
 #include "libc/sysv/consts/termios.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_TERMIOS_H_ */
+#endif /* _TERMIOS_H */

libc/isystem/tgmath.h

@@ -1,5 +1,5 @@
-#ifndef LIBC_ISYSTEM_TGMATH_H_
-#define LIBC_ISYSTEM_TGMATH_H_
+#ifndef _TGMATH_H
+#define _TGMATH_H
 #include "libc/complex.h"
 #include "libc/imag.internal.h"
 #include "libc/math.h"
@@ -329,4 +329,4 @@
 
 #endif /* C11 */
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* LIBC_ISYSTEM_TGMATH_H_ */
+#endif /* _TGMATH_H */

libc/isystem/time.h

@@ -1,5 +1,6 @@
-#ifndef LIBC_ISYSTEM_TIME_H_
-#define LIBC_ISYSTEM_TIME_H_
+#ifndef _TIME_H
+#define _TIME_H
+#include "libc/calls/calls.h"
 #include "libc/calls/struct/timespec.h"
 #include "libc/calls/struct/timeval.h"
 #include "libc/calls/weirdtypes.h"
@@ -8,4 +9,4 @@
 #include "libc/sysv/consts/timer.h"
 #include "libc/time/struct/tm.h"
 #include "libc/time/time.h"
-#endif
+#endif /* _TIME_H */

libc/isystem/unistd.h

@@ -1,5 +1,5 @@
-#ifndef LIBC_ISYSTEM_UNISTD_H_
-#define LIBC_ISYSTEM_UNISTD_H_
+#ifndef _UNISTD_H
+#define _UNISTD_H
 #include "libc/calls/calls.h"
 #include "libc/calls/weirdtypes.h"
 #include "libc/runtime/pathconf.h"
@@ -13,4 +13,4 @@
 #include "third_party/getopt/getopt.h"
 #include "third_party/musl/crypt.h"
 #include "third_party/musl/lockf.h"
-#endif
+#endif /* _UNISTD_H */

libc/isystem/utime.h

@@ -1,5 +1,5 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_UTIME_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_UTIME_H_
+#ifndef _UTIME_H
+#define _UTIME_H
 #include "libc/time/struct/utimbuf.h"
 #include "libc/time/time.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_UTIME_H_ */
+#endif /* _UTIME_H */

libc/isystem/utmp.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_UTMP_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_UTMP_H_
+#ifndef _UTMP_H
+#define _UTMP_H
 #include "libc/runtime/utmp.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_UTMP_H_ */
+#endif /* _UTMP_H */

libc/isystem/utmpx.h

@@ -1,4 +1,4 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_UTMPX_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_UTMPX_H_
+#ifndef _UTMPX_H
+#define _UTMPX_H
 #include "libc/runtime/utmpx.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_UTMPX_H_ */
+#endif /* _UTMPX_H */

libc/isystem/wait.h

@@ -1,6 +1,6 @@
-#ifndef COSMOPOLITAN_LIBC_ISYSTEM_WAIT_H_
-#define COSMOPOLITAN_LIBC_ISYSTEM_WAIT_H_
+#ifndef _WAIT_H
+#define _WAIT_H
 #include "libc/calls/calls.h"
 #include "libc/calls/weirdtypes.h"
 #include "libc/sysv/consts/w.h"
-#endif /* COSMOPOLITAN_LIBC_ISYSTEM_WAIT_H_ */
+#endif /* _WAIT_H */

libc/isystem/wchar.h

@@ -1,8 +1,8 @@
-#ifndef LIBC_ISYSTEM_WCHAR_H_
-#define LIBC_ISYSTEM_WCHAR_H_
+#ifndef _WCHAR_H
+#define _WCHAR_H
 #include "libc/fmt/conv.h"
 #include "libc/stdio/stdio.h"
 #include "libc/str/str.h"
 #include "libc/str/unicode.h"
 #include "libc/time/time.h"
-#endif
+#endif /* _WCHAR_H */

libc/isystem/wctype.h

@@ -1,6 +1,6 @@
-#ifndef LIBC_ISYSTEM_WCTYPE_H_
-#define LIBC_ISYSTEM_WCTYPE_H_
+#ifndef _WCTYPE_H
+#define _WCTYPE_H
 #include "libc/calls/calls.h"
 #include "libc/fmt/conv.h"
 #include "libc/str/str.h"
-#endif
+#endif /* _WCTYPE_H */