diff --git a/src/header/sys_ipc/cbindgen.toml b/src/header/sys_ipc/cbindgen.toml
index 22735777ef..4e3d0813b2 100644
--- a/src/header/sys_ipc/cbindgen.toml
+++ b/src/header/sys_ipc/cbindgen.toml
@@ -3,7 +3,7 @@
 # Spec quotations relating to includes:
 # - The <sys/ipc.h> header shall define the uid_t, gid_t, mode_t, and key_t types as described in <sys/types.h>
 sys_includes = []
-include_guard = "_SYS_IPC_H"
+include_guard = "_RELIBC_SYS_IPC_H"
 after_includes = """
 #include <bits/gid-t.h>  // for gid_t from sys/types.h
 #include <bits/uid-t.h>  // for uid_t from sys/types.h
diff --git a/src/header/sys_shm/cbindgen.toml b/src/header/sys_shm/cbindgen.toml
index 0ab46ad2c1..0b5fa47012 100644
--- a/src/header/sys_shm/cbindgen.toml
+++ b/src/header/sys_shm/cbindgen.toml
@@ -2,9 +2,15 @@
 #
 # Spec quotations relating to includes:
 # - The <sys/shm.h> header shall define the type intptr_t as described in <stdint.h>
+# - The <sys/shm.h> header shall define the pid_t, size_t, and time_t types as described in <sys/types.h>
 # - In addition, the <sys/shm.h> header shall include the <sys/ipc.h> header.
 sys_includes = ["sys/ipc.h", "stdint.h"]
-include_guard = "_SYS_SHM_H"
+include_guard = "_RELIBC_SYS_SHM_H"
+after_includes = """
+#include <bits/pid-t.h>  // for pid_t from sys/types.h
+#include <bits/size-t.h>  // for size_t from sys/types.h
+#include <bits/time-t.h>  // for time_t from sys/types.h
+"""
 language = "C"
 style = "Tag"