diff --git a/libc/Android.bp b/libc/Android.bp
index 4abb32f..5ffb2e1 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -24,6 +24,7 @@
 // ========================================================
 libc_common_src_files += [
     "bionic/ndk_cruft.cpp",
+    "bionic/ndk_cruft_data.cpp",
 ]
 
 libc_common_src_files_32 = [
@@ -390,8 +391,6 @@
         "upstream-openbsd/lib/libc/gen/getprogname.c",
         "upstream-openbsd/lib/libc/gen/isctype.c",
         "upstream-openbsd/lib/libc/gen/setprogname.c",
-        "upstream-openbsd/lib/libc/gen/tolower_.c",
-        "upstream-openbsd/lib/libc/gen/toupper_.c",
         "upstream-openbsd/lib/libc/gen/verr.c",
         "upstream-openbsd/lib/libc/gen/verrx.c",
         "upstream-openbsd/lib/libc/gen/vwarn.c",