diff --git a/libc/bionic/memswap.c b/libc/bionic/memswap.c
deleted file mode 100644
index 35b0b32..0000000
--- a/libc/bionic/memswap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include <string.h>
-
-void memswap(void *m1, void *m2, size_t n)
-{
-    char*  p     = m1;
-    char*  p_end = p + n;
-    char*  q     = m2;
-
-    while (p < p_end) {
-        char  tmp = *p;
-        *p = *q;
-        *q = tmp;
-        p++;
-        q++;
-    }
-}
diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index fc9d9d4..b915382 100644
--- a/libc/bionic/ndk_cruft.cpp
+++ b/libc/bionic/ndk_cruft.cpp
@@ -59,4 +59,18 @@
   return __get_tls();
 }
 
+// This non-standard function was in our <string.h> for some reason.
+extern "C" void memswap(void* m1, void* m2, size_t n) {
+  char* p = reinterpret_cast<char*>(m1);
+  char* p_end = p + n;
+  char* q = reinterpret_cast<char*>(m2);
+  while (p < p_end) {
+    char tmp = *p;
+    *p = *q;
+    *q = tmp;
+    p++;
+    q++;
+  }
+}
+
 #endif