diff --git a/source/diagnostics.tex b/source/diagnostics.tex
index e421b207f4..6fbb429302 100644
--- a/source/diagnostics.tex
+++ b/source/diagnostics.tex
@@ -530,158 +530,83 @@
 
 \rSec2[cerrno.syn]{Header \tcode{<cerrno>} synopsis}
 
-\indexlibraryglobal{errno}%
-\indexlibraryglobal{E2BIG}%
-\indexlibraryglobal{EACCES}%
-\indexlibraryglobal{EADDRINUSE}%
-\indexlibraryglobal{EADDRNOTAVAIL}%
-\indexlibraryglobal{EAFNOSUPPORT}%
-\indexlibraryglobal{EAGAIN}%
-\indexlibraryglobal{EALREADY}%
-\indexlibraryglobal{EBADF}%
-\indexlibraryglobal{EBADMSG}%
-\indexlibraryglobal{EBUSY}%
-\indexlibraryglobal{ECANCELED}%
-\indexlibraryglobal{ECHILD}%
-\indexlibraryglobal{ECONNABORTED}%
-\indexlibraryglobal{ECONNREFUSED}%
-\indexlibraryglobal{ECONNRESET}%
-\indexlibraryglobal{EDEADLK}%
-\indexlibraryglobal{EDESTADDRREQ}%
-\indexlibraryglobal{EDOM}%
-\indexlibraryglobal{EEXIST}%
-\indexlibraryglobal{EFAULT}%
-\indexlibraryglobal{EFBIG}%
-\indexlibraryglobal{EHOSTUNREACH}%
-\indexlibraryglobal{EIDRM}%
-\indexlibraryglobal{EILSEQ}%
-\indexlibraryglobal{EINPROGRESS}%
-\indexlibraryglobal{EINTR}%
-\indexlibraryglobal{EINVAL}%
-\indexlibraryglobal{EIO}%
-\indexlibraryglobal{EISCONN}%
-\indexlibraryglobal{EISDIR}%
-\indexlibraryglobal{ELOOP}%
-\indexlibraryglobal{EMFILE}%
-\indexlibraryglobal{EMLINK}%
-\indexlibraryglobal{EMSGSIZE}%
-\indexlibraryglobal{ENAMETOOLONG}%
-\indexlibraryglobal{ENETDOWN}%
-\indexlibraryglobal{ENETRESET}%
-\indexlibraryglobal{ENETUNREACH}%
-\indexlibraryglobal{ENFILE}%
-\indexlibraryglobal{ENOBUFS}%
-\indexlibraryglobal{ENODEV}%
-\indexlibraryglobal{ENOENT}%
-\indexlibraryglobal{ENOEXEC}%
-\indexlibraryglobal{ENOLCK}%
-\indexlibraryglobal{ENOLINK}%
-\indexlibraryglobal{ENOMEM}%
-\indexlibraryglobal{ENOMSG}%
-\indexlibraryglobal{ENOPROTOOPT}%
-\indexlibraryglobal{ENOSPC}%
-\indexlibraryglobal{ENOSYS}%
-\indexlibraryglobal{ENOTCONN}%
-\indexlibraryglobal{ENOTDIR}%
-\indexlibraryglobal{ENOTEMPTY}%
-\indexlibraryglobal{ENOTRECOVERABLE}%
-\indexlibraryglobal{ENOTSOCK}%
-\indexlibraryglobal{ENOTSUP}%
-\indexlibraryglobal{ENOTTY}%
-\indexlibraryglobal{ENXIO}%
-\indexlibraryglobal{EOPNOTSUPP}%
-\indexlibraryglobal{EOVERFLOW}%
-\indexlibraryglobal{EOWNERDEAD}%
-\indexlibraryglobal{EPERM}%
-\indexlibraryglobal{EPIPE}%
-\indexlibraryglobal{EPROTO}%
-\indexlibraryglobal{EPROTONOSUPPORT}%
-\indexlibraryglobal{EPROTOTYPE}%
-\indexlibraryglobal{ERANGE}%
-\indexlibraryglobal{EROFS}%
-\indexlibraryglobal{ESPIPE}%
-\indexlibraryglobal{ESRCH}%
-\indexlibraryglobal{ETIMEDOUT}%
-\indexlibraryglobal{ETXTBSY}%
-\indexlibraryglobal{EWOULDBLOCK}%
-\indexlibraryglobal{EXDEV}%
 \begin{codeblock}
