diff --git a/src/header/ctype/cbindgen.toml b/src/header/ctype/cbindgen.toml
index c0b42f8c49..74bb221c44 100644
--- a/src/header/ctype/cbindgen.toml
+++ b/src/header/ctype/cbindgen.toml
@@ -4,7 +4,7 @@
 # - "The <ctype.h> header shall define the locale_t type as described in <locale.h>, representing a locale object."
 #
 # features.h included for #[deprecated] annotation
-sys_includes = ["features.h"]
+sys_includes = ["features.h", "stddef.h"]
 include_guard = "_RELIBC_CTYPE_H"
 after_includes = """
 #include <bits/locale-t.h> // for locale_t
diff --git a/src/header/string/cbindgen.toml b/src/header/string/cbindgen.toml
index f5b8a9ad9a..e0f04f0a33 100644
--- a/src/header/string/cbindgen.toml
+++ b/src/header/string/cbindgen.toml
@@ -4,7 +4,7 @@
 # - "The <string.h> header shall define NULL and size_t as described in <stddef.h>."
 # - "The <string.h> header shall define the locale_t type as described in <locale.h>."
 # - "Inclusion of the <string.h> header may also make visible all symbols from <stddef.h>."
-sys_includes = ["stddef.h"]
+sys_includes = ["stddef.h", "features.h", "strings.h"]
 include_guard = "_RELIBC_STRING_H"
 after_includes = """
 #include <bits/locale-t.h> // for locale_t from locale.h
diff --git a/src/header/sys_socket/cbindgen.toml b/src/header/sys_socket/cbindgen.toml
index 6372c60a0f..ffa64f9def 100644
--- a/src/header/sys_socket/cbindgen.toml
+++ b/src/header/sys_socket/cbindgen.toml
@@ -1,4 +1,4 @@
-sys_includes = ["stddef.h", "stdint.h", "sys/types.h"]
+sys_includes = ["stddef.h", "stdint.h", "sys/types.h", "sys/un.h"]
 include_guard = "_RELIBC_SYS_SOCKET_H"
 after_includes = """
 #include <bits/iovec.h> // for iovec from sys/uio.h
diff --git a/src/header/sys_wait/cbindgen.toml b/src/header/sys_wait/cbindgen.toml
index 25774409f8..f4cdf46b9c 100644
--- a/src/header/sys_wait/cbindgen.toml
+++ b/src/header/sys_wait/cbindgen.toml
@@ -1,4 +1,4 @@
-sys_includes = ["sys/types.h", "sys/resource.h", "signal.h"]
+sys_includes = ["sys/types.h", "sys/resource.h", "signal.h", "stdint.h"]
 include_guard = "_RELIBC_SYS_WAIT_H"
 after_includes = """
 
diff --git a/src/header/wchar/cbindgen.toml b/src/header/wchar/cbindgen.toml
index 77b888b105..846657c9a8 100644
--- a/src/header/wchar/cbindgen.toml
+++ b/src/header/wchar/cbindgen.toml
@@ -1,4 +1,4 @@
-sys_includes = ["features.h"]
+sys_includes = ["features.h", "stddef.h", "stdarg.h", "stdio.h"]
 after_includes = """
 // int32_t, uint32_t, WCHAR_MIN, WCHAR_MAX
 #include <stdint.h>