diff --git a/libc/Android.mk b/libc/Android.mk
index 20442f7..a399b89 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1387,11 +1387,8 @@
     $(LOCAL_PATH)/libc.x86.map \
     $(LOCAL_PATH)/libc.x86_64.map \
     $(LOCAL_PATH)/libc.arm.brillo.map \
-    $(LOCAL_PATH)/libc.arm64.brillo.map \
     $(LOCAL_PATH)/libc.mips.brillo.map \
-    $(LOCAL_PATH)/libc.mips64.brillo.map \
     $(LOCAL_PATH)/libc.x86.brillo.map \
-    $(LOCAL_PATH)/libc.x86_64.brillo.map \
 
 # Leave the symbols in the shared library so that stack unwinders can produce
 # meaningful name resolution.
@@ -1427,17 +1424,15 @@
 LOCAL_LDFLAGS_arm    += -Wl,--version-script,$(LOCAL_PATH)/libc.arm.brillo.map
 LOCAL_LDFLAGS_mips   += -Wl,--version-script,$(LOCAL_PATH)/libc.mips.brillo.map
 LOCAL_LDFLAGS_x86    += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.brillo.map
-LOCAL_LDFLAGS_arm64  += -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.brillo.map
-LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.brillo.map
-LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.brillo.map
 else
 LOCAL_LDFLAGS_arm    += -Wl,--version-script,$(LOCAL_PATH)/libc.arm.map
 LOCAL_LDFLAGS_mips   += -Wl,--version-script,$(LOCAL_PATH)/libc.mips.map
 LOCAL_LDFLAGS_x86    += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.map
+endif
+
 LOCAL_LDFLAGS_arm64  += -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.map
 LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.map
 LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.map
-endif
 
 # We'd really like to do this for all architectures, but since this wasn't done
 # before, these symbols must continue to be exported on LP32 for binary
diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index 0429430..4bbb2c1 100644
--- a/libc/bionic/ndk_cruft.cpp
+++ b/libc/bionic/ndk_cruft.cpp
@@ -49,11 +49,8 @@
 
 extern "C" {
 
-// Brillo doesn't need to support any legacy cruft.
-#if !defined(__BRILLO__)
-
-// Most of the cruft is only for 32-bit Android targets.
-#if !defined(__LP64__)
+// Brillo and LP64 don't need to support any legacy cruft.
+#if !defined(__BRILLO__) && !defined(__LP64__)
 
 // These were accidentally declared in <unistd.h> because we stupidly used to inline
 // getpagesize() and __getpageshift(). Needed for backwards compatibility with old NDK apps.
@@ -367,8 +364,6 @@
   return __set_errno_internal(n);
 }
 
-#endif // !defined(__LP64__)
-
 // This was never implemented in bionic, only needed for ABI compatibility with the NDK.
 // In the M time frame, over 1000 apps have a reference to this!
 void endpwent() { }
@@ -392,6 +387,6 @@
 }
 #endif
 
-#endif // !defined(__BRILLO__)
+#endif // !defined(__BRILLO__) && !defined (__LP64__)
 
 } // extern "C"
diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index d6f5407..1a666f4 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -383,7 +383,7 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
+    endpwent; # arm x86 mips nobrillo
     endservent;
     endutent;
     environ;
@@ -1447,8 +1447,8 @@
     _Unwind_VRS_Set; # arm
     atexit; # arm
     dlmalloc; # arm x86 mips nobrillo
-    dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
-    dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
+    dlmalloc_inspect_all; # arm x86 mips nobrillo
+    dlmalloc_trim; # arm x86 mips nobrillo
     dlmalloc_usable_size; # arm x86 mips nobrillo
     gMallocLeakZygoteChild;
     SHA1Final; # arm x86 mips
