diff --git a/libc/include/arpa/inet.h.def b/libc/include/arpa/inet.h.def
index fdd5ae3e3f85a..6a62b2c7be81b 100644
--- a/libc/include/arpa/inet.h.def
+++ b/libc/include/arpa/inet.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_ARPA_INET_H
 #define LLVM_LIBC_ARPA_INET_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 #include <inttypes.h>
 
diff --git a/libc/include/assert.h.def b/libc/include/assert.h.def
index e5d7dfbffdbb6..e006133a76542 100644
--- a/libc/include/assert.h.def
+++ b/libc/include/assert.h.def
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 // This file may be usefully included multiple times to change assert()'s
 // definition based on NDEBUG.
diff --git a/libc/include/ctype.h.def b/libc/include/ctype.h.def
index ac52a36bf72f5..a9bb786931ead 100644
--- a/libc/include/ctype.h.def
+++ b/libc/include/ctype.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_CTYPE_H
 #define LLVM_LIBC_CTYPE_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
diff --git a/libc/include/dirent.h.def b/libc/include/dirent.h.def
index 3de8b1c6713f1..6786578fbd067 100644
--- a/libc/include/dirent.h.def
+++ b/libc/include/dirent.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_DIRENT_H
 #define LLVM_LIBC_DIRENT_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
diff --git a/libc/include/errno.h.def b/libc/include/errno.h.def
index 90bd8bfecf2f1..d7ae90ad45247 100644
--- a/libc/include/errno.h.def
+++ b/libc/include/errno.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_ERRNO_H
 #define LLVM_LIBC_ERRNO_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 #ifdef __linux__
 
@@ -40,7 +40,7 @@
 #endif // ENOTRECOVERABLE
 
 #else // __linux__
-#include <llvm-libc-macros/generic-error-number-macros.h>
+#include "llvm-libc-macros/generic-error-number-macros.h"
 #endif
 
 #if !defined(__AMDGPU__) && !defined(__NVPTX__)
diff --git a/libc/include/fcntl.h.def b/libc/include/fcntl.h.def
index b11645d18c5bd..4f608845ce1ed 100644
--- a/libc/include/fcntl.h.def
+++ b/libc/include/fcntl.h.def
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_FCNTL_H
 #define LLVM_LIBC_FCNTL_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/fcntl-macros.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/fcntl-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/features.h.def b/libc/include/features.h.def
index 64205f57acb5d..238b88d4b90f5 100644
--- a/libc/include/features.h.def
+++ b/libc/include/features.h.def
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_FEATURES_H
 #define LLVM_LIBC_FEATURES_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/features-macros.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/features-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/fenv.h.def b/libc/include/fenv.h.def
index f131a44914abf..c677b2a5930dc 100644
--- a/libc/include/fenv.h.def
+++ b/libc/include/fenv.h.def
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_FENV_H
 #define LLVM_LIBC_FENV_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/fenv-macros.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/fenv-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/float.h.def b/libc/include/float.h.def
index 6d3599d78c69e..3bcd7f5e3f98a 100644
--- a/libc/include/float.h.def
+++ b/libc/include/float.h.def
@@ -9,6 +9,6 @@
 #ifndef LLVM_LIBC_FLOAT_H
 #define LLVM_LIBC_FLOAT_H
 
-#include <llvm-libc-macros/float-macros.h>
+#include "llvm-libc-macros/float-macros.h"
 
 #endif // LLVM_LIBC_FLOAT_H
diff --git a/libc/include/gpu/rpc.h.def b/libc/include/gpu/rpc.h.def
index 0438cd65e7be2..72acf0c814228 100644
--- a/libc/include/gpu/rpc.h.def
+++ b/libc/include/gpu/rpc.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_GPU_RPC_H
 #define LLVM_LIBC_GPU_RPC_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
-#include <llvm-libc-types/rpc_opcodes_t.h>
+#include "llvm-libc-types/rpc_opcodes_t.h"
 
 %%public_api()
 
diff --git a/libc/include/inttypes.h.def b/libc/include/inttypes.h.def
index a99d4e931f514..5879d2d8e0410 100644
--- a/libc/include/inttypes.h.def
+++ b/libc/include/inttypes.h.def
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_INTTYPES_H
 #define LLVM_LIBC_INTTYPES_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/inttypes-macros.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/inttypes-macros.h"
 #include <stdint.h>
 
 %%public_api()
diff --git a/libc/include/limits.h.def b/libc/include/limits.h.def
index de5f3490459ed..c37c97c69a843 100644
--- a/libc/include/limits.h.def
+++ b/libc/include/limits.h.def
@@ -9,6 +9,6 @@
 #ifndef LLVM_LIBC_LIMITS_H
 #define LLVM_LIBC_LIMITS_H
 
-#include <llvm-libc-macros/limits-macros.h>
+#include "llvm-libc-macros/limits-macros.h"
 
 #endif // LLVM_LIBC_LIMITS_H
