diff --git a/libc/Android.bp b/libc/Android.bp
index 89d33b022..abdad6215 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -531,8 +531,8 @@ cc_library_static {
     name: "libc_openbsd_large_stack",
     defaults: ["libc_defaults"],
     srcs: [
-        "upstream-openbsd/lib/libc/stdio/vfprintf.c",
-        "upstream-openbsd/lib/libc/stdio/vfwprintf.c",
+        "stdio/vfprintf.c",
+        "stdio/vfwprintf.c",
     ],
     cflags: [
         "-include openbsd-compat.h",
@@ -541,10 +541,10 @@ cc_library_static {
     ],
 
     local_include_dirs: [
-        "stdio",
-        "upstream-openbsd/android/include",
-        "upstream-openbsd/lib/libc/include",
+        "upstream-openbsd/android/include/",
+        "upstream-openbsd/lib/libc/include/",
         "upstream-openbsd/lib/libc/gdtoa/",
+        "upstream-openbsd/lib/libc/stdio/",
     ],
 }
 
diff --git a/libc/upstream-openbsd/lib/libc/stdio/vfprintf.c b/libc/stdio/vfprintf.c
similarity index 100%
rename from libc/upstream-openbsd/lib/libc/stdio/vfprintf.c
rename to libc/stdio/vfprintf.c
diff --git a/libc/upstream-openbsd/lib/libc/stdio/vfwprintf.c b/libc/stdio/vfwprintf.c
similarity index 100%
rename from libc/upstream-openbsd/lib/libc/stdio/vfwprintf.c
rename to libc/stdio/vfwprintf.c