diff --git a/libc/libc.arm64.brillo.map b/libc/libc.arm64.brillo.map
deleted file mode 100644
index 8fa46a8..0000000
--- a/libc/libc.arm64.brillo.map
+++ /dev/null
@@ -1,1185 +0,0 @@
-# Generated by genversionscripts.py. Do not edit.
-LIBC {
-  global:
-    __assert;
-    __assert2;
-    __b64_ntop;
-    __b64_pton;
-    __cmsg_nxthdr;
-    __ctype_get_mb_cur_max;
-    __cxa_atexit;
-    __cxa_finalize;
-    __cxa_thread_atexit_impl;
-    __dn_comp;
-    __dn_count_labels;
-    __dn_skipname;
-    __errno;
-    __fbufsize;
-    __FD_CLR_chk;
-    __FD_ISSET_chk;
-    __FD_SET_chk;
-    __fgets_chk;
-    __flbf;
-    __fp_nquery;
-    __fp_query;
-    __fpclassify;
-    __fpclassifyd;
-    __fpclassifyf;
-    __fpclassifyl;
-    __fpending;
-    __fpurge;
-    __freadable;
-    __fsetlocking;
-    __fwritable;
-    __get_h_errno;
-    __gnu_basename;
-    __gnu_strerror_r;
-    __hostalias;
-    __isfinite;
-    __isfinitef;
-    __isfinitel;
-    __isinf;
-    __isinff;
-    __isinfl;
-    __isnan;
-    __isnanf;
-    __isnanl;
-    __isnormal;
-    __isnormalf;
-    __isnormall;
-    __isthreaded;
-    __libc_current_sigrtmax;
-    __libc_current_sigrtmin;
-    __libc_init;
-    __loc_aton;
-    __loc_ntoa;
-    __memchr_chk;
-    __memcpy_chk;
-    __memmove_chk;
-    __memrchr_chk;
-    __memset_chk;
-    __open_2;
-    __openat_2;
-    __p_cdname;
-    __p_cdnname;
-    __p_class;
-    __p_class_syms;
-    __p_fqname;
-    __p_fqnname;
-    __p_option;
-    __p_query;
-    __p_rcode;
-    __p_secstodate;
-    __p_time;
-    __p_type;
-    __p_type_syms;
-    __poll_chk;
-    __ppoll_chk;
-    __pread64_chk;
-    __pread_chk;
-    __progname;
-    __pthread_cleanup_pop;
-    __pthread_cleanup_push;
-    __putlong;
-    __putshort;
-    __read_chk;
-    __readlink_chk;
-    __readlinkat_chk;
-    __recvfrom_chk;
-    __register_atfork;
-    __res_close;
-    __res_dnok;
-    __res_hnok;
-    __res_hostalias;
-    __res_isourserver;
-    __res_mailok;
-    __res_nameinquery;
-    __res_nclose;
-    __res_ninit;
-    __res_nmkquery;
-    __res_nquery;
-    __res_nquerydomain;
-    __res_nsearch;
-    __res_nsend;
-    __res_ownok;
-    __res_queriesmatch;
-    __res_querydomain;
-    __res_send;
-    __res_send_setqhook;
-    __res_send_setrhook;
-    __sched_cpualloc;
-    __sched_cpucount;
-    __sched_cpufree;
-    __sF;
-    __snprintf_chk;
-    __sprintf_chk;
-    __stack_chk_fail;
-    __stack_chk_guard;
-    __stpcpy_chk;
-    __stpncpy_chk;
-    __stpncpy_chk2;
-    __strcat_chk;
-    __strchr_chk;
-    __strcpy_chk;
-    __strlcat_chk;
-    __strlcpy_chk;
-    __strlen_chk;
-    __strncat_chk;
-    __strncpy_chk;
-    __strncpy_chk2;
-    __strrchr_chk;
-    __sym_ntop;
-    __sym_ntos;
-    __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
-    __umask_chk;
-    __vsnprintf_chk;
-    __vsprintf_chk;
-    _ctype_;
-    _Exit;
-    _exit;
-    _flushlbf;
-    _getlong;
-    _getshort;
-    _longjmp;
-    _resolv_delete_cache_for_net;
-    _resolv_flush_cache_for_net;
-    _resolv_set_nameservers_for_net;
-    _setjmp;
-    _tolower;
-    _toupper;
-    abort;
-    abs;
-    accept;
-    accept4;
-    access;
-    acct;
-    alarm;
-    alphasort;
-    alphasort64;
-    android_getaddrinfofornet;
-    android_getaddrinfofornetcontext;
-    android_gethostbyaddrfornet;
-    android_gethostbynamefornet;
-    android_set_abort_message;
-    arc4random;
-    arc4random_buf;
-    arc4random_uniform;
-    asctime;
-    asctime_r;
-    asprintf;
-    at_quick_exit;
-    atof;
-    atoi;
-    atol;
-    atoll;
-    basename;
-    bind;
-    bindresvport;
-    brk;
-    bsearch;
-    btowc;
-    c16rtomb;
-    c32rtomb;
-    calloc;
-    capget;
-    capset;
-    cfgetispeed;
-    cfgetospeed;
-    cfmakeraw;
-    cfsetispeed;
-    cfsetospeed;
-    cfsetspeed;
-    chdir;
-    chmod;
-    chown;
-    chroot;
-    clearenv;
-    clearerr;
-    clearerr_unlocked;
-    clock;
-    clock_getcpuclockid;
-    clock_getres;
-    clock_gettime;
-    clock_nanosleep;
-    clock_settime;
-    clone;
-    close;
-    closedir;
-    closelog;
-    connect;
-    creat;
-    creat64;
-    ctime;
-    ctime_r;
-    daemon;
-    daylight;
-    delete_module;
-    difftime;
-    dirfd;
-    dirname;
-    div;
-    dn_expand;
-    dprintf;
-    drand48;
-    dup;
-    dup2;
-    dup3;
-    duplocale;
-    endmntent;
-    endservent;
-    endutent;
-    environ;
-    epoll_create;
-    epoll_create1;
-    epoll_ctl;
-    epoll_pwait;
-    epoll_wait;
-    erand48;
-    err;
-    error;
-    error_at_line;
-    error_message_count;
-    error_one_per_line;
-    error_print_progname;
-    errx;
-    ether_aton;
-    ether_aton_r;
-    ether_ntoa;
-    ether_ntoa_r;
-    eventfd;
-    eventfd_read;
-    eventfd_write;
-    execl;
-    execle;
-    execlp;
-    execv;
-    execve;
-    execvp;
-    execvpe;
-    exit;
-    faccessat;
-    fallocate;
-    fallocate64;
-    fchdir;
-    fchmod;
-    fchmodat;
-    fchown;
-    fchownat;
-    fclose;
-    fcntl;
-    fdatasync;
-    fdopen;
-    fdopendir;
-    feof;
-    feof_unlocked;
-    ferror;
-    ferror_unlocked;
-    fflush;
-    ffs;
-    fgetc;
-    fgetln;
-    fgetpos;
-    fgets;
-    fgetwc;
-    fgetws;
-    fgetxattr;
-    fileno;
-    flistxattr;
-    flock;
-    flockfile;
-    fmemopen;
-    fnmatch;
-    fopen;
-    fork;
-    forkpty;
-    fpathconf;
-    fprintf;
-    fpurge;
-    fputc;
-    fputs;
-    fputwc;
-    fputws;
-    fread;
-    free;
-    free_malloc_leak_info;
-    freeaddrinfo;
-    freelocale;
-    fremovexattr;
-    freopen;
-    fscanf;
-    fseek;
-    fseeko;
-    fsetpos;
-    fsetxattr;
-    fstat;
-    fstat64;
-    fstatat;
-    fstatat64;
-    fstatfs;
-    fstatfs64;
-    fstatvfs;
-    fstatvfs64;
-    fsync;
-    ftell;
-    ftello;
-    ftok;
-    ftruncate;
-    ftruncate64;
-    ftrylockfile;
-    fts_children;
-    fts_close;
-    fts_open;
-    fts_read;
-    fts_set;
-    ftw;
-    ftw64;
-    funlockfile;
-    funopen;
-    futimens;
-    fwide;
-    fwprintf;
-    fwrite;
-    fwscanf;
-    gai_strerror;
-    get_avphys_pages;
-    get_malloc_leak_info;
-    get_nprocs;
-    get_nprocs_conf;
-    get_phys_pages;
-    getaddrinfo;
-    getauxval;
-    getc;
-    getc_unlocked;
-    getchar;
-    getchar_unlocked;
-    getcwd;
-    getdelim;
-    getegid;
-    getenv;
-    geteuid;
-    getgid;
-    getgrgid;
-    getgrnam;
-    getgrouplist;
-    getgroups;
-    gethostbyaddr;
-    gethostbyaddr_r;
-    gethostbyname;
-    gethostbyname2;
-    gethostbyname2_r;
-    gethostbyname_r;
-    gethostent;
-    gethostname;
-    getitimer;
-    getline;
-    getlogin;
-    getmntent;
-    getmntent_r;
-    getnameinfo;
-    getnetbyaddr;
-    getnetbyname;
-    getopt;
-    getopt_long;
-    getopt_long_only;
-    getpagesize;
-    getpeername;
-    getpgid;
-    getpgrp;
-    getpid;
-    getppid;
-    getpriority;
-    getprogname;
-    getprotobyname;
-    getprotobynumber;
-    getpt;
-    getpwnam;
-    getpwnam_r;
-    getpwuid;
-    getpwuid_r;
-    getresgid;
-    getresuid;
-    getrlimit;
-    getrlimit64;
-    getrusage;
-    gets;
-    getservbyname;
-    getservbyport;
-    getservent;
-    getsid;
-    getsockname;
-    getsockopt;
-    gettid;
-    gettimeofday;
-    getuid;
-    getutent;
-    getwc;
-    getwchar;
-    getxattr;
-    gmtime;
-    gmtime_r;
-    grantpt;
-    herror;
-    hstrerror;
-    htonl;
-    htons;
-    if_indextoname;
-    if_nametoindex;
-    imaxabs;
-    imaxdiv;
-    inet_addr;
-    inet_aton;
-    inet_lnaof;
-    inet_makeaddr;
-    inet_netof;
-    inet_network;
-    inet_nsap_addr;
-    inet_nsap_ntoa;
-    inet_ntoa;
-    inet_ntop;
-    inet_pton;
-    init_module;
-    initgroups;
-    initstate;
-    inotify_add_watch;
-    inotify_init;
-    inotify_init1;
-    inotify_rm_watch;
-    insque;
-    ioctl;
-    isalnum;
-    isalnum_l;
-    isalpha;
-    isalpha_l;
-    isascii;
-    isatty;
-    isblank;
-    isblank_l;
-    iscntrl;
-    iscntrl_l;
-    isdigit;
-    isdigit_l;
-    isfinite;
-    isfinitef;
-    isfinitel;
-    isgraph;
-    isgraph_l;
-    isinf;
-    isinff;
-    isinfl;
-    islower;
-    islower_l;
-    isnan;
-    isnanf;
-    isnanl;
-    isnormal;
-    isnormalf;
-    isnormall;
-    isprint;
-    isprint_l;
-    ispunct;
-    ispunct_l;
-    isspace;
-    isspace_l;
-    isupper;
-    isupper_l;
-    iswalnum;
-    iswalnum_l;
-    iswalpha;
-    iswalpha_l;
-    iswblank;
-    iswblank_l;
-    iswcntrl;
-    iswcntrl_l;
-    iswctype;
-    iswctype_l;
-    iswdigit;
-    iswdigit_l;
-    iswgraph;
-    iswgraph_l;
-    iswlower;
-    iswlower_l;
-    iswprint;
-    iswprint_l;
-    iswpunct;
-    iswpunct_l;
-    iswspace;
-    iswspace_l;
-    iswupper;
-    iswupper_l;
-    iswxdigit;
-    iswxdigit_l;
-    isxdigit;
-    isxdigit_l;
-    jrand48;
-    kill;
-    killpg;
-    klogctl;
-    labs;
-    lchown;
-    lcong48;
-    ldexp;
-    ldiv;
-    lfind;
-    lgetxattr;
-    link;
-    linkat;
-    listen;
-    listxattr;
-    llabs;
-    lldiv;
-    llistxattr;
-    localeconv;
-    localtime;
-    localtime_r;
-    login_tty;
-    longjmp;
-    lrand48;
-    lremovexattr;
-    lsearch;
-    lseek;
-    lseek64;
-    lsetxattr;
-    lstat;
-    lstat64;
-    madvise;
-    mallinfo;
-    malloc;
-    malloc_info;
-    malloc_usable_size;
-    mbrlen;
-    mbrtoc16;
-    mbrtoc32;
-    mbrtowc;
-    mbsinit;
-    mbsnrtowcs;
-    mbsrtowcs;
-    mbstowcs;
-    mbtowc;
-    memalign;
-    memccpy;
-    memchr;
-    memcmp;
-    memcpy;
-    memmem;
-    memmove;
-    mempcpy;
-    memrchr;
-    memset;
-    mincore;
-    mkdir;
-    mkdirat;
-    mkdtemp;
-    mkfifo;
-    mkfifoat;
-    mknod;
-    mknodat;
-    mkostemp;
-    mkostemp64;
-    mkostemps;
-    mkostemps64;
-    mkstemp;
-    mkstemp64;
-    mkstemps;
-    mkstemps64;
-    mktemp;
-    mktime;
-    mktime_tz;
-    mlock;
-    mlockall;
-    mmap;
-    mmap64;
-    mount;
-    mprotect;
-    mrand48;
-    mremap;
-    msync;
-    munlock;
-    munlockall;
-    munmap;
-    nanosleep;
-    newlocale;
-    nftw;
-    nftw64;
-    nice;
-    nrand48;
-    ns_format_ttl; # arm64 x86_64 mips64
-    ns_get16; # arm64 x86_64 mips64
-    ns_get32; # arm64 x86_64 mips64
-    ns_initparse; # arm64 x86_64 mips64
-    ns_makecanon; # arm64 x86_64 mips64
-    ns_msg_getflag; # arm64 x86_64 mips64
-    ns_name_compress; # arm64 x86_64 mips64
-    ns_name_ntol; # arm64 x86_64 mips64
-    ns_name_ntop; # arm64 x86_64 mips64
-    ns_name_pack; # arm64 x86_64 mips64
-    ns_name_pton; # arm64 x86_64 mips64
-    ns_name_rollback; # arm64 x86_64 mips64
-    ns_name_skip; # arm64 x86_64 mips64
-    ns_name_uncompress; # arm64 x86_64 mips64
-    ns_name_unpack; # arm64 x86_64 mips64
-    ns_parserr; # arm64 x86_64 mips64
-    ns_put16; # arm64 x86_64 mips64
-    ns_put32; # arm64 x86_64 mips64
-    ns_samename; # arm64 x86_64 mips64
-    ns_skiprr; # arm64 x86_64 mips64
-    ns_sprintrr; # arm64 x86_64 mips64
-    ns_sprintrrf; # arm64 x86_64 mips64
-    nsdispatch;
-    ntohl;
-    ntohs;
-    open;
-    open64;
-    open_memstream;
-    open_wmemstream;
-    openat;
-    openat64;
-    opendir;
-    openlog;
-    openpty;
-    optarg;
-    opterr;
-    optind;
-    optopt;
-    optreset;
-    pathconf;
-    pause;
-    pclose;
-    perror;
-    personality;
-    pipe;
-    pipe2;
-    poll;
-    popen;
-    posix_fadvise;
-    posix_fadvise64;
-    posix_fallocate;
-    posix_fallocate64;
-    posix_madvise;
-    posix_memalign;
-    posix_openpt;
-    ppoll;
-    prctl;
-    pread;
-    pread64;
-    printf;
-    prlimit; # arm64 x86_64 mips64
-    prlimit64;
-    process_vm_readv;
-    process_vm_writev;
-    pselect;
-    psiginfo;
-    psignal;
-    pthread_atfork;
-    pthread_attr_destroy;
-    pthread_attr_getdetachstate;
-    pthread_attr_getguardsize;
-    pthread_attr_getschedparam;
-    pthread_attr_getschedpolicy;
-    pthread_attr_getscope;
-    pthread_attr_getstack;
-    pthread_attr_getstacksize;
-    pthread_attr_init;
-    pthread_attr_setdetachstate;
-    pthread_attr_setguardsize;
-    pthread_attr_setschedparam;
-    pthread_attr_setschedpolicy;
-    pthread_attr_setscope;
-    pthread_attr_setstack;
-    pthread_attr_setstacksize;
-    pthread_cond_broadcast;
-    pthread_cond_destroy;
-    pthread_cond_init;
-    pthread_cond_signal;
-    pthread_cond_timedwait;
-    pthread_cond_wait;
-    pthread_condattr_destroy;
-    pthread_condattr_getclock;
-    pthread_condattr_getpshared;
-    pthread_condattr_init;
-    pthread_condattr_setclock;
-    pthread_condattr_setpshared;
-    pthread_create;
-    pthread_detach;
-    pthread_equal;
-    pthread_exit;
-    pthread_getattr_np;
-    pthread_getcpuclockid;
-    pthread_getschedparam;
-    pthread_getspecific;
-    pthread_gettid_np;
-    pthread_join;
-    pthread_key_create;
-    pthread_key_delete;
-    pthread_kill;
-    pthread_mutex_destroy;
-    pthread_mutex_init;
-    pthread_mutex_lock;
-    pthread_mutex_timedlock;
-    pthread_mutex_trylock;
-    pthread_mutex_unlock;
-    pthread_mutexattr_destroy;
-    pthread_mutexattr_getpshared;
-    pthread_mutexattr_gettype;
-    pthread_mutexattr_init;
-    pthread_mutexattr_setpshared;
-    pthread_mutexattr_settype;
-    pthread_once;
-    pthread_rwlock_destroy;
-    pthread_rwlock_init;
-    pthread_rwlock_rdlock;
-    pthread_rwlock_timedrdlock;
-    pthread_rwlock_timedwrlock;
-    pthread_rwlock_tryrdlock;
-    pthread_rwlock_trywrlock;
-    pthread_rwlock_unlock;
-    pthread_rwlock_wrlock;
-    pthread_rwlockattr_destroy;
-    pthread_rwlockattr_getkind_np;
-    pthread_rwlockattr_getpshared;
-    pthread_rwlockattr_init;
-    pthread_rwlockattr_setkind_np;
-    pthread_rwlockattr_setpshared;
-    pthread_self;
-    pthread_setname_np;
-    pthread_setschedparam;
-    pthread_setspecific;
-    pthread_sigmask;
-    ptrace;
-    ptsname;
-    ptsname_r;
-    putc;
-    putc_unlocked;
-    putchar;
-    putchar_unlocked;
-    putenv;
-    puts;
-    pututline;
-    putwc;
-    putwchar;
-    pwrite;
-    pwrite64;
-    qsort;
-    quick_exit;
-    raise;
-    rand;
-    rand_r;
-    random;
-    read;
-    readahead;
-    readdir;
-    readdir64;
-    readdir64_r;
-    readdir_r;
-    readlink;
-    readlinkat;
-    readv;
-    realloc;
-    realpath;
-    reboot;
-    recv;
-    recvfrom;
-    recvmmsg;
-    recvmsg;
-    regcomp;
-    regerror;
-    regexec;
-    regfree;
-    remove;
-    removexattr;
-    remque;
-    rename;
-    renameat;
-    res_init;
-    res_mkquery;
-    res_query;
-    res_search;
-    rewind;
-    rewinddir;
-    rmdir;
-    sbrk;
-    scandir;
-    scandir64;
-    scanf;
-    sched_get_priority_max;
-    sched_get_priority_min;
-    sched_getaffinity;
-    sched_getcpu;
-    sched_getparam;
-    sched_getscheduler;
-    sched_rr_get_interval;
-    sched_setaffinity;
-    sched_setparam;
-    sched_setscheduler;
-    sched_yield;
-    seed48;
-    seekdir;
-    select;
-    sem_close;
-    sem_destroy;
-    sem_getvalue;
-    sem_init;
-    sem_open;
-    sem_post;
-    sem_timedwait;
-    sem_trywait;
-    sem_unlink;
-    sem_wait;
-    send;
-    sendfile;
-    sendfile64;
-    sendmmsg;
-    sendmsg;
-    sendto;
-    setbuf;
-    setbuffer;
-    setegid;
-    setenv;
-    seteuid;
-    setfsgid;
-    setfsuid;
-    setgid;
-    setgroups;
-    sethostname;
-    setitimer;
-    setjmp;
-    setlinebuf;
-    setlocale;
-    setlogmask;
-    setmntent;
-    setns;
-    setpgid;
-    setpgrp;
-    setpriority;
-    setprogname;
-    setregid;
-    setresgid;
-    setresuid;
-    setreuid;
-    setrlimit;
-    setrlimit64;
-    setservent;
-    setsid;
-    setsockopt;
-    setstate;
-    settimeofday;
-    setuid;
-    setutent;
-    setvbuf;
-    setxattr;
-    shutdown;
-    sigaction;
-    sigaddset;
-    sigaltstack;
-    sigblock;
-    sigdelset;
-    sigemptyset;
-    sigfillset;
-    siginterrupt;
-    sigismember;
-    siglongjmp;
-    signal;
-    signalfd;
-    sigpending;
-    sigprocmask;
-    sigqueue;
-    sigsetjmp;
-    sigsetmask;
-    sigsuspend;
-    sigtimedwait;
-    sigwait;
-    sigwaitinfo;
-    sleep;
-    snprintf;
-    socket;
-    socketpair;
-    splice;
-    sprintf;
-    srand;
-    srand48;
-    srandom;
-    sscanf;
-    stat;
-    stat64;
-    statfs;
-    statfs64;
-    statvfs;
-    statvfs64;
-    stderr;
-    stdin;
-    stdout;
-    stpcpy;
-    stpncpy;
-    strcasecmp;
-    strcasecmp_l;
-    strcasestr;
-    strcat;
-    strchr;
-    strcmp;
-    strcoll;
-    strcoll_l;
-    strcpy;
-    strcspn;
-    strdup;
-    strerror;
-    strerror_l;
-    strerror_r;
-    strftime;
-    strftime_l;
-    strlcat;
-    strlcpy;
-    strlen;
-    strncasecmp;
-    strncasecmp_l;
-    strncat;
-    strncmp;
-    strncpy;
-    strndup;
-    strnlen;
-    strpbrk;
-    strptime;
-    strrchr;
-    strsep;
-    strsignal;
-    strspn;
-    strstr;
-    strtod;
-    strtof;
-    strtoimax;
-    strtok;
-    strtok_r;
-    strtol;
-    strtold;
-    strtold_l;
-    strtoll;
-    strtoll_l;
-    strtoq;
-    strtoul;
-    strtoull;
-    strtoull_l;
-    strtoumax;
-    strtouq;
-    strxfrm;
-    strxfrm_l;
-    swapoff;
-    swapon;
-    swprintf;
-    swscanf;
-    symlink;
-    symlinkat;
-    sync;
-    sys_siglist;
-    sys_signame;
-    syscall;
-    sysconf;
-    sysinfo;
-    syslog;
-    system;
-    tcdrain;
-    tcflow;
-    tcflush;
-    tcgetattr;
-    tcgetpgrp;
-    tcgetsid;
-    tcsendbreak;
-    tcsetattr;
-    tcsetpgrp;
-    tdelete;
-    tdestroy;
-    tee;
-    telldir;
-    tempnam;
-    tfind;
-    tgkill;
-    time;
-    timegm;
-    timelocal;
-    timer_create;
-    timer_delete;
-    timer_getoverrun;
-    timer_gettime;
-    timer_settime;
-    timerfd_create;
-    timerfd_gettime;
-    timerfd_settime;
-    times;
-    timezone;
-    tmpfile;
-    tmpnam;
-    toascii;
-    tolower;
-    tolower_l;
-    toupper;
-    toupper_l;
-    towlower;
-    towlower_l;
-    towupper;
-    towupper_l;
-    truncate;
-    truncate64;
-    tsearch;
-    ttyname;
-    ttyname_r;
-    twalk;
-    tzname;
-    tzset;
-    umask;
-    umount;
-    umount2;
-    uname;
-    ungetc;
-    ungetwc;
-    unlink;
-    unlinkat;
-    unlockpt;
-    unsetenv;
-    unshare;
-    uselocale;
-    usleep;
-    utime;
-    utimensat;
-    utimes;
-    utmpname;
-    vasprintf;
-    vdprintf;
-    verr;
-    verrx;
-    vfork;
-    vfprintf;
-    vfscanf;
-    vfwprintf;
-    vfwscanf;
-    vmsplice;
-    vprintf;
-    vscanf;
-    vsnprintf;
-    vsprintf;
-    vsscanf;
-    vswprintf;
-    vswscanf;
-    vsyslog;
-    vwarn;
-    vwarnx;
-    vwprintf;
-    vwscanf;
-    wait;
-    wait4;
-    waitid;
-    waitpid;
-    warn;
-    warnx;
-    wcpcpy;
-    wcpncpy;
-    wcrtomb;
-    wcscasecmp;
-    wcscasecmp_l;
-    wcscat;
-    wcschr;
-    wcscmp;
-    wcscoll;
-    wcscoll_l;
-    wcscpy;
-    wcscspn;
-    wcsdup;
-    wcsftime;
-    wcslcat;
-    wcslcpy;
-    wcslen;
-    wcsncasecmp;
-    wcsncasecmp_l;
-    wcsncat;
-    wcsncmp;
-    wcsncpy;
-    wcsnlen;
-    wcsnrtombs;
-    wcspbrk;
-    wcsrchr;
-    wcsrtombs;
-    wcsspn;
-    wcsstr;
-    wcstod;
-    wcstof;
-    wcstoimax;
-    wcstok;
-    wcstol;
-    wcstold;
-    wcstold_l;
-    wcstoll;
-    wcstoll_l;
-    wcstombs;
-    wcstoul;
-    wcstoull;
-    wcstoull_l;
-    wcstoumax;
-    wcswidth;
-    wcsxfrm;
-    wcsxfrm_l;
-    wctob;
-    wctomb;
-    wctype;
-    wctype_l;
-    wcwidth;
-    wmemchr;
-    wmemcmp;
-    wmemcpy;
-    wmemmove;
-    wmempcpy;
-    wmemset;
-    wprintf;
-    write;
-    writev;
-    wscanf;
-  local:
-    *;
-};
-
-LIBC_N {
-  global:
-    __fread_chk;
-    __fwrite_chk;
-    __getcwd_chk;
-    __pwrite_chk;
-    __pwrite64_chk;
-    __write_chk;
-    fileno_unlocked;
-    getgrgid_r;
-    getgrnam_r;
-    preadv;
-    preadv64;
-    pthread_barrierattr_destroy;
-    pthread_barrierattr_getpshared;
-    pthread_barrierattr_init;
-    pthread_barrierattr_setpshared;
-    pthread_barrier_destroy;
-    pthread_barrier_init;
-    pthread_barrier_wait;
-    pthread_spin_destroy;
-    pthread_spin_init;
-    pthread_spin_lock;
-    pthread_spin_trylock;
-    pthread_spin_unlock;
-    pwritev;
-    pwritev64;
-    scandirat;
-    scandirat64;
-    strchrnul;
-} LIBC;
-
-LIBC_PRIVATE {
-  global:
-    gMallocLeakZygoteChild;
-} LIBC_N;
diff --git a/libc/libc.arm64.map b/libc/libc.arm64.map
index be0bf5b..8fa46a8 100644
--- a/libc/libc.arm64.map
+++ b/libc/libc.arm64.map
@@ -241,7 +241,6 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
     endservent;
     endutent;
     environ;
