diff --git a/libc/Android.bp b/libc/Android.bp
index 35453c5..ca235f0 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -6,8 +6,6 @@
     "bionic/ether_ntoa.c",
     "bionic/fts.c",
     "bionic/getpriority.c",
-    "bionic/if_indextoname.c",
-    "bionic/if_nametoindex.c",
     "bionic/initgroups.c",
     "bionic/isatty.c",
     "bionic/memmem.c",
@@ -236,12 +234,9 @@
         "upstream-netbsd/lib/libc/isc/ev_streams.c",
         "upstream-netbsd/lib/libc/isc/ev_timers.c",
         "upstream-netbsd/lib/libc/resolv/mtctxres.c",
-        // We use the OpenBSD res_random.
-        "upstream-openbsd/lib/libc/net/res_random.c",
     ],
 
     cflags: [
-        "-Dres_randomid=__res_randomid",
         "-DANDROID_CHANGES",
         "-DINET6",
         "-fvisibility=hidden",
@@ -474,6 +469,7 @@
         "upstream-openbsd/lib/libc/net/inet_pton.c",
         "upstream-openbsd/lib/libc/net/ntohl.c",
         "upstream-openbsd/lib/libc/net/ntohs.c",
+        "upstream-openbsd/lib/libc/net/res_random.c",
         "upstream-openbsd/lib/libc/stdio/asprintf.c",
         "upstream-openbsd/lib/libc/stdio/clrerr.c",
         "upstream-openbsd/lib/libc/stdio/dprintf.c",
@@ -1308,6 +1304,7 @@
         "bionic/arpa_inet.cpp",
         "bionic/assert.cpp",
         "bionic/atof.cpp",
+        "bionic/bionic_netlink.cpp",
         "bionic/bionic_systrace.cpp",
         "bionic/bionic_time_conversions.cpp",
         "bionic/brk.cpp",
@@ -1374,6 +1371,7 @@
         "bionic/mntent.cpp",
         "bionic/mremap.cpp",
         "bionic/NetdClientDispatch.cpp",
+        "bionic/net_if.cpp",
         "bionic/open.cpp",
         "bionic/pathconf.cpp",
         "bionic/pause.cpp",