diff --git a/source/iostreams.tex b/source/iostreams.tex
index fd97be24a5..e517bbccde 100644
--- a/source/iostreams.tex
+++ b/source/iostreams.tex
@@ -18872,7 +18872,7 @@
 \indexlibraryglobal{ferror}%
 \indexlibraryglobal{perror}%
 \begin{codeblock}
-#define __STDC_VERSION_STDIO_H__ 202311L
+#define @\libmacro{__STDC_VERSION_STDIO_H__}@ 202311L
 
 namespace std {
   using size_t = @\textit{see \ref{support.types.layout}}@;
@@ -19045,7 +19045,7 @@
   constexpr imaxdiv_t div(intmax_t, intmax_t);  // optional, see below
 }
 
-#define __STDC_VERSION_INTTYPES_H__ 202311L
+#define @\libmacro{__STDC_VERSION_INTTYPES_H__}@ 202311L
 
 #define PRId@\placeholdernc{N}@ @\seebelow@
 #define PRIi@\placeholdernc{N}@ @\seebelow@
diff --git a/source/strings.tex b/source/strings.tex
index 1286a2364b..bff4b1abef 100644
--- a/source/strings.tex
+++ b/source/strings.tex
@@ -5501,7 +5501,7 @@
 \indexlibraryglobal{strtok}%
 \indexlibraryglobal{strxfrm}%
 \begin{codeblock}
-#define __STDC_VERSION_STRING_H__ 202311L
+#define @\libmacro{__STDC_VERSION_STRING_H__}@ 202311L
 
 namespace std {
   using size_t = @\textit{see \ref{support.types.layout}}@;                                            // freestanding
diff --git a/source/support.tex b/source/support.tex
index 9eeaba1426..9abc991973 100644
--- a/source/support.tex
+++ b/source/support.tex
@@ -1825,7 +1825,7 @@
 \indexheader{cfloat}%
 \begin{codeblock}
 // all freestanding
-#define __STDC_VERSION_FLOAT_H__ 202311L
+#define @\libmacro{__STDC_VERSION_FLOAT_H__}@ 202311L
 
 #define @\libmacro{FLT_ROUNDS}@ @\seebelow@
 #define @\libmacro{FLT_EVAL_METHOD}@ @\seebelow@
@@ -1944,7 +1944,7 @@
 \indexlibraryglobal{UINTMAX_C}%
 \begin{codeblock}
 // all freestanding
-#define __STDC_VERSION_STDINT_H__ 202311L
+#define @\libmacro{__STDC_VERSION_STDINT_H__}@ 202311L
 
 namespace std {
   using int8_t         = @\textit{signed integer type}@;   // optional
@@ -6366,7 +6366,7 @@
 \indexheader{cstdarg}%
 \begin{codeblock}
 // all freestanding
-#define __STDC_VERSION_STDARG_H__ 202311L
+#define @\libmacro{__STDC_VERSION_STDARG_H__}@ 202311L
 
 namespace std {
   using @\libglobal{va_list}@ = @\seebelow@;
@@ -6408,7 +6408,7 @@
 \indexlibraryglobal{longjmp}%
 \indexlibraryglobal{setjmp}%
 \begin{codeblock}
-#define __STDC_VERSION_SETJMP_H__ 202311L
+#define @\libmacro{__STDC_VERSION_SETJMP_H__}@ 202311L
 
 namespace std {
   using jmp_buf = @\seebelow@;
diff --git a/source/text.tex b/source/text.tex
index eb59082065..0fe56b29ff 100644
--- a/source/text.tex
+++ b/source/text.tex
@@ -13177,7 +13177,7 @@
 \indexlibraryglobal{wprintf}%
 \indexlibraryglobal{wscanf}%
 \begin{codeblock}
-#define __STDC_VERSION_WCHAR_H__ 202311L
+#define @\libmacro{__STDC_VERSION_WCHAR_H__}@ 202311L
 
 namespace std {
   using size_t = @\textit{see \ref{support.types.layout}}@;                                             // freestanding
@@ -13287,7 +13287,7 @@
 \indexlibraryglobal{mbrtoc32}%
 \indexlibraryglobal{c32rtomb}%
 \begin{codeblock}
-#define __STDC_VERSION_UCHAR_H__ 202311L
+#define @\libmacro{__STDC_VERSION_UCHAR_H__}@ 202311L
 
 namespace std {
   using mbstate_t = @\seebelow@;
diff --git a/source/time.tex b/source/time.tex
index 85696ba96b..981798e5a4 100644
--- a/source/time.tex
+++ b/source/time.tex
@@ -11647,7 +11647,7 @@
 \indexlibraryglobal{timegm}%
 \indexlibraryglobal{tm}%
 \begin{codeblock}
-#define __STDC_VERSION_TIME_H__ 202311L
+#define @\libmacro{__STDC_VERSION_TIME_H__}@ 202311L
 
 #define @\libmacro{NULL}@ @\textit{see \ref{support.types.nullptr}}@
 #define @\libmacro{CLOCKS_PER_SEC}@ @\seebelow@