-#define errno @\seebelow@
-
-#define E2BIG @\seebelow@                                                // freestanding
-#define EACCES @\seebelow@                                               // freestanding
-#define EADDRINUSE @\seebelow@                                           // freestanding
-#define EADDRNOTAVAIL @\seebelow@                                        // freestanding
-#define EAFNOSUPPORT @\seebelow@                                         // freestanding
-#define EAGAIN @\seebelow@                                               // freestanding
-#define EALREADY @\seebelow@                                             // freestanding
-#define EBADF @\seebelow@                                                // freestanding
-#define EBADMSG @\seebelow@                                              // freestanding
-#define EBUSY @\seebelow@                                                // freestanding
-#define ECANCELED @\seebelow@                                            // freestanding
-#define ECHILD @\seebelow@                                               // freestanding
-#define ECONNABORTED @\seebelow@                                         // freestanding
-#define ECONNREFUSED @\seebelow@                                         // freestanding
-#define ECONNRESET @\seebelow@                                           // freestanding
-#define EDEADLK @\seebelow@                                              // freestanding
-#define EDESTADDRREQ @\seebelow@                                         // freestanding
-#define EDOM @\seebelow@                                                 // freestanding
-#define EEXIST @\seebelow@                                               // freestanding
-#define EFAULT @\seebelow@                                               // freestanding
-#define EFBIG @\seebelow@                                                // freestanding
-#define EHOSTUNREACH @\seebelow@                                         // freestanding
-#define EIDRM @\seebelow@                                                // freestanding
-#define EILSEQ @\seebelow@                                               // freestanding
-#define EINPROGRESS @\seebelow@                                          // freestanding
-#define EINTR @\seebelow@                                                // freestanding
-#define EINVAL @\seebelow@                                               // freestanding
-#define EIO @\seebelow@                                                  // freestanding
-#define EISCONN @\seebelow@                                              // freestanding
-#define EISDIR @\seebelow@                                               // freestanding
-#define ELOOP @\seebelow@                                                // freestanding
-#define EMFILE @\seebelow@                                               // freestanding
-#define EMLINK @\seebelow@                                               // freestanding
-#define EMSGSIZE @\seebelow@                                             // freestanding
-#define ENAMETOOLONG @\seebelow@                                         // freestanding
-#define ENETDOWN @\seebelow@                                             // freestanding
-#define ENETRESET @\seebelow@                                            // freestanding
-#define ENETUNREACH @\seebelow@                                          // freestanding
-#define ENFILE @\seebelow@                                               // freestanding
-#define ENOBUFS @\seebelow@                                              // freestanding
-#define ENODEV @\seebelow@                                               // freestanding
-#define ENOENT @\seebelow@                                               // freestanding
-#define ENOEXEC @\seebelow@                                              // freestanding
-#define ENOLCK @\seebelow@                                               // freestanding
-#define ENOLINK @\seebelow@                                              // freestanding
-#define ENOMEM @\seebelow@                                               // freestanding
-#define ENOMSG @\seebelow@                                               // freestanding
-#define ENOPROTOOPT @\seebelow@                                          // freestanding
-#define ENOSPC @\seebelow@                                               // freestanding
-#define ENOSYS @\seebelow@                                               // freestanding
-#define ENOTCONN @\seebelow@                                             // freestanding
-#define ENOTDIR @\seebelow@                                              // freestanding
-#define ENOTEMPTY @\seebelow@                                            // freestanding
-#define ENOTRECOVERABLE @\seebelow@                                      // freestanding
-#define ENOTSOCK @\seebelow@                                             // freestanding
-#define ENOTSUP @\seebelow@                                              // freestanding
-#define ENOTTY @\seebelow@                                               // freestanding
-#define ENXIO @\seebelow@                                                // freestanding
-#define EOPNOTSUPP @\seebelow@                                           // freestanding
-#define EOVERFLOW @\seebelow@                                            // freestanding
-#define EOWNERDEAD @\seebelow@                                           // freestanding
-#define EPERM @\seebelow@                                                // freestanding
-#define EPIPE @\seebelow@                                                // freestanding
-#define EPROTO @\seebelow@                                               // freestanding
-#define EPROTONOSUPPORT @\seebelow@                                      // freestanding
-#define EPROTOTYPE @\seebelow@                                           // freestanding
-#define ERANGE @\seebelow@                                               // freestanding
-#define EROFS @\seebelow@                                                // freestanding
-#define ESPIPE @\seebelow@                                               // freestanding
-#define ESRCH @\seebelow@                                                // freestanding
-#define ETIMEDOUT @\seebelow@                                            // freestanding
-#define ETXTBSY @\seebelow@                                              // freestanding
-#define EWOULDBLOCK @\seebelow@                                          // freestanding
-#define EXDEV @\seebelow@                                                // freestanding
+#define @\libglobal{errno}@ @\seebelow@
+
+#define @\libglobal{E2BIG}@ @\seebelow@                                                // freestanding
+#define @\libglobal{EACCES}@ @\seebelow@                                               // freestanding
+#define @\libglobal{EADDRINUSE}@ @\seebelow@                                           // freestanding
+#define @\libglobal{EADDRNOTAVAIL}@ @\seebelow@                                        // freestanding
+#define @\libglobal{EAFNOSUPPORT}@ @\seebelow@                                         // freestanding
+#define @\libglobal{EAGAIN}@ @\seebelow@                                               // freestanding
+#define @\libglobal{EALREADY}@ @\seebelow@                                             // freestanding
+#define @\libglobal{EBADF}@ @\seebelow@                                                // freestanding
+#define @\libglobal{EBADMSG}@ @\seebelow@                                              // freestanding
+#define @\libglobal{EBUSY}@ @\seebelow@                                                // freestanding
+#define @\libglobal{ECANCELED}@ @\seebelow@                                            // freestanding
+#define @\libglobal{ECHILD}@ @\seebelow@                                               // freestanding
+#define @\libglobal{ECONNABORTED}@ @\seebelow@                                         // freestanding
+#define @\libglobal{ECONNREFUSED}@ @\seebelow@                                         // freestanding
+#define @\libglobal{ECONNRESET}@ @\seebelow@                                           // freestanding
+#define @\libglobal{EDEADLK}@ @\seebelow@                                              // freestanding
+#define @\libglobal{EDESTADDRREQ}@ @\seebelow@                                         // freestanding
+#define @\libglobal{EDOM}@ @\seebelow@                                                 // freestanding
+#define @\libglobal{EEXIST}@ @\seebelow@                                               // freestanding
+#define @\libglobal{EFAULT}@ @\seebelow@                                               // freestanding
+#define @\libglobal{EFBIG}@ @\seebelow@                                                // freestanding
+#define @\libglobal{EHOSTUNREACH}@ @\seebelow@                                         // freestanding
+#define @\libglobal{EIDRM}@ @\seebelow@                                                // freestanding
+#define @\libglobal{EILSEQ}@ @\seebelow@                                               // freestanding
+#define @\libglobal{EINPROGRESS}@ @\seebelow@                                          // freestanding
+#define @\libglobal{EINTR}@ @\seebelow@                                                // freestanding
+#define @\libglobal{EINVAL}@ @\seebelow@                                               // freestanding
+#define @\libglobal{EIO}@ @\seebelow@                                                  // freestanding
+#define @\libglobal{EISCONN}@ @\seebelow@                                              // freestanding
+#define @\libglobal{EISDIR}@ @\seebelow@                                               // freestanding
+#define @\libglobal{ELOOP}@ @\seebelow@                                                // freestanding
+#define @\libglobal{EMFILE}@ @\seebelow@                                               // freestanding
+#define @\libglobal{EMLINK}@ @\seebelow@                                               // freestanding
+#define @\libglobal{EMSGSIZE}@ @\seebelow@                                             // freestanding
+#define @\libglobal{ENAMETOOLONG}@ @\seebelow@                                         // freestanding
+#define @\libglobal{ENETDOWN}@ @\seebelow@                                             // freestanding
+#define @\libglobal{ENETRESET}@ @\seebelow@                                            // freestanding
+#define @\libglobal{ENETUNREACH}@ @\seebelow@                                          // freestanding
+#define @\libglobal{ENFILE}@ @\seebelow@                                               // freestanding
+#define @\libglobal{ENOBUFS}@ @\seebelow@                                              // freestanding
+#define @\libglobal{ENODEV}@ @\seebelow@                                               // freestanding
+#define @\libglobal{ENOENT}@ @\seebelow@                                               // freestanding
+#define @\libglobal{ENOEXEC}@ @\seebelow@                                              // freestanding
+#define @\libglobal{ENOLCK}@ @\seebelow@                                               // freestanding
+#define @\libglobal{ENOLINK}@ @\seebelow@                                              // freestanding
+#define @\libglobal{ENOMEM}@ @\seebelow@                                               // freestanding
+#define @\libglobal{ENOMSG}@ @\seebelow@                                               // freestanding
+#define @\libglobal{ENOPROTOOPT}@ @\seebelow@                                          // freestanding
+#define @\libglobal{ENOSPC}@ @\seebelow@                                               // freestanding
+#define @\libglobal{ENOSYS}@ @\seebelow@                                               // freestanding
+#define @\libglobal{ENOTCONN}@ @\seebelow@                                             // freestanding
+#define @\libglobal{ENOTDIR}@ @\seebelow@                                              // freestanding
+#define @\libglobal{ENOTEMPTY}@ @\seebelow@                                            // freestanding
+#define @\libglobal{ENOTRECOVERABLE}@ @\seebelow@                                      // freestanding
+#define @\libglobal{ENOTSOCK}@ @\seebelow@                                             // freestanding
+#define @\libglobal{ENOTSUP}@ @\seebelow@                                              // freestanding
+#define @\libglobal{ENOTTY}@ @\seebelow@                                               // freestanding
+#define @\libglobal{ENXIO}@ @\seebelow@                                                // freestanding
+#define @\libglobal{EOPNOTSUPP}@ @\seebelow@                                           // freestanding
+#define @\libglobal{EOVERFLOW}@ @\seebelow@                                            // freestanding
+#define @\libglobal{EOWNERDEAD}@ @\seebelow@                                           // freestanding
+#define @\libglobal{EPERM}@ @\seebelow@                                                // freestanding
+#define @\libglobal{EPIPE}@ @\seebelow@                                                // freestanding
+#define @\libglobal{EPROTO}@ @\seebelow@                                               // freestanding
+#define @\libglobal{EPROTONOSUPPORT}@ @\seebelow@                                      // freestanding
+#define @\libglobal{EPROTOTYPE}@ @\seebelow@                                           // freestanding
+#define @\libglobal{ERANGE}@ @\seebelow@                                               // freestanding
+#define @\libglobal{EROFS}@ @\seebelow@                                                // freestanding
+#define @\libglobal{ESPIPE}@ @\seebelow@                                               // freestanding
+#define @\libglobal{ESRCH}@ @\seebelow@                                                // freestanding
+#define @\libglobal{ETIMEDOUT}@ @\seebelow@                                            // freestanding
+#define @\libglobal{ETXTBSY}@ @\seebelow@                                              // freestanding
+#define @\libglobal{EWOULDBLOCK}@ @\seebelow@                                          // freestanding
+#define @\libglobal{EXDEV}@ @\seebelow@                                                // freestanding
 \end{codeblock}
 
 \pnum
diff --git a/source/future.tex b/source/future.tex
index 1abc48bc00..f8126dc266 100644
--- a/source/future.tex
+++ b/source/future.tex
@@ -221,18 +221,16 @@
 
 \pnum
 The header \libheaderref{stdalign.h} has the following macros:
-\indexlibraryglobal{__alignas_is_defined}%
 \begin{codeblock}
-#define @\xname{alignas_is_defined}@ 1
-#define @\xname{alignof_is_defined}@ 1
+#define @\libglobal{alignas_is_defined}@ 1
+#define @\libglobal{alignof_is_defined}@ 1
 \end{codeblock}
 
 \pnum
 The header \libheaderref{stdbool.h} has the following macro:
 \indexhdr{stdbool.h}%
-\indexlibraryglobal{__bool_true_false_are_defined}%
 \begin{codeblock}
-#define @\xname{bool_true_false_are_defined}@ 1
+#define @\libglobal{bool_true_false_are_defined}@ 1
 \end{codeblock}
 
 \rSec1[depr.cerrno]{Deprecated error numbers}