@@ -1182,7 +1181,5 @@
 
 LIBC_PRIVATE {
   global:
-    dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
-    dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
     gMallocLeakZygoteChild;
 } LIBC_N;
diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index 74f7b82..9eb8d01 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -387,7 +387,7 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
+    endpwent; # arm x86 mips nobrillo
     endservent;
     endutent;
     environ;
@@ -1474,8 +1474,8 @@
     _Unwind_VRS_Set; # arm
     atexit; # arm
     dlmalloc; # arm x86 mips nobrillo
-    dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
-    dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
+    dlmalloc_inspect_all; # arm x86 mips nobrillo
+    dlmalloc_trim; # arm x86 mips nobrillo
     dlmalloc_usable_size; # arm x86 mips nobrillo
     gMallocLeakZygoteChild;
     SHA1Final; # arm x86 mips
diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index 18c482e..5bee67e 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -347,7 +347,7 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
+    endpwent; # arm x86 mips nobrillo
     endservent;
     endutent;
     environ;
@@ -1303,8 +1303,8 @@
     __accept4; # arm x86 mips
     __bionic_brk; # arm x86 mips
     dlmalloc; # arm x86 mips nobrillo
-    dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
-    dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
+    dlmalloc_inspect_all; # arm x86 mips nobrillo
+    dlmalloc_trim; # arm x86 mips nobrillo
     dlmalloc_usable_size; # arm x86 mips nobrillo
     gMallocLeakZygoteChild;
     SHA1Final; # arm x86 mips