diff --git a/libc/include/llvm-libc-macros/containerof-macro.h b/libc/include/llvm-libc-macros/containerof-macro.h
index 62724abd3b0f1..592acd6e3aa98 100644
--- a/libc/include/llvm-libc-macros/containerof-macro.h
+++ b/libc/include/llvm-libc-macros/containerof-macro.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_MACROS_CONTAINEROF_MACRO_H
 #define LLVM_LIBC_MACROS_CONTAINEROF_MACRO_H
 
-#include <llvm-libc-macros/offsetof-macro.h>
+#include "llvm-libc-macros/offsetof-macro.h"
 
 #define __containerof(ptr, type, member)                                       \
   ({                                                                           \
diff --git a/libc/include/llvm-libc-macros/sys-queue-macros.h b/libc/include/llvm-libc-macros/sys-queue-macros.h
index fcac265333fc8..089b6abaa0240 100644
--- a/libc/include/llvm-libc-macros/sys-queue-macros.h
+++ b/libc/include/llvm-libc-macros/sys-queue-macros.h
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_MACROS_SYS_QUEUE_MACROS_H
 #define LLVM_LIBC_MACROS_SYS_QUEUE_MACROS_H
 
-#include <llvm-libc-macros/containerof-macro.h>
-#include <llvm-libc-macros/null-macro.h>
+#include "llvm-libc-macros/containerof-macro.h"
+#include "llvm-libc-macros/null-macro.h"
 
 #ifdef __cplusplus
 #define QUEUE_TYPEOF(type) type
diff --git a/libc/include/llvm-libc-types/__mutex_type.h b/libc/include/llvm-libc-types/__mutex_type.h
index d27bf5db83776..3779c78203ed8 100644
--- a/libc/include/llvm-libc-types/__mutex_type.h
+++ b/libc/include/llvm-libc-types/__mutex_type.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES___MUTEX_TYPE_H
 #define LLVM_LIBC_TYPES___MUTEX_TYPE_H
 
-#include <llvm-libc-types/__futex_word.h>
+#include "llvm-libc-types/__futex_word.h"
 
 typedef struct {
   unsigned char __timed;
diff --git a/libc/include/llvm-libc-types/cookie_io_functions_t.h b/libc/include/llvm-libc-types/cookie_io_functions_t.h
index f9fa1a2d50ed0..a3e7c32a50966 100644
--- a/libc/include/llvm-libc-types/cookie_io_functions_t.h
+++ b/libc/include/llvm-libc-types/cookie_io_functions_t.h
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_TYPES_COOKIE_IO_FUNCTIONS_T_H
 #define LLVM_LIBC_TYPES_COOKIE_IO_FUNCTIONS_T_H
 
-#include <llvm-libc-types/off64_t.h>
-#include <llvm-libc-types/size_t.h>
-#include <llvm-libc-types/ssize_t.h>
+#include "llvm-libc-types/off64_t.h"
+#include "llvm-libc-types/size_t.h"
+#include "llvm-libc-types/ssize_t.h"
 
 typedef ssize_t cookie_read_function_t(void *, char *, size_t);
 typedef ssize_t cookie_write_function_t(void *, const char *, size_t);
diff --git a/libc/include/llvm-libc-types/fd_set.h b/libc/include/llvm-libc-types/fd_set.h
index 58fc438bbdd28..fd1bde24c90e8 100644
--- a/libc/include/llvm-libc-types/fd_set.h
+++ b/libc/include/llvm-libc-types/fd_set.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_FD_SET_H
 #define LLVM_LIBC_TYPES_FD_SET_H
 
-#include <llvm-libc-macros/sys-select-macros.h> // FD_SETSIZE
+#include "llvm-libc-macros/sys-select-macros.h" // FD_SETSIZE
 
 typedef struct {
   __FD_SET_WORD_TYPE __set[__FD_SET_ARRAYSIZE];
diff --git a/libc/include/llvm-libc-types/mtx_t.h b/libc/include/llvm-libc-types/mtx_t.h
index 0f3882c26b6bc..ebf79871c9357 100644
--- a/libc/include/llvm-libc-types/mtx_t.h
+++ b/libc/include/llvm-libc-types/mtx_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_MTX_T_H
 #define LLVM_LIBC_TYPES_MTX_T_H
 
-#include <llvm-libc-types/__mutex_type.h>
+#include "llvm-libc-types/__mutex_type.h"
 
 typedef __mutex_type mtx_t;
 
diff --git a/libc/include/llvm-libc-types/once_flag.h b/libc/include/llvm-libc-types/once_flag.h
index cb80112846102..f80d35e317e99 100644
--- a/libc/include/llvm-libc-types/once_flag.h
+++ b/libc/include/llvm-libc-types/once_flag.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ONCE_FLAG_H
 #define LLVM_LIBC_TYPES_ONCE_FLAG_H
 
-#include <llvm-libc-types/__futex_word.h>
+#include "llvm-libc-types/__futex_word.h"
 
 #ifdef __linux__
 typedef __futex_word once_flag;
diff --git a/libc/include/llvm-libc-types/pthread_attr_t.h b/libc/include/llvm-libc-types/pthread_attr_t.h
index 66c04de04a99b..7512193ef97be 100644
--- a/libc/include/llvm-libc-types/pthread_attr_t.h
+++ b/libc/include/llvm-libc-types/pthread_attr_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_PTHREAD_ATTR_T_H
 #define LLVM_LIBC_TYPES_PTHREAD_ATTR_T_H
 
-#include <llvm-libc-types/size_t.h>
+#include "llvm-libc-types/size_t.h"
 
 typedef struct {
   int __detachstate;
diff --git a/libc/include/llvm-libc-types/pthread_mutex_t.h b/libc/include/llvm-libc-types/pthread_mutex_t.h
index b1eb21f24fac5..cf2194d719f35 100644
--- a/libc/include/llvm-libc-types/pthread_mutex_t.h
+++ b/libc/include/llvm-libc-types/pthread_mutex_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_PTHREAD_MUTEX_T_H
 #define LLVM_LIBC_TYPES_PTHREAD_MUTEX_T_H
 
-#include <llvm-libc-types/__mutex_type.h>
+#include "llvm-libc-types/__mutex_type.h"
 
 typedef __mutex_type pthread_mutex_t;
 
diff --git a/libc/include/llvm-libc-types/pthread_once_t.h b/libc/include/llvm-libc-types/pthread_once_t.h
index 3fe78b7ddff66..8ea926f4ee7dc 100644
--- a/libc/include/llvm-libc-types/pthread_once_t.h
+++ b/libc/include/llvm-libc-types/pthread_once_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_PTHREAD_ONCE_T_H
 #define LLVM_LIBC_TYPES_PTHREAD_ONCE_T_H
 
-#include <llvm-libc-types/__futex_word.h>
+#include "llvm-libc-types/__futex_word.h"
 
 #ifdef __linux__
 typedef __futex_word pthread_once_t;
diff --git a/libc/include/llvm-libc-types/pthread_t.h b/libc/include/llvm-libc-types/pthread_t.h
index 72c14e1c2eea8..63cc0d7dd74cb 100644
--- a/libc/include/llvm-libc-types/pthread_t.h
+++ b/libc/include/llvm-libc-types/pthread_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_PTHREAD_T_H
 #define LLVM_LIBC_TYPES_PTHREAD_T_H
 
-#include <llvm-libc-types/__thread_type.h>
+#include "llvm-libc-types/__thread_type.h"
 
 typedef __thread_type pthread_t;
 
diff --git a/libc/include/llvm-libc-types/siginfo_t.h b/libc/include/llvm-libc-types/siginfo_t.h
index 935ef4bbcb723..dafe9c1b5f8eb 100644
--- a/libc/include/llvm-libc-types/siginfo_t.h
+++ b/libc/include/llvm-libc-types/siginfo_t.h
@@ -9,10 +9,10 @@
 #ifndef LLVM_LIBC_TYPES_SIGINFO_T_H
 #define LLVM_LIBC_TYPES_SIGINFO_T_H
 
-#include <llvm-libc-types/clock_t.h>
-#include <llvm-libc-types/pid_t.h>
-#include <llvm-libc-types/uid_t.h>
-#include <llvm-libc-types/union_sigval.h>
+#include "llvm-libc-types/clock_t.h"
+#include "llvm-libc-types/pid_t.h"
+#include "llvm-libc-types/uid_t.h"
+#include "llvm-libc-types/union_sigval.h"
 
 #define SI_MAX_SIZE 128
 
diff --git a/libc/include/llvm-libc-types/sigset_t.h b/libc/include/llvm-libc-types/sigset_t.h
index f159c6c6c6435..311a92b823ff5 100644
--- a/libc/include/llvm-libc-types/sigset_t.h
+++ b/libc/include/llvm-libc-types/sigset_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_SIGSET_T_H
 #define LLVM_LIBC_TYPES_SIGSET_T_H
 
-#include <llvm-libc-macros/signal-macros.h>
+#include "llvm-libc-macros/signal-macros.h"
 
 // This definition can be adjusted/specialized for different targets and
 // platforms as necessary. This definition works for Linux on most targets.
diff --git a/libc/include/llvm-libc-types/stack_t.h b/libc/include/llvm-libc-types/stack_t.h
index 5fa4d3a6d3dc9..9156425436e94 100644
--- a/libc/include/llvm-libc-types/stack_t.h
+++ b/libc/include/llvm-libc-types/stack_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_STACK_T_H
 #define LLVM_LIBC_TYPES_STACK_T_H
 
-#include <llvm-libc-types/size_t.h>
+#include "llvm-libc-types/size_t.h"
 
 typedef struct {
   // The order of the fields declared here should match the kernel definition
diff --git a/libc/include/llvm-libc-types/struct_dirent.h b/libc/include/llvm-libc-types/struct_dirent.h
index 3c5b361c3cbcf..0bb71b9f3b84c 100644
--- a/libc/include/llvm-libc-types/struct_dirent.h
+++ b/libc/include/llvm-libc-types/struct_dirent.h
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_DIRENT_H
 #define LLVM_LIBC_TYPES_STRUCT_DIRENT_H
 
-#include <llvm-libc-types/ino_t.h>
-#include <llvm-libc-types/off_t.h>
+#include "llvm-libc-types/ino_t.h"
+#include "llvm-libc-types/off_t.h"
 
 struct dirent {
   ino_t d_ino;
diff --git a/libc/include/llvm-libc-types/struct_epoll_event.h b/libc/include/llvm-libc-types/struct_epoll_event.h
index 6fc5b410348a1..66cf86c1e2a00 100644
--- a/libc/include/llvm-libc-types/struct_epoll_event.h
+++ b/libc/include/llvm-libc-types/struct_epoll_event.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_EPOLL_EVENT_H
 #define LLVM_LIBC_TYPES_STRUCT_EPOLL_EVENT_H
 
-#include <llvm-libc-types/struct_epoll_data.h>
+#include "llvm-libc-types/struct_epoll_data.h"
 
 typedef struct epoll_event {
   __UINT32_TYPE__ events;
diff --git a/libc/include/llvm-libc-types/struct_rlimit.h b/libc/include/llvm-libc-types/struct_rlimit.h
index e093d9f306c98..11e6bee15f9d6 100644
--- a/libc/include/llvm-libc-types/struct_rlimit.h
+++ b/libc/include/llvm-libc-types/struct_rlimit.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_RLIMIT_H
 #define LLVM_LIBC_TYPES_STRUCT_RLIMIT_H
 
-#include <llvm-libc-types/rlim_t.h>
+#include "llvm-libc-types/rlim_t.h"
 
 struct rlimit {
   rlim_t rlim_cur;
diff --git a/libc/include/llvm-libc-types/struct_rusage.h b/libc/include/llvm-libc-types/struct_rusage.h
index 21ea8b1061c29..ed838d30ede3d 100644
--- a/libc/include/llvm-libc-types/struct_rusage.h
+++ b/libc/include/llvm-libc-types/struct_rusage.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_RUSAGE_H
 #define LLVM_LIBC_TYPES_STRUCT_RUSAGE_H
 
-#include <llvm-libc-types/struct_timeval.h>
+#include "llvm-libc-types/struct_timeval.h"
 
 struct rusage {
   struct timeval ru_utime;
diff --git a/libc/include/llvm-libc-types/struct_sched_param.h b/libc/include/llvm-libc-types/struct_sched_param.h
index 0521a4df652f1..86209ac3a1816 100644
--- a/libc/include/llvm-libc-types/struct_sched_param.h
+++ b/libc/include/llvm-libc-types/struct_sched_param.h
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_SCHED_PARAM_H
 #define LLVM_LIBC_TYPES_STRUCT_SCHED_PARAM_H
 
-#include <llvm-libc-types/pid_t.h>
-#include <llvm-libc-types/struct_timespec.h>
-#include <llvm-libc-types/time_t.h>
+#include "llvm-libc-types/pid_t.h"
+#include "llvm-libc-types/struct_timespec.h"
+#include "llvm-libc-types/time_t.h"
 
 struct sched_param {
   // Process or thread execution scheduling priority.
diff --git a/libc/include/llvm-libc-types/struct_sigaction.h b/libc/include/llvm-libc-types/struct_sigaction.h
index 54d2995f4ecd0..ffce04d0f7e8c 100644
--- a/libc/include/llvm-libc-types/struct_sigaction.h
+++ b/libc/include/llvm-libc-types/struct_sigaction.h
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_SIGACTION_H
 #define LLVM_LIBC_TYPES_STRUCT_SIGACTION_H
 
-#include <llvm-libc-types/siginfo_t.h>
-#include <llvm-libc-types/sigset_t.h>
+#include "llvm-libc-types/siginfo_t.h"
+#include "llvm-libc-types/sigset_t.h"
 
 struct sigaction {
   union {
diff --git a/libc/include/llvm-libc-types/struct_sockaddr.h b/libc/include/llvm-libc-types/struct_sockaddr.h
index 074b1ae50ef07..a98606323c522 100644
--- a/libc/include/llvm-libc-types/struct_sockaddr.h
+++ b/libc/include/llvm-libc-types/struct_sockaddr.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_SOCKADDR_H
 #define LLVM_LIBC_TYPES_STRUCT_SOCKADDR_H
 
-#include <llvm-libc-types/sa_family_t.h>
+#include "llvm-libc-types/sa_family_t.h"
 
 struct sockaddr {
   sa_family_t sa_family;
diff --git a/libc/include/llvm-libc-types/struct_sockaddr_un.h b/libc/include/llvm-libc-types/struct_sockaddr_un.h
index 4332419a5b715..3c0362ce24fba 100644
--- a/libc/include/llvm-libc-types/struct_sockaddr_un.h
+++ b/libc/include/llvm-libc-types/struct_sockaddr_un.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_SOCKADDR_UN_H
 #define LLVM_LIBC_TYPES_STRUCT_SOCKADDR_UN_H
 
-#include <llvm-libc-types/sa_family_t.h>
+#include "llvm-libc-types/sa_family_t.h"
 
 // This is the sockaddr specialization for AF_UNIX or AF_LOCAL sockets, as
 // defined by posix.
diff --git a/libc/include/llvm-libc-types/struct_stat.h b/libc/include/llvm-libc-types/struct_stat.h
index 3539fb5b920e3..d8ae9dd6ffdca 100644
--- a/libc/include/llvm-libc-types/struct_stat.h
+++ b/libc/include/llvm-libc-types/struct_stat.h
@@ -9,16 +9,16 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_STAT_H
 #define LLVM_LIBC_TYPES_STRUCT_STAT_H
 
-#include <llvm-libc-types/blkcnt_t.h>
-#include <llvm-libc-types/blksize_t.h>
-#include <llvm-libc-types/dev_t.h>
-#include <llvm-libc-types/gid_t.h>
-#include <llvm-libc-types/ino_t.h>
-#include <llvm-libc-types/mode_t.h>
-#include <llvm-libc-types/nlink_t.h>
-#include <llvm-libc-types/off_t.h>
-#include <llvm-libc-types/struct_timespec.h>
-#include <llvm-libc-types/uid_t.h>
+#include "llvm-libc-types/blkcnt_t.h"
+#include "llvm-libc-types/blksize_t.h"
+#include "llvm-libc-types/dev_t.h"
+#include "llvm-libc-types/gid_t.h"
+#include "llvm-libc-types/ino_t.h"
+#include "llvm-libc-types/mode_t.h"
+#include "llvm-libc-types/nlink_t.h"
+#include "llvm-libc-types/off_t.h"
+#include "llvm-libc-types/struct_timespec.h"
+#include "llvm-libc-types/uid_t.h"
 
 struct stat {
   dev_t st_dev;
diff --git a/libc/include/llvm-libc-types/struct_termios.h b/libc/include/llvm-libc-types/struct_termios.h
index 72aefe4f69267..51241192f741f 100644
--- a/libc/include/llvm-libc-types/struct_termios.h
+++ b/libc/include/llvm-libc-types/struct_termios.h
@@ -9,9 +9,9 @@
 #ifndef __LLVM_LIBC_TYPES_STRUCT_TERMIOS_H__
 #define __LLVM_LIBC_TYPES_STRUCT_TERMIOS_H__
 
-#include <llvm-libc-types/cc_t.h>
-#include <llvm-libc-types/speed_t.h>
-#include <llvm-libc-types/tcflag_t.h>
+#include "llvm-libc-types/cc_t.h"
+#include "llvm-libc-types/speed_t.h"
+#include "llvm-libc-types/tcflag_t.h"
 
 struct termios {
   tcflag_t c_iflag; // Input mode flags
diff --git a/libc/include/llvm-libc-types/struct_timespec.h b/libc/include/llvm-libc-types/struct_timespec.h
index 5d56d9c9468b4..4baab07c10f85 100644
--- a/libc/include/llvm-libc-types/struct_timespec.h
+++ b/libc/include/llvm-libc-types/struct_timespec.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_TIMESPEC_H
 #define LLVM_LIBC_TYPES_STRUCT_TIMESPEC_H
 
-#include <llvm-libc-types/time_t.h>
+#include "llvm-libc-types/time_t.h"
 
 struct timespec {
   time_t tv_sec; /* Seconds.  */
diff --git a/libc/include/llvm-libc-types/struct_timeval.h b/libc/include/llvm-libc-types/struct_timeval.h
index 6a0b7bbaf8254..365b835d345dd 100644
--- a/libc/include/llvm-libc-types/struct_timeval.h
+++ b/libc/include/llvm-libc-types/struct_timeval.h
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_TIMEVAL_H
 #define LLVM_LIBC_TYPES_STRUCT_TIMEVAL_H
 
-#include <llvm-libc-types/suseconds_t.h>
-#include <llvm-libc-types/time_t.h>
+#include "llvm-libc-types/suseconds_t.h"
+#include "llvm-libc-types/time_t.h"
 
 struct timeval {
   time_t tv_sec;       // Seconds
diff --git a/libc/include/llvm-libc-types/thrd_t.h b/libc/include/llvm-libc-types/thrd_t.h
index 2e0f9a0d75ad7..751ea5b9e4c02 100644
--- a/libc/include/llvm-libc-types/thrd_t.h
+++ b/libc/include/llvm-libc-types/thrd_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_THRD_T_H
 #define LLVM_LIBC_TYPES_THRD_T_H
 
-#include <llvm-libc-types/__thread_type.h>
+#include "llvm-libc-types/__thread_type.h"
 
 typedef __thread_type thrd_t;
 
diff --git a/libc/include/math.h.def b/libc/include/math.h.def
index 927e2d6697c67..cd2fe76f40bf2 100644
--- a/libc/include/math.h.def
+++ b/libc/include/math.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_MATH_H
 #define LLVM_LIBC_MATH_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/math-macros.h>
-#include <llvm-libc-types/float128.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/math-macros.h"
+#include "llvm-libc-types/float128.h"
 
 
 %%public_api()
diff --git a/libc/include/pthread.h.def b/libc/include/pthread.h.def
index 391ecd3c124f2..abeb839ee83d1 100644
--- a/libc/include/pthread.h.def
+++ b/libc/include/pthread.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_PTHREAD_H
 #define LLVM_LIBC_PTHREAD_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 #define PTHREAD_STACK_MIN (1 << 14) // 16KB
 
diff --git a/libc/include/sched.h.def b/libc/include/sched.h.def
index 3b2d5e3308593..493028e8dcc47 100644
--- a/libc/include/sched.h.def
+++ b/libc/include/sched.h.def
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_SCHED_H
 #define LLVM_LIBC_SCHED_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/sched-macros.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/sched-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/search.h.def b/libc/include/search.h.def
index 3435c1f8ad048..6301ba7b656ce 100644
--- a/libc/include/search.h.def
+++ b/libc/include/search.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_SEARCH_H
 #define LLVM_LIBC_SEARCH_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 #define __need_size_t
 #include <stddef.h>
 
diff --git a/libc/include/setjmp.h.def b/libc/include/setjmp.h.def
index 7447be2415bd5..670bc1ac0fe24 100644
--- a/libc/include/setjmp.h.def
+++ b/libc/include/setjmp.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_SETJMP_H
 #define LLVM_LIBC_SETJMP_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
diff --git a/libc/include/signal.h.def b/libc/include/signal.h.def
index 0e70334527157..50a5f44c7337a 100644
--- a/libc/include/signal.h.def
+++ b/libc/include/signal.h.def
@@ -9,12 +9,12 @@
 #ifndef LLVM_LIBC_SIGNAL_H
 #define LLVM_LIBC_SIGNAL_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 #define __need_size_t
 #include <stddef.h>
 
-#include <llvm-libc-macros/signal-macros.h>
+#include "llvm-libc-macros/signal-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/spawn.h.def b/libc/include/spawn.h.def
index 368ebff17ca12..a8d7015852868 100644
--- a/libc/include/spawn.h.def
+++ b/libc/include/spawn.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_SPAWN_H
 #define LLVM_LIBC_SPAWN_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
diff --git a/libc/include/stdbit.h.def b/libc/include/stdbit.h.def
index c5a77329fbfe7..28c147b01e22f 100644
--- a/libc/include/stdbit.h.def
+++ b/libc/include/stdbit.h.def
@@ -9,10 +9,10 @@
 #ifndef LLVM_LIBC_STDBIT_H
 #define LLVM_LIBC_STDBIT_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
-#include <llvm-libc-macros/stdbit-macros.h>
+#include "llvm-libc-macros/stdbit-macros.h"
 
 #endif // LLVM_LIBC_STDBIT_H
diff --git a/libc/include/stdckdint.h.def b/libc/include/stdckdint.h.def
index c82470911c33f..d4a9d829a3c9a 100644
--- a/libc/include/stdckdint.h.def
+++ b/libc/include/stdckdint.h.def
@@ -9,10 +9,10 @@
 #ifndef LLVM_LIBC_STDCKDINT_H
 #define LLVM_LIBC_STDCKDINT_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
-#include <llvm-libc-macros/stdckdint-macros.h>
+#include "llvm-libc-macros/stdckdint-macros.h"
 
 #endif // LLVM_LIBC_STDCKDINT_H
diff --git a/libc/include/stdfix.h.def b/libc/include/stdfix.h.def
index 368eeb33f2f0a..8ac49be45fbae 100644
--- a/libc/include/stdfix.h.def
+++ b/libc/include/stdfix.h.def
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_STDFIX_H
 #define LLVM_LIBC_STDFIX_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/stdfix-macros.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/stdfix-macros.h"
 
 // From ISO/IEC TR 18037:2008 standard:
 // https://www.iso.org/standard/51126.html
diff --git a/libc/include/stdint.h.def b/libc/include/stdint.h.def
index 9e269101acd2f..d7660860c91f8 100644
--- a/libc/include/stdint.h.def
+++ b/libc/include/stdint.h.def
@@ -9,6 +9,6 @@
 #ifndef LLVM_LIBC_STDINT_H
 #define LLVM_LIBC_STDINT_H
 
-#include <llvm-libc-macros/stdint-macros.h>
+#include "llvm-libc-macros/stdint-macros.h"
 
 #endif // LLVM_LIBC_STDINT_H
diff --git a/libc/include/stdio.h.def b/libc/include/stdio.h.def
index a28d009288d5a..78d800c83b514 100644
--- a/libc/include/stdio.h.def
+++ b/libc/include/stdio.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_STDIO_H
 #define LLVM_LIBC_STDIO_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/file-seek-macros.h>
-#include <llvm-libc-macros/stdio-macros.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/file-seek-macros.h"
+#include "llvm-libc-macros/stdio-macros.h"
 
 #include <stdarg.h>
 
diff --git a/libc/include/stdlib.h.def b/libc/include/stdlib.h.def
index 18df71a49a9b4..d523f7a53024a 100644
--- a/libc/include/stdlib.h.def
+++ b/libc/include/stdlib.h.def
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_STDLIB_H
 #define LLVM_LIBC_STDLIB_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/stdlib-macros.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/stdlib-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/string.h.def b/libc/include/string.h.def
index 26e6ef93d314d..1bd2687db2bea 100644
--- a/libc/include/string.h.def
+++ b/libc/include/string.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_STRING_H
 #define LLVM_LIBC_STRING_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
-#include <llvm-libc-macros/null-macro.h>
+#include "llvm-libc-macros/null-macro.h"
 
 %%public_api()
 
diff --git a/libc/include/strings.h.def b/libc/include/strings.h.def
index f07ca30d5dbd0..9b016bf0bc50b 100644
--- a/libc/include/strings.h.def
+++ b/libc/include/strings.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_STRINGS_H
 #define LLVM_LIBC_STRINGS_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/auxv.h.def b/libc/include/sys/auxv.h.def
index 504c2f68cb1eb..11ab25bcfe2c2 100644
--- a/libc/include/sys/auxv.h.def
+++ b/libc/include/sys/auxv.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_SYS_AUXV_H
 #define LLVM_LIBC_SYS_AUXV_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
-#include <llvm-libc-macros/sys-auxv-macros.h>
+#include "llvm-libc-macros/sys-auxv-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/epoll.h.def b/libc/include/sys/epoll.h.def
index 490fad91db3c3..85f7d9ad6091f 100644
--- a/libc/include/sys/epoll.h.def
+++ b/libc/include/sys/epoll.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_SYS_EPOLL_H
 #define LLVM_LIBC_SYS_EPOLL_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/ioctl.h.def b/libc/include/sys/ioctl.h.def
index 90d91cf382913..2f37a1190ac11 100644
--- a/libc/include/sys/ioctl.h.def
+++ b/libc/include/sys/ioctl.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_SYS_IOCTL_H
 #define LLVM_LIBC_SYS_IOCTL_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
-#include <llvm-libc-macros/sys-ioctl-macros.h>
+#include "llvm-libc-macros/sys-ioctl-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/mman.h.def b/libc/include/sys/mman.h.def
index ab9fde1bb9204..2e2c2f1997b83 100644
--- a/libc/include/sys/mman.h.def
+++ b/libc/include/sys/mman.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_SYS_MMAN_H
 #define LLVM_LIBC_SYS_MMAN_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
-#include <llvm-libc-macros/sys-mman-macros.h>
+#include "llvm-libc-macros/sys-mman-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/prctl.h.def b/libc/include/sys/prctl.h.def
index 0a11543d07296..08648c9f47922 100644
--- a/libc/include/sys/prctl.h.def
+++ b/libc/include/sys/prctl.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_SYS_PRCTL_H
 #define LLVM_LIBC_SYS_PRCTL_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 // Process control is highly platform specific, so the platform usually defines
 // the macros itself.
diff --git a/libc/include/sys/queue.h b/libc/include/sys/queue.h
index 1cde35e77a04e..cca53c16f0f3c 100644
--- a/libc/include/sys/queue.h
+++ b/libc/include/sys/queue.h
@@ -9,6 +9,6 @@
 #ifndef SYS_QUEUE_H
 #define SYS_QUEUE_H
 
-#include <llvm-libc-macros/sys-queue-macros.h>
+#include "llvm-libc-macros/sys-queue-macros.h"
 
 #endif // SYS_QUEUE_H
diff --git a/libc/include/sys/random.h.def b/libc/include/sys/random.h.def
index b767f2479fc2d..d11431b2755d9 100644
--- a/libc/include/sys/random.h.def
+++ b/libc/include/sys/random.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_SYS_RANDOM_H
 #define LLVM_LIBC_SYS_RANDOM_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
-#include <llvm-libc-macros/sys-random-macros.h>
+#include "llvm-libc-macros/sys-random-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/resource.h.def b/libc/include/sys/resource.h.def
index 31132d3b26087..365d803cf7154 100644
--- a/libc/include/sys/resource.h.def
+++ b/libc/include/sys/resource.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_SYS_RESOURCE_H
 #define LLVM_LIBC_SYS_RESOURCE_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
-#include <llvm-libc-macros/sys-resource-macros.h>
+#include "llvm-libc-macros/sys-resource-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/select.h.def b/libc/include/sys/select.h.def
index 4f3cebaecbb93..529be7158f262 100644
--- a/libc/include/sys/select.h.def
+++ b/libc/include/sys/select.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_SYS_SELECT_H
 #define LLVM_LIBC_SYS_SELECT_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
-#include <llvm-libc-macros/sys-select-macros.h>
+#include "llvm-libc-macros/sys-select-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/sendfile.h.def b/libc/include/sys/sendfile.h.def
index 947edc28e1ecf..d7f21f91f95ed 100644
--- a/libc/include/sys/sendfile.h.def
+++ b/libc/include/sys/sendfile.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_SYS_SENDFILE_H
 #define LLVM_LIBC_SYS_SENDFILE_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/socket.h.def b/libc/include/sys/socket.h.def
index 71654c64b9885..933ef1512e454 100644
--- a/libc/include/sys/socket.h.def
+++ b/libc/include/sys/socket.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_SYS_SOCKET_H
 #define LLVM_LIBC_SYS_SOCKET_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
-#include <llvm-libc-macros/sys-socket-macros.h>
+#include "llvm-libc-macros/sys-socket-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/stat.h.def b/libc/include/sys/stat.h.def
index ed37d010f497d..06a98a4aa029c 100644
--- a/libc/include/sys/stat.h.def
+++ b/libc/include/sys/stat.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_SYS_STAT_H
 #define LLVM_LIBC_SYS_STAT_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
-#include <llvm-libc-macros/sys-stat-macros.h>
+#include "llvm-libc-macros/sys-stat-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/time.h.def b/libc/include/sys/time.h.def
index 9a3bd7bb49f8f..5a87139aefc95 100644
--- a/libc/include/sys/time.h.def
+++ b/libc/include/sys/time.h.def
@@ -9,11 +9,11 @@
 #ifndef LLVM_LIBC_SYS_TIME_H
 #define LLVM_LIBC_SYS_TIME_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
-#include <llvm-libc-types/struct_timeval.h>
+#include "llvm-libc-types/struct_timeval.h"
 
-#include <llvm-libc-macros/sys-time-macros.h>
+#include "llvm-libc-macros/sys-time-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/types.h.def b/libc/include/sys/types.h.def
index 689482973fc7a..f5c3bb2c928bf 100644
--- a/libc/include/sys/types.h.def
+++ b/libc/include/sys/types.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_SYS_TYPES_H
 #define LLVM_LIBC_SYS_TYPES_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/utsname.h.def b/libc/include/sys/utsname.h.def
index 6d7daeb45f018..08dbbfc062453 100644
--- a/libc/include/sys/utsname.h.def
+++ b/libc/include/sys/utsname.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_SYS_UTSNAME_H
 #define LLVM_LIBC_SYS_UTSNAME_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
diff --git a/libc/include/sys/wait.h.def b/libc/include/sys/wait.h.def
index b4fcce4d16529..0a76da019fdce 100644
--- a/libc/include/sys/wait.h.def
+++ b/libc/include/sys/wait.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_SYS_WAIT_H
 #define LLVM_LIBC_SYS_WAIT_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
-#include <llvm-libc-macros/sys-wait-macros.h>
+#include "llvm-libc-macros/sys-wait-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/termios.h.def b/libc/include/termios.h.def
index be1cd2bff526c..7538944c0985e 100644
--- a/libc/include/termios.h.def
+++ b/libc/include/termios.h.def
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_TERMIOS_H
 #define LLVM_LIBC_TERMIOS_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/termios-macros.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/termios-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/threads.h.def b/libc/include/threads.h.def
index 93541b8d3bac4..b114bea0ace34 100644
--- a/libc/include/threads.h.def
+++ b/libc/include/threads.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_THREADS_H
 #define LLVM_LIBC_THREADS_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
diff --git a/libc/include/time.h.def b/libc/include/time.h.def
index d8988329a372b..2355e8822fad7 100644
--- a/libc/include/time.h.def
+++ b/libc/include/time.h.def
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_TIME_H
 #define LLVM_LIBC_TIME_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/time-macros.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/time-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/uchar.h.def b/libc/include/uchar.h.def
index 7e62d43e9cc48..31b7fcb73ded6 100644
--- a/libc/include/uchar.h.def
+++ b/libc/include/uchar.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_UCHAR_H
 #define LLVM_LIBC_UCHAR_H
 
-#include <__llvm-libc-common.h>
+#include "__llvm-libc-common.h"
 
 %%public_api()
 
diff --git a/libc/include/unistd.h.def b/libc/include/unistd.h.def
index fa10af653fae2..6b9137e14623c 100644
--- a/libc/include/unistd.h.def
+++ b/libc/include/unistd.h.def
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_UNISTD_H
 #define LLVM_LIBC_UNISTD_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/file-seek-macros.h>
-#include <llvm-libc-macros/unistd-macros.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/file-seek-macros.h"
+#include "llvm-libc-macros/unistd-macros.h"
 
 %%public_api()
 
diff --git a/libc/include/wchar.h.def b/libc/include/wchar.h.def
index ac72f80aa0833..4c25de700d606 100644
--- a/libc/include/wchar.h.def
+++ b/libc/include/wchar.h.def
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_WCHAR_H
 #define LLVM_LIBC_WCHAR_H
 
-#include <__llvm-libc-common.h>
-#include <llvm-libc-macros/wchar-macros.h>
+#include "__llvm-libc-common.h"
+#include "llvm-libc-macros/wchar-macros.h"
 
 %%public_api()