[libc-commits] [libc] [libc] Remove relative includes (PR #203288)

Pavel Labath via libc-commits libc-commits at lists.llvm.org
Thu Jun 11 07:15:50 PDT 2026 

https://github.com/labath created https://github.com/llvm/llvm-project/pull/203288

IIUC, this is the old style (which I've unwittingly propagated) and is no longer needed/desired.

This cleans removes all ".." occurences from libc/include.

I've needed to add a target_include_directories stanza to unit test library targets, as they didn't have it yet.

Assisted by `xargs sed`.

>From b651a00e7ce9569db007acc56cf56f00cdac5053 Mon Sep 17 00:00:00 2001
From: Pavel Labath <pavel at labath.sk>
Date: Thu, 11 Jun 2026 13:40:13 +0000
Subject: [PATCH] [libc] Remove relative includes

IIUC, this is the old style (which I've unwittingly propagated) and is
no longer needed/desired.

This cleans removes all ".." occurences from libc/include.

I've needed to add a target_include_directories stanza to unit test
library targets, as they didn't have it yet.

Assisted by `xargs sed`.
---
 .../include/llvm-libc-macros/float16-macros.h |  2 +-
 libc/include/llvm-libc-macros/link-macros.h   | 70 +++++++++----------
 libc/include/llvm-libc-macros/locale-macros.h |  2 +-
 .../llvm-libc-macros/netinet-in-macros.h      |  2 +-
 libc/include/llvm-libc-macros/stdio-macros.h  |  2 +-
 libc/include/llvm-libc-macros/wchar-macros.h  |  2 +-
 .../llvm-libc-types/EFI_BOOT_SERVICES.h       |  2 +-
 libc/include/llvm-libc-types/EFI_CAPSULE.h    |  2 +-
 .../EFI_DEVICE_PATH_PROTOCOL.h                |  2 +-
 libc/include/llvm-libc-types/EFI_GUID.h       |  2 +-
 .../llvm-libc-types/EFI_MEMORY_DESCRIPTOR.h   |  2 +-
 .../EFI_OPEN_PROTOCOL_INFORMATION_ENTRY.h     |  2 +-
 .../llvm-libc-types/EFI_PHYSICAL_ADDRESS.h    |  2 +-
 .../llvm-libc-types/EFI_RUNTIME_SERVICES.h    |  4 +-
 .../EFI_SIMPLE_TEXT_INPUT_PROTOCOL.h          |  4 +-
 .../EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.h         |  4 +-
 libc/include/llvm-libc-types/EFI_STATUS.h     |  2 +-
 .../llvm-libc-types/EFI_SYSTEM_TABLE.h        |  2 +-
 .../llvm-libc-types/EFI_TABLE_HEADER.h        |  2 +-
 libc/include/llvm-libc-types/EFI_TIME.h       |  2 +-
 .../llvm-libc-types/EFI_VIRTUAL_ADDRESS.h     |  2 +-
 libc/include/llvm-libc-types/Elf32_Addr.h     |  2 +-
 libc/include/llvm-libc-types/Elf32_Half.h     |  2 +-
 libc/include/llvm-libc-types/Elf32_Lword.h    |  2 +-
 libc/include/llvm-libc-types/Elf32_Off.h      |  2 +-
 libc/include/llvm-libc-types/Elf32_Sword.h    |  2 +-
 libc/include/llvm-libc-types/Elf32_Word.h     |  2 +-
 libc/include/llvm-libc-types/Elf32_Xword.h    |  2 +-
 libc/include/llvm-libc-types/Elf32_auxv_t.h   |  2 +-
 libc/include/llvm-libc-types/Elf64_Addr.h     |  2 +-
 libc/include/llvm-libc-types/Elf64_Half.h     |  2 +-
 libc/include/llvm-libc-types/Elf64_Lword.h    |  2 +-
 libc/include/llvm-libc-types/Elf64_Off.h      |  2 +-
 libc/include/llvm-libc-types/Elf64_Sword.h    |  2 +-
 libc/include/llvm-libc-types/Elf64_Sxword.h   |  2 +-
 libc/include/llvm-libc-types/Elf64_Word.h     |  2 +-
 libc/include/llvm-libc-types/Elf64_Xword.h    |  2 +-
 libc/include/llvm-libc-types/Elf64_auxv_t.h   |  2 +-
 libc/include/llvm-libc-types/cfloat128.h      |  2 +-
 libc/include/llvm-libc-types/cfloat16.h       |  2 +-
 libc/include/llvm-libc-types/char16_t.h       |  2 +-
 libc/include/llvm-libc-types/char32_t.h       |  2 +-
 .../llvm-libc-types/constraint_handler_t.h    |  2 +-
 libc/include/llvm-libc-types/errno_t.h        |  2 +-
 libc/include/llvm-libc-types/fd_set.h         |  2 +-
 libc/include/llvm-libc-types/float128.h       |  2 +-
 libc/include/llvm-libc-types/in_port_t.h      |  2 +-
 libc/include/llvm-libc-types/mbstate_t.h      |  2 +-
 .../include/llvm-libc-types/pthread_id_np_t.h |  2 +-
 libc/include/llvm-libc-types/rsize_t.h        |  2 +-
 libc/include/llvm-libc-types/sigset_t.h       |  2 +-
 .../llvm-libc-types/struct_dl_phdr_info.h     |  2 +-
 .../include/llvm-libc-types/struct_in6_addr.h |  2 +-
 libc/include/llvm-libc-types/struct_udphdr.h  |  2 +-
 .../llvm-libc-types/x86_64/ucontext_t.h       |  4 +-
 libc/include/sys/queue.h                      |  2 +-
 libc/test/UnitTest/CMakeLists.txt             |  1 +
 57 files changed, 95 insertions(+), 94 deletions(-)

diff --git a/libc/include/llvm-libc-macros/float16-macros.h b/libc/include/llvm-libc-macros/float16-macros.h
index 528c7f016f873..5dcc440edf59d 100644
--- a/libc/include/llvm-libc-macros/float16-macros.h
+++ b/libc/include/llvm-libc-macros/float16-macros.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_MACROS_FLOAT16_MACROS_H
 #define LLVM_LIBC_MACROS_FLOAT16_MACROS_H
 
-#include "../llvm-libc-types/float128.h"
+#include "llvm-libc-types/float128.h"
 
 #if defined(__FLT16_MANT_DIG__) &&                                             \
     (!defined(__GNUC__) || __GNUC__ >= 13 ||                                   \
diff --git a/libc/include/llvm-libc-macros/link-macros.h b/libc/include/llvm-libc-macros/link-macros.h
index 64fee52f936b0..3f72fad15b1c4 100644
--- a/libc/include/llvm-libc-macros/link-macros.h
+++ b/libc/include/llvm-libc-macros/link-macros.h
@@ -9,41 +9,41 @@
 #ifndef LLVM_LIBC_MACROS_LINK_MACROS_H
 #define LLVM_LIBC_MACROS_LINK_MACROS_H
 
-#include "../llvm-libc-types/Elf32_Addr.h"
-#include "../llvm-libc-types/Elf32_Chdr.h"
-#include "../llvm-libc-types/Elf32_Dyn.h"
-#include "../llvm-libc-types/Elf32_Ehdr.h"
-#include "../llvm-libc-types/Elf32_Half.h"
-#include "../llvm-libc-types/Elf32_Lword.h"
-#include "../llvm-libc-types/Elf32_Nhdr.h"
-#include "../llvm-libc-types/Elf32_Off.h"
-#include "../llvm-libc-types/Elf32_Phdr.h"
-#include "../llvm-libc-types/Elf32_Rel.h"
-#include "../llvm-libc-types/Elf32_Rela.h"
-#include "../llvm-libc-types/Elf32_Shdr.h"
-#include "../llvm-libc-types/Elf32_Sword.h"
-#include "../llvm-libc-types/Elf32_Sym.h"
-#include "../llvm-libc-types/Elf32_Word.h"
-#include "../llvm-libc-types/Elf32_Xword.h"
-#include "../llvm-libc-types/Elf32_auxv_t.h"
-#include "../llvm-libc-types/Elf64_Addr.h"
-#include "../llvm-libc-types/Elf64_Chdr.h"
-#include "../llvm-libc-types/Elf64_Dyn.h"
-#include "../llvm-libc-types/Elf64_Ehdr.h"
-#include "../llvm-libc-types/Elf64_Half.h"
-#include "../llvm-libc-types/Elf64_Lword.h"
-#include "../llvm-libc-types/Elf64_Nhdr.h"
-#include "../llvm-libc-types/Elf64_Off.h"
-#include "../llvm-libc-types/Elf64_Phdr.h"
-#include "../llvm-libc-types/Elf64_Rel.h"
-#include "../llvm-libc-types/Elf64_Rela.h"
-#include "../llvm-libc-types/Elf64_Shdr.h"
-#include "../llvm-libc-types/Elf64_Sword.h"
-#include "../llvm-libc-types/Elf64_Sxword.h"
-#include "../llvm-libc-types/Elf64_Sym.h"
-#include "../llvm-libc-types/Elf64_Word.h"
-#include "../llvm-libc-types/Elf64_Xword.h"
-#include "../llvm-libc-types/Elf64_auxv_t.h"
+#include "llvm-libc-types/Elf32_Addr.h"
+#include "llvm-libc-types/Elf32_Chdr.h"
+#include "llvm-libc-types/Elf32_Dyn.h"
+#include "llvm-libc-types/Elf32_Ehdr.h"
+#include "llvm-libc-types/Elf32_Half.h"
+#include "llvm-libc-types/Elf32_Lword.h"
+#include "llvm-libc-types/Elf32_Nhdr.h"
+#include "llvm-libc-types/Elf32_Off.h"
+#include "llvm-libc-types/Elf32_Phdr.h"
+#include "llvm-libc-types/Elf32_Rel.h"
+#include "llvm-libc-types/Elf32_Rela.h"
+#include "llvm-libc-types/Elf32_Shdr.h"
+#include "llvm-libc-types/Elf32_Sword.h"
+#include "llvm-libc-types/Elf32_Sym.h"
+#include "llvm-libc-types/Elf32_Word.h"
+#include "llvm-libc-types/Elf32_Xword.h"
+#include "llvm-libc-types/Elf32_auxv_t.h"
+#include "llvm-libc-types/Elf64_Addr.h"
+#include "llvm-libc-types/Elf64_Chdr.h"
+#include "llvm-libc-types/Elf64_Dyn.h"
+#include "llvm-libc-types/Elf64_Ehdr.h"
+#include "llvm-libc-types/Elf64_Half.h"
+#include "llvm-libc-types/Elf64_Lword.h"
+#include "llvm-libc-types/Elf64_Nhdr.h"
+#include "llvm-libc-types/Elf64_Off.h"
+#include "llvm-libc-types/Elf64_Phdr.h"
+#include "llvm-libc-types/Elf64_Rel.h"
+#include "llvm-libc-types/Elf64_Rela.h"
+#include "llvm-libc-types/Elf64_Shdr.h"
+#include "llvm-libc-types/Elf64_Sword.h"
+#include "llvm-libc-types/Elf64_Sxword.h"
+#include "llvm-libc-types/Elf64_Sym.h"
+#include "llvm-libc-types/Elf64_Word.h"
+#include "llvm-libc-types/Elf64_Xword.h"
+#include "llvm-libc-types/Elf64_auxv_t.h"
 
 #ifdef __LP64__
 #define ElfW(type) Elf64_##type
diff --git a/libc/include/llvm-libc-macros/locale-macros.h b/libc/include/llvm-libc-macros/locale-macros.h
index 892f8b69f3a77..82871080e588a 100644
--- a/libc/include/llvm-libc-macros/locale-macros.h
+++ b/libc/include/llvm-libc-macros/locale-macros.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_MACROS_LOCALE_MACROS_H
 #define LLVM_LIBC_MACROS_LOCALE_MACROS_H
 
-#include "../llvm-libc-types/locale_t.h"
+#include "llvm-libc-types/locale_t.h"
 
 #define LC_CTYPE 0
 #define LC_NUMERIC 1
diff --git a/libc/include/llvm-libc-macros/netinet-in-macros.h b/libc/include/llvm-libc-macros/netinet-in-macros.h
index f85f6f5403635..077309cd18dc5 100644
--- a/libc/include/llvm-libc-macros/netinet-in-macros.h
+++ b/libc/include/llvm-libc-macros/netinet-in-macros.h
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_MACROS_NETINET_IN_MACROS_H
 #define LLVM_LIBC_MACROS_NETINET_IN_MACROS_H
 
-#include "../llvm-libc-types/in_addr_t.h"
 #include "__llvm-libc-common.h"
+#include "llvm-libc-types/in_addr_t.h"
 
 #define IPPROTO_IP 0
 #define IPPROTO_ICMP 1
diff --git a/libc/include/llvm-libc-macros/stdio-macros.h b/libc/include/llvm-libc-macros/stdio-macros.h
index 96f0e6933ade6..b355c3bdf119f 100644
--- a/libc/include/llvm-libc-macros/stdio-macros.h
+++ b/libc/include/llvm-libc-macros/stdio-macros.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_MACROS_STDIO_MACROS_H
 #define LLVM_LIBC_MACROS_STDIO_MACROS_H
 
-#include "../llvm-libc-types/FILE.h"
+#include "llvm-libc-types/FILE.h"
 
 #ifdef __cplusplus
 extern "C" FILE *stdin;
diff --git a/libc/include/llvm-libc-macros/wchar-macros.h b/libc/include/llvm-libc-macros/wchar-macros.h
index 2a0cabd6133a4..52f4b7a768e04 100644
--- a/libc/include/llvm-libc-macros/wchar-macros.h
+++ b/libc/include/llvm-libc-macros/wchar-macros.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_MACROS_WCHAR_MACROS_H
 #define LLVM_LIBC_MACROS_WCHAR_MACROS_H
 
-#include "../llvm-libc-types/wint_t.h"
+#include "llvm-libc-types/wint_t.h"
 
 #ifndef WEOF
 #define WEOF ((wint_t)(0xffffffffu))
diff --git a/libc/include/llvm-libc-types/EFI_BOOT_SERVICES.h b/libc/include/llvm-libc-types/EFI_BOOT_SERVICES.h
index 8b7a6aadd7a24..b99201b6a0eae 100644
--- a/libc/include/llvm-libc-types/EFI_BOOT_SERVICES.h
+++ b/libc/include/llvm-libc-types/EFI_BOOT_SERVICES.h
@@ -9,7 +9,6 @@
 #ifndef LLVM_LIBC_TYPES_EFI_BOOT_SERVICES_H
 #define LLVM_LIBC_TYPES_EFI_BOOT_SERVICES_H
 
-#include "../llvm-libc-macros/EFIAPI-macros.h"
 #include "EFI_ALLOCATE_TYPE.h"
 #include "EFI_DEVICE_PATH_PROTOCOL.h"
 #include "EFI_EVENT.h"
@@ -25,6 +24,7 @@
 #include "EFI_TIMER_DELAY.h"
 #include "EFI_TPL.h"
 #include "char16_t.h"
+#include "llvm-libc-macros/EFIAPI-macros.h"
 #include "size_t.h"
 
 #define EFI_BOOT_SERVICES_SIGNATURE 0x56524553544f4f42
diff --git a/libc/include/llvm-libc-types/EFI_CAPSULE.h b/libc/include/llvm-libc-types/EFI_CAPSULE.h
index c7440c9b03b75..070ae637d1d93 100644
--- a/libc/include/llvm-libc-types/EFI_CAPSULE.h
+++ b/libc/include/llvm-libc-types/EFI_CAPSULE.h
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_TYPES_EFI_CAPSULE_H
 #define LLVM_LIBC_TYPES_EFI_CAPSULE_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
 #include "EFI_GUID.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef struct {
   EFI_GUID CapsuleGuid;
diff --git a/libc/include/llvm-libc-types/EFI_DEVICE_PATH_PROTOCOL.h b/libc/include/llvm-libc-types/EFI_DEVICE_PATH_PROTOCOL.h
index f6a0b2e1f45c0..da1ae674de0ad 100644
--- a/libc/include/llvm-libc-types/EFI_DEVICE_PATH_PROTOCOL.h
+++ b/libc/include/llvm-libc-types/EFI_DEVICE_PATH_PROTOCOL.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_EFI_DEVICE_PATH_PROTOCOL_H
 #define LLVM_LIBC_TYPES_EFI_DEVICE_PATH_PROTOCOL_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 #define EFI_DEVICE_PATH_PROTOCOL_GUID                                          \
   {0x09576e91, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b}}
diff --git a/libc/include/llvm-libc-types/EFI_GUID.h b/libc/include/llvm-libc-types/EFI_GUID.h
index b3530008384dd..9527d6d6c8c7d 100644
--- a/libc/include/llvm-libc-types/EFI_GUID.h
+++ b/libc/include/llvm-libc-types/EFI_GUID.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_EFI_GUID_H
 #define LLVM_LIBC_TYPES_EFI_GUID_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef struct {
   uint32_t Data1;
diff --git a/libc/include/llvm-libc-types/EFI_MEMORY_DESCRIPTOR.h b/libc/include/llvm-libc-types/EFI_MEMORY_DESCRIPTOR.h
index 72d0579aef76c..a5b126a07d3ad 100644
--- a/libc/include/llvm-libc-types/EFI_MEMORY_DESCRIPTOR.h
+++ b/libc/include/llvm-libc-types/EFI_MEMORY_DESCRIPTOR.h
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_TYPES_EFI_MEMORY_DESCRIPTOR_H
 #define LLVM_LIBC_TYPES_EFI_MEMORY_DESCRIPTOR_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
 #include "EFI_PHYSICAL_ADDRESS.h"
 #include "EFI_VIRTUAL_ADDRESS.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 #define EFI_MEMORY_DESCRIPTOR_VERSION 1
 
diff --git a/libc/include/llvm-libc-types/EFI_OPEN_PROTOCOL_INFORMATION_ENTRY.h b/libc/include/llvm-libc-types/EFI_OPEN_PROTOCOL_INFORMATION_ENTRY.h
index de0c59c139efb..5090bdb512ff2 100644
--- a/libc/include/llvm-libc-types/EFI_OPEN_PROTOCOL_INFORMATION_ENTRY.h
+++ b/libc/include/llvm-libc-types/EFI_OPEN_PROTOCOL_INFORMATION_ENTRY.h
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_TYPES_EFI_OPEN_PROTOCOL_INFORMATION_ENTRY_H
 #define LLVM_LIBC_TYPES_EFI_OPEN_PROTOCOL_INFORMATION_ENTRY_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
 #include "EFI_HANDLE.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef struct {
   EFI_HANDLE AgentHandle;
diff --git a/libc/include/llvm-libc-types/EFI_PHYSICAL_ADDRESS.h b/libc/include/llvm-libc-types/EFI_PHYSICAL_ADDRESS.h
index 8880ee66c0f8d..50ab366ca8a9e 100644
--- a/libc/include/llvm-libc-types/EFI_PHYSICAL_ADDRESS.h
+++ b/libc/include/llvm-libc-types/EFI_PHYSICAL_ADDRESS.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_EFI_PHYSICAL_ADDRESS_H
 #define LLVM_LIBC_TYPES_EFI_PHYSICAL_ADDRESS_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint64_t EFI_PHYSICAL_ADDRESS;
 
diff --git a/libc/include/llvm-libc-types/EFI_RUNTIME_SERVICES.h b/libc/include/llvm-libc-types/EFI_RUNTIME_SERVICES.h
index 8913118b0844c..cc4dfcb0c9bc9 100644
--- a/libc/include/llvm-libc-types/EFI_RUNTIME_SERVICES.h
+++ b/libc/include/llvm-libc-types/EFI_RUNTIME_SERVICES.h
@@ -9,8 +9,6 @@
 #ifndef LLVM_LIBC_TYPES_EFI_RUNTIME_SERVICES_H
 #define LLVM_LIBC_TYPES_EFI_RUNTIME_SERVICES_H
 
-#include "../llvm-libc-macros/EFIAPI-macros.h"
-#include "../llvm-libc-macros/stdint-macros.h"
 #include "EFI_CAPSULE.h"
 #include "EFI_MEMORY_DESCRIPTOR.h"
 #include "EFI_PHYSICAL_ADDRESS.h"
@@ -18,6 +16,8 @@
 #include "EFI_TABLE_HEADER.h"
 #include "EFI_TIME.h"
 #include "char16_t.h"
+#include "llvm-libc-macros/EFIAPI-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 #include "size_t.h"
 
 #define EFI_RUNTIME_SERVICES_SIGNATURE 0x56524553544e5552
diff --git a/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_INPUT_PROTOCOL.h b/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_INPUT_PROTOCOL.h
index a6dc0952b6310..e158fdbf3c8fa 100644
--- a/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_INPUT_PROTOCOL.h
+++ b/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_INPUT_PROTOCOL.h
@@ -9,11 +9,11 @@
 #ifndef LLVM_LIBC_TYPES_EFI_SIMPLE_TEXT_INPUT_PROTOCOL_H
 #define LLVM_LIBC_TYPES_EFI_SIMPLE_TEXT_INPUT_PROTOCOL_H
 
-#include "../llvm-libc-macros/EFIAPI-macros.h"
-#include "../llvm-libc-macros/stdint-macros.h"
 #include "EFI_EVENT.h"
 #include "EFI_STATUS.h"
 #include "char16_t.h"
+#include "llvm-libc-macros/EFIAPI-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 #define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID                                    \
   {0x387477c1, 0x69c7, 0x11d2, {0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b}}
diff --git a/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.h b/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.h
index 91d169f018dbc..85da18c95ab9e 100644
--- a/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.h
+++ b/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.h
@@ -9,9 +9,9 @@
 #ifndef LLVM_LIBC_TYPES_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_H
 #define LLVM_LIBC_TYPES_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_H
 
-#include "../llvm-libc-macros/EFIAPI-macros.h"
-#include "../llvm-libc-macros/stdint-macros.h"
 #include "EFI_STATUS.h"
+#include "llvm-libc-macros/EFIAPI-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 #include "size_t.h"
 
 #define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID                                   \
diff --git a/libc/include/llvm-libc-types/EFI_STATUS.h b/libc/include/llvm-libc-types/EFI_STATUS.h
index bb9542bed8efc..a74762e6d0ea3 100644
--- a/libc/include/llvm-libc-types/EFI_STATUS.h
+++ b/libc/include/llvm-libc-types/EFI_STATUS.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_EFI_STATUS_H
 #define LLVM_LIBC_TYPES_EFI_STATUS_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uintptr_t EFI_STATUS;
 
diff --git a/libc/include/llvm-libc-types/EFI_SYSTEM_TABLE.h b/libc/include/llvm-libc-types/EFI_SYSTEM_TABLE.h
index 290067ad862e1..57f223bc31898 100644
--- a/libc/include/llvm-libc-types/EFI_SYSTEM_TABLE.h
+++ b/libc/include/llvm-libc-types/EFI_SYSTEM_TABLE.h
@@ -9,7 +9,6 @@
 #ifndef LLVM_LIBC_TYPES_EFI_SYSTEM_TABLE_H
 #define LLVM_LIBC_TYPES_EFI_SYSTEM_TABLE_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
 #include "EFI_BOOT_SERVICES.h"
 #include "EFI_CONFIGURATION_TABLE.h"
 #include "EFI_HANDLE.h"
@@ -18,6 +17,7 @@
 #include "EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.h"
 #include "EFI_STATUS.h"
 #include "EFI_TABLE_HEADER.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 #include "char16_t.h"
 #include "size_t.h"
diff --git a/libc/include/llvm-libc-types/EFI_TABLE_HEADER.h b/libc/include/llvm-libc-types/EFI_TABLE_HEADER.h
index 293968ecc4d1b..78dc17904b7f5 100644
--- a/libc/include/llvm-libc-types/EFI_TABLE_HEADER.h
+++ b/libc/include/llvm-libc-types/EFI_TABLE_HEADER.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_EFI_TABLE_HEADER_H
 #define LLVM_LIBC_TYPES_EFI_TABLE_HEADER_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef struct {
   uint64_t Signature;
diff --git a/libc/include/llvm-libc-types/EFI_TIME.h b/libc/include/llvm-libc-types/EFI_TIME.h
index b0e38b987d44e..986aa5ebb2469 100644
--- a/libc/include/llvm-libc-types/EFI_TIME.h
+++ b/libc/include/llvm-libc-types/EFI_TIME.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_EFI_TIME_H
 #define LLVM_LIBC_TYPES_EFI_TIME_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef struct {
   uint16_t Year;  // 1900 - 9999
diff --git a/libc/include/llvm-libc-types/EFI_VIRTUAL_ADDRESS.h b/libc/include/llvm-libc-types/EFI_VIRTUAL_ADDRESS.h
index 46cbec734dadc..9be36cc8684be 100644
--- a/libc/include/llvm-libc-types/EFI_VIRTUAL_ADDRESS.h
+++ b/libc/include/llvm-libc-types/EFI_VIRTUAL_ADDRESS.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_EFI_VIRTUAL_ADDRESS_H
 #define LLVM_LIBC_TYPES_EFI_VIRTUAL_ADDRESS_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint64_t EFI_VIRTUAL_ADDRESS;
 
diff --git a/libc/include/llvm-libc-types/Elf32_Addr.h b/libc/include/llvm-libc-types/Elf32_Addr.h
index 16cca621fbd47..cba3398a548e3 100644
--- a/libc/include/llvm-libc-types/Elf32_Addr.h
+++ b/libc/include/llvm-libc-types/Elf32_Addr.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF32_ADDR_H
 #define LLVM_LIBC_TYPES_ELF32_ADDR_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint32_t Elf32_Addr;
 
diff --git a/libc/include/llvm-libc-types/Elf32_Half.h b/libc/include/llvm-libc-types/Elf32_Half.h
index b614b416d51af..dbd0d12525534 100644
--- a/libc/include/llvm-libc-types/Elf32_Half.h
+++ b/libc/include/llvm-libc-types/Elf32_Half.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF32_HALF_H
 #define LLVM_LIBC_TYPES_ELF32_HALF_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint16_t Elf32_Half;
 
diff --git a/libc/include/llvm-libc-types/Elf32_Lword.h b/libc/include/llvm-libc-types/Elf32_Lword.h
index 5d1e634a1b9b5..de6daad474566 100644
--- a/libc/include/llvm-libc-types/Elf32_Lword.h
+++ b/libc/include/llvm-libc-types/Elf32_Lword.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF32_LWORD_H
 #define LLVM_LIBC_TYPES_ELF32_LWORD_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint32_t Elf32_Lword;
 
diff --git a/libc/include/llvm-libc-types/Elf32_Off.h b/libc/include/llvm-libc-types/Elf32_Off.h
index 46c7118d95e77..d57d72f9807d6 100644
--- a/libc/include/llvm-libc-types/Elf32_Off.h
+++ b/libc/include/llvm-libc-types/Elf32_Off.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF32_OFF_H
 #define LLVM_LIBC_TYPES_ELF32_OFF_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint32_t Elf32_Off;
 
diff --git a/libc/include/llvm-libc-types/Elf32_Sword.h b/libc/include/llvm-libc-types/Elf32_Sword.h
index 8adbba727afde..99b11f841fc53 100644
--- a/libc/include/llvm-libc-types/Elf32_Sword.h
+++ b/libc/include/llvm-libc-types/Elf32_Sword.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF32_SWORD_H
 #define LLVM_LIBC_TYPES_ELF32_SWORD_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef int32_t Elf32_Sword;
 
diff --git a/libc/include/llvm-libc-types/Elf32_Word.h b/libc/include/llvm-libc-types/Elf32_Word.h
index 7444a8b41ff4b..1198df89b6f9f 100644
--- a/libc/include/llvm-libc-types/Elf32_Word.h
+++ b/libc/include/llvm-libc-types/Elf32_Word.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF32_WORD_H
 #define LLVM_LIBC_TYPES_ELF32_WORD_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint32_t Elf32_Word;
 
diff --git a/libc/include/llvm-libc-types/Elf32_Xword.h b/libc/include/llvm-libc-types/Elf32_Xword.h
index 9a4898043b041..208f675739af0 100644
--- a/libc/include/llvm-libc-types/Elf32_Xword.h
+++ b/libc/include/llvm-libc-types/Elf32_Xword.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF32_XWORD_H
 #define LLVM_LIBC_TYPES_ELF32_XWORD_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint64_t Elf32_Xword;
 
diff --git a/libc/include/llvm-libc-types/Elf32_auxv_t.h b/libc/include/llvm-libc-types/Elf32_auxv_t.h
index 280b85af9876f..5ca0d5fbe09bc 100644
--- a/libc/include/llvm-libc-types/Elf32_auxv_t.h
+++ b/libc/include/llvm-libc-types/Elf32_auxv_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF32_AUXV_T_H
 #define LLVM_LIBC_TYPES_ELF32_AUXV_T_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef struct {
   uint32_t a_type;
diff --git a/libc/include/llvm-libc-types/Elf64_Addr.h b/libc/include/llvm-libc-types/Elf64_Addr.h
index a186c1b316f40..c603e54814334 100644
--- a/libc/include/llvm-libc-types/Elf64_Addr.h
+++ b/libc/include/llvm-libc-types/Elf64_Addr.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF64_ADDR_H
 #define LLVM_LIBC_TYPES_ELF64_ADDR_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint64_t Elf64_Addr;
 
diff --git a/libc/include/llvm-libc-types/Elf64_Half.h b/libc/include/llvm-libc-types/Elf64_Half.h
index 2f0bfe88992d0..ba6f1ea4b6b87 100644
--- a/libc/include/llvm-libc-types/Elf64_Half.h
+++ b/libc/include/llvm-libc-types/Elf64_Half.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF64_HALF_H
 #define LLVM_LIBC_TYPES_ELF64_HALF_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint16_t Elf64_Half;
 
diff --git a/libc/include/llvm-libc-types/Elf64_Lword.h b/libc/include/llvm-libc-types/Elf64_Lword.h
index 5435e1d8e5deb..35b802e28a397 100644
--- a/libc/include/llvm-libc-types/Elf64_Lword.h
+++ b/libc/include/llvm-libc-types/Elf64_Lword.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF64_LWORD_H
 #define LLVM_LIBC_TYPES_ELF64_LWORD_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint64_t Elf64_Lword;
 
diff --git a/libc/include/llvm-libc-types/Elf64_Off.h b/libc/include/llvm-libc-types/Elf64_Off.h
index 8a3e49f2ed1b8..a89669112496c 100644
--- a/libc/include/llvm-libc-types/Elf64_Off.h
+++ b/libc/include/llvm-libc-types/Elf64_Off.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF64_OFF_H
 #define LLVM_LIBC_TYPES_ELF64_OFF_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint64_t Elf64_Off;
 
diff --git a/libc/include/llvm-libc-types/Elf64_Sword.h b/libc/include/llvm-libc-types/Elf64_Sword.h
index dfadd3c7b4dbf..c58fe1b4e7b3c 100644
--- a/libc/include/llvm-libc-types/Elf64_Sword.h
+++ b/libc/include/llvm-libc-types/Elf64_Sword.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF64_SWORD_H
 #define LLVM_LIBC_TYPES_ELF64_SWORD_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef int32_t Elf64_Sword;
 
diff --git a/libc/include/llvm-libc-types/Elf64_Sxword.h b/libc/include/llvm-libc-types/Elf64_Sxword.h
index 6f66e0d8098ac..2730b891e10c4 100644
--- a/libc/include/llvm-libc-types/Elf64_Sxword.h
+++ b/libc/include/llvm-libc-types/Elf64_Sxword.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF64_SXWORD_H
 #define LLVM_LIBC_TYPES_ELF64_SXWORD_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint64_t Elf64_Sxword;
 
diff --git a/libc/include/llvm-libc-types/Elf64_Word.h b/libc/include/llvm-libc-types/Elf64_Word.h
index 0f001460e0549..e16fdb8c1f872 100644
--- a/libc/include/llvm-libc-types/Elf64_Word.h
+++ b/libc/include/llvm-libc-types/Elf64_Word.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF64_WORD_H
 #define LLVM_LIBC_TYPES_ELF64_WORD_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint32_t Elf64_Word;
 
diff --git a/libc/include/llvm-libc-types/Elf64_Xword.h b/libc/include/llvm-libc-types/Elf64_Xword.h
index 70438b612dbed..3b5e8c4a06a74 100644
--- a/libc/include/llvm-libc-types/Elf64_Xword.h
+++ b/libc/include/llvm-libc-types/Elf64_Xword.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF64_XWORD_H
 #define LLVM_LIBC_TYPES_ELF64_XWORD_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint64_t Elf64_Xword;
 
diff --git a/libc/include/llvm-libc-types/Elf64_auxv_t.h b/libc/include/llvm-libc-types/Elf64_auxv_t.h
index 95494cfc0ecfc..a4a4f4a1424d6 100644
--- a/libc/include/llvm-libc-types/Elf64_auxv_t.h
+++ b/libc/include/llvm-libc-types/Elf64_auxv_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_ELF64_AUXV_T_H
 #define LLVM_LIBC_TYPES_ELF64_AUXV_T_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef struct {
   uint64_t a_type;
diff --git a/libc/include/llvm-libc-types/cfloat128.h b/libc/include/llvm-libc-types/cfloat128.h
index 4b1d2543dd819..e440c1c37c61a 100644
--- a/libc/include/llvm-libc-types/cfloat128.h
+++ b/libc/include/llvm-libc-types/cfloat128.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_CFLOAT128_H
 #define LLVM_LIBC_TYPES_CFLOAT128_H
 
-#include "../llvm-libc-macros/cfloat128-macros.h"
+#include "llvm-libc-macros/cfloat128-macros.h"
 
 #ifdef LIBC_TYPES_HAS_CFLOAT128
 #ifndef LIBC_TYPES_CFLOAT128_IS_COMPLEX_LONG_DOUBLE
diff --git a/libc/include/llvm-libc-types/cfloat16.h b/libc/include/llvm-libc-types/cfloat16.h
index 644a6469f0592..313335e0c0e0d 100644
--- a/libc/include/llvm-libc-types/cfloat16.h
+++ b/libc/include/llvm-libc-types/cfloat16.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_CFLOAT16_H
 #define LLVM_LIBC_TYPES_CFLOAT16_H
 
-#include "../llvm-libc-macros/cfloat16-macros.h"
+#include "llvm-libc-macros/cfloat16-macros.h"
 
 #ifdef LIBC_TYPES_HAS_CFLOAT16
 typedef _Complex _Float16 cfloat16;
diff --git a/libc/include/llvm-libc-types/char16_t.h b/libc/include/llvm-libc-types/char16_t.h
index 1f5847ae771b4..9a2b9553b1ab9 100644
--- a/libc/include/llvm-libc-types/char16_t.h
+++ b/libc/include/llvm-libc-types/char16_t.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_TYPES_CHAR16_T_H
 
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 typedef uint_least16_t char16_t;
 #endif
 
diff --git a/libc/include/llvm-libc-types/char32_t.h b/libc/include/llvm-libc-types/char32_t.h
index 20b72dc5d67e3..02bc4a8f86517 100644
--- a/libc/include/llvm-libc-types/char32_t.h
+++ b/libc/include/llvm-libc-types/char32_t.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_TYPES_CHAR32_T_H
 
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 typedef uint_least32_t char32_t;
 #endif
 
diff --git a/libc/include/llvm-libc-types/constraint_handler_t.h b/libc/include/llvm-libc-types/constraint_handler_t.h
index 951e42f6c6116..1506d5513bd9d 100644
--- a/libc/include/llvm-libc-types/constraint_handler_t.h
+++ b/libc/include/llvm-libc-types/constraint_handler_t.h
@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_INCLUDE_LLVM_LIBC_TYPES_CONSTRAINT_HANDLER_T_H
 #define LLVM_LIBC_INCLUDE_LLVM_LIBC_TYPES_CONSTRAINT_HANDLER_T_H
 
-#include "../llvm-libc-macros/annex-k-macros.h"
 #include "errno_t.h"
+#include "llvm-libc-macros/annex-k-macros.h"
 
 #ifdef LIBC_HAS_ANNEX_K
 
diff --git a/libc/include/llvm-libc-types/errno_t.h b/libc/include/llvm-libc-types/errno_t.h
index 4ce694959ef2e..7f4b28655642e 100644
--- a/libc/include/llvm-libc-types/errno_t.h
+++ b/libc/include/llvm-libc-types/errno_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_INCLUDE_LLVM_LIBC_TYPES_ERRNO_T_H
 #define LLVM_LIBC_INCLUDE_LLVM_LIBC_TYPES_ERRNO_T_H
 
-#include "../llvm-libc-macros/annex-k-macros.h"
+#include "llvm-libc-macros/annex-k-macros.h"
 
 // LIBC_HAS_ANNEX_K is used to check whether C11 Annex K (the optional
 // “Bounds-checking interfaces”) is enabled in this libc implementation. Annex K
diff --git a/libc/include/llvm-libc-types/fd_set.h b/libc/include/llvm-libc-types/fd_set.h
index 52b716185566b..cd8ced44c205d 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_SET_WORD_TYPE, __FD_SET_ARRAYSIZE
+#include "llvm-libc-macros/sys-select-macros.h" // __FD_SET_WORD_TYPE, __FD_SET_ARRAYSIZE
 
 typedef struct {
   __FD_SET_WORD_TYPE __set[__FD_SET_ARRAYSIZE];
diff --git a/libc/include/llvm-libc-types/float128.h b/libc/include/llvm-libc-types/float128.h
index 82ebb79f1f580..f6c2fdea186ae 100644
--- a/libc/include/llvm-libc-types/float128.h
+++ b/libc/include/llvm-libc-types/float128.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_FLOAT128_H
 #define LLVM_LIBC_TYPES_FLOAT128_H
 
-#include "../llvm-libc-macros/float-macros.h" // LDBL_MANT_DIG
+#include "llvm-libc-macros/float-macros.h" // LDBL_MANT_DIG
 
 // Currently, C23 `_Float128` type is only defined as a built-in type in GCC 7
 // or later, and only for C.  For C++, or for clang, `__float128` is defined
diff --git a/libc/include/llvm-libc-types/in_port_t.h b/libc/include/llvm-libc-types/in_port_t.h
index f86c39cb34e8d..b2ee00c1143ee 100644
--- a/libc/include/llvm-libc-types/in_port_t.h
+++ b/libc/include/llvm-libc-types/in_port_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_IN_PORT_T_H
 #define LLVM_LIBC_TYPES_IN_PORT_T_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uint16_t in_port_t;
 
diff --git a/libc/include/llvm-libc-types/mbstate_t.h b/libc/include/llvm-libc-types/mbstate_t.h
index 009fe57da50e2..1f7f2500ab63b 100644
--- a/libc/include/llvm-libc-types/mbstate_t.h
+++ b/libc/include/llvm-libc-types/mbstate_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_MBSTATE_T_H
 #define LLVM_LIBC_TYPES_MBSTATE_T_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef struct {
   uint32_t __field1;
diff --git a/libc/include/llvm-libc-types/pthread_id_np_t.h b/libc/include/llvm-libc-types/pthread_id_np_t.h
index 92c24b0d35452..c0263a2d71808 100644
--- a/libc/include/llvm-libc-types/pthread_id_np_t.h
+++ b/libc/include/llvm-libc-types/pthread_id_np_t.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_LIBC_TYPES_PTHREAD_ID_NP_T_H
 #define LLVM_LIBC_TYPES_PTHREAD_ID_NP_T_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 typedef uintptr_t pthread_id_np_t;
 
diff --git a/libc/include/llvm-libc-types/rsize_t.h b/libc/include/llvm-libc-types/rsize_t.h
index 6e92bb99025f8..2554149734d4b 100644
--- a/libc/include/llvm-libc-types/rsize_t.h
+++ b/libc/include/llvm-libc-types/rsize_t.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_RSIZE_T_H
 #define LLVM_LIBC_TYPES_RSIZE_T_H
 
-#include "../llvm-libc-macros/annex-k-macros.h"
+#include "llvm-libc-macros/annex-k-macros.h"
 
 #ifdef LIBC_HAS_ANNEX_K
 
diff --git a/libc/include/llvm-libc-types/sigset_t.h b/libc/include/llvm-libc-types/sigset_t.h
index 8c4d3b49533db..f385e251d045d 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" // __NSIGSET_WORDS
+#include "llvm-libc-macros/signal-macros.h" // __NSIGSET_WORDS
 
 // 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/struct_dl_phdr_info.h b/libc/include/llvm-libc-types/struct_dl_phdr_info.h
index e336c010f4321..a56a11a5c82d9 100644
--- a/libc/include/llvm-libc-types/struct_dl_phdr_info.h
+++ b/libc/include/llvm-libc-types/struct_dl_phdr_info.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_DL_PHDR_INFO_H
 #define LLVM_LIBC_TYPES_STRUCT_DL_PHDR_INFO_H
 
-#include "../llvm-libc-macros/link-macros.h"
+#include "llvm-libc-macros/link-macros.h"
 #include "size_t.h"
 #include <stdint.h>
 
diff --git a/libc/include/llvm-libc-types/struct_in6_addr.h b/libc/include/llvm-libc-types/struct_in6_addr.h
index 58e9b6a1009d4..ed57dc094fcff 100644
--- a/libc/include/llvm-libc-types/struct_in6_addr.h
+++ b/libc/include/llvm-libc-types/struct_in6_addr.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_IN6_ADDR_H
 #define LLVM_LIBC_TYPES_STRUCT_IN6_ADDR_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 struct in6_addr {
   __extension__ union {
diff --git a/libc/include/llvm-libc-types/struct_udphdr.h b/libc/include/llvm-libc-types/struct_udphdr.h
index e821cf79018c8..5a71b87231996 100644
--- a/libc/include/llvm-libc-types/struct_udphdr.h
+++ b/libc/include/llvm-libc-types/struct_udphdr.h
@@ -15,7 +15,7 @@
 #ifndef LLVM_LIBC_TYPES_STRUCT_UDPHDR_H
 #define LLVM_LIBC_TYPES_STRUCT_UDPHDR_H
 
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
 
 struct udphdr {
   __extension__ union {
diff --git a/libc/include/llvm-libc-types/x86_64/ucontext_t.h b/libc/include/llvm-libc-types/x86_64/ucontext_t.h
index bb8cfe6069aae..cdcc3f997e986 100644
--- a/libc/include/llvm-libc-types/x86_64/ucontext_t.h
+++ b/libc/include/llvm-libc-types/x86_64/ucontext_t.h
@@ -11,8 +11,8 @@
 #ifndef LLVM_LIBC_TYPES_X86_64_UCONTEXT_T_H
 #define LLVM_LIBC_TYPES_X86_64_UCONTEXT_T_H
 
-#include "../sigset_t.h"
-#include "../stack_t.h"
+#include "llvm-libc-types/sigset_t.h"
+#include "llvm-libc-types/stack_t.h"
 #include "mcontext_t.h"
 
 typedef struct ucontext_t {
diff --git a/libc/include/sys/queue.h b/libc/include/sys/queue.h
index fc739b4a253b1..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/test/UnitTest/CMakeLists.txt b/libc/test/UnitTest/CMakeLists.txt
index aa245b2234793..e9838c5cc99ed 100644
--- a/libc/test/UnitTest/CMakeLists.txt
+++ b/libc/test/UnitTest/CMakeLists.txt
@@ -19,6 +19,7 @@ function(add_unittest_framework_library name)
       ${TEST_LIB_SRCS}
       ${TEST_LIB_HDRS}
     )
+    target_include_directories(${lib} SYSTEM PRIVATE ${LIBC_INCLUDE_DIR})
     target_include_directories(${lib} PRIVATE ${LIBC_SOURCE_DIR})
     if(TARGET libc.src.time.clock)
       target_compile_definitions(${lib} PRIVATE TARGET_SUPPORTS_CLOCK)

More information about the libc-commits mailing list