diff --git a/src/ctype/cbindgen.toml b/src/ctype/cbindgen.toml
index db7a3a0bc8cc154671431a48bbf13af6964c7dee..4fadb8447717c3292b035e2431bb369d23550cf6 100644
--- a/src/ctype/cbindgen.toml
+++ b/src/ctype/cbindgen.toml
@@ -1,6 +1,7 @@
 sys_includes = []
 include_guard = "_CTYPE_H"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/errno/cbindgen.toml b/src/errno/cbindgen.toml
index 1159d8eda7d72be9043ea92755f9783a7677704e..b1b2ef41448f51cd526d0106cab9805015aef029 100644
--- a/src/errno/cbindgen.toml
+++ b/src/errno/cbindgen.toml
@@ -1,6 +1,7 @@
 sys_includes = ["bits/errno.h"]
 include_guard = "_ERRNO_H"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/fcntl/cbindgen.toml b/src/fcntl/cbindgen.toml
index d49feaa87a14439d500104dde368bf9341973200..a3dac2dda6e6d0ce2da59041dceed7b689838b61 100644
--- a/src/fcntl/cbindgen.toml
+++ b/src/fcntl/cbindgen.toml
@@ -2,6 +2,7 @@ sys_includes = ["stdarg.h", "sys/types.h"]
 include_guard = "_FCNTL_H"
 trailer = "#include <bits/fcntl.h>"
 language = "C"
+style = "Tag"
 
 [defines]
 "target_os=linux" = "__linux__"
diff --git a/src/fenv/cbindgen.toml b/src/fenv/cbindgen.toml
index c369f03b344fd2908471182b47236967e91fe3cb..35663dc7bc554a032c25b39f1914de6b61477e43 100644
--- a/src/fenv/cbindgen.toml
+++ b/src/fenv/cbindgen.toml
@@ -1,6 +1,7 @@
 sys_includes = ["stdint.h", "sys/types.h"]
 include_guard = "_FENV_H"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/float/cbindgen.toml b/src/float/cbindgen.toml
index bbb97a813949d4b8162914fca24b9be3e67c4f99..643616b31eea87454f332851ce07bac1a994439b 100644
--- a/src/float/cbindgen.toml
+++ b/src/float/cbindgen.toml
@@ -1,6 +1,7 @@
 sys_includes = ["sys/types.h", "bits/float.h"]
 include_guard = "_FLOAT_H"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/grp/cbindgen.toml b/src/grp/cbindgen.toml
index 5b249723f82f9ed7a4f550344bbf3aa0562b2eaa..97cd01412418966a5749b3ce2a5e1eafd2676941 100644
--- a/src/grp/cbindgen.toml
+++ b/src/grp/cbindgen.toml
@@ -1,6 +1,7 @@
 sys_includes = []
 include_guard = "_GRP_H"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/locale/cbindgen.toml b/src/locale/cbindgen.toml
index 1c865da186479bd23f76ac9b644f1bcfe752a62f..2d2b2b425c6401d1fc8e8a9327c6a8b381da5f97 100644
--- a/src/locale/cbindgen.toml
+++ b/src/locale/cbindgen.toml
@@ -1,6 +1,7 @@
 include_guard = "_LOCALE_H"
 trailer = "#include <bits/locale.h>"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/semaphore/cbindgen.toml b/src/semaphore/cbindgen.toml
index db95e2fec95470a7fade7468b9c0ef3ff310118c..def4de4a95534d820034528860e6f36d3ddada7f 100644
--- a/src/semaphore/cbindgen.toml
+++ b/src/semaphore/cbindgen.toml
@@ -1,6 +1,7 @@
 sys_includes = []
 include_guard = "_SEMAPHORE_H"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/stdio/cbindgen.toml b/src/stdio/cbindgen.toml
index 3f13ef55cb66b092e669e76578cce789ee7899ab..a610fc3c9c5fedc941ff6834b956f44a2f16c6fa 100644
--- a/src/stdio/cbindgen.toml
+++ b/src/stdio/cbindgen.toml
@@ -2,6 +2,7 @@ sys_includes = ["stdarg.h", "stddef.h", "stdint.h", "sys/types.h"]
 include_guard = "_STDIO_H"
 trailer = "#include <bits/stdio.h>"
 language = "C"
+style = "Type"
 
 [enum]
 prefix_with_name = true
diff --git a/src/stdlib/cbindgen.toml b/src/stdlib/cbindgen.toml
index c4d72d172a4c2fe636208f929c72f23876bed082..0c8062d6e7a21c692064a383492ede595bee2300 100644
--- a/src/stdlib/cbindgen.toml
+++ b/src/stdlib/cbindgen.toml
@@ -1,6 +1,7 @@
 sys_includes = ["stddef.h"]
 include_guard = "_STDLIB_H"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/string/cbindgen.toml b/src/string/cbindgen.toml
index 33100dc2741217ff537ea809f9fda7b506b2105f..b61a780419fbcc1a8d6ba839f71c2a312e657a21 100644
--- a/src/string/cbindgen.toml
+++ b/src/string/cbindgen.toml
@@ -1,6 +1,7 @@
 sys_includes = ["stddef.h", "stdint.h"]
 include_guard = "_STRING_H"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/sys_mman/cbindgen.toml b/src/sys_mman/cbindgen.toml