@@ -240,15 +238,11 @@
 \pnum
 The header \libheaderref{cerrno} has the following additional macros:
 
-\indexlibraryglobal{ENODATA}%
-\indexlibraryglobal{ENOSR}%
-\indexlibraryglobal{ENOSTR}%
-\indexlibraryglobal{ETIME}%
 \begin{codeblock}
-#define ENODATA @\seebelow@
-#define ENOSR @\seebelow@
-#define ENOSTR @\seebelow@
-#define ETIME @\seebelow@
+#define @\libglobal{ENODATA}@ @\seebelow@
+#define @\libglobal{ENOSR}@ @\seebelow@
+#define @\libglobal{ENOSTR}@ @\seebelow@
+#define @\libglobal{ETIME}@ @\seebelow@
 \end{codeblock}
 
 \pnum
diff --git a/source/iostreams.tex b/source/iostreams.tex
index d92718239b..dc36a4cf9d 100644
--- a/source/iostreams.tex
+++ b/source/iostreams.tex
@@ -18825,22 +18825,6 @@
 \indexlibraryglobal{size_t}%
 \indexlibraryglobal{FILE}%
 \indexlibraryglobal{fpos_t}%
-\indexlibraryglobal{NULL}%
-\indexlibraryglobal{_IOFBF}%
-\indexlibraryglobal{_IOLBF}%
-\indexlibraryglobal{_IONBF}%
-\indexlibraryglobal{BUFSIZ}%
-\indexlibraryglobal{EOF}%
-\indexlibraryglobal{FOPEN_MAX}%
-\indexlibraryglobal{FILENAME_MAX}%
-\indexlibraryglobal{L_tmpnam}%
-\indexlibraryglobal{SEEK_CUR}%
-\indexlibraryglobal{SEEK_END}%
-\indexlibraryglobal{SEEK_SET}%
-\indexlibraryglobal{TMP_MAX}%
-\indexlibraryglobal{stderr}%
-\indexlibraryglobal{stdin}%
-\indexlibraryglobal{stdout}%
 \indexlibraryglobal{remove}%
 \indexlibraryglobal{rename}%
 \indexlibraryglobal{tmpfile}%
@@ -18893,22 +18877,22 @@
   using fpos_t = @\seebelow@;
 }
 
