diff --git a/src/header/arpa_inet/cbindgen.toml b/src/header/arpa_inet/cbindgen.toml
index e6205e3805..cc6241d6de 100644
--- a/src/header/arpa_inet/cbindgen.toml
+++ b/src/header/arpa_inet/cbindgen.toml
@@ -11,10 +11,10 @@
 # - including netinet/in.h in arpa/inet.h
 # - splitting out functions (htonl, htons, ntohl, ntohs) into bits/arpainet.h
 #
-# netinet/in.h brings in sys/types.h which brings in features.h (needed for #[deprecated] annotation)
+# features.h needed for #[deprecated] annotation
 # bits/arpainet.h brings in inttypes.h
-sys_includes = ["netinet/in.h"]
-include_guard = "_ARPA_INET_H"
+sys_includes = ["features.h", "netinet/in.h"]
+include_guard = "_RELIBC_ARPA_INET_H"
 after_includes = """
 #include <bits/arpainet.h> // for htonl, htons, ntohl, ntohs
 #include <bits/socklen-t.h> // for socklen_t
diff --git a/src/header/sys_time/cbindgen.toml b/src/header/sys_time/cbindgen.toml
index 9e28d70f11..61012686ff 100644
--- a/src/header/sys_time/cbindgen.toml
+++ b/src/header/sys_time/cbindgen.toml
@@ -1,6 +1,6 @@
-# sys/types.h brings in features.h (needed for #[deprecated] annotations)
-sys_includes = ["sys/types.h", "sys/select.h"]
-include_guard = "_SYS_TIME_H"
+# features.h needed for #[deprecated] annotations
+sys_includes = ["features.h", "sys/types.h", "sys/select.h"]
+include_guard = "_RELIBC_SYS_TIME_H"
 language = "C"
 after_includes = """
 #include <bits/timespec.h> // for timespec