index 9858a56ae2d617c4f6d0fe140d72e6e6aaf5fc0e..baaa532574a3feb7241532931e58b8544ba27604 100644
--- a/src/sys_mman/cbindgen.toml
+++ b/src/sys_mman/cbindgen.toml
@@ -1,6 +1,7 @@
 sys_includes = ["stdint.h", "sys/types.h"]
 include_guard = "_SYS_MMAN_H"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/sys_resource/cbindgen.toml b/src/sys_resource/cbindgen.toml
index 1b33a4e4383d52da0b59effa2dc33a7ff4b46b05..3ed0b2f5da9b145f9981a85cb8b8b224dd3d975e 100644
--- a/src/sys_resource/cbindgen.toml
+++ b/src/sys_resource/cbindgen.toml
@@ -1,6 +1,9 @@
 sys_includes = ["sys/types.h", "stdint.h", "sys/time.h"]
 include_guard = "_SYS_RESOURCE_H"
 language = "C"
+
+# WORKAROUND:
+# Rusage is used by another header, and cbindgen does not prefix that usage with `struct` :|
 style = "Both"
 
 [enum]
diff --git a/src/sys_time/cbindgen.toml b/src/sys_time/cbindgen.toml
index e25c54043f03dbbf67e731f1c40efcdf625b1a55..f599d8f99d3175120e9c28cf61116cd5d62dbb94 100644
--- a/src/sys_time/cbindgen.toml
+++ b/src/sys_time/cbindgen.toml
@@ -1,6 +1,9 @@
 sys_includes = ["sys/types.h"]
 include_guard = "_SYS_TIME_H"
 language = "C"
+
+# WORKAROUND:
+# Timeval is used by another header, and cbindgen doesn't prefix that with `struct` :|
 style = "Both"
 
 [enum]
diff --git a/src/sys_utsname/cbindgen.toml b/src/sys_utsname/cbindgen.toml
index 7429451f540d02ed670331ecfcb7f12a80caba12..967c89dc9aee807e5a844da465957d906ed8ecba 100644
--- a/src/sys_utsname/cbindgen.toml
+++ b/src/sys_utsname/cbindgen.toml
@@ -1,5 +1,6 @@
 include_guard = "_SYS_UTSNAME_H"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/template/cbindgen.toml b/src/template/cbindgen.toml
index bf4ccefceda1d5b41b72d0dee832a2b8fde6e7d1..37ed9f83d800ac126ae9e504d2bae8dead591d60 100644
--- a/src/template/cbindgen.toml
+++ b/src/template/cbindgen.toml
@@ -1,6 +1,7 @@
 sys_includes = []
 include_guard = "_TEMPLATE_H"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/time/cbindgen.toml b/src/time/cbindgen.toml
index 40448b8f899a567c7c044c9f5705a89d65e7a8e8..7864a0a54cf419a29302a7702de84c5839b5f14c 100644
--- a/src/time/cbindgen.toml
+++ b/src/time/cbindgen.toml
@@ -2,6 +2,10 @@ sys_includes = ["sys/types.h", "bits/timespec.h", "stdint.h"]
 include_guard = "_TIME_H"
 language = "C"
 
+# WORKAROUND:
+# Tm is used by another header, and cbindgen doesn't prefix that with `struct` :|
+style = "Both"
+
 [enum]
 prefix_with_name = true
 
diff --git a/src/unistd/cbindgen.toml b/src/unistd/cbindgen.toml
index a10250c6ddd2b485719f28ee675929235850f5c4..2c03074df9c2f42ddbf8eb750694249ddcf6002d 100644
--- a/src/unistd/cbindgen.toml
+++ b/src/unistd/cbindgen.toml
@@ -2,6 +2,7 @@ sys_includes = ["stddef.h", "stdint.h", "sys/types.h"]
 include_guard = "_UNISTD_H"
 trailer = "#include <bits/fcntl.h>\n#include <bits/unistd.h>"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
diff --git a/src/wchar/cbindgen.toml b/src/wchar/cbindgen.toml
index 0e0aa10c843a41423844ef34faa5749a87c5041a..1deb8f6475be8f06409156ae39225ecc236d67ae 100644
--- a/src/wchar/cbindgen.toml
+++ b/src/wchar/cbindgen.toml
@@ -2,6 +2,7 @@ sys_includes = ["stddef.h", "stdint.h", "time.h", "stdio.h" ]
 include_guard = "_WCHAR_H"
 header = "#include <bits/wchar.h>"
 language = "C"
+style = "Type"
 
 [enum]
 prefix_with_name = true
diff --git a/src/wctype/cbindgen.toml b/src/wctype/cbindgen.toml
index f31ad97cf12ba0bb92a4571452aa171b06b99ac0..bd1dd437f1bd9e500e5527d6d3fdd63e9e857cb7 100644
--- a/src/wctype/cbindgen.toml
+++ b/src/wctype/cbindgen.toml
@@ -1,6 +1,7 @@
 sys_includes = []
 include_guard = "_WCTYPE_H"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true