diff --git a/libc/Android.bp b/libc/Android.bp
index 528dd47dd..d1228af14 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -9,7 +9,6 @@ libc_common_src_files = [
     "bionic/if_indextoname.c",
     "bionic/if_nametoindex.c",
     "bionic/initgroups.c",
-    "bionic/ioctl.c",
     "bionic/isatty.c",
     "bionic/memmem.c",
     "bionic/pututline.c",
@@ -1348,6 +1347,7 @@ cc_library_static {
         "bionic/gettid.cpp",
         "bionic/__gnu_basename.cpp",
         "bionic/inotify_init.cpp",
+        "bionic/ioctl.cpp",
         "bionic/lchown.cpp",
         "bionic/lfs64_support.cpp",
         "bionic/__libc_current_sigrtmax.cpp",
@@ -1367,6 +1367,7 @@ cc_library_static {
         "bionic/mkfifo.cpp",
         "bionic/mknod.cpp",
         "bionic/mntent.cpp",
+        "bionic/mremap.cpp",
         "bionic/NetdClientDispatch.cpp",
         "bionic/open.cpp",
         "bionic/pathconf.cpp",