Index: libc/cmake/modules/LLVMLibCArchitectures.cmake
===================================================================
--- libc/cmake/modules/LLVMLibCArchitectures.cmake
+++ libc/cmake/modules/LLVMLibCArchitectures.cmake
@@ -178,8 +178,8 @@
   set(LIBC_CROSSBUILD TRUE)
   if(CMAKE_COMPILER_IS_GNUCXX)
     message(FATAL_ERROR
-            "GCC target triple and the explicity specified target triple do "
-            "not match.")
+            "GCC target triple (${libc_compiler_triple}) and the explicity "
+            "specified target triple (${explicit_target_triple}) do not match.")
   else()
     list(APPEND
          LIBC_COMPILE_OPTIONS_DEFAULT "--target=${explicit_target_triple}")
Index: libc/config/linux/api.td
===================================================================
--- libc/config/linux/api.td
+++ libc/config/linux/api.td
@@ -171,9 +171,6 @@
 
 def SysMManAPI : PublicAPI<"sys/mman.h"> {
   let Types = ["off_t", "size_t"];
-  let Macros = [
-  ];
-
 }
 
 def SignalAPI : PublicAPI<"signal.h"> {
@@ -240,7 +237,8 @@
 }
 
 def UniStdAPI : PublicAPI<"unistd.h"> {
-  let Types = ["__exec_argv_t", "__exec_envp_t", "off_t", "pid_t", "size_t", "ssize_t", "uid_t", "__getoptargv_t"];
+  let Types = ["__exec_argv_t", "__exec_envp_t", "off_t", "pid_t", "size_t",
+               "ssize_t", "uid_t", "__getoptargv_t"];
 }
 
 def SysRandomAPI : PublicAPI<"sys/random.h"> {
@@ -248,7 +246,8 @@
 }
 
 def SysSelectAPI : PublicAPI<"sys/select.h"> {
-  let Types = ["fd_set", "sigset_t", "suseconds_t", "time_t", "struct timespec", "struct timeval"];
+  let Types = ["fd_set", "sigset_t", "suseconds_t", "time_t", "struct timespec",
+               "struct timeval"];
 }
 
 def SysResourceAPI : PublicAPI<"sys/resource.h"> {
Index: libc/include/CMakeLists.txt
===================================================================
--- libc/include/CMakeLists.txt
+++ libc/include/CMakeLists.txt
@@ -24,8 +24,8 @@
   GEN_HDR dirent.h
   DEPENDS
     .llvm_libc_common_h
-    .llvm-libc-types.DIR
     .llvm-libc-types.ino_t
+    .llvm-libc-types.DIR
     .llvm-libc-types.struct_dirent
 )
 
@@ -122,12 +122,12 @@
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.time_macros
-    .llvm-libc-types.time_t
     .llvm-libc-types.clock_t
-    .llvm-libc-types.clockid_t
+    .llvm-libc-types.time_t
     .llvm-libc-types.struct_tm
     .llvm-libc-types.struct_timespec
     .llvm-libc-types.struct_timeval
+    .llvm-libc-types.clockid_t
 )
 
 add_gen_header(
@@ -137,11 +137,11 @@
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-types.__call_once_func_t
+    .llvm-libc-types.once_flag
     .llvm-libc-types.cnd_t
     .llvm-libc-types.mtx_t
-    .llvm-libc-types.once_flag
-    .llvm-libc-types.thrd_start_t
     .llvm-libc-types.thrd_t
+    .llvm-libc-types.thrd_start_t
     .llvm-libc-types.tss_t
     .llvm-libc-types.tss_dtor_t
 )
@@ -164,11 +164,12 @@
     ../config/${LIBC_TARGET_OS}/signal.h.in
   DEPENDS
     .llvm-libc-macros.signal_macros
-    .llvm-libc-types.__sighandler_t
-    .llvm-libc-types.sigset_t
     .llvm-libc-types.sig_atomic_t
-    .llvm-libc-types.stack_t
+    .llvm-libc-types.sigset_t
     .llvm-libc-types.struct_sigaction
+    .llvm-libc-types.union_sigval
+    .llvm-libc-types.siginfo_t
+    .llvm-libc-types.stack_t
     .llvm-libc-types.pid_t
 )
 
@@ -180,10 +181,9 @@
     .llvm_libc_common_h
     .llvm-libc-macros.file_seek_macros
     .llvm-libc-macros.stdio_macros
-    .llvm-libc-types.cookie_io_functions_t
-    .llvm-libc-types.FILE
-    .llvm-libc-types.off_t
     .llvm-libc-types.size_t
+    .llvm-libc-types.FILE
+    .llvm-libc-types.cookie_io_functions_t
 )
 
 add_gen_header(
@@ -193,12 +193,12 @@
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.stdlib_macros
-    .llvm-libc-types.__bsearchcompare_t
-    .llvm-libc-types.__qsortcompare_t
     .llvm-libc-types.div_t
     .llvm-libc-types.ldiv_t
     .llvm-libc-types.lldiv_t
     .llvm-libc-types.size_t
+    .llvm-libc-types.__bsearchcompare_t
+    .llvm-libc-types.__qsortcompare_t
     .llvm-libc-types.__atexithandler_t
 )
 
