diff --git a/stdlib/public/Platform/CMakeLists.txt b/stdlib/public/Platform/CMakeLists.txt
index aba1e0c6745fa..cbe8a89730e0b 100644
--- a/stdlib/public/Platform/CMakeLists.txt
+++ b/stdlib/public/Platform/CMakeLists.txt
@@ -229,33 +229,21 @@ foreach(sdk ${SWIFT_SDKS})
 
     list(APPEND glibc_modulemap_target_list ${glibc_modulemap_target})
 
-    set(glibc_header_out "${module_dir}/SwiftGlibc.h")
-    set(glibc_header_out_static "${module_dir_static}/SwiftGlibc.h")
-    handle_gyb_source_single(glibc_header_target
-        SOURCE "SwiftGlibc.h.gyb"
-        OUTPUT "${glibc_header_out}"
-        FLAGS "-DCMAKE_SDK=${sdk}")
-    list(APPEND glibc_modulemap_target_list ${glibc_header_target})
-
     if(SWIFT_BUILD_STATIC_STDLIB)
       add_custom_command_target(
-        copy_glibc_modulemap_header_static
+        copy_glibc_modulemap_static
         COMMAND
           "${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir_static}
         COMMAND
           "${CMAKE_COMMAND}" "-E" "copy"
             ${glibc_modulemap_out} ${glibc_modulemap_out_static}
-        COMMAND
-          "${CMAKE_COMMAND}" "-E" "copy"
-            ${glibc_header_out} ${glibc_header_out_static}
-        OUTPUT ${glibc_modulemap_out_static} ${glibc_header_out_static}
+        OUTPUT ${glibc_modulemap_out_static}
         DEPENDS
           "${glibc_modulemap_target}"
-          "${glibc_header_target}"
-        COMMENT "Copying Glibc modulemap and header to static resources")
+        COMMENT "Copying Glibc modulemap to static resources")
 
       list(APPEND glibc_modulemap_target_list
-        ${copy_glibc_modulemap_header_static})
+        ${copy_glibc_modulemap_static})
     endif()
 
     # If this SDK is a target for a non-native host, except if it's for Android
