diff --git a/source/future.tex b/source/future.tex
index 1abc48bc00..806a3e4551 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 @\libmacrox{alignas_is_defined}@ 1
+#define @\libmacrox{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 @\libmacrox{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 @\libmacro{ENODATA}@ @\seebelow@
+#define @\libmacro{ENOSR}@ @\seebelow@
+#define @\libmacro{ENOSTR}@ @\seebelow@
+#define @\libmacro{ETIME}@ @\seebelow@
 \end{codeblock}
 
 \pnum
@@ -862,7 +856,7 @@
   template<class T>
     void atomic_init(atomic<T>*, typename atomic<T>::value_type) noexcept;
 
-  #define ATOMIC_VAR_INIT(value) @\seebelow@
+  #define @\libmacro{ATOMIC_VAR_INIT}@(value) @\seebelow@
 }
 \end{codeblock}
 
@@ -911,7 +905,7 @@
 
 \indexlibraryglobal{ATOMIC_VAR_INIT}%
 \begin{itemdecl}
-#define ATOMIC_VAR_INIT(value) @\seebelow@
+#define @\libmacro{ATOMIC_VAR_INIT}@(value) @\seebelow@
 \end{itemdecl}
 
 \begin{itemdescr}
diff --git a/source/macros.tex b/source/macros.tex
index 13e8089227..927c486056 100644
--- a/source/macros.tex
+++ b/source/macros.tex
@@ -218,6 +218,7 @@
 % use in-place defining the macro in header synopses
 % initially just a global entry in the library index
 \newcommand{\libmacro}[1]{\indexlibraryglobal{#1}#1}
+\newcommand{\libmacrox}[1]{\indexlibraryglobal{\idxxname{#1}}\xname{#1}}
 
 % index for library headers
 \newcommand{\libheaderx}[2]{\indexhdr{#1}\tcode{<#2>}}