-#define NULL @\textit{see \ref{support.types.nullptr}}@
-#define _IOFBF @\seebelow@
-#define _IOLBF @\seebelow@
-#define _IONBF @\seebelow@
-#define BUFSIZ @\seebelow@
-#define EOF @\seebelow@
-#define FOPEN_MAX @\seebelow@
-#define FILENAME_MAX @\seebelow@
-#define L_tmpnam @\seebelow@
-#define SEEK_CUR @\seebelow@
-#define SEEK_END @\seebelow@
-#define SEEK_SET @\seebelow@
-#define TMP_MAX @\seebelow@
-#define stderr @\seebelow@
-#define stdin @\seebelow@
-#define stdout @\seebelow@
+#define @\libglobal{NULL}@ @\textit{see \ref{support.types.nullptr}}@
+#define @\libglobal{_IOFBF}@ @\seebelow@
+#define @\libglobal{_IOLBF}@ @\seebelow@
+#define @\libglobal{_IONBF}@ @\seebelow@
+#define @\libglobal{BUFSIZ}@ @\seebelow@
+#define @\libglobal{EOF}@ @\seebelow@
+#define @\libglobal{FOPEN_MAX}@ @\seebelow@
+#define @\libglobal{FILENAME_MAX}@ @\seebelow@
+#define @\libglobal{L_tmpnam}@ @\seebelow@
+#define @\libglobal{SEEK_CUR}@ @\seebelow@
+#define @\libglobal{SEEK_END}@ @\seebelow@
+#define @\libglobal{SEEK_SET}@ @\seebelow@
+#define @\libglobal{TMP_MAX}@ @\seebelow@
+#define @\libglobal{stderr}@ @\seebelow@
+#define @\libglobal{stdin}@ @\seebelow@
+#define @\libglobal{stdout}@ @\seebelow@
 
 namespace std {
   int remove(const char* filename);
@@ -19015,28 +18999,6 @@
 \indexlibraryglobal{SCNoFASTN}%
 \indexlibraryglobal{SCNuFASTN}%
 \indexlibraryglobal{SCNxFASTN}%
-\indexlibraryglobal{PRIdMAX}%
-\indexlibraryglobal{PRIiMAX}%
-\indexlibraryglobal{PRIoMAX}%
-\indexlibraryglobal{PRIuMAX}%
-\indexlibraryglobal{PRIxMAX}%
-\indexlibraryglobal{PRIXMAX}%
-\indexlibraryglobal{SCNdMAX}%
-\indexlibraryglobal{SCNiMAX}%
-\indexlibraryglobal{SCNoMAX}%
-\indexlibraryglobal{SCNuMAX}%
-\indexlibraryglobal{SCNxMAX}%
-\indexlibraryglobal{PRIdPTR}%
-\indexlibraryglobal{PRIiPTR}%
-\indexlibraryglobal{PRIoPTR}%
-\indexlibraryglobal{PRIuPTR}%
-\indexlibraryglobal{PRIxPTR}%
-\indexlibraryglobal{PRIXPTR}%
-\indexlibraryglobal{SCNdPTR}%
-\indexlibraryglobal{SCNiPTR}%
-\indexlibraryglobal{SCNoPTR}%
-\indexlibraryglobal{SCNuPTR}%
-\indexlibraryglobal{SCNxPTR}%
 \begin{codeblock}
 #include <cstdint>  // see \ref{cstdint.syn}
 
@@ -19087,28 +19049,28 @@
 #define SCNoFAST@\placeholdernc{N}@ @\seebelow@
 #define SCNuFAST@\placeholdernc{N}@ @\seebelow@
 #define SCNxFAST@\placeholdernc{N}@ @\seebelow@
-#define PRIdMAX @\seebelow@
-#define PRIiMAX @\seebelow@
-#define PRIoMAX @\seebelow@
-#define PRIuMAX @\seebelow@
-#define PRIxMAX @\seebelow@
-#define PRIXMAX @\seebelow@
-#define SCNdMAX @\seebelow@
-#define SCNiMAX @\seebelow@
-#define SCNoMAX @\seebelow@
-#define SCNuMAX @\seebelow@
-#define SCNxMAX @\seebelow@
-#define PRIdPTR @\seebelow@
-#define PRIiPTR @\seebelow@
-#define PRIoPTR @\seebelow@
-#define PRIuPTR @\seebelow@
-#define PRIxPTR @\seebelow@
-#define PRIXPTR @\seebelow@
-#define SCNdPTR @\seebelow@
-#define SCNiPTR @\seebelow@
-#define SCNoPTR @\seebelow@
-#define SCNuPTR @\seebelow@
-#define SCNxPTR @\seebelow@
+#define @\libglobal{PRIdMAX}@ @\seebelow@
+#define @\libglobal{PRIiMAX}@ @\seebelow@
+#define @\libglobal{PRIoMAX}@ @\seebelow@
+#define @\libglobal{PRIuMAX}@ @\seebelow@
+#define @\libglobal{PRIxMAX}@ @\seebelow@
+#define @\libglobal{PRIXMAX}@ @\seebelow@
+#define @\libglobal{SCNdMAX}@ @\seebelow@
+#define @\libglobal{SCNiMAX}@ @\seebelow@
+#define @\libglobal{SCNoMAX}@ @\seebelow@
+#define @\libglobal{SCNuMAX}@ @\seebelow@
+#define @\libglobal{SCNxMAX}@ @\seebelow@
+#define @\libglobal{PRIdPTR}@ @\seebelow@
+#define @\libglobal{PRIiPTR}@ @\seebelow@
+#define @\libglobal{PRIoPTR}@ @\seebelow@
+#define @\libglobal{PRIuPTR}@ @\seebelow@
+#define @\libglobal{PRIxPTR}@ @\seebelow@
+#define @\libglobal{PRIXPTR}@ @\seebelow@
+#define @\libglobal{SCNdPTR}@ @\seebelow@
+#define @\libglobal{SCNiPTR}@ @\seebelow@
+#define @\libglobal{SCNoPTR}@ @\seebelow@
+#define @\libglobal{SCNuPTR}@ @\seebelow@
+#define @\libglobal{SCNxPTR}@ @\seebelow@
 \end{codeblock}
 
 \pnum
diff --git a/source/numerics.tex b/source/numerics.tex
index b91b8a06e1..680049c225 100644
--- a/source/numerics.tex
+++ b/source/numerics.tex
@@ -98,31 +98,20 @@
 \indexlibraryglobal{feholdexcept}%
 \indexlibraryglobal{fesetenv}%
 \indexlibraryglobal{feupdateenv}%
-\indexlibraryglobal{FE_ALL_EXCEPT}%
-\indexlibraryglobal{FE_DIVBYZERO}%
-\indexlibraryglobal{FE_INEXACT}%
-\indexlibraryglobal{FE_INVALID}%
-\indexlibraryglobal{FE_OVERFLOW}%
-\indexlibraryglobal{FE_UNDERFLOW}%
-\indexlibraryglobal{FE_DOWNWARD}%
-\indexlibraryglobal{FE_TONEAREST}%
-\indexlibraryglobal{FE_TOWARDZERO}%
-\indexlibraryglobal{FE_UPWARD}%
-\indexlibraryglobal{FE_DFL_ENV}%
 \begin{codeblock}
-#define FE_ALL_EXCEPT @\seebelow@
-#define FE_DIVBYZERO @\seebelow@    // optional
-#define FE_INEXACT @\seebelow@      // optional
-#define FE_INVALID @\seebelow@      // optional
-#define FE_OVERFLOW @\seebelow@     // optional
-#define FE_UNDERFLOW @\seebelow@    // optional
+#define @\libglobal{FE_ALL_EXCEPT}@ @\seebelow@
+#define @\libglobal{FE_DIVBYZERO}@ @\seebelow@    // optional
+#define @\libglobal{FE_INEXACT}@ @\seebelow@      // optional
+#define @\libglobal{FE_INVALID}@ @\seebelow@      // optional
+#define @\libglobal{FE_OVERFLOW}@ @\seebelow@     // optional
+#define @\libglobal{FE_UNDERFLOW}@ @\seebelow@    // optional
 
-#define FE_DOWNWARD @\seebelow@     // optional
-#define FE_TONEAREST @\seebelow@    // optional
-#define FE_TOWARDZERO @\seebelow@   // optional
-#define FE_UPWARD @\seebelow@       // optional
+#define @\libglobal{FE_DOWNWARD}@ @\seebelow@     // optional
+#define @\libglobal{FE_TONEAREST}@ @\seebelow@    // optional
+#define @\libglobal{FE_TOWARDZERO}@ @\seebelow@   // optional
+#define @\libglobal{FE_UPWARD}@ @\seebelow@       // optional
 
-#define FE_DFL_ENV @\seebelow@
+#define @\libglobal{FE_DFL_ENV}@ @\seebelow@
 
 namespace std {
   // types
@@ -9128,23 +9117,6 @@
 \rSec2[cmath.syn]{Header \tcode{<cmath>} synopsis}
 
 \indexheader{cmath}%
-\indexlibraryglobal{FP_FAST_FMA}%
-\indexlibraryglobal{FP_FAST_FMAF}%
-\indexlibraryglobal{FP_FAST_FMAL}%
-\indexlibraryglobal{FP_ILOGB0}%
-\indexlibraryglobal{FP_ILOGBNAN}%
-\indexlibraryglobal{FP_INFINITE}%
-\indexlibraryglobal{FP_NAN}%
-\indexlibraryglobal{FP_NORMAL}%
-\indexlibraryglobal{FP_SUBNORMAL}%
-\indexlibraryglobal{FP_ZERO}%
-\indexlibraryglobal{HUGE_VAL}%
-\indexlibraryglobal{HUGE_VALF}%
-\indexlibraryglobal{HUGE_VALL}%
-\indexlibraryglobal{INFINITY}%
-\indexlibraryglobal{MATH_ERREXCEPT}%
-\indexlibraryglobal{MATH_ERRNO}%
-\indexlibraryglobal{NAN}%
 \indexlibraryglobal{abs}%
 \indexlibraryglobal{acos}%
 \indexlibraryglobal{acosf}%
@@ -9273,7 +9245,6 @@
 \indexlibraryglobal{lround}%
 \indexlibraryglobal{lroundf}%
 \indexlibraryglobal{lroundl}%
-\indexlibraryglobal{math_errhandling}%
 \indexlibraryglobal{modf}%
 \indexlibraryglobal{modff}%
 \indexlibraryglobal{modfl}%
@@ -9338,25 +9309,25 @@
   using double_t = @\seebelow@;
 }
 
-#define HUGE_VAL @\seebelow@
-#define HUGE_VALF @\seebelow@
-#define HUGE_VALL @\seebelow@
-#define INFINITY @\seebelow@
-#define NAN @\seebelow@
-#define FP_INFINITE @\seebelow@
-#define FP_NAN @\seebelow@
-#define FP_NORMAL @\seebelow@
-#define FP_SUBNORMAL @\seebelow@
-#define FP_ZERO @\seebelow@
-#define FP_FAST_FMA @\seebelow@
-#define FP_FAST_FMAF @\seebelow@
-#define FP_FAST_FMAL @\seebelow@
-#define FP_ILOGB0 @\seebelow@
-#define FP_ILOGBNAN @\seebelow@
-#define MATH_ERRNO @\seebelow@
-#define MATH_ERREXCEPT @\seebelow@
-
-#define math_errhandling @\seebelow@
+#define @\libglobal{HUGE_VAL}@ @\seebelow@
+#define @\libglobal{HUGE_VALF}@ @\seebelow@
+#define @\libglobal{HUGE_VALL}@ @\seebelow@
+#define @\libglobal{INFINITY}@ @\seebelow@
+#define @\libglobal{NAN}@ @\seebelow@
+#define @\libglobal{FP_INFINITE}@ @\seebelow@
+#define @\libglobal{FP_NAN}@ @\seebelow@
+#define @\libglobal{FP_NORMAL}@ @\seebelow@
+#define @\libglobal{FP_SUBNORMAL}@ @\seebelow@
+#define @\libglobal{FP_ZERO}@ @\seebelow@
+#define @\libglobal{FP_FAST_FMA}@ @\seebelow@
+#define @\libglobal{FP_FAST_FMAF}@ @\seebelow@
+#define @\libglobal{FP_FAST_FMAL}@ @\seebelow@
+#define @\libglobal{FP_ILOGB0}@ @\seebelow@
+#define @\libglobal{FP_ILOGBNAN}@ @\seebelow@
+#define @\libglobal{MATH_ERRNO}@ @\seebelow@
+#define @\libglobal{MATH_ERREXCEPT}@ @\seebelow@
+
+#define @\libglobal{math_errhandling}@ @\seebelow@
 
 namespace std {
   constexpr @\placeholdernc{floating-point-type}@ acos(@\placeholdernc{floating-point-type}@ x);
diff --git a/source/strings.tex b/source/strings.tex
index 48e2bee8a3..63f5f8e254 100644
--- a/source/strings.tex
+++ b/source/strings.tex
@@ -5500,7 +5500,7 @@
   size_t strlen(const char* s);                                         // freestanding
 }
 
-#define NULL @\textit{see \ref{support.types.nullptr}}@                                                // freestanding
+#define @\libglobal{NULL}@ @\textit{see \ref{support.types.nullptr}}@                                                // freestanding
 \end{codeblock}
 
 \pnum
diff --git a/source/support.tex b/source/support.tex
index 72a0507464..32ae662d38 100644
--- a/source/support.tex
+++ b/source/support.tex
@@ -43,7 +43,6 @@
 
 \rSec2[cstddef.syn]{Header \tcode{<cstddef>} synopsis}
 
-\indexlibraryglobal{NULL}%
 \indexlibraryglobal{offsetof}%
 \indexlibraryglobal{ptrdiff_t}%
 \indexlibraryglobal{size_t}%
@@ -80,7 +79,7 @@
     constexpr IntType to_integer(byte b) noexcept;
 }
 
-#define NULL @\seebelow@
+#define @\libglobal{NULL}@ @\seebelow@
 #define offsetof(P, D) @\seebelow@
 \end{codeblock}
 
@@ -99,11 +98,6 @@
 \rSec2[cstdlib.syn]{Header \tcode{<cstdlib>} synopsis}
 
 \indexheader{cstdlib}%