diff --git a/libc/libc.mips64.brillo.map b/libc/libc.mips64.brillo.map
deleted file mode 100644
index 8fa46a8..0000000
--- a/libc/libc.mips64.brillo.map
+++ /dev/null
@@ -1,1185 +0,0 @@
-# Generated by genversionscripts.py. Do not edit.
-LIBC {
-  global:
-    __assert;
-    __assert2;
-    __b64_ntop;
-    __b64_pton;
-    __cmsg_nxthdr;
-    __ctype_get_mb_cur_max;
-    __cxa_atexit;
-    __cxa_finalize;
-    __cxa_thread_atexit_impl;
-    __dn_comp;
-    __dn_count_labels;
-    __dn_skipname;
-    __errno;
-    __fbufsize;
-    __FD_CLR_chk;
-    __FD_ISSET_chk;
-    __FD_SET_chk;
-    __fgets_chk;
-    __flbf;
-    __fp_nquery;
-    __fp_query;
-    __fpclassify;
-    __fpclassifyd;
-    __fpclassifyf;
-    __fpclassifyl;
-    __fpending;
-    __fpurge;
-    __freadable;
-    __fsetlocking;
-    __fwritable;
-    __get_h_errno;
-    __gnu_basename;
-    __gnu_strerror_r;
-    __hostalias;
-    __isfinite;
-    __isfinitef;
-    __isfinitel;
-    __isinf;
-    __isinff;
-    __isinfl;
-    __isnan;
-    __isnanf;
-    __isnanl;
-    __isnormal;
-    __isnormalf;
-    __isnormall;
-    __isthreaded;
-    __libc_current_sigrtmax;
-    __libc_current_sigrtmin;
-    __libc_init;
-    __loc_aton;
-    __loc_ntoa;
-    __memchr_chk;
-    __memcpy_chk;
-    __memmove_chk;
-    __memrchr_chk;
-    __memset_chk;
-    __open_2;
-    __openat_2;
-    __p_cdname;
-    __p_cdnname;
-    __p_class;
-    __p_class_syms;
-    __p_fqname;
-    __p_fqnname;
-    __p_option;
-    __p_query;
-    __p_rcode;
-    __p_secstodate;
-    __p_time;
-    __p_type;
-    __p_type_syms;
-    __poll_chk;
-    __ppoll_chk;
-    __pread64_chk;
-    __pread_chk;
-    __progname;
-    __pthread_cleanup_pop;
-    __pthread_cleanup_push;
-    __putlong;
-    __putshort;
-    __read_chk;
-    __readlink_chk;
-    __readlinkat_chk;
-    __recvfrom_chk;
-    __register_atfork;
-    __res_close;
-    __res_dnok;
-    __res_hnok;
-    __res_hostalias;
-    __res_isourserver;
-    __res_mailok;
-    __res_nameinquery;
-    __res_nclose;
-    __res_ninit;
-    __res_nmkquery;
-    __res_nquery;
-    __res_nquerydomain;
-    __res_nsearch;
-    __res_nsend;
-    __res_ownok;
-    __res_queriesmatch;
-    __res_querydomain;
-    __res_send;
-    __res_send_setqhook;
-    __res_send_setrhook;
-    __sched_cpualloc;
-    __sched_cpucount;
-    __sched_cpufree;
-    __sF;
-    __snprintf_chk;
-    __sprintf_chk;
-    __stack_chk_fail;
-    __stack_chk_guard;
-    __stpcpy_chk;
-    __stpncpy_chk;
-    __stpncpy_chk2;
-    __strcat_chk;
-    __strchr_chk;
-    __strcpy_chk;
-    __strlcat_chk;
-    __strlcpy_chk;
-    __strlen_chk;
-    __strncat_chk;
-    __strncpy_chk;
-    __strncpy_chk2;
-    __strrchr_chk;
-    __sym_ntop;
-    __sym_ntos;
-    __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
-    __umask_chk;
-    __vsnprintf_chk;
-    __vsprintf_chk;
-    _ctype_;
-    _Exit;
-    _exit;
-    _flushlbf;
-    _getlong;
-    _getshort;
-    _longjmp;
-    _resolv_delete_cache_for_net;
-    _resolv_flush_cache_for_net;
-    _resolv_set_nameservers_for_net;
-    _setjmp;
-    _tolower;
-    _toupper;
-    abort;
-    abs;
-    accept;
-    accept4;
-    access;
-    acct;
-    alarm;
-    alphasort;
-    alphasort64;
-    android_getaddrinfofornet;
-    android_getaddrinfofornetcontext;
-    android_gethostbyaddrfornet;
-    android_gethostbynamefornet;
-    android_set_abort_message;
-    arc4random;
-    arc4random_buf;
-    arc4random_uniform;
-    asctime;
-    asctime_r;
-    asprintf;
-    at_quick_exit;
-    atof;
-    atoi;
-    atol;
-    atoll;
-    basename;
-    bind;
-    bindresvport;
-    brk;
-    bsearch;
-    btowc;
-    c16rtomb;
-    c32rtomb;
-    calloc;
-    capget;
-    capset;
-    cfgetispeed;
-    cfgetospeed;
-    cfmakeraw;
-    cfsetispeed;
-    cfsetospeed;
-    cfsetspeed;
-    chdir;
-    chmod;
-    chown;
-    chroot;
-    clearenv;
-    clearerr;
-    clearerr_unlocked;
-    clock;
-    clock_getcpuclockid;
-    clock_getres;
-    clock_gettime;
-    clock_nanosleep;
-    clock_settime;
-    clone;
-    close;
-    closedir;
-    closelog;
-    connect;
-    creat;
-    creat64;
-    ctime;
-    ctime_r;
-    daemon;
-    daylight;
-    delete_module;
-    difftime;
-    dirfd;
-    dirname;
-    div;
-    dn_expand;
-    dprintf;
-    drand48;
-    dup;
-    dup2;
-    dup3;
-    duplocale;
-    endmntent;
-    endservent;
-    endutent;
-    environ;
-    epoll_create;
-    epoll_create1;
-    epoll_ctl;
-    epoll_pwait;
-    epoll_wait;
-    erand48;
-    err;
-    error;
-    error_at_line;
-    error_message_count;
-    error_one_per_line;
-    error_print_progname;
-    errx;
-    ether_aton;
-    ether_aton_r;
-    ether_ntoa;
-    ether_ntoa_r;
-    eventfd;
-    eventfd_read;
-    eventfd_write;
-    execl;
-    execle;
-    execlp;
-    execv;
-    execve;
-    execvp;
-    execvpe;
-    exit;
-    faccessat;
-    fallocate;
-    fallocate64;
-    fchdir;
-    fchmod;
-    fchmodat;
-    fchown;
-    fchownat;
-    fclose;
-    fcntl;
-    fdatasync;
-    fdopen;
-    fdopendir;
-    feof;
-    feof_unlocked;
-    ferror;
-    ferror_unlocked;
-    fflush;
-    ffs;
-    fgetc;
-    fgetln;
-    fgetpos;
-    fgets;
-    fgetwc;
-    fgetws;
-    fgetxattr;
-    fileno;
-    flistxattr;
-    flock;
-    flockfile;
-    fmemopen;
-    fnmatch;
-    fopen;
-    fork;
-    forkpty;
-    fpathconf;
-    fprintf;
-    fpurge;
-    fputc;
-    fputs;
-    fputwc;
-    fputws;
-    fread;
-    free;
-    free_malloc_leak_info;
-    freeaddrinfo;
-    freelocale;
-    fremovexattr;
-    freopen;
-    fscanf;
-    fseek;
-    fseeko;
-    fsetpos;
-    fsetxattr;
-    fstat;
-    fstat64;
-    fstatat;
-    fstatat64;
-    fstatfs;
-    fstatfs64;
-    fstatvfs;
-    fstatvfs64;
-    fsync;
-    ftell;
-    ftello;
-    ftok;
-    ftruncate;
-    ftruncate64;
-    ftrylockfile;
-    fts_children;
-    fts_close;
-    fts_open;
-    fts_read;
-    fts_set;
-    ftw;
-    ftw64;
-    funlockfile;
-    funopen;
-    futimens;
-    fwide;
-    fwprintf;
-    fwrite;
-    fwscanf;
-    gai_strerror;
-    get_avphys_pages;
-    get_malloc_leak_info;
-    get_nprocs;
-    get_nprocs_conf;
-    get_phys_pages;
-    getaddrinfo;
-    getauxval;
-    getc;
-    getc_unlocked;
-    getchar;
-    getchar_unlocked;
-    getcwd;
-    getdelim;
-    getegid;
-    getenv;
-    geteuid;
-    getgid;
-    getgrgid;
-    getgrnam;
-    getgrouplist;
-    getgroups;
-    gethostbyaddr;
-    gethostbyaddr_r;
-    gethostbyname;
-    gethostbyname2;
-    gethostbyname2_r;
-    gethostbyname_r;
-    gethostent;
-    gethostname;
-    getitimer;
-    getline;
-    getlogin;
-    getmntent;
-    getmntent_r;
-    getnameinfo;
-    getnetbyaddr;
-    getnetbyname;
-    getopt;
-    getopt_long;
-    getopt_long_only;
-    getpagesize;
-    getpeername;
-    getpgid;
-    getpgrp;
-    getpid;
-    getppid;
-    getpriority;
-    getprogname;
-    getprotobyname;
-    getprotobynumber;
-    getpt;
-    getpwnam;
-    getpwnam_r;
-    getpwuid;
-    getpwuid_r;
-    getresgid;
-    getresuid;
-    getrlimit;
-    getrlimit64;
-    getrusage;
-    gets;
-    getservbyname;
-    getservbyport;
-    getservent;
-    getsid;
-    getsockname;
-    getsockopt;
-    gettid;
-    gettimeofday;
-    getuid;
-    getutent;
-    getwc;
-    getwchar;
-    getxattr;
-    gmtime;
-    gmtime_r;
-    grantpt;
-    herror;
-    hstrerror;
-    htonl;
-    htons;
-    if_indextoname;
-    if_nametoindex;
-    imaxabs;
-    imaxdiv;
-    inet_addr;
-    inet_aton;
-    inet_lnaof;
-    inet_makeaddr;
-    inet_netof;
-    inet_network;
-    inet_nsap_addr;
-    inet_nsap_ntoa;
-    inet_ntoa;
-    inet_ntop;
-    inet_pton;
-    init_module;
-    initgroups;
-    initstate;
-    inotify_add_watch;
-    inotify_init;
-    inotify_init1;
-    inotify_rm_watch;
-    insque;
-    ioctl;
-    isalnum;
-    isalnum_l;
-    isalpha;
-    isalpha_l;
-    isascii;
-    isatty;
-    isblank;
-    isblank_l;
-    iscntrl;
-    iscntrl_l;
-    isdigit;
-    isdigit_l;
-    isfinite;
-    isfinitef;
-    isfinitel;
-    isgraph;
-    isgraph_l;
-    isinf;
-    isinff;
-    isinfl;
-    islower;
-    islower_l;
-    isnan;
-    isnanf;
-    isnanl;
-    isnormal;
-    isnormalf;
-    isnormall;
-    isprint;
-    isprint_l;
-    ispunct;
-    ispunct_l;
-    isspace;
-    isspace_l;
-    isupper;
-    isupper_l;
-    iswalnum;
-    iswalnum_l;
-    iswalpha;
-    iswalpha_l;
-    iswblank;
-    iswblank_l;
-    iswcntrl;
-    iswcntrl_l;
-    iswctype;
-    iswctype_l;
-    iswdigit;
-    iswdigit_l;
-    iswgraph;
-    iswgraph_l;
-    iswlower;
-    iswlower_l;
-    iswprint;
-    iswprint_l;
-    iswpunct;
-    iswpunct_l;
-    iswspace;
-    iswspace_l;
-    iswupper;
-    iswupper_l;
-    iswxdigit;
-    iswxdigit_l;
-    isxdigit;
-    isxdigit_l;
-    jrand48;
-    kill;
-    killpg;
-    klogctl;
-    labs;
-    lchown;
-    lcong48;
-    ldexp;
-    ldiv;
-    lfind;
-    lgetxattr;
-    link;
-    linkat;
-    listen;
-    listxattr;
-    llabs;
-    lldiv;
-    llistxattr;
-    localeconv;
-    localtime;
-    localtime_r;
-    login_tty;
-    longjmp;
-    lrand48;
-    lremovexattr;
-    lsearch;
-    lseek;
-    lseek64;
-    lsetxattr;
-    lstat;
-    lstat64;
-    madvise;
-    mallinfo;
-    malloc;
-    malloc_info;
-    malloc_usable_size;
-    mbrlen;
-    mbrtoc16;
-    mbrtoc32;
-    mbrtowc;
-    mbsinit;
-    mbsnrtowcs;
-    mbsrtowcs;
-    mbstowcs;
-    mbtowc;
-    memalign;
-    memccpy;
-    memchr;
-    memcmp;
-    memcpy;
-    memmem;
-    memmove;
-    mempcpy;
-    memrchr;
-    memset;
-    mincore;
-    mkdir;
-    mkdirat;
-    mkdtemp;
-    mkfifo;
-    mkfifoat;
-    mknod;
-    mknodat;
-    mkostemp;
-    mkostemp64;
-    mkostemps;
-    mkostemps64;
-    mkstemp;
-    mkstemp64;
-    mkstemps;
-    mkstemps64;
-    mktemp;
-    mktime;
-    mktime_tz;
-    mlock;
-    mlockall;
-    mmap;
-    mmap64;
-    mount;
-    mprotect;
-    mrand48;
-    mremap;
-    msync;
-    munlock;
-    munlockall;
-    munmap;
-    nanosleep;
-    newlocale;
-    nftw;
-    nftw64;
-    nice;
-    nrand48;
-    ns_format_ttl; # arm64 x86_64 mips64
-    ns_get16; # arm64 x86_64 mips64
-    ns_get32; # arm64 x86_64 mips64
-    ns_initparse; # arm64 x86_64 mips64
-    ns_makecanon; # arm64 x86_64 mips64
-    ns_msg_getflag; # arm64 x86_64 mips64
-    ns_name_compress; # arm64 x86_64 mips64
-    ns_name_ntol; # arm64 x86_64 mips64
-    ns_name_ntop; # arm64 x86_64 mips64
-    ns_name_pack; # arm64 x86_64 mips64
-    ns_name_pton; # arm64 x86_64 mips64
-    ns_name_rollback; # arm64 x86_64 mips64
-    ns_name_skip; # arm64 x86_64 mips64
-    ns_name_uncompress; # arm64 x86_64 mips64
-    ns_name_unpack; # arm64 x86_64 mips64
-    ns_parserr; # arm64 x86_64 mips64
-    ns_put16; # arm64 x86_64 mips64
-    ns_put32; # arm64 x86_64 mips64
-    ns_samename; # arm64 x86_64 mips64
-    ns_skiprr; # arm64 x86_64 mips64
-    ns_sprintrr; # arm64 x86_64 mips64
-    ns_sprintrrf; # arm64 x86_64 mips64
-    nsdispatch;
-    ntohl;
-    ntohs;
-    open;
-    open64;
-    open_memstream;
-    open_wmemstream;
-    openat;
-    openat64;
-    opendir;
-    openlog;
-    openpty;
-    optarg;
-    opterr;
-    optind;
-    optopt;
-    optreset;
-    pathconf;
-    pause;
-    pclose;
-    perror;
-    personality;
-    pipe;
-    pipe2;
-    poll;
-    popen;
-    posix_fadvise;
-    posix_fadvise64;
-    posix_fallocate;
-    posix_fallocate64;
-    posix_madvise;
-    posix_memalign;
-    posix_openpt;
-    ppoll;
-    prctl;
-    pread;
-    pread64;
-    printf;
-    prlimit; # arm64 x86_64 mips64
-    prlimit64;
-    process_vm_readv;
-    process_vm_writev;
-    pselect;
-    psiginfo;
-    psignal;
-    pthread_atfork;
-    pthread_attr_destroy;
-    pthread_attr_getdetachstate;
-    pthread_attr_getguardsize;
-    pthread_attr_getschedparam;
-    pthread_attr_getschedpolicy;
-    pthread_attr_getscope;
-    pthread_attr_getstack;
-    pthread_attr_getstacksize;
-    pthread_attr_init;
-    pthread_attr_setdetachstate;
-    pthread_attr_setguardsize;
-    pthread_attr_setschedparam;
-    pthread_attr_setschedpolicy;
-    pthread_attr_setscope;
-    pthread_attr_setstack;
-    pthread_attr_setstacksize;
-    pthread_cond_broadcast;
-    pthread_cond_destroy;
-    pthread_cond_init;
-    pthread_cond_signal;
-    pthread_cond_timedwait;
-    pthread_cond_wait;
-    pthread_condattr_destroy;
-    pthread_condattr_getclock;
-    pthread_condattr_getpshared;
-    pthread_condattr_init;
-    pthread_condattr_setclock;
-    pthread_condattr_setpshared;
-    pthread_create;
-    pthread_detach;
-    pthread_equal;
-    pthread_exit;
-    pthread_getattr_np;
-    pthread_getcpuclockid;
-    pthread_getschedparam;
-    pthread_getspecific;
-    pthread_gettid_np;
-    pthread_join;
-    pthread_key_create;
-    pthread_key_delete;
-    pthread_kill;
-    pthread_mutex_destroy;
-    pthread_mutex_init;
-    pthread_mutex_lock;
-    pthread_mutex_timedlock;
-    pthread_mutex_trylock;
-    pthread_mutex_unlock;
-    pthread_mutexattr_destroy;
-    pthread_mutexattr_getpshared;
-    pthread_mutexattr_gettype;
-    pthread_mutexattr_init;
-    pthread_mutexattr_setpshared;
-    pthread_mutexattr_settype;
-    pthread_once;
-    pthread_rwlock_destroy;
-    pthread_rwlock_init;
-    pthread_rwlock_rdlock;
-    pthread_rwlock_timedrdlock;
-    pthread_rwlock_timedwrlock;
-    pthread_rwlock_tryrdlock;
-    pthread_rwlock_trywrlock;
-    pthread_rwlock_unlock;
-    pthread_rwlock_wrlock;
-    pthread_rwlockattr_destroy;
-    pthread_rwlockattr_getkind_np;
-    pthread_rwlockattr_getpshared;
-    pthread_rwlockattr_init;
-    pthread_rwlockattr_setkind_np;
-    pthread_rwlockattr_setpshared;
-    pthread_self;
-    pthread_setname_np;
-    pthread_setschedparam;
-    pthread_setspecific;
-    pthread_sigmask;
-    ptrace;
-    ptsname;
-    ptsname_r;
-    putc;
-    putc_unlocked;
-    putchar;
-    putchar_unlocked;
-    putenv;
-    puts;
-    pututline;
-    putwc;
-    putwchar;
-    pwrite;
-    pwrite64;
-    qsort;
-    quick_exit;
-    raise;
-    rand;
-    rand_r;
-    random;
-    read;
-    readahead;
-    readdir;
-    readdir64;
-    readdir64_r;
-    readdir_r;
-    readlink;
-    readlinkat;
-    readv;
-    realloc;
-    realpath;
-    reboot;
-    recv;
-    recvfrom;
-    recvmmsg;
-    recvmsg;
-    regcomp;
-    regerror;
-    regexec;
-    regfree;
-    remove;
-    removexattr;
-    remque;
-    rename;
-    renameat;
-    res_init;
-    res_mkquery;
-    res_query;
-    res_search;
-    rewind;
-    rewinddir;
-    rmdir;
-    sbrk;
-    scandir;
-    scandir64;
-    scanf;
-    sched_get_priority_max;
-    sched_get_priority_min;
-    sched_getaffinity;
-    sched_getcpu;
-    sched_getparam;
-    sched_getscheduler;
-    sched_rr_get_interval;
-    sched_setaffinity;
-    sched_setparam;
-    sched_setscheduler;
-    sched_yield;
-    seed48;
-    seekdir;
-    select;
-    sem_close;
-    sem_destroy;
-    sem_getvalue;
-    sem_init;
-    sem_open;
-    sem_post;
-    sem_timedwait;
-    sem_trywait;
-    sem_unlink;
-    sem_wait;
-    send;
-    sendfile;
-    sendfile64;
-    sendmmsg;
-    sendmsg;
-    sendto;
-    setbuf;
-    setbuffer;
-    setegid;
-    setenv;
-    seteuid;
-    setfsgid;
-    setfsuid;
-    setgid;
-    setgroups;
-    sethostname;
-    setitimer;
-    setjmp;
-    setlinebuf;
-    setlocale;
-    setlogmask;
-    setmntent;
-    setns;
-    setpgid;
-    setpgrp;
-    setpriority;
-    setprogname;
-    setregid;
-    setresgid;
-    setresuid;
-    setreuid;
-    setrlimit;
-    setrlimit64;
-    setservent;
-    setsid;
-    setsockopt;
-    setstate;
-    settimeofday;
-    setuid;
-    setutent;
-    setvbuf;
-    setxattr;
-    shutdown;
-    sigaction;
-    sigaddset;
-    sigaltstack;
-    sigblock;
-    sigdelset;
-    sigemptyset;
-    sigfillset;
-    siginterrupt;
-    sigismember;
-    siglongjmp;
-    signal;
-    signalfd;
-    sigpending;
-    sigprocmask;
-    sigqueue;
-    sigsetjmp;
-    sigsetmask;
-    sigsuspend;
-    sigtimedwait;
-    sigwait;
-    sigwaitinfo;
-    sleep;
-    snprintf;
-    socket;
-    socketpair;
-    splice;
-    sprintf;
-    srand;
-    srand48;
-    srandom;
-    sscanf;
-    stat;
-    stat64;
-    statfs;
-    statfs64;
-    statvfs;
-    statvfs64;
-    stderr;
-    stdin;
-    stdout;
-    stpcpy;
-    stpncpy;
-    strcasecmp;
-    strcasecmp_l;
-    strcasestr;
-    strcat;
-    strchr;
-    strcmp;
-    strcoll;
-    strcoll_l;
-    strcpy;
-    strcspn;
-    strdup;
-    strerror;
-    strerror_l;
-    strerror_r;
-    strftime;
-    strftime_l;
-    strlcat;
-    strlcpy;
-    strlen;
-    strncasecmp;
-    strncasecmp_l;
-    strncat;
-    strncmp;
-    strncpy;
-    strndup;
-    strnlen;
-    strpbrk;
-    strptime;
-    strrchr;
-    strsep;
-    strsignal;
-    strspn;
-    strstr;
-    strtod;
-    strtof;
-    strtoimax;
-    strtok;
-    strtok_r;
-    strtol;
-    strtold;
-    strtold_l;
-    strtoll;
-    strtoll_l;
-    strtoq;
-    strtoul;
-    strtoull;
-    strtoull_l;
-    strtoumax;
-    strtouq;
-    strxfrm;
-    strxfrm_l;
-    swapoff;
-    swapon;
-    swprintf;
-    swscanf;
-    symlink;
-    symlinkat;
-    sync;
-    sys_siglist;
-    sys_signame;
-    syscall;
-    sysconf;
-    sysinfo;
-    syslog;
-    system;
-    tcdrain;
-    tcflow;
-    tcflush;
-    tcgetattr;
-    tcgetpgrp;
-    tcgetsid;
-    tcsendbreak;
-    tcsetattr;
-    tcsetpgrp;
-    tdelete;
-    tdestroy;
-    tee;
-    telldir;
-    tempnam;
-    tfind;
-    tgkill;
-    time;
-    timegm;
-    timelocal;
-    timer_create;
-    timer_delete;
-    timer_getoverrun;
-    timer_gettime;
-    timer_settime;
-    timerfd_create;
-    timerfd_gettime;
-    timerfd_settime;
-    times;
-    timezone;
-    tmpfile;
-    tmpnam;
-    toascii;
-    tolower;
-    tolower_l;
-    toupper;
-    toupper_l;
-    towlower;
-    towlower_l;
-    towupper;
-    towupper_l;
-    truncate;
-    truncate64;
-    tsearch;
-    ttyname;
-    ttyname_r;
-    twalk;
-    tzname;
-    tzset;
-    umask;
-    umount;
-    umount2;
-    uname;
-    ungetc;
-    ungetwc;
-    unlink;
-    unlinkat;
-    unlockpt;
-    unsetenv;
-    unshare;
-    uselocale;
-    usleep;
-    utime;
-    utimensat;
-    utimes;
-    utmpname;
-    vasprintf;
-    vdprintf;
-    verr;
-    verrx;
-    vfork;
-    vfprintf;
-    vfscanf;
-    vfwprintf;
-    vfwscanf;
-    vmsplice;
-    vprintf;
-    vscanf;
-    vsnprintf;
-    vsprintf;
-    vsscanf;
-    vswprintf;
-    vswscanf;
-    vsyslog;
-    vwarn;
-    vwarnx;
-    vwprintf;
-    vwscanf;
-    wait;
-    wait4;
-    waitid;
-    waitpid;
-    warn;
-    warnx;
-    wcpcpy;
-    wcpncpy;
-    wcrtomb;
-    wcscasecmp;
-    wcscasecmp_l;
-    wcscat;
-    wcschr;
-    wcscmp;
-    wcscoll;
-    wcscoll_l;
-    wcscpy;
-    wcscspn;
-    wcsdup;
-    wcsftime;
-    wcslcat;
-    wcslcpy;
-    wcslen;
-    wcsncasecmp;
-    wcsncasecmp_l;
-    wcsncat;
-    wcsncmp;
-    wcsncpy;
-    wcsnlen;
-    wcsnrtombs;
-    wcspbrk;
-    wcsrchr;
-    wcsrtombs;
-    wcsspn;
-    wcsstr;
-    wcstod;
-    wcstof;
-    wcstoimax;
-    wcstok;
-    wcstol;
-    wcstold;
-    wcstold_l;
-    wcstoll;
-    wcstoll_l;
-    wcstombs;
-    wcstoul;
-    wcstoull;
-    wcstoull_l;
-    wcstoumax;
-    wcswidth;
-    wcsxfrm;
-    wcsxfrm_l;
-    wctob;
-    wctomb;
-    wctype;
-    wctype_l;
-    wcwidth;
-    wmemchr;
-    wmemcmp;
-    wmemcpy;
-    wmemmove;
-    wmempcpy;
-    wmemset;
-    wprintf;
-    write;
-    writev;
-    wscanf;
-  local:
-    *;
-};
-
-LIBC_N {
-  global:
-    __fread_chk;
-    __fwrite_chk;
-    __getcwd_chk;
-    __pwrite_chk;
-    __pwrite64_chk;
-    __write_chk;
-    fileno_unlocked;
-    getgrgid_r;
-    getgrnam_r;
-    preadv;
-    preadv64;
-    pthread_barrierattr_destroy;
-    pthread_barrierattr_getpshared;
-    pthread_barrierattr_init;
-    pthread_barrierattr_setpshared;
-    pthread_barrier_destroy;
-    pthread_barrier_init;
-    pthread_barrier_wait;
-    pthread_spin_destroy;
-    pthread_spin_init;
-    pthread_spin_lock;
-    pthread_spin_trylock;
-    pthread_spin_unlock;
-    pwritev;
-    pwritev64;
-    scandirat;
-    scandirat64;
-    strchrnul;
-} LIBC;
-
-LIBC_PRIVATE {
-  global:
-    gMallocLeakZygoteChild;
-} LIBC_N;
diff --git a/libc/libc.mips64.map b/libc/libc.mips64.map
index be0bf5b..8fa46a8 100644
--- a/libc/libc.mips64.map
+++ b/libc/libc.mips64.map
@@ -241,7 +241,6 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
     endservent;
     endutent;
     environ;