diff --git a/stdlib/public/Platform/SwiftGlibc.h.gyb b/stdlib/public/Platform/SwiftGlibc.h.gyb
deleted file mode 100644
index 61d054e09b049..0000000000000
--- a/stdlib/public/Platform/SwiftGlibc.h.gyb
+++ /dev/null
@@ -1,108 +0,0 @@
-%{
-headers = [
-  'stdc-predef.h',
-  'features.h',
-
-  # C standard library
-  'complex.h',
-  'ctype.h',
-  'errno.h',
-  'fenv.h',
-  'float.h',
-  'inttypes.h',
-  'iso646.h',
-  'libutil.h',
-  'limits.h',
-  'locale.h',
-  'math.h',
-  'pty.h',
-  'setjmp.h',
-  'signal.h',
-  'stdarg.h',
-  'stdbool.h',
-  'stddef.h',
-  'stdint.h',
-  'stdio.h',
-  'stdlib.h',
-  'string.h',
-  'tgmath.h',
-  'time.h',
-  'util.h',
-  'utmp.h',
-
-  # POSIX
-  'aio.h',
-  'arpa/inet.h',
-  'bsd/ifaddrs.h',
-  'bsd/pty.h',
-  'cpio.h',
-  'dirent.h',
-  'dlfcn.h',
-  'fcntl.h',
-  'fmtmsg.h',
-  'fnmatch.h',
-  'ftw.h',
-  'glob.h',
-  'grp.h',
-  'iconv.h',
-  'ifaddrs.h',
-  'langinfo.h',
-  'libgen.h',
-  'link.h',
-  'monetary.h',
-  'net/if.h',
-  'netdb.h',
-  'netinet/in.h',
-  'netinet/tcp.h',
-  'nl_types.h',
-  'poll.h',
-  'pthread.h',
-  'pwd.h',
-  'regex.h',
-  'sched.h',
-  'search.h',
-  'semaphore.h',
-  'spawn.h',
-  'strings.h',
-  'sys/event.h',
-  'sys/file.h',
-  'sys/inotify.h',
-  'sys/ioctl.h',
-  'sys/ipc.h',
-  'sys/mman.h',
-  'sys/mount.h',
-  'sys/msg.h',
-  'sys/resource.h',
-  'sys/select.h',
-  'sys/sem.h',
-  'sys/sendfile.h',
-  'sys/shm.h',
-  'sys/socket.h',
-  'sys/stat.h',
-  'sys/statvfs.h',
-  'sys/time.h',
-  'sys/times.h',
-  'sys/types.h',
-  'sys/uio.h',
-  'sys/un.h',
-  'sys/user.h',
-  'sys/utsname.h',
-  'sys/wait.h',
-  'sysexits.h',
-  'syslog.h',
-  'tar.h',
-  'termios.h',
-  'ulimit.h',
-  'unistd.h',
-  'utime.h',
-  'utmpx.h',
-  'wait.h',
-  'wordexp.h',
-]
-}%
-
-% for header in headers:
-#if __has_include(<${header}>)
-#include <${header}>
-#endif
-% end
diff --git a/stdlib/public/Platform/glibc.modulemap.gyb b/stdlib/public/Platform/glibc.modulemap.gyb
index 82597f579736c..c526fc7d5a6e1 100644
--- a/stdlib/public/Platform/glibc.modulemap.gyb
+++ b/stdlib/public/Platform/glibc.modulemap.gyb
@@ -41,7 +41,114 @@ module SwiftGlibc [system] {
   link "execinfo"
 % end
 
-  header "SwiftGlibc.h"
+% if CMAKE_SDK not in ["ANDROID"]:
+  header "stdc-predef.h"
+  header "features.h"
+% end
+
+  // C standard library
+  header "complex.h"
+  header "ctype.h"
+  header "errno.h"
+  header "fenv.h"
+  header "inttypes.h"
+% if CMAKE_SDK not in ["LINUX", "ANDROID"]:
+  header "libutil.h"
+% end
+  header "locale.h"
+  header "math.h"
+  header "pty.h"
+  header "setjmp.h"
+  header "signal.h"
+  header "stdio.h"
+  header "stdlib.h"
+  header "string.h"
+  header "time.h"
+% if CMAKE_SDK in ["OPENBSD"]:
+  header "util.h"
+% end
+  header "utmp.h"
+
+  // POSIX
+% if CMAKE_SDK not in ["ANDROID"]:
+  header "aio.h"
+% end
+  header "arpa/inet.h"
+% if CMAKE_SDK not in ["LINUX", "ANDROID"]:
+  header "bsd/ifaddrs.h"
+  header "bsd/pty.h"
+% end
+  header "cpio.h"
+  header "dirent.h"
+  header "dlfcn.h"
+  header "fcntl.h"
+% if CMAKE_SDK not in ["ANDROID"]:
+  header "fmtmsg.h"
+% end
+  header "fnmatch.h"
+  header "ftw.h"
+  header "glob.h"
+  header "grp.h"
+  header "iconv.h"
+  header "ifaddrs.h"
+  header "langinfo.h"
+  header "libgen.h"
+  header "link.h"
+% if CMAKE_SDK not in ["ANDROID"]:
+  header "monetary.h"
+% end
+  header "net/if.h"
+  header "netdb.h"
+  header "netinet/in.h"
+  header "netinet/tcp.h"
+  header "nl_types.h"
+  header "poll.h"
+  header "pthread.h"
+  header "pwd.h"
+  header "regex.h"
+  header "sched.h"
+  header "search.h"
+  header "semaphore.h"
+  header "spawn.h"
+  header "strings.h"
+% if CMAKE_SDK not in ["LINUX", "ANDROID"]:
+  header "sys/event.h"
+% end
+  header "x86_64-linux-gnu/sys/file.h"
+  header "x86_64-linux-gnu/sys/inotify.h"
+  header "x86_64-linux-gnu/sys/ioctl.h"
+  header "x86_64-linux-gnu/sys/ipc.h"
+  header "x86_64-linux-gnu/sys/mman.h"
+  header "x86_64-linux-gnu/sys/mount.h"
+  header "x86_64-linux-gnu/sys/msg.h"
+  header "x86_64-linux-gnu/sys/resource.h"
+  header "x86_64-linux-gnu/sys/select.h"
+  header "x86_64-linux-gnu/sys/sem.h"
+  header "x86_64-linux-gnu/sys/sendfile.h"
+  header "x86_64-linux-gnu/sys/shm.h"
+  header "x86_64-linux-gnu/sys/socket.h"
+  header "x86_64-linux-gnu/sys/stat.h"
+  header "x86_64-linux-gnu/sys/statvfs.h"
+  header "x86_64-linux-gnu/sys/time.h"
+  header "x86_64-linux-gnu/sys/times.h"
+  header "x86_64-linux-gnu/sys/types.h"
+  header "x86_64-linux-gnu/sys/uio.h"
+  header "x86_64-linux-gnu/sys/un.h"
+  header "x86_64-linux-gnu/sys/user.h"
+  header "x86_64-linux-gnu/sys/utsname.h"
+  header "x86_64-linux-gnu/sys/wait.h"
+  header "sysexits.h"
+  header "syslog.h"
+  header "tar.h"
+  header "termios.h"
+  header "unistd.h"
+  header "utime.h"
+  header "wait.h"
+% if CMAKE_SDK not in ["ANDROID"]:
+  header "ulimit.h"
+  header "utmpx.h"
+  header "wordexp.h"
+% end
 
   // <assert.h>'s use of NDEBUG requires textual inclusion. 
   textual header "assert.h"