-\indexlibraryglobal{EXIT_FAILURE}%
-\indexlibraryglobal{EXIT_SUCCESS}%
-\indexlibraryglobal{MB_CUR_MAX}%
-\indexlibraryglobal{NULL}%
-\indexlibraryglobal{RAND_MAX}%
 \indexlibraryglobal{_Exit}%
 \indexlibraryglobal{abort}%
 \indexlibraryglobal{abs}%
@@ -155,11 +149,11 @@
   using lldiv_t = @\seebelow@;                                            // freestanding
 }
 
-#define NULL @\seebelow@                                                  // freestanding
-#define EXIT_FAILURE @\seebelow@                                          // freestanding
-#define EXIT_SUCCESS @\seebelow@                                          // freestanding
-#define RAND_MAX @\seebelow@
-#define MB_CUR_MAX @\seebelow@
+#define @\libglobal{NULL}@ @\seebelow@                                                  // freestanding
+#define @\libglobal{EXIT_FAILURE}@ @\seebelow@                                          // freestanding
+#define @\libglobal{EXIT_SUCCESS}@ @\seebelow@                                          // freestanding
+#define @\libglobal{RAND_MAX}@ @\seebelow@
+#define @\libglobal{MB_CUR_MAX}@ @\seebelow@
 
 namespace std {
   // Exposition-only function type aliases
@@ -1701,46 +1695,27 @@
 \rSec2[climits.syn]{Header \tcode{<climits>} synopsis}
 
 \indexheader{climits}%
-\indexlibraryglobal{CHAR_BIT}%
-\indexlibraryglobal{SCHAR_MIN}%
-\indexlibraryglobal{SCHAR_MAX}%
-\indexlibraryglobal{UCHAR_MAX}%
-\indexlibraryglobal{CHAR_MIN}%
-\indexlibraryglobal{CHAR_MAX}%
-\indexlibraryglobal{MB_LEN_MAX}%
-\indexlibraryglobal{SHRT_MIN}%
-\indexlibraryglobal{SHRT_MAX}%
-\indexlibraryglobal{USHRT_MAX}%
-\indexlibraryglobal{INT_MIN}%
-\indexlibraryglobal{INT_MAX}%
-\indexlibraryglobal{UINT_MAX}%
-\indexlibraryglobal{LONG_MIN}%
-\indexlibraryglobal{LONG_MAX}%
-\indexlibraryglobal{ULONG_MAX}%
-\indexlibraryglobal{LLONG_MIN}%
-\indexlibraryglobal{LLONG_MAX}%
-\indexlibraryglobal{ULLONG_MAX}%
 \begin{codeblock}
 // all freestanding
-#define CHAR_BIT @\seebelow@
-#define SCHAR_MIN @\seebelow@
-#define SCHAR_MAX @\seebelow@
-#define UCHAR_MAX @\seebelow@
-#define CHAR_MIN @\seebelow@
-#define CHAR_MAX @\seebelow@
-#define MB_LEN_MAX @\seebelow@
-#define SHRT_MIN @\seebelow@
-#define SHRT_MAX @\seebelow@
-#define USHRT_MAX @\seebelow@
-#define INT_MIN @\seebelow@
-#define INT_MAX @\seebelow@
-#define UINT_MAX @\seebelow@
-#define LONG_MIN @\seebelow@
-#define LONG_MAX @\seebelow@
-#define ULONG_MAX @\seebelow@
-#define LLONG_MIN @\seebelow@
-#define LLONG_MAX @\seebelow@
-#define ULLONG_MAX @\seebelow@
+#define @\libglobal{CHAR_BIT}@ @\seebelow@
+#define @\libglobal{SCHAR_MIN}@ @\seebelow@
+#define @\libglobal{SCHAR_MAX}@ @\seebelow@
+#define @\libglobal{UCHAR_MAX}@ @\seebelow@
+#define @\libglobal{CHAR_MIN}@ @\seebelow@
+#define @\libglobal{CHAR_MAX}@ @\seebelow@
+#define @\libglobal{MB_LEN_MAX}@ @\seebelow@
+#define @\libglobal{SHRT_MIN}@ @\seebelow@
+#define @\libglobal{SHRT_MAX}@ @\seebelow@
+#define @\libglobal{USHRT_MAX}@ @\seebelow@
+#define @\libglobal{INT_MIN}@ @\seebelow@
+#define @\libglobal{INT_MAX}@ @\seebelow@
+#define @\libglobal{UINT_MAX}@ @\seebelow@
+#define @\libglobal{LONG_MIN}@ @\seebelow@
+#define @\libglobal{LONG_MAX}@ @\seebelow@
+#define @\libglobal{ULONG_MAX}@ @\seebelow@
+#define @\libglobal{LLONG_MIN}@ @\seebelow@
+#define @\libglobal{LLONG_MAX}@ @\seebelow@
+#define @\libglobal{ULLONG_MAX}@ @\seebelow@
 \end{codeblock}
 
 \pnum
@@ -1757,88 +1732,48 @@
 \rSec2[cfloat.syn]{Header \tcode{<cfloat>} synopsis}
 
 \indexheader{cfloat}%
-\indexlibraryglobal{DBL_DECIMAL_DIG}%
-\indexlibraryglobal{DBL_DIG}%
-\indexlibraryglobal{DBL_EPSILON}%
-\indexlibraryglobal{DBL_HAS_SUBNORM}%
-\indexlibraryglobal{DBL_MANT_DIG}%
-\indexlibraryglobal{DBL_MAX}%
-\indexlibraryglobal{DBL_MAX_10_EXP}%
-\indexlibraryglobal{DBL_MAX_EXP}%
-\indexlibraryglobal{DBL_MIN}%
-\indexlibraryglobal{DBL_MIN_10_EXP}%
-\indexlibraryglobal{DBL_MIN_EXP}%
-\indexlibraryglobal{DBL_TRUE_MIN}%
-\indexlibraryglobal{DECIMAL_DIG}%
-\indexlibraryglobal{FLT_DECIMAL_DIG}%
-\indexlibraryglobal{FLT_DIG}%
-\indexlibraryglobal{FLT_EPSILON}%
-\indexlibraryglobal{FLT_EVAL_METHOD}%
-\indexlibraryglobal{FLT_HAS_SUBNORM}%
-\indexlibraryglobal{FLT_MANT_DIG}%
-\indexlibraryglobal{FLT_MAX}%
-\indexlibraryglobal{FLT_MAX_10_EXP}%
-\indexlibraryglobal{FLT_MAX_EXP}%
-\indexlibraryglobal{FLT_MIN}%
-\indexlibraryglobal{FLT_MIN_10_EXP}%
-\indexlibraryglobal{FLT_MIN_EXP}%
-\indexlibraryglobal{FLT_RADIX}%
-\indexlibraryglobal{FLT_ROUNDS}%
-\indexlibraryglobal{FLT_TRUE_MIN}%
-\indexlibraryglobal{LDBL_DECIMAL_DIG}%
-\indexlibraryglobal{LDBL_DIG}%
-\indexlibraryglobal{LDBL_EPSILON}%
-\indexlibraryglobal{LDBL_HAS_SUBNORM}%
-\indexlibraryglobal{LDBL_MANT_DIG}%
-\indexlibraryglobal{LDBL_MAX}%
-\indexlibraryglobal{LDBL_MAX_10_EXP}%
-\indexlibraryglobal{LDBL_MAX_EXP}%
-\indexlibraryglobal{LDBL_MIN}%
-\indexlibraryglobal{LDBL_MIN_10_EXP}%
-\indexlibraryglobal{LDBL_MIN_EXP}%
-\indexlibraryglobal{LDBL_TRUE_MIN}%
 \begin{codeblock}
 // all freestanding
-#define FLT_ROUNDS @\seebelow@
-#define FLT_EVAL_METHOD @\seebelow@
-#define FLT_HAS_SUBNORM @\seebelow@
-#define DBL_HAS_SUBNORM @\seebelow@
-#define LDBL_HAS_SUBNORM @\seebelow@
-#define FLT_RADIX @\seebelow@
-#define FLT_MANT_DIG @\seebelow@
-#define DBL_MANT_DIG @\seebelow@
-#define LDBL_MANT_DIG @\seebelow@
-#define FLT_DECIMAL_DIG @\seebelow@
-#define DBL_DECIMAL_DIG @\seebelow@
-#define LDBL_DECIMAL_DIG @\seebelow@
-#define DECIMAL_DIG @\seebelow@
-#define FLT_DIG @\seebelow@
-#define DBL_DIG @\seebelow@
-#define LDBL_DIG @\seebelow@
-#define FLT_MIN_EXP @\seebelow@
-#define DBL_MIN_EXP @\seebelow@
-#define LDBL_MIN_EXP @\seebelow@
-#define FLT_MIN_10_EXP @\seebelow@
-#define DBL_MIN_10_EXP @\seebelow@
-#define LDBL_MIN_10_EXP @\seebelow@
-#define FLT_MAX_EXP @\seebelow@
-#define DBL_MAX_EXP @\seebelow@
-#define LDBL_MAX_EXP @\seebelow@
-#define FLT_MAX_10_EXP @\seebelow@
-#define DBL_MAX_10_EXP @\seebelow@
-#define LDBL_MAX_10_EXP @\seebelow@
-#define FLT_MAX @\seebelow@
-#define DBL_MAX @\seebelow@
-#define LDBL_MAX @\seebelow@
-#define FLT_EPSILON @\seebelow@
-#define DBL_EPSILON @\seebelow@
-#define LDBL_EPSILON @\seebelow@
-#define FLT_MIN @\seebelow@
-#define DBL_MIN @\seebelow@
-#define LDBL_MIN @\seebelow@
-#define FLT_TRUE_MIN @\seebelow@
-#define DBL_TRUE_MIN @\seebelow@
-#define LDBL_TRUE_MIN @\seebelow@
+#define @\libglobal{FLT_ROUNDS}@ @\seebelow@
+#define @\libglobal{FLT_EVAL_METHOD}@ @\seebelow@
+#define @\libglobal{FLT_HAS_SUBNORM}@ @\seebelow@
+#define @\libglobal{DBL_HAS_SUBNORM}@ @\seebelow@
+#define @\libglobal{LDBL_HAS_SUBNORM}@ @\seebelow@
+#define @\libglobal{FLT_RADIX}@ @\seebelow@
+#define @\libglobal{FLT_MANT_DIG}@ @\seebelow@
+#define @\libglobal{DBL_MANT_DIG}@ @\seebelow@
+#define @\libglobal{LDBL_MANT_DIG}@ @\seebelow@
+#define @\libglobal{FLT_DECIMAL_DIG}@ @\seebelow@
+#define @\libglobal{DBL_DECIMAL_DIG}@ @\seebelow@
+#define @\libglobal{LDBL_DECIMAL_DIG}@ @\seebelow@
+#define @\libglobal{DECIMAL_DIG}@ @\seebelow@
+#define @\libglobal{FLT_DIG}@ @\seebelow@
+#define @\libglobal{DBL_DIG}@ @\seebelow@
+#define @\libglobal{LDBL_DIG}@ @\seebelow@
+#define @\libglobal{FLT_MIN_EXP}@ @\seebelow@
+#define @\libglobal{DBL_MIN_EXP}@ @\seebelow@
+#define @\libglobal{LDBL_MIN_EXP}@ @\seebelow@
+#define @\libglobal{FLT_MIN_10_EXP}@ @\seebelow@
+#define @\libglobal{DBL_MIN_10_EXP}@ @\seebelow@
+#define @\libglobal{LDBL_MIN_10_EXP}@ @\seebelow@
+#define @\libglobal{FLT_MAX_EXP}@ @\seebelow@
+#define @\libglobal{DBL_MAX_EXP}@ @\seebelow@
+#define @\libglobal{LDBL_MAX_EXP}@ @\seebelow@
+#define @\libglobal{FLT_MAX_10_EXP}@ @\seebelow@
+#define @\libglobal{DBL_MAX_10_EXP}@ @\seebelow@
+#define @\libglobal{LDBL_MAX_10_EXP}@ @\seebelow@
+#define @\libglobal{FLT_MAX}@ @\seebelow@
+#define @\libglobal{DBL_MAX}@ @\seebelow@
+#define @\libglobal{LDBL_MAX}@ @\seebelow@
+#define @\libglobal{FLT_EPSILON}@ @\seebelow@
+#define @\libglobal{DBL_EPSILON}@ @\seebelow@
+#define @\libglobal{LDBL_EPSILON}@ @\seebelow@
+#define @\libglobal{FLT_MIN}@ @\seebelow@
+#define @\libglobal{DBL_MIN}@ @\seebelow@
+#define @\libglobal{LDBL_MIN}@ @\seebelow@
+#define @\libglobal{FLT_TRUE_MIN}@ @\seebelow@
+#define @\libglobal{DBL_TRUE_MIN}@ @\seebelow@
+#define @\libglobal{LDBL_TRUE_MIN}@ @\seebelow@
 \end{codeblock}
 
 \pnum
@@ -1894,21 +1829,6 @@
 \indexlibraryglobal{INT_LEASTN_MIN}%
 \indexlibraryglobal{INT_LEASTN_MAX}%
 \indexlibraryglobal{UINT_LEASTN_MAX}%
-\indexlibraryglobal{INTMAX_MIN}%
-\indexlibraryglobal{INTMAX_MAX}%
-\indexlibraryglobal{UINTMAX_MAX}%
-\indexlibraryglobal{INTPTR_MIN}%
-\indexlibraryglobal{INTPTR_MAX}%
-\indexlibraryglobal{UINTPTR_MAX}%
-\indexlibraryglobal{PTRDIFF_MIN}%
-\indexlibraryglobal{PTRDIFF_MAX}%
-\indexlibraryglobal{SIZE_MAX}%
-\indexlibraryglobal{SIG_ATOMIC_MIN}%
-\indexlibraryglobal{SIG_ATOMIC_MAX}%
-\indexlibraryglobal{WCHAR_MAX}%
-\indexlibraryglobal{WCHAR_MIN}%
-\indexlibraryglobal{WINT_MIN}%
-\indexlibraryglobal{WINT_MAX}%
 \indexlibraryglobal{INTN_C}%
 \indexlibraryglobal{UINTN_C}%
 \indexlibraryglobal{INTMAX_C}%
@@ -1971,26 +1891,26 @@
 #define INT_LEAST@\placeholdernc{N}@_MAX   @\seebelow@
 #define UINT_LEAST@\placeholdernc{N}@_MAX  @\seebelow@
 
-#define INTMAX_MIN       @\seebelow@
-#define INTMAX_MAX       @\seebelow@
-#define UINTMAX_MAX      @\seebelow@
+#define @\libglobal{INTMAX_MIN}@       @\seebelow@
+#define @\libglobal{INTMAX_MAX}@       @\seebelow@
+#define @\libglobal{UINTMAX_MAX}@      @\seebelow@
 
-#define INTPTR_MIN       @\seebelow@              // optional
-#define INTPTR_MAX       @\seebelow@              // optional
-#define UINTPTR_MAX      @\seebelow@              // optional
+#define @\libglobal{INTPTR_MIN}@       @\seebelow@              // optional
+#define @\libglobal{INTPTR_MAX}@       @\seebelow@              // optional
+#define @\libglobal{UINTPTR_MAX}@      @\seebelow@              // optional
 
-#define PTRDIFF_MIN      @\seebelow@
-#define PTRDIFF_MAX      @\seebelow@
-#define SIZE_MAX         @\seebelow@
+#define @\libglobal{PTRDIFF_MIN}@      @\seebelow@
+#define @\libglobal{PTRDIFF_MAX}@      @\seebelow@
+#define @\libglobal{SIZE_MAX}@         @\seebelow@
 
-#define SIG_ATOMIC_MIN   @\seebelow@
-#define SIG_ATOMIC_MAX   @\seebelow@
+#define @\libglobal{SIG_ATOMIC_MIN}@   @\seebelow@
+#define @\libglobal{SIG_ATOMIC_MAX}@   @\seebelow@
 
-#define WCHAR_MIN        @\seebelow@
-#define WCHAR_MAX        @\seebelow@
+#define @\libglobal{WCHAR_MIN}@        @\seebelow@
+#define @\libglobal{WCHAR_MAX}@        @\seebelow@
 
-#define WINT_MIN         @\seebelow@
-#define WINT_MAX         @\seebelow@
+#define @\libglobal{WINT_MIN}@         @\seebelow@
+#define @\libglobal{WINT_MAX}@         @\seebelow@
 
 #define INT@\placeholdernc{N}@_C(value)    @\seebelow@
 #define UINT@\placeholdernc{N}@_C(value)   @\seebelow@
@@ -6084,15 +6004,6 @@
 \indexlibraryglobal{sig_atomic_t}%
 \indexlibraryglobal{signal}%
 \indexlibraryglobal{raise}%
-\indexlibraryglobal{SIG_IGN}%
-\indexlibraryglobal{SIGABRT}%
-\indexlibraryglobal{SIGFPE}%
-\indexlibraryglobal{SIGILL}%
-\indexlibraryglobal{SIGINT}%
-\indexlibraryglobal{SIGSEGV}%
-\indexlibraryglobal{SIGTERM}%
-\indexlibraryglobal{SIG_DFL}%
-\indexlibraryglobal{SIG_ERR}%
 \begin{codeblock}
 namespace std {
   using sig_atomic_t = @\seebelow@;
@@ -6104,15 +6015,15 @@
   int raise(int sig);
 }
 
-#define SIG_DFL @\seebelow@
-#define SIG_ERR @\seebelow@
-#define SIG_IGN @\seebelow@
-#define SIGABRT @\seebelow@
-#define SIGFPE @\seebelow@
-#define SIGILL @\seebelow@
-#define SIGINT @\seebelow@
-#define SIGSEGV @\seebelow@
-#define SIGTERM @\seebelow@
+#define @\libglobal{SIG_DFL}@ @\seebelow@
+#define @\libglobal{SIG_ERR}@ @\seebelow@
+#define @\libglobal{SIG_IGN}@ @\seebelow@
+#define @\libglobal{SIGABRT}@ @\seebelow@
+#define @\libglobal{SIGFPE}@ @\seebelow@
+#define @\libglobal{SIGILL}@ @\seebelow@
+#define @\libglobal{SIGINT}@ @\seebelow@
+#define @\libglobal{SIGSEGV}@ @\seebelow@
+#define @\libglobal{SIGTERM}@ @\seebelow@
 \end{codeblock}
 
 \pnum
diff --git a/source/text.tex b/source/text.tex
index f1786cea2f..55d06370b5 100644
--- a/source/text.tex
+++ b/source/text.tex
@@ -4903,13 +4903,6 @@
 \indexlibraryglobal{lconv}%
 \indexlibraryglobal{setlocale}%
 \indexlibraryglobal{localeconv}%
-\indexlibraryglobal{NULL}%
-\indexlibraryglobal{LC_ALL}%
-\indexlibraryglobal{LC_COLLATE}%
-\indexlibraryglobal{LC_CTYPE}%
-\indexlibraryglobal{LC_MONETARY}%
-\indexlibraryglobal{LC_NUMERIC}%
-\indexlibraryglobal{LC_TIME}%
 \begin{codeblock}
 namespace std {
   struct lconv;
@@ -4918,13 +4911,13 @@
   lconv* localeconv();
 }
 
-#define NULL @\textit{see \ref{support.types.nullptr}}@
-#define LC_ALL @\seebelow@
-#define LC_COLLATE @\seebelow@
-#define LC_CTYPE @\seebelow@
-#define LC_MONETARY @\seebelow@
-#define LC_NUMERIC @\seebelow@
-#define LC_TIME @\seebelow@
+#define @\libglobal{NULL}@ @\textit{see \ref{support.types.nullptr}}@
+#define @\libglobal{LC_ALL}@ @\seebelow@
+#define @\libglobal{LC_COLLATE}@ @\seebelow@
+#define @\libglobal{LC_CTYPE}@ @\seebelow@
+#define @\libglobal{LC_MONETARY}@ @\seebelow@
+#define @\libglobal{LC_NUMERIC}@ @\seebelow@
+#define @\libglobal{LC_TIME}@ @\seebelow@
 \end{codeblock}
 
 \pnum
@@ -13065,7 +13058,6 @@
 \indexlibraryglobal{towupper}%
 \indexlibraryglobal{towctrans}%
 \indexlibraryglobal{wctrans}%
-\indexlibraryglobal{WEOF}%
 \begin{codeblock}
 namespace std {
   using wint_t = @\seebelow@;
@@ -13092,7 +13084,7 @@
   wctrans_t wctrans(const char* property);
 }
 
-#define WEOF @\seebelow@
+#define @\libglobal{WEOF}@ @\seebelow@
 \end{codeblock}
 
 \pnum
@@ -13104,10 +13096,6 @@
 \rSec2[cwchar.syn]{Header \tcode{<cwchar>} synopsis}
 
 \indexheader{cwchar}%
-\indexlibraryglobal{NULL}%
-\indexlibraryglobal{WCHAR_MAX}%
-\indexlibraryglobal{WCHAR_MIN}%
-\indexlibraryglobal{WEOF}%
 \indexlibraryglobal{btowc}%
 \indexlibraryglobal{fgetwc}%
 \indexlibraryglobal{fgetws}%
@@ -13247,10 +13235,10 @@
   size_t wcsrtombs(char* dst, const wchar_t** src, size_t len, mbstate_t* ps);
 }
 