@@ -1182,7 +1181,5 @@
 
 LIBC_PRIVATE {
   global:
-    dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
-    dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
     gMallocLeakZygoteChild;
 } LIBC_N;
diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index 93927c0..7120e7a 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -345,7 +345,7 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
+    endpwent; # arm x86 mips nobrillo
     endservent;
     endutent;
     environ;
@@ -1302,8 +1302,8 @@
     __bionic_brk; # arm x86 mips
     __bionic_libgcc_compat_symbols; # arm x86
     dlmalloc; # arm x86 mips nobrillo
-    dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
-    dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
+    dlmalloc_inspect_all; # arm x86 mips nobrillo
+    dlmalloc_trim; # arm x86 mips nobrillo
     dlmalloc_usable_size; # arm x86 mips nobrillo
     gMallocLeakZygoteChild;
     SHA1Final; # arm x86 mips
diff --git a/libc/libc.x86_64.brillo.map b/libc/libc.x86_64.brillo.map
deleted file mode 100644
index 8fa46a8..0000000
--- a/libc/libc.x86_64.brillo.map
+++ /dev/null
@@ -1,1185 +0,0 @@
-# Generated by genversionscripts.py. Do not edit.
-LIBC {
-  global:
-    __assert;
-    __assert2;
-    __b64_ntop;
-    __b64_pton;
-    __cmsg_nxthdr;
-    __ctype_get_mb_cur_max;
-    __cxa_atexit;
-    __cxa_finalize;
-    __cxa_thread_atexit_impl;
-    __dn_comp;
-    __dn_count_labels;
-    __dn_skipname;
-    __errno;
-    __fbufsize;
-    __FD_CLR_chk;
-    __FD_ISSET_chk;
-    __FD_SET_chk;
-    __fgets_chk;
-    __flbf;
-    __fp_nquery;
-    __fp_query;
-    __fpclassify;
-    __fpclassifyd;
-    __fpclassifyf;
-    __fpclassifyl;
-    __fpending;
-    __fpurge;
-    __freadable;
-    __fsetlocking;
-    __fwritable;
-    __get_h_errno;
-    __gnu_basename;
-    __gnu_strerror_r;
-    __hostalias;
-    __isfinite;
-    __isfinitef;
-    __isfinitel;
-    __isinf;
-    __isinff;
-    __isinfl;
-    __isnan;
-    __isnanf;
-    __isnanl;
-    __isnormal;
-    __isnormalf;
-    __isnormall;
-    __isthreaded;
-    __libc_current_sigrtmax;
-    __libc_current_sigrtmin;
-    __libc_init;
-    __loc_aton;
-    __loc_ntoa;
-    __memchr_chk;
-    __memcpy_chk;
-    __memmove_chk;
-    __memrchr_chk;
-    __memset_chk;
-    __open_2;
-    __openat_2;
-    __p_cdname;
-    __p_cdnname;
-    __p_class;
-    __p_class_syms;
-    __p_fqname;
-    __p_fqnname;
-    __p_option;
-    __p_query;
-    __p_rcode;
-    __p_secstodate;
-    __p_time;
-    __p_type;
-    __p_type_syms;
-    __poll_chk;
-    __ppoll_chk;
-    __pread64_chk;
-    __pread_chk;
-    __progname;
-    __pthread_cleanup_pop;
-    __pthread_cleanup_push;
-    __putlong;
-    __putshort;
-    __read_chk;
-    __readlink_chk;
-    __readlinkat_chk;
-    __recvfrom_chk;
-    __register_atfork;
-    __res_close;
-    __res_dnok;
-    __res_hnok;
-    __res_hostalias;
-    __res_isourserver;
-    __res_mailok;
-    __res_nameinquery;
-    __res_nclose;
-    __res_ninit;
-    __res_nmkquery;
-    __res_nquery;
-    __res_nquerydomain;
-    __res_nsearch;
-    __res_nsend;
-    __res_ownok;
-    __res_queriesmatch;
-    __res_querydomain;
-    __res_send;
-    __res_send_setqhook;
-    __res_send_setrhook;
-    __sched_cpualloc;
-    __sched_cpucount;
-    __sched_cpufree;
-    __sF;
-    __snprintf_chk;
-    __sprintf_chk;
-    __stack_chk_fail;
-    __stack_chk_guard;
-    __stpcpy_chk;
-    __stpncpy_chk;
-    __stpncpy_chk2;
-    __strcat_chk;
-    __strchr_chk;
-    __strcpy_chk;
-    __strlcat_chk;
-    __strlcpy_chk;
-    __strlen_chk;
-    __strncat_chk;
-    __strncpy_chk;
-    __strncpy_chk2;
-    __strrchr_chk;
-    __sym_ntop;
-    __sym_ntos;
-    __sym_ston;
-    __system_properties_init;
-    __system_property_add;
-    __system_property_area__;
-    __system_property_area_init;
-    __system_property_area_serial;
-    __system_property_find;
-    __system_property_find_nth;
-    __system_property_foreach;
-    __system_property_get;
-    __system_property_read;
-    __system_property_serial;
-    __system_property_set;
-    __system_property_set_filename;
-    __system_property_update;
-    __system_property_wait_any;
-    __umask_chk;
-    __vsnprintf_chk;
-    __vsprintf_chk;
-    _ctype_;
-    _Exit;
-    _exit;
-    _flushlbf;
-    _getlong;
-    _getshort;
-    _longjmp;
-    _resolv_delete_cache_for_net;
-    _resolv_flush_cache_for_net;
-    _resolv_set_nameservers_for_net;
-    _setjmp;
-    _tolower;
-    _toupper;
-    abort;
-    abs;
-    accept;
-    accept4;
-    access;
-    acct;
-    alarm;
-    alphasort;
-    alphasort64;
-    android_getaddrinfofornet;
-    android_getaddrinfofornetcontext;
-    android_gethostbyaddrfornet;
-    android_gethostbynamefornet;
-    android_set_abort_message;
-    arc4random;
-    arc4random_buf;
-    arc4random_uniform;
-    asctime;
-    asctime_r;
-    asprintf;
-    at_quick_exit;
-    atof;
-    atoi;
-    atol;
-    atoll;
-    basename;
-    bind;
-    bindresvport;
-    brk;
-    bsearch;
-    btowc;
-    c16rtomb;
-    c32rtomb;
-    calloc;
-    capget;
-    capset;
-    cfgetispeed;
-    cfgetospeed;
-    cfmakeraw;
-    cfsetispeed;
-    cfsetospeed;
-    cfsetspeed;
-    chdir;
-    chmod;
-    chown;
-    chroot;
-    clearenv;
-    clearerr;
-    clearerr_unlocked;
-    clock;
-    clock_getcpuclockid;
-    clock_getres;
-    clock_gettime;
-    clock_nanosleep;
-    clock_settime;
-    clone;
-    close;
-    closedir;
-    closelog;
-    connect;
-    creat;
-    creat64;
-    ctime;
-    ctime_r;
-    daemon;
-    daylight;
-    delete_module;
-    difftime;
-    dirfd;
-    dirname;
-    div;
-    dn_expand;
-    dprintf;
-    drand48;
-    dup;
-    dup2;
-    dup3;
-    duplocale;
-    endmntent;
-    endservent;
-    endutent;
-    environ;
-    epoll_create;
-    epoll_create1;
-    epoll_ctl;
-    epoll_pwait;
-    epoll_wait;
-    erand48;
-    err;
-    error;
-    error_at_line;
-    error_message_count;
-    error_one_per_line;
-    error_print_progname;
-    errx;
-    ether_aton;
-    ether_aton_r;
-    ether_ntoa;
-    ether_ntoa_r;
-    eventfd;
-    eventfd_read;
-    eventfd_write;
-    execl;
-    execle;
-    execlp;
-    execv;
-    execve;
-    execvp;
-    execvpe;
-    exit;
-    faccessat;
-    fallocate;
-    fallocate64;
-    fchdir;
-    fchmod;
-    fchmodat;
-    fchown;
-    fchownat;
-    fclose;
-    fcntl;
-    fdatasync;
-    fdopen;
-    fdopendir;
-    feof;
-    feof_unlocked;
-    ferror;
-    ferror_unlocked;
-    fflush;
-    ffs;
-    fgetc;
-    fgetln;
-    fgetpos;
-    fgets;
-    fgetwc;
-    fgetws;
-    fgetxattr;
-    fileno;
-    flistxattr;
-    flock;
-    flockfile;
-    fmemopen;
-    fnmatch;
-    fopen;
-    fork;
-    forkpty;
-    fpathconf;
-    fprintf;
-    fpurge;
-    fputc;
-    fputs;
-    fputwc;
-    fputws;
-    fread;
-    free;
-    free_malloc_leak_info;
-    freeaddrinfo;
-    freelocale;
-    fremovexattr;
-    freopen;
-    fscanf;
-    fseek;
-    fseeko;
-    fsetpos;
-    fsetxattr;
-    fstat;
-    fstat64;
-    fstatat;
-    fstatat64;
-    fstatfs;
-    fstatfs64;
-    fstatvfs;
-    fstatvfs64;
-    fsync;
-    ftell;
-    ftello;
-    ftok;
-    ftruncate;
-    ftruncate64;
-    ftrylockfile;
-    fts_children;
-    fts_close;
-    fts_open;
-    fts_read;
-    fts_set;
-    ftw;
-    ftw64;
-    funlockfile;
-    funopen;
-    futimens;
-    fwide;
-    fwprintf;
-    fwrite;
-    fwscanf;
-    gai_strerror;
-    get_avphys_pages;
-    get_malloc_leak_info;
-    get_nprocs;
-    get_nprocs_conf;
-    get_phys_pages;
-    getaddrinfo;
-    getauxval;
-    getc;
-    getc_unlocked;
-    getchar;
-    getchar_unlocked;
-    getcwd;
-    getdelim;
-    getegid;
-    getenv;
-    geteuid;
-    getgid;
-    getgrgid;
-    getgrnam;
-    getgrouplist;
-    getgroups;
-    gethostbyaddr;
-    gethostbyaddr_r;
-    gethostbyname;
-    gethostbyname2;
-    gethostbyname2_r;
-    gethostbyname_r;
-    gethostent;
-    gethostname;
-    getitimer;
-    getline;
-    getlogin;
-    getmntent;
-    getmntent_r;
-    getnameinfo;
-    getnetbyaddr;
-    getnetbyname;
-    getopt;
-    getopt_long;
-    getopt_long_only;
-    getpagesize;
-    getpeername;
-    getpgid;
-    getpgrp;
-    getpid;
-    getppid;
-    getpriority;
-    getprogname;
-    getprotobyname;
-    getprotobynumber;
-    getpt;
-    getpwnam;
-    getpwnam_r;
-    getpwuid;
-    getpwuid_r;
-    getresgid;
-    getresuid;
-    getrlimit;
-    getrlimit64;
-    getrusage;
-    gets;
-    getservbyname;
-    getservbyport;
-    getservent;
-    getsid;
-    getsockname;
-    getsockopt;
-    gettid;
-    gettimeofday;
-    getuid;
-    getutent;
-    getwc;
-    getwchar;
-    getxattr;
-    gmtime;
-    gmtime_r;
-    grantpt;
-    herror;
-    hstrerror;
-    htonl;
-    htons;
-    if_indextoname;
-    if_nametoindex;
-    imaxabs;
-    imaxdiv;
-    inet_addr;
-    inet_aton;
-    inet_lnaof;
-    inet_makeaddr;
-    inet_netof;
-    inet_network;
-    inet_nsap_addr;
-    inet_nsap_ntoa;
-    inet_ntoa;
-    inet_ntop;
-    inet_pton;
-    init_module;
-    initgroups;
-    initstate;
-    inotify_add_watch;
-    inotify_init;
-    inotify_init1;
-    inotify_rm_watch;
-    insque;
-    ioctl;
-    isalnum;
-    isalnum_l;
-    isalpha;
-    isalpha_l;
-    isascii;
-    isatty;
-    isblank;
-    isblank_l;
-    iscntrl;
-    iscntrl_l;
-    isdigit;
-    isdigit_l;
-    isfinite;
-    isfinitef;
-    isfinitel;
-    isgraph;
-    isgraph_l;
-    isinf;
-    isinff;
-    isinfl;
-    islower;
-    islower_l;
-    isnan;
-    isnanf;
-    isnanl;
-    isnormal;
-    isnormalf;
-    isnormall;
-    isprint;
-    isprint_l;
-    ispunct;
-    ispunct_l;
-    isspace;
-    isspace_l;
-    isupper;
-    isupper_l;
-    iswalnum;
-    iswalnum_l;
-    iswalpha;
-    iswalpha_l;
-    iswblank;
-    iswblank_l;
-    iswcntrl;
-    iswcntrl_l;
-    iswctype;
-    iswctype_l;
-    iswdigit;
-    iswdigit_l;
-    iswgraph;
-    iswgraph_l;
-    iswlower;
-    iswlower_l;
-    iswprint;
-    iswprint_l;
-    iswpunct;
-    iswpunct_l;
-    iswspace;
-    iswspace_l;
-    iswupper;
-    iswupper_l;
-    iswxdigit;
-    iswxdigit_l;
-    isxdigit;
-    isxdigit_l;
-    jrand48;
-    kill;
-    killpg;
-    klogctl;
-    labs;
-    lchown;
-    lcong48;
-    ldexp;
-    ldiv;
-    lfind;
-    lgetxattr;
-    link;
-    linkat;
-    listen;
-    listxattr;
-    llabs;
-    lldiv;
-    llistxattr;
-    localeconv;
-    localtime;
-    localtime_r;
-    login_tty;
-    longjmp;
-    lrand48;
-    lremovexattr;
-    lsearch;
-    lseek;
-    lseek64;
-    lsetxattr;
-    lstat;
-    lstat64;
-    madvise;
-    mallinfo;
-    malloc;
-    malloc_info;
-    malloc_usable_size;
-    mbrlen;
-    mbrtoc16;
-    mbrtoc32;
-    mbrtowc;
-    mbsinit;
-    mbsnrtowcs;
-    mbsrtowcs;
-    mbstowcs;
-    mbtowc;
-    memalign;
-    memccpy;
-    memchr;
-    memcmp;
-    memcpy;
-    memmem;
-    memmove;
-    mempcpy;
-    memrchr;
-    memset;
-    mincore;
-    mkdir;
-    mkdirat;
-    mkdtemp;
-    mkfifo;
-    mkfifoat;
-    mknod;
-    mknodat;
-    mkostemp;
-    mkostemp64;
-    mkostemps;
-    mkostemps64;
-    mkstemp;
-    mkstemp64;
-    mkstemps;
-    mkstemps64;
-    mktemp;
-    mktime;
-    mktime_tz;
-    mlock;
-    mlockall;
-    mmap;
-    mmap64;
-    mount;
-    mprotect;
-    mrand48;
-    mremap;
-    msync;
-    munlock;
-    munlockall;
-    munmap;
-    nanosleep;
-    newlocale;
-    nftw;
-    nftw64;
-    nice;
-    nrand48;
-    ns_format_ttl; # arm64 x86_64 mips64
-    ns_get16; # arm64 x86_64 mips64
-    ns_get32; # arm64 x86_64 mips64
-    ns_initparse; # arm64 x86_64 mips64
-    ns_makecanon; # arm64 x86_64 mips64
-    ns_msg_getflag; # arm64 x86_64 mips64
-    ns_name_compress; # arm64 x86_64 mips64
-    ns_name_ntol; # arm64 x86_64 mips64
-    ns_name_ntop; # arm64 x86_64 mips64
-    ns_name_pack; # arm64 x86_64 mips64
-    ns_name_pton; # arm64 x86_64 mips64
-    ns_name_rollback; # arm64 x86_64 mips64
-    ns_name_skip; # arm64 x86_64 mips64
-    ns_name_uncompress; # arm64 x86_64 mips64
-    ns_name_unpack; # arm64 x86_64 mips64
-    ns_parserr; # arm64 x86_64 mips64
-    ns_put16; # arm64 x86_64 mips64
-    ns_put32; # arm64 x86_64 mips64
-    ns_samename; # arm64 x86_64 mips64
-    ns_skiprr; # arm64 x86_64 mips64
-    ns_sprintrr; # arm64 x86_64 mips64
-    ns_sprintrrf; # arm64 x86_64 mips64
-    nsdispatch;
-    ntohl;
-    ntohs;
-    open;
-    open64;
-    open_memstream;
-    open_wmemstream;
-    openat;
-    openat64;
-    opendir;
-    openlog;
-    openpty;
-    optarg;
-    opterr;
-    optind;
-    optopt;
-    optreset;
-    pathconf;
-    pause;
-    pclose;
-    perror;
-    personality;
-    pipe;
-    pipe2;
-    poll;
-    popen;
-    posix_fadvise;
-    posix_fadvise64;
-    posix_fallocate;
-    posix_fallocate64;
-    posix_madvise;
-    posix_memalign;
-    posix_openpt;
-    ppoll;
-    prctl;
-    pread;
-    pread64;
-    printf;
-    prlimit; # arm64 x86_64 mips64
-    prlimit64;
-    process_vm_readv;
-    process_vm_writev;
-    pselect;
-    psiginfo;
-    psignal;
-    pthread_atfork;
-    pthread_attr_destroy;
-    pthread_attr_getdetachstate;
-    pthread_attr_getguardsize;
-    pthread_attr_getschedparam;
-    pthread_attr_getschedpolicy;
-    pthread_attr_getscope;
-    pthread_attr_getstack;
-    pthread_attr_getstacksize;
-    pthread_attr_init;
-    pthread_attr_setdetachstate;
-    pthread_attr_setguardsize;
-    pthread_attr_setschedparam;
-    pthread_attr_setschedpolicy;
-    pthread_attr_setscope;
-    pthread_attr_setstack;
-    pthread_attr_setstacksize;
-    pthread_cond_broadcast;
-    pthread_cond_destroy;
-    pthread_cond_init;
-    pthread_cond_signal;
-    pthread_cond_timedwait;
-    pthread_cond_wait;
-    pthread_condattr_destroy;
-    pthread_condattr_getclock;
-    pthread_condattr_getpshared;
-    pthread_condattr_init;
-    pthread_condattr_setclock;
-    pthread_condattr_setpshared;
-    pthread_create;
-    pthread_detach;
-    pthread_equal;
-    pthread_exit;
-    pthread_getattr_np;
-    pthread_getcpuclockid;
-    pthread_getschedparam;
-    pthread_getspecific;
-    pthread_gettid_np;
-    pthread_join;
-    pthread_key_create;
-    pthread_key_delete;
-    pthread_kill;
-    pthread_mutex_destroy;
-    pthread_mutex_init;
-    pthread_mutex_lock;
-    pthread_mutex_timedlock;
-    pthread_mutex_trylock;
-    pthread_mutex_unlock;
-    pthread_mutexattr_destroy;
-    pthread_mutexattr_getpshared;
-    pthread_mutexattr_gettype;
-    pthread_mutexattr_init;
-    pthread_mutexattr_setpshared;
-    pthread_mutexattr_settype;
-    pthread_once;
-    pthread_rwlock_destroy;
-    pthread_rwlock_init;
-    pthread_rwlock_rdlock;
-    pthread_rwlock_timedrdlock;
-    pthread_rwlock_timedwrlock;
-    pthread_rwlock_tryrdlock;
-    pthread_rwlock_trywrlock;
-    pthread_rwlock_unlock;
-    pthread_rwlock_wrlock;
-    pthread_rwlockattr_destroy;
-    pthread_rwlockattr_getkind_np;
-    pthread_rwlockattr_getpshared;
-    pthread_rwlockattr_init;
-    pthread_rwlockattr_setkind_np;
-    pthread_rwlockattr_setpshared;
-    pthread_self;
-    pthread_setname_np;
-    pthread_setschedparam;
-    pthread_setspecific;
-    pthread_sigmask;
-    ptrace;
-    ptsname;
-    ptsname_r;
-    putc;
-    putc_unlocked;
-    putchar;
-    putchar_unlocked;
-    putenv;
-    puts;
-    pututline;
-    putwc;
-    putwchar;
-    pwrite;
-    pwrite64;
-    qsort;
-    quick_exit;
-    raise;
-    rand;
-    rand_r;
-    random;
-    read;
-    readahead;
-    readdir;
-    readdir64;
-    readdir64_r;
-    readdir_r;
-    readlink;
-    readlinkat;
-    readv;
-    realloc;
-    realpath;
-    reboot;
-    recv;
-    recvfrom;
-    recvmmsg;
-    recvmsg;
-    regcomp;
-    regerror;
-    regexec;
-    regfree;
-    remove;
-    removexattr;
-    remque;
-    rename;
-    renameat;
-    res_init;
-    res_mkquery;
-    res_query;
-    res_search;
-    rewind;
-    rewinddir;
-    rmdir;
-    sbrk;
-    scandir;
-    scandir64;
-    scanf;
-    sched_get_priority_max;
-    sched_get_priority_min;
-    sched_getaffinity;
-    sched_getcpu;
-    sched_getparam;
-    sched_getscheduler;
-    sched_rr_get_interval;
-    sched_setaffinity;
-    sched_setparam;
-    sched_setscheduler;
-    sched_yield;
-    seed48;
-    seekdir;
-    select;
-    sem_close;
-    sem_destroy;
-    sem_getvalue;
-    sem_init;
-    sem_open;
-    sem_post;
-    sem_timedwait;
-    sem_trywait;
-    sem_unlink;
-    sem_wait;
-    send;
-    sendfile;
-    sendfile64;
-    sendmmsg;
-    sendmsg;
-    sendto;
-    setbuf;
-    setbuffer;
-    setegid;
-    setenv;
-    seteuid;
-    setfsgid;
-    setfsuid;
-    setgid;
-    setgroups;
-    sethostname;
-    setitimer;
-    setjmp;
-    setlinebuf;
-    setlocale;
-    setlogmask;
-    setmntent;
-    setns;
-    setpgid;
-    setpgrp;
-    setpriority;
-    setprogname;
-    setregid;
-    setresgid;
-    setresuid;
-    setreuid;
-    setrlimit;
-    setrlimit64;
-    setservent;
-    setsid;
-    setsockopt;
-    setstate;
-    settimeofday;
-    setuid;
-    setutent;
-    setvbuf;
-    setxattr;
-    shutdown;
-    sigaction;
-    sigaddset;
-    sigaltstack;
-    sigblock;
-    sigdelset;
-    sigemptyset;
-    sigfillset;
-    siginterrupt;
-    sigismember;
-    siglongjmp;
-    signal;
-    signalfd;
-    sigpending;
-    sigprocmask;
-    sigqueue;
-    sigsetjmp;
-    sigsetmask;
-    sigsuspend;
-    sigtimedwait;
-    sigwait;
-    sigwaitinfo;
-    sleep;
-    snprintf;
-    socket;
-    socketpair;
-    splice;
-    sprintf;
-    srand;
-    srand48;
-    srandom;
-    sscanf;
-    stat;
-    stat64;
-    statfs;
-    statfs64;
-    statvfs;
-    statvfs64;
-    stderr;
-    stdin;
-    stdout;
-    stpcpy;
-    stpncpy;
-    strcasecmp;
-    strcasecmp_l;
-    strcasestr;
-    strcat;
-    strchr;
-    strcmp;
-    strcoll;
-    strcoll_l;
-    strcpy;
-    strcspn;
-    strdup;
-    strerror;
-    strerror_l;
-    strerror_r;
-    strftime;
-    strftime_l;
-    strlcat;
-    strlcpy;
-    strlen;
-    strncasecmp;
-    strncasecmp_l;
-    strncat;
-    strncmp;
-    strncpy;
-    strndup;
-    strnlen;
-    strpbrk;
-    strptime;
-    strrchr;
-    strsep;
-    strsignal;
-    strspn;
-    strstr;
-    strtod;
-    strtof;
-    strtoimax;
-    strtok;
-    strtok_r;
-    strtol;
-    strtold;
-    strtold_l;
-    strtoll;
-    strtoll_l;
-    strtoq;
-    strtoul;
-    strtoull;
-    strtoull_l;
-    strtoumax;
-    strtouq;
-    strxfrm;
-    strxfrm_l;
-    swapoff;
-    swapon;
-    swprintf;
-    swscanf;
-    symlink;
-    symlinkat;
-    sync;
-    sys_siglist;
-    sys_signame;
-    syscall;
-    sysconf;
-    sysinfo;
-    syslog;
-    system;
-    tcdrain;
-    tcflow;
-    tcflush;
-    tcgetattr;
-    tcgetpgrp;
-    tcgetsid;
-    tcsendbreak;
-    tcsetattr;
-    tcsetpgrp;
-    tdelete;
-    tdestroy;
-    tee;
-    telldir;
-    tempnam;
-    tfind;
-    tgkill;
-    time;
-    timegm;
-    timelocal;
-    timer_create;
-    timer_delete;
-    timer_getoverrun;
-    timer_gettime;
-    timer_settime;
-    timerfd_create;
-    timerfd_gettime;
-    timerfd_settime;
-    times;
-    timezone;
-    tmpfile;
-    tmpnam;
-    toascii;
-    tolower;
-    tolower_l;
-    toupper;
-    toupper_l;
-    towlower;
-    towlower_l;
-    towupper;
-    towupper_l;
-    truncate;
-    truncate64;
-    tsearch;
-    ttyname;
-    ttyname_r;
-    twalk;
-    tzname;
-    tzset;
-    umask;
-    umount;
-    umount2;
-    uname;
-    ungetc;
-    ungetwc;
-    unlink;
-    unlinkat;
-    unlockpt;
-    unsetenv;
-    unshare;
-    uselocale;
-    usleep;
-    utime;
-    utimensat;
-    utimes;
-    utmpname;
-    vasprintf;
-    vdprintf;
-    verr;
-    verrx;
-    vfork;
-    vfprintf;
-    vfscanf;
-    vfwprintf;
-    vfwscanf;
-    vmsplice;
-    vprintf;
-    vscanf;
-    vsnprintf;
-    vsprintf;
-    vsscanf;
-    vswprintf;
-    vswscanf;
-    vsyslog;
-    vwarn;
-    vwarnx;
-    vwprintf;
-    vwscanf;
-    wait;
-    wait4;
-    waitid;
-    waitpid;
-    warn;
-    warnx;
-    wcpcpy;
-    wcpncpy;
-    wcrtomb;
-    wcscasecmp;
-    wcscasecmp_l;
-    wcscat;
-    wcschr;
-    wcscmp;
-    wcscoll;
-    wcscoll_l;
-    wcscpy;
-    wcscspn;
-    wcsdup;
-    wcsftime;
-    wcslcat;
-    wcslcpy;
-    wcslen;
-    wcsncasecmp;
-    wcsncasecmp_l;
-    wcsncat;
-    wcsncmp;
-    wcsncpy;
-    wcsnlen;
-    wcsnrtombs;
-    wcspbrk;
-    wcsrchr;
-    wcsrtombs;
-    wcsspn;
-    wcsstr;
-    wcstod;
-    wcstof;
-    wcstoimax;
-    wcstok;
-    wcstol;
-    wcstold;
-    wcstold_l;
-    wcstoll;
-    wcstoll_l;
-    wcstombs;
-    wcstoul;
-    wcstoull;
-    wcstoull_l;
-    wcstoumax;
-    wcswidth;
-    wcsxfrm;
-    wcsxfrm_l;
-    wctob;
-    wctomb;
-    wctype;
-    wctype_l;
-    wcwidth;
-    wmemchr;
-    wmemcmp;
-    wmemcpy;
-    wmemmove;
-    wmempcpy;
-    wmemset;
-    wprintf;
-    write;
-    writev;
-    wscanf;
-  local:
-    *;
-};
-
-LIBC_N {
-  global:
-    __fread_chk;
-    __fwrite_chk;
-    __getcwd_chk;
-    __pwrite_chk;
-    __pwrite64_chk;
-    __write_chk;
-    fileno_unlocked;
-    getgrgid_r;
-    getgrnam_r;
-    preadv;
-    preadv64;
-    pthread_barrierattr_destroy;
-    pthread_barrierattr_getpshared;
-    pthread_barrierattr_init;
-    pthread_barrierattr_setpshared;
-    pthread_barrier_destroy;
-    pthread_barrier_init;
-    pthread_barrier_wait;
-    pthread_spin_destroy;
-    pthread_spin_init;
-    pthread_spin_lock;
-    pthread_spin_trylock;
-    pthread_spin_unlock;
-    pwritev;
-    pwritev64;
-    scandirat;
-    scandirat64;
-    strchrnul;
-} LIBC;
-
-LIBC_PRIVATE {
-  global:
-    gMallocLeakZygoteChild;
-} LIBC_N;
diff --git a/libc/libc.x86_64.map b/libc/libc.x86_64.map
index be0bf5b..8fa46a8 100644
--- a/libc/libc.x86_64.map
+++ b/libc/libc.x86_64.map
@@ -241,7 +241,6 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
     endservent;
     endutent;
     environ;
@@ -1182,7 +1181,5 @@
 
 LIBC_PRIVATE {
   global:
-    dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
-    dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
     gMallocLeakZygoteChild;
 } LIBC_N;