@@ -227,15 +227,15 @@
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-types.__atfork_callback_t
+    .llvm-libc-types.__pthread_once_func_t
     .llvm-libc-types.__pthread_start_t
     .llvm-libc-types.__pthread_tss_dtor_t
     .llvm-libc-types.pthread_attr_t
-    .llvm-libc-types.pthread_key_t
     .llvm-libc-types.pthread_mutex_t
     .llvm-libc-types.pthread_mutexattr_t
-    .llvm-libc-types.pthread_once_t
-    .llvm-libc-types.__pthread_once_func_t
     .llvm-libc-types.pthread_t
+    .llvm-libc-types.pthread_key_t
+    .llvm-libc-types.pthread_once_t
 )
 
 add_gen_header(
@@ -244,8 +244,10 @@
   GEN_HDR sched.h
   DEPENDS
     .llvm_libc_common_h
-    .llvm-libc-types.cpu_set_t
     .llvm-libc-macros.sched_macros
+    .llvm-libc-types.pid_t
+    .llvm-libc-types.size_t
+    .llvm-libc-types.cpu_set_t
 )
 
 add_gen_header(
@@ -289,9 +291,9 @@
   GEN_HDR sys/mman.h
   DEPENDS
     .llvm_libc_common_h
+    .llvm-libc-macros.sys_mman_macros
     .llvm-libc-types.off_t
     .llvm-libc-types.ssize_t
-    .llvm-libc-macros.sys_mman_macros
 )
 
 add_gen_header(
@@ -309,8 +311,8 @@
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.sys_random_macros
-    .llvm-libc-types.ssize_t
     .llvm-libc-types.size_t
+    .llvm-libc-types.ssize_t
 )
 
 add_gen_header(
@@ -332,6 +334,16 @@
     .llvm_libc_common_h
     .llvm-libc-macros.sys_stat_macros
     .llvm-libc-types.mode_t
+    .llvm-libc-types.dev_t
+    .llvm-libc-types.ino_t
+    .llvm-libc-types.nlink_t
+    .llvm-libc-types.uid_t
+    .llvm-libc-types.gid_t
+    .llvm-libc-types.off_t
+    .llvm-libc-types.struct_timespec
+    .llvm-libc-types.struct_timeval
+    .llvm-libc-types.blksize_t
+    .llvm-libc-types.blkcnt_t
     .llvm-libc-types.struct_stat
 )
 
@@ -344,11 +356,10 @@
     .llvm-libc-macros.sys_select_macros
     .llvm-libc-types.fd_set
     .llvm-libc-types.sigset_t
-    .llvm-libc-types.struct_timespec
-    .llvm-libc-types.struct_timeval
     .llvm-libc-types.suseconds_t
     .llvm-libc-types.time_t
-    .llvm-libc-types.ssize_t
+    .llvm-libc-types.struct_timespec
+    .llvm-libc-types.struct_timeval
 )
 
 add_gen_header(
@@ -358,6 +369,7 @@
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-types.off_t
+    .llvm-libc-types.size_t
     .llvm-libc-types.ssize_t
 )
 
@@ -447,6 +459,7 @@
     .llvm_libc_common_h
     .llvm-libc-macros.termios_macros
     .llvm-libc-types.cc_t
+    .llvm-libc-types.pid_t
     .llvm-libc-types.speed_t
     .llvm-libc-types.struct_termios
     .llvm-libc-types.tcflag_t
Index: libc/src/stdlib/linux/CMakeLists.txt
===================================================================
--- libc/src/stdlib/linux/CMakeLists.txt
+++ libc/src/stdlib/linux/CMakeLists.txt
@@ -19,5 +19,5 @@
   DEPENDS
     libc.include.stdlib
     libc.src.signal.raise
-    ._Exit
+    libc.src.stdlib._Exit
 )
Index: libc/utils/HdrGen/CMakeLists.txt
===================================================================
--- libc/utils/HdrGen/CMakeLists.txt
+++ libc/utils/HdrGen/CMakeLists.txt
@@ -14,7 +14,7 @@
   PublicAPICommand.h
 )
 
-target_include_directories(libc-hdrgen PRIVATE ${LIBC_SOURCE_DIR} ${LLVM_LIBC_INCLUDE_DIRS})
+target_include_directories(libc-hdrgen PRIVATE ${LIBC_SOURCE_DIR})
 target_link_libraries(libc-hdrgen PRIVATE LibcTableGenUtil)
 
 add_subdirectory(PrototypeTestGen)
Index: libc/utils/LibcTableGenUtil/CMakeLists.txt
===================================================================
--- libc/utils/LibcTableGenUtil/CMakeLists.txt
+++ libc/utils/LibcTableGenUtil/CMakeLists.txt
@@ -4,4 +4,4 @@
   APIIndexer.h
   LINK_COMPONENTS Support TableGen
 )
-target_include_directories(LibcTableGenUtil PUBLIC ${LIBC_SOURCE_DIR} ${LLVM_LIBC_INCLUDE_DIRS})
+target_include_directories(LibcTableGenUtil PUBLIC ${LIBC_SOURCE_DIR})