-#define NULL @\textit{see \ref{support.types.nullptr}}@                                                  // freestanding
-#define WCHAR_MAX @\seebelow@                                             // freestanding
-#define WCHAR_MIN @\seebelow@                                             // freestanding
-#define WEOF @\seebelow@                                                  // freestanding
+#define @\libglobal{NULL}@ @\textit{see \ref{support.types.nullptr}}@                                                  // freestanding
+#define @\libglobal{WCHAR_MAX}@ @\seebelow@                                             // freestanding
+#define @\libglobal{WCHAR_MIN}@ @\seebelow@                                             // freestanding
+#define @\libglobal{WEOF}@ @\seebelow@                                                  // freestanding
 \end{codeblock}
 
 \pnum
diff --git a/source/threads.tex b/source/threads.tex
index 212367adcd..dbccf66c9c 100644
--- a/source/threads.tex
+++ b/source/threads.tex
@@ -2405,17 +2405,17 @@
 }
 
 // \ref{atomics.lockfree}, lock-free property
-#define ATOMIC_BOOL_LOCK_FREE @\unspecnc@                                           // freestanding
-#define ATOMIC_CHAR_LOCK_FREE @\unspecnc@                                           // freestanding
-#define ATOMIC_CHAR8_T_LOCK_FREE @\unspecnc@                                        // freestanding
-#define ATOMIC_CHAR16_T_LOCK_FREE @\unspecnc@                                       // freestanding
-#define ATOMIC_CHAR32_T_LOCK_FREE @\unspecnc@                                       // freestanding
-#define ATOMIC_WCHAR_T_LOCK_FREE @\unspecnc@                                        // freestanding
-#define ATOMIC_SHORT_LOCK_FREE @\unspecnc@                                          // freestanding
-#define ATOMIC_INT_LOCK_FREE @\unspecnc@                                            // freestanding
-#define ATOMIC_LONG_LOCK_FREE @\unspecnc@                                           // freestanding
-#define ATOMIC_LLONG_LOCK_FREE @\unspecnc@                                          // freestanding
-#define ATOMIC_POINTER_LOCK_FREE @\unspecnc@                                        // freestanding
+#define @\libglobal{ATOMIC_BOOL_LOCK_FREE}@ @\unspecnc@                                           // freestanding
+#define @\libglobal{ATOMIC_CHAR_LOCK_FREE}@ @\unspecnc@                                           // freestanding
+#define @\libglobal{ATOMIC_CHAR8_T_LOCK_FREE}@ @\unspecnc@                                        // freestanding
+#define @\libglobal{ATOMIC_CHAR16_T_LOCK_FREE}@ @\unspecnc@                                       // freestanding
+#define @\libglobal{ATOMIC_CHAR32_T_LOCK_FREE}@ @\unspecnc@                                       // freestanding
+#define @\libglobal{ATOMIC_WCHAR_T_LOCK_FREE}@ @\unspecnc@                                        // freestanding
+#define @\libglobal{ATOMIC_SHORT_LOCK_FREE}@ @\unspecnc@                                          // freestanding
+#define @\libglobal{ATOMIC_INT_LOCK_FREE}@ @\unspecnc@                                            // freestanding
+#define @\libglobal{ATOMIC_LONG_LOCK_FREE}@ @\unspecnc@                                           // freestanding
+#define @\libglobal{ATOMIC_LLONG_LOCK_FREE}@ @\unspecnc@                                          // freestanding
+#define @\libglobal{ATOMIC_POINTER_LOCK_FREE}@ @\unspecnc@                                        // freestanding
 
 namespace std {
   // \ref{atomics.ref.generic}, class template \tcode{atomic_ref}
@@ -2709,7 +2709,7 @@
   constexpr void atomic_flag_notify_one(atomic_flag*) noexcept;                     // freestanding
   void atomic_flag_notify_all(volatile atomic_flag*) noexcept;                      // freestanding
   constexpr void atomic_flag_notify_all(atomic_flag*) noexcept;                     // freestanding
-  #define ATOMIC_FLAG_INIT @\seebelownc@                                                // freestanding
+  #define @\libglobal{ATOMIC_FLAG_INIT}@ @\seebelownc@                                                // freestanding
 
   // \ref{atomics.fences}, fences
   extern "C" constexpr void atomic_thread_fence(memory_order) noexcept;             // freestanding
@@ -3010,30 +3010,19 @@
 
 \rSec2[atomics.lockfree]{Lock-free property}
 
-\indexlibraryglobal{ATOMIC_BOOL_LOCK_FREE}%
-\indexlibraryglobal{ATOMIC_CHAR_LOCK_FREE}%
-\indexlibraryglobal{ATOMIC_CHAR8_T_LOCK_FREE}%
-\indexlibraryglobal{ATOMIC_CHAR16_T_LOCK_FREE}%
-\indexlibraryglobal{ATOMIC_CHAR32_T_LOCK_FREE}%
-\indexlibraryglobal{ATOMIC_WCHAR_T_LOCK_FREE}%
-\indexlibraryglobal{ATOMIC_SHORT_LOCK_FREE}%
-\indexlibraryglobal{ATOMIC_INT_LOCK_FREE}%
-\indexlibraryglobal{ATOMIC_LONG_LOCK_FREE}%
-\indexlibraryglobal{ATOMIC_LLONG_LOCK_FREE}%
-\indexlibraryglobal{ATOMIC_POINTER_LOCK_FREE}%
 \indeximpldef{values of various \tcode{ATOMIC_..._LOCK_FREE} macros}
 \begin{codeblock}
-#define ATOMIC_BOOL_LOCK_FREE @\unspec@
-#define ATOMIC_CHAR_LOCK_FREE @\unspec@
-#define ATOMIC_CHAR8_T_LOCK_FREE @\unspec@
-#define ATOMIC_CHAR16_T_LOCK_FREE @\unspec@
-#define ATOMIC_CHAR32_T_LOCK_FREE @\unspec@
-#define ATOMIC_WCHAR_T_LOCK_FREE @\unspec@
-#define ATOMIC_SHORT_LOCK_FREE @\unspec@
-#define ATOMIC_INT_LOCK_FREE @\unspec@
-#define ATOMIC_LONG_LOCK_FREE @\unspec@
-#define ATOMIC_LLONG_LOCK_FREE @\unspec@
-#define ATOMIC_POINTER_LOCK_FREE @\unspec@
+#define @\libglobal{ATOMIC_BOOL_LOCK_FREE}@ @\unspec@
+#define @\libglobal{ATOMIC_CHAR_LOCK_FREE}@ @\unspec@
+#define @\libglobal{ATOMIC_CHAR8_T_LOCK_FREE}@ @\unspec@
+#define @\libglobal{ATOMIC_CHAR16_T_LOCK_FREE}@ @\unspec@
+#define @\libglobal{ATOMIC_CHAR32_T_LOCK_FREE}@ @\unspec@
+#define @\libglobal{ATOMIC_WCHAR_T_LOCK_FREE}@ @\unspec@
+#define @\libglobal{ATOMIC_SHORT_LOCK_FREE}@ @\unspec@
+#define @\libglobal{ATOMIC_INT_LOCK_FREE}@ @\unspec@
+#define @\libglobal{ATOMIC_LONG_LOCK_FREE}@ @\unspec@
+#define @\libglobal{ATOMIC_LLONG_LOCK_FREE}@ @\unspec@
+#define @\libglobal{ATOMIC_POINTER_LOCK_FREE}@ @\unspec@
 \end{codeblock}
 
 \pnum
@@ -6326,9 +6315,8 @@
 This function is an atomic notifying operation\iref{atomics.wait}.
 \end{itemdescr}
 
-\indexlibraryglobal{ATOMIC_FLAG_INIT}%
 \begin{itemdecl}
-#define ATOMIC_FLAG_INIT @\seebelow@
+#define @\libglobal{ATOMIC_FLAG_INIT}@ @\seebelow@
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -6431,16 +6419,16 @@
 
 #define _Atomic(T) @\exposid{std-atomic}@<T>
 
-#define ATOMIC_BOOL_LOCK_FREE @\seebelow@
-#define ATOMIC_CHAR_LOCK_FREE @\seebelow@
-#define ATOMIC_CHAR16_T_LOCK_FREE @\seebelow@
-#define ATOMIC_CHAR32_T_LOCK_FREE @\seebelow@
-#define ATOMIC_WCHAR_T_LOCK_FREE @\seebelow@
-#define ATOMIC_SHORT_LOCK_FREE @\seebelow@
-#define ATOMIC_INT_LOCK_FREE @\seebelow@
-#define ATOMIC_LONG_LOCK_FREE @\seebelow@
-#define ATOMIC_LLONG_LOCK_FREE @\seebelow@
-#define ATOMIC_POINTER_LOCK_FREE @\seebelow@
+#define @\libglobal{ATOMIC_BOOL_LOCK_FREE}@ @\seebelow@
+#define @\libglobal{ATOMIC_CHAR_LOCK_FREE}@ @\seebelow@
+#define @\libglobal{ATOMIC_CHAR16_T_LOCK_FREE}@ @\seebelow@
+#define @\libglobal{ATOMIC_CHAR32_T_LOCK_FREE}@ @\seebelow@
+#define @\libglobal{ATOMIC_WCHAR_T_LOCK_FREE}@ @\seebelow@
+#define @\libglobal{ATOMIC_SHORT_LOCK_FREE}@ @\seebelow@
+#define @\libglobal{ATOMIC_INT_LOCK_FREE}@ @\seebelow@
+#define @\libglobal{ATOMIC_LONG_LOCK_FREE}@ @\seebelow@
+#define @\libglobal{ATOMIC_LLONG_LOCK_FREE}@ @\seebelow@
+#define @\libglobal{ATOMIC_POINTER_LOCK_FREE}@ @\seebelow@
 
 using std::@\libglobal{memory_order}@;             // \seebelow
 using std::@\libglobal{memory_order_relaxed}@;     // \seebelow
@@ -6524,7 +6512,7 @@
 using std::@\libglobal{atomic_flag_test_and_set_explicit}@;            // \seebelow
 using std::@\libglobal{atomic_flag_clear}@;                            // \seebelow
 using std::@\libglobal{atomic_flag_clear_explicit}@;                   // \seebelow
-#define ATOMIC_FLAG_INIT @\seebelow@
+#define @\libglobal{ATOMIC_FLAG_INIT}@ @\seebelow@
 
 using std::@\libglobal{atomic_thread_fence}@;                          // \seebelow
 using std::@\libglobal{atomic_signal_fence}@;                          // \seebelow
diff --git a/source/time.tex b/source/time.tex
index f74e3a87fd..69dee2e6bd 100644
--- a/source/time.tex
+++ b/source/time.tex
@@ -11606,9 +11606,6 @@
 \rSec1[ctime.syn]{Header \tcode{<ctime>} synopsis}
 
 \indexheader{ctime}%
-\indexlibraryglobal{CLOCKS_PER_SEC}%
-\indexlibraryglobal{NULL}%
-\indexlibraryglobal{TIME_UTC}%
 \indexlibraryglobal{asctime}%
 \indexlibraryglobal{clock_t}%
 \indexlibraryglobal{clock}%
@@ -11625,9 +11622,9 @@
 \indexlibraryglobal{time}%
 \indexlibraryglobal{tm}%
 \begin{codeblock}
-#define NULL @\textit{see \ref{support.types.nullptr}}@
-#define CLOCKS_PER_SEC @\seebelow@
-#define TIME_UTC @\seebelow@
+#define @\libglobal{NULL}@ @\textit{see \ref{support.types.nullptr}}@
+#define @\libglobal{CLOCKS_PER_SEC}@ @\seebelow@
+#define @\libglobal{TIME_UTC}@ @\seebelow@
 
 namespace std {
   using size_t = @\textit{see \ref{support.types.layout}}@;