From 7df33d647c0f2e72e7b60e9050aa07e8b60336d7 Mon Sep 17 00:00:00 2001
From: auronandace <auronandace@googlemail.com>
Date: Tue, 12 May 2026 15:46:26 +0100
Subject: [PATCH] remove wchar header from inttypes includes

---
 src/header/inttypes/cbindgen.toml | 5 +++--
 src/header/poll/cbindgen.toml     | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/header/inttypes/cbindgen.toml b/src/header/inttypes/cbindgen.toml
index 568f0cd552..522dbbb3df 100644
--- a/src/header/inttypes/cbindgen.toml
+++ b/src/header/inttypes/cbindgen.toml
@@ -4,8 +4,9 @@
 # - "The <inttypes.h> header shall include the <stdint.h> header."
 # - "wchar_t As described in <stddef.h>."
 #
-# wchar.h brings in both stdint.h and stddef.h
-sys_includes = ["wchar.h"]
+# TODO possibly split out wchar_t to avoid including all of stddef.h
+# stddef.h also currently includes stdint.h but shouldn't according to the spec
+sys_includes = ["stdint.h", "stddef.h"]
 include_guard = "_RELIBC_INTTYPES_H"
 trailer = """
 #ifndef _RELIBC_BITS_INTTYPES_H
diff --git a/src/header/poll/cbindgen.toml b/src/header/poll/cbindgen.toml
index a619fe41ef..c45d820b7f 100644
--- a/src/header/poll/cbindgen.toml
+++ b/src/header/poll/cbindgen.toml
@@ -4,8 +4,6 @@
 # - "The <poll.h> header shall define the sigset_t type as described in <signal.h>."
 # - "The <poll.h> header shall define the timespec structure as described in <time.h>."
 # - "Inclusion of the <poll.h> header may make visible all symbols from the headers <signal.h> and <time.h>."
-#
-# bits/timespec.h brings in sys/types.h (TODO: refactor bits/timespec.h and sys/types.h)
 sys_includes = []
 include_guard = "_RELIBC_POLL_H"
 after_includes = """