man: use __libmansuffix__ instead of 3X11 for references to other pages

180 files changed, 1337 insertions, 1337 deletions

diff --git a/man/AllPlanes.man b/man/AllPlanes.man
index 829a45d2..f530a93e 100644
--- a/man/AllPlanes.man
+++ b/man/AllPlanes.man
@@ -372,9 +372,9 @@ The
 .ZN VendorRelease
 macro returns a number related to a vendor's release of the X server.
 .SH "SEE ALSO"
-BlackPixelOfScreen(3X11),
-ImageByteOrder(3X11),
-IsCursorKey(3X11),
-XOpenDisplay(3X11)
+BlackPixelOfScreen(__libmansuffix__),
+ImageByteOrder(__libmansuffix__),
+IsCursorKey(__libmansuffix__),
+XOpenDisplay(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/BlackPixelOfScreen.man b/man/BlackPixelOfScreen.man
index 68f38ed1..59f3b26e 100644
--- a/man/BlackPixelOfScreen.man
+++ b/man/BlackPixelOfScreen.man
@@ -281,8 +281,8 @@ The
 .ZN WidthMMOfScreen
 macro returns the width of the specified screen in millimeters.
 .SH "SEE ALSO"
-AllPlanes(3X11),
-ImageByteOrder(3X11),
-IsCursorKey(3X11)
+AllPlanes(__libmansuffix__),
+ImageByteOrder(__libmansuffix__),
+IsCursorKey(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/DisplayOfCCC.man b/man/DisplayOfCCC.man
index 512a1736..6d9b7078 100644
--- a/man/DisplayOfCCC.man
+++ b/man/DisplayOfCCC.man
@@ -180,10 +180,10 @@ The
 macro returns the client white point of the screen associated with
 the specified CCC.
 .SH "SEE ALSO"
-XcmsCCCOfColormap(3X11),
-XcmsConvertColors(3X11),
-XcmsCreateCCC(3X11),
-XcmsDefaultCCC(3X11),
-XcmsSetWhitePoint(3X11)
+XcmsCCCOfColormap(__libmansuffix__),
+XcmsConvertColors(__libmansuffix__),
+XcmsCreateCCC(__libmansuffix__),
+XcmsDefaultCCC(__libmansuffix__),
+XcmsSetWhitePoint(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/ImageByteOrder.man b/man/ImageByteOrder.man
index 37827505..35941cee 100644
--- a/man/ImageByteOrder.man
+++ b/man/ImageByteOrder.man
@@ -238,9 +238,9 @@ typedef struct {
 } XPixmapFormatValues;
 .De
 .SH "SEE ALSO"
-AllPlanes(3X11),
-BlackPixelOfScreen(3X11),
-IsCursorKey(3X11),
-XFree(3X11)
+AllPlanes(__libmansuffix__),
+BlackPixelOfScreen(__libmansuffix__),
+IsCursorKey(__libmansuffix__),
+XFree(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/IsCursorKey.man b/man/IsCursorKey.man
index d37ea1ba..f96f8dc6 100644
--- a/man/IsCursorKey.man
+++ b/man/IsCursorKey.man
@@ -205,8 +205,8 @@ macro returns
 .ZN True
 if the specified KeySym is a vendor-private keypad key.
 .SH "SEE ALSO"
-AllPlanes(3X11),
-BlackPixelOfScreen(3X11),
-ImageByteOrder(3X11)
+AllPlanes(__libmansuffix__),
+BlackPixelOfScreen(__libmansuffix__),
+ImageByteOrder(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XAddHost.man b/man/XAddHost.man
index fe95c7dd..fd6541dc 100644
--- a/man/XAddHost.man
+++ b/man/XAddHost.man
@@ -355,6 +355,6 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XFree(3X11)
+XFree(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XAllocClassHint.man b/man/XAllocClassHint.man
index 5145dd0a..510c4d4e 100644
--- a/man/XAllocClassHint.man
+++ b/man/XAllocClassHint.man
@@ -248,19 +248,19 @@ The server failed to allocate the requested resource or server memory.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocIconSize(3X11),
-XAllocSizeHints(3X11),
-XAllocWMHints(3X11),
-XFree(3X11),
-XSetCommand(3X11),
-XSetTransientForHint(3X11),
-XSetTextProperty(3X11),
-XSetWMClientMachine(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMIconName(3X11),
-XSetWMName(3X11),
-XSetWMProperties(3X11),
-XSetWMProtocols(3X11),
-XStringListToTextProperty(3X11)
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XAllocColor.man b/man/XAllocColor.man
index 50c0f350..5e123182 100644
--- a/man/XAllocColor.man
+++ b/man/XAllocColor.man
@@ -441,8 +441,8 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XCreateColormap(3X11), 
-XQueryColor(3X11),
-XStoreColors(3X11) 
+XCreateColormap(__libmansuffix__), 
+XQueryColor(__libmansuffix__),
+XStoreColors(__libmansuffix__) 
 .br
 \fI\*(xL\fP
diff --git a/man/XAllocIconSize.man b/man/XAllocIconSize.man
index fb05d596..11d938f0 100644
--- a/man/XAllocIconSize.man
+++ b/man/XAllocIconSize.man
@@ -244,19 +244,19 @@ The server failed to allocate the requested resource or server memory.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocSizeHints(3X11),
-XAllocWMHints(3X11),
-XFree(3X11),
-XSetCommand(3X11),
-XSetTransientForHint(3X11),
-XSetTextProperty(3X11),
-XSetWMClientMachine(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMIconName(3X11),
-XSetWMName(3X11),
-XSetWMProperties(3X11),
-XSetWMProtocols(3X11),
-XStringListToTextProperty(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XAllocSizeHints.man b/man/XAllocSizeHints.man
index 226b9d5f..3d440d63 100644
--- a/man/XAllocSizeHints.man
+++ b/man/XAllocSizeHints.man
@@ -486,19 +486,19 @@ A value for an Atom argument does not name a defined Atom.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocIconSize(3X11),
-XAllocWMHints(3X11),
-XFree(3X11),
-XSetCommand(3X11),
-XSetTransientForHint(3X11),
-XSetTextProperty(3X11),
-XSetWMClientMachine(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMIconName(3X11),
-XSetWMName(3X11),
-XSetWMProperties(3X11),
-XSetWMProtocols(3X11),
-XStringListToTextProperty(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XAllocStandardColormap.man b/man/XAllocStandardColormap.man
index 0baf05ca..1191f9ea 100644
--- a/man/XAllocStandardColormap.man
+++ b/man/XAllocStandardColormap.man
@@ -399,9 +399,9 @@ A value for an Atom argument does not name a defined Atom.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocColor(3X11),
-XCreateColormap(3X11),
-XFree(3X11),
-XSetCloseDownMode(3X11)
+XAllocColor(__libmansuffix__),
+XCreateColormap(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCloseDownMode(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XAllocWMHints.man b/man/XAllocWMHints.man
index 9afaa7df..914431a3 100644
--- a/man/XAllocWMHints.man
+++ b/man/XAllocWMHints.man
@@ -400,19 +400,19 @@ The server failed to allocate the requested resource or server memory.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocIconSize(3X11),
-XAllocSizeHints(3X11),
-XFree(3X11),
-XSetCommand(3X11),
-XSetTransientForHint(3X11),
-XSetTextProperty(3X11),
-XSetWMClientMachine(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMIconName(3X11),
-XSetWMName(3X11),
-XSetWMProperties(3X11),
-XSetWMProtocols(3X11),
-XStringListToTextProperty(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XAnyEvent.man b/man/XAnyEvent.man
index 40be01ee..878a24ac 100644
--- a/man/XAnyEvent.man
+++ b/man/XAnyEvent.man
@@ -244,30 +244,30 @@ which is the time at which an event occurred.
 In addition, a pointer to the generic event must be cast before it
 is used to access any other information in the structure.
 .SH "SEE ALSO"
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XButtonEvent.man b/man/XButtonEvent.man
index 7cc3e540..963c86b3 100644
--- a/man/XButtonEvent.man
+++ b/man/XButtonEvent.man
@@ -328,30 +328,30 @@ It can be set to
 or
 .ZN NotifyHint .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XChangeKeyboardControl.man b/man/XChangeKeyboardControl.man
index dd3225d9..452e530d 100644
--- a/man/XChangeKeyboardControl.man
+++ b/man/XChangeKeyboardControl.man
@@ -444,7 +444,7 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XChangeKeyboardMapping(3X11),
-XSetPointerMapping(3X11)
+XChangeKeyboardMapping(__libmansuffix__),
+XSetPointerMapping(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XChangeKeyboardMapping.man b/man/XChangeKeyboardMapping.man
index e157ec92..bcdcb370 100644
--- a/man/XChangeKeyboardMapping.man
+++ b/man/XChangeKeyboardMapping.man
@@ -443,7 +443,7 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XFree(3X11),
-XSetPointerMapping(3X11) 
+XFree(__libmansuffix__),
+XSetPointerMapping(__libmansuffix__) 
 .br
 \fI\*(xL\fP
diff --git a/man/XChangeSaveSet.man b/man/XChangeSaveSet.man
index 8ccc6c96..eb41dffe 100644
--- a/man/XChangeSaveSet.man
+++ b/man/XChangeSaveSet.man
@@ -223,6 +223,6 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XReparentWindow(3X11)
+XReparentWindow(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XChangeWindowAttributes.man b/man/XChangeWindowAttributes.man
index 1de75240..57e2c988 100644
--- a/man/XChangeWindowAttributes.man
+++ b/man/XChangeWindowAttributes.man
@@ -395,12 +395,12 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XConfigureWindow(3X11),
-XCreateWindow(3X11),
-XDestroyWindow(3X11),
-XInstallColormap(3X11),
-XMapWindow(3X11),
-XRaiseWindow(3X11),
-XUnmapWindow(3X11)
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XInstallColormap(__libmansuffix__),
+XMapWindow(__libmansuffix__),
+XRaiseWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCirculateEvent.man b/man/XCirculateEvent.man
index 1ac71f85..987bde7f 100644
--- a/man/XCirculateEvent.man
+++ b/man/XCirculateEvent.man
@@ -204,30 +204,30 @@ If it is
 .ZN PlaceOnBottom ,
 the window is now below all siblings.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCirculateRequestEvent.man b/man/XCirculateRequestEvent.man
index 6c9ac80a..a8baac0d 100644
--- a/man/XCirculateRequestEvent.man
+++ b/man/XCirculateRequestEvent.man
@@ -199,30 +199,30 @@ If it is
 .ZN PlaceOnBottom ,
 the subwindow should be below all siblings.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XClearArea.man b/man/XClearArea.man
index 26f2db24..fc2f1f2f 100644
--- a/man/XClearArea.man
+++ b/man/XClearArea.man
@@ -253,6 +253,6 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XCopyArea(3X11)
+XCopyArea(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XClientMessageEvent.man b/man/XClientMessageEvent.man
index da786af9..7f953dac 100644
--- a/man/XClientMessageEvent.man
+++ b/man/XClientMessageEvent.man
@@ -201,31 +201,31 @@ Particular message types might not make use of all these values.
 The X server places no interpretation on the values in the window,
 message_type, or data members.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XColormapEvent.man b/man/XColormapEvent.man
index 8920c7fa..9a794cef 100644
--- a/man/XColormapEvent.man
+++ b/man/XColormapEvent.man
@@ -212,31 +212,31 @@ uninstalled and can be
 or
 .ZN ColormapUninstalled .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCreateColormap(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCreateColormap(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XConfigureEvent.man b/man/XConfigureEvent.man
index 47c8ea4c..31f0182f 100644
--- a/man/XConfigureEvent.man
+++ b/man/XConfigureEvent.man
@@ -222,30 +222,30 @@ override_redirect member
 is
 .ZN True .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XConfigureRequestEvent.man b/man/XConfigureRequestEvent.man
index 07c6709c..f46dccb4 100644
--- a/man/XConfigureRequestEvent.man
+++ b/man/XConfigureRequestEvent.man
@@ -205,30 +205,30 @@ and
 .ZN Above ,
 respectively, if they are not given in the request.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XConfigureWindow.man b/man/XConfigureWindow.man
index 25419427..d3bc1445 100644
--- a/man/XConfigureWindow.man
+++ b/man/XConfigureWindow.man
@@ -449,11 +449,11 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XChangeWindowAttributes(3X11),
-XCreateWindow(3X11),
-XDestroyWindow(3X11),
-XMapWindow(3X11),
-XRaiseWindow(3X11),
-XUnmapWindow(3X11)
+XChangeWindowAttributes(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XMapWindow(__libmansuffix__),
+XRaiseWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCopyArea.man b/man/XCopyArea.man
index 61f8ca22..502ec4f9 100644
--- a/man/XCopyArea.man
+++ b/man/XCopyArea.man
@@ -303,6 +303,6 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XClearArea(3X11)
+XClearArea(__libmansuffix__)
 .br
 \fIXlib \- C Language X Interface\fP
diff --git a/man/XCreateColormap.man b/man/XCreateColormap.man
index 6a806dc6..fae2c488 100644
--- a/man/XCreateColormap.man
+++ b/man/XCreateColormap.man
@@ -360,10 +360,10 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocColor(3X11),
-XChangeWindowAttributes(3X11),
-XCreateWindow(3X11),
-XQueryColor(3X11),
-XStoreColors(3X11)
+XAllocColor(__libmansuffix__),
+XChangeWindowAttributes(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XQueryColor(__libmansuffix__),
+XStoreColors(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCreateFontCursor.man b/man/XCreateFontCursor.man
index dd0a511a..6c36dbe6 100644
--- a/man/XCreateFontCursor.man
+++ b/man/XCreateFontCursor.man
@@ -310,8 +310,8 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XDefineCursor(3X11),
-XLoadFont(3X11),
-XRecolorCursor(3X11)
+XDefineCursor(__libmansuffix__),
+XLoadFont(__libmansuffix__),
+XRecolorCursor(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCreateFontSet.man b/man/XCreateFontSet.man
index 3cfe8a1b..79b0b58b 100644
--- a/man/XCreateFontSet.man
+++ b/man/XCreateFontSet.man
@@ -369,8 +369,8 @@ list, and
 .ZN XFontSetExtents , 
 if any, are freed.
 .SH "SEE ALSO"
-XExtentsofFontSet(3X11),
-XFontsOfFontSet(3X11),
-XFontSetExtents(3X11)
+XExtentsofFontSet(__libmansuffix__),
+XFontsOfFontSet(__libmansuffix__),
+XFontSetExtents(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCreateGC.man b/man/XCreateGC.man
index 9b698e63..1008ad32 100644
--- a/man/XCreateGC.man
+++ b/man/XCreateGC.man
@@ -1185,21 +1185,21 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-AllPlanes(3X11),
-XCopyArea(3X11),
-XCreateRegion(3X11),
-XDrawArc(3X11),
-XDrawLine(3X11),
-XDrawRectangle(3X11),
-XDrawText(3X11),
-XFillRectangle(3X11),
-XQueryBestSize(3X11),
-XSetArcMode(3X11),
-XSetClipOrigin(3X11),
-XSetFillStyle(3X11),
-XSetFont(3X11),
-XSetLineAttributes(3X11),
-XSetState(3X11),
-XSetTile(3X11)
+AllPlanes(__libmansuffix__),
+XCopyArea(__libmansuffix__),
+XCreateRegion(__libmansuffix__),
+XDrawArc(__libmansuffix__),
+XDrawLine(__libmansuffix__),
+XDrawRectangle(__libmansuffix__),
+XDrawText(__libmansuffix__),
+XFillRectangle(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCreateIC.man b/man/XCreateIC.man
index 9a1901ed..3db1d298 100644
--- a/man/XCreateIC.man
+++ b/man/XCreateIC.man
@@ -212,9 +212,9 @@ A value for a Pixmap argument does not name a defined Pixmap.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XOpenIM(3X11),
-XSetICFocus(3X11),
-XSetICValues(3X11),
-XmbResetIC(3X11)
+XOpenIM(__libmansuffix__),
+XSetICFocus(__libmansuffix__),
+XSetICValues(__libmansuffix__),
+XmbResetIC(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCreateOC.man b/man/XCreateOC.man
index 7f7eb0c9..382f1638 100644
--- a/man/XCreateOC.man
+++ b/man/XCreateOC.man
@@ -221,7 +221,7 @@ The
 function returns the output method associated with the
 specified output context.
 .SH "SEE ALSO"
-XCreateOM(3X11),
-XCreateFontSet(3X11)
+XCreateOM(__libmansuffix__),
+XCreateFontSet(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCreatePixmap.man b/man/XCreatePixmap.man
index 15938ca7..72ca06d4 100644
--- a/man/XCreatePixmap.man
+++ b/man/XCreatePixmap.man
@@ -226,6 +226,6 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XCopyArea(3X11)
+XCopyArea(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCreateRegion.man b/man/XCreateRegion.man
index 808d7a15..7c867959 100644
--- a/man/XCreateRegion.man
+++ b/man/XCreateRegion.man
@@ -174,7 +174,7 @@ The
 .ZN XDestroyRegion
 function deallocates the storage associated with a specified region.
 .SH "SEE ALSO"
-XEmptyRegion(3X11),
-XIntersectRegion(3X11)
+XEmptyRegion(__libmansuffix__),
+XIntersectRegion(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCreateWindow.man b/man/XCreateWindow.man
index c8e03ea9..7b1a7caa 100644
--- a/man/XCreateWindow.man
+++ b/man/XCreateWindow.man
@@ -487,12 +487,12 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XChangeWindowAttributes(3X11),
-XConfigureWindow(3X11), 
-XDefineCursor(3X11),
-XDestroyWindow(3X11), 
-XMapWindow(3X11), 
-XRaiseWindow(3X11),
-XUnmapWindow(3X11)
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__), 
+XDefineCursor(__libmansuffix__),
+XDestroyWindow(__libmansuffix__), 
+XMapWindow(__libmansuffix__), 
+XRaiseWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCreateWindowEvent.man b/man/XCreateWindowEvent.man
index 8574f4e0..9d2d1c1a 100644
--- a/man/XCreateWindowEvent.man
+++ b/man/XCreateWindowEvent.man
@@ -202,30 +202,30 @@ Window manager clients normally should ignore this window
 if the override_redirect member is
 .ZN True .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XCrossingEvent.man b/man/XCrossingEvent.man
index 1556b488..38733e28 100644
--- a/man/XCrossingEvent.man
+++ b/man/XCrossingEvent.man
@@ -299,30 +299,30 @@ The detail member is set to indicate the notify detail and can be
 or
 .ZN NotifyNonlinearVirtual .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XDefineCursor.man b/man/XDefineCursor.man
index a3000d23..0426df5e 100644
--- a/man/XDefineCursor.man
+++ b/man/XDefineCursor.man
@@ -196,7 +196,7 @@ A value for a Cursor argument does not name a defined Cursor.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XCreateFontCursor(3X11),
-XRecolorCursor(3X11)
+XCreateFontCursor(__libmansuffix__),
+XRecolorCursor(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XDestroyWindow.man b/man/XDestroyWindow.man
index ca441341..5cab2f8a 100644
--- a/man/XDestroyWindow.man
+++ b/man/XDestroyWindow.man
@@ -208,11 +208,11 @@ error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XChangeWindowAttributes(3X11),
-XConfigureWindow(3X11),
-XCreateWindow(3X11),
-XMapWindow(3X11),
-XRaiseWindow(3X11),
-XUnmapWindow(3X11)
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XMapWindow(__libmansuffix__),
+XRaiseWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XDestroyWindowEvent.man b/man/XDestroyWindowEvent.man
index 91c024b6..c76f91aa 100644
--- a/man/XDestroyWindowEvent.man
+++ b/man/XDestroyWindowEvent.man
@@ -192,30 +192,30 @@ or
 was selected.
 The window member is set to the window that is destroyed.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XDrawArc.man b/man/XDrawArc.man
index af252767..7a15ff78 100644
--- a/man/XDrawArc.man
+++ b/man/XDrawArc.man
@@ -334,8 +334,8 @@ window is used as a Drawable.
 Some argument or pair of arguments has the correct type and range but fails
 to match in some other way required by the request.
 .SH "SEE ALSO"
-XDrawLine(3X11),
-XDrawPoint(3X11),
-XDrawRectangle(3X11)
+XDrawLine(__libmansuffix__),
+XDrawPoint(__libmansuffix__),
+XDrawRectangle(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XDrawImageString.man b/man/XDrawImageString.man
index 38a58111..596a8f2f 100644
--- a/man/XDrawImageString.man
+++ b/man/XDrawImageString.man
@@ -245,9 +245,9 @@ window is used as a Drawable.
 Some argument or pair of arguments has the correct type and range but fails
 to match in some other way required by the request.
 .SH "SEE ALSO"
-XDrawString(3X11),
-XDrawText(3X11),
-XLoadFont(3X11),
-XTextExtents(3X11)
+XDrawString(__libmansuffix__),
+XDrawText(__libmansuffix__),
+XLoadFont(__libmansuffix__),
+XTextExtents(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XDrawLine.man b/man/XDrawLine.man
index 03ae3450..b76bb39b 100644
--- a/man/XDrawLine.man
+++ b/man/XDrawLine.man
@@ -302,8 +302,8 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XDrawArc(3X11),
-XDrawPoint(3X11),
-XDrawRectangle(3X11)
+XDrawArc(__libmansuffix__),
+XDrawPoint(__libmansuffix__),
+XDrawRectangle(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XDrawPoint.man b/man/XDrawPoint.man
index 37be5f54..0ae14661 100644
--- a/man/XDrawPoint.man
+++ b/man/XDrawPoint.man
@@ -246,8 +246,8 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XDrawArc(3X11),
-XDrawLine(3X11),
-XDrawRectangle(3X11)
+XDrawArc(__libmansuffix__),
+XDrawLine(__libmansuffix__),
+XDrawRectangle(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XDrawRectangle.man b/man/XDrawRectangle.man
index a210cad1..da3086fd 100644
--- a/man/XDrawRectangle.man
+++ b/man/XDrawRectangle.man
@@ -246,8 +246,8 @@ window is used as a Drawable.
 Some argument or pair of arguments has the correct type and range but fails
 to match in some other way required by the request.
 .SH "SEE ALSO"
-XDrawArc(3X11),
-XDrawLine(3X11),
-XDrawPoint(3X11)
+XDrawArc(__libmansuffix__),
+XDrawLine(__libmansuffix__),
+XDrawPoint(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XDrawString.man b/man/XDrawString.man
index 767be991..5e8298d5 100644
--- a/man/XDrawString.man
+++ b/man/XDrawString.man
@@ -212,8 +212,8 @@ window is used as a Drawable.
 Some argument or pair of arguments has the correct type and range but fails
 to match in some other way required by the request.
 .SH "SEE ALSO"
-XDrawImageString(3X11),
-XDrawText(3X11),
-XLoadFont(3X11)
+XDrawImageString(__libmansuffix__),
+XDrawText(__libmansuffix__),
+XLoadFont(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XDrawText.man b/man/XDrawText.man
index ae2e44e7..65837535 100644
--- a/man/XDrawText.man
+++ b/man/XDrawText.man
@@ -284,8 +284,8 @@ An
 .ZN InputOnly
 window is used as a Drawable.
 .SH "SEE ALSO"
-XDrawImageString(3X11),
-XDrawString(3X11),
-XLoadFont(3X11)
+XDrawImageString(__libmansuffix__),
+XDrawString(__libmansuffix__),
+XLoadFont(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XEmptyRegion.man b/man/XEmptyRegion.man
index 37211996..43fcc197 100644
--- a/man/XEmptyRegion.man
+++ b/man/XEmptyRegion.man
@@ -204,7 +204,7 @@ and
 .ZN RectanglePart
 if the rectangle is partially in the specified region.
 .SH "SEE ALSO"
-XCreateRegion(3X11),
-XIntersectRegion(3X11)
+XCreateRegion(__libmansuffix__),
+XIntersectRegion(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XErrorEvent.man b/man/XErrorEvent.man
index c74b46b2..49999f53 100644
--- a/man/XErrorEvent.man
+++ b/man/XErrorEvent.man
@@ -175,31 +175,31 @@ The request_code member is a protocol request
 of the procedure that failed, as defined in 
 .hN X11/Xproto.h .
 .SH "SEE ALSO"
-AllPlanes(3X11),
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+AllPlanes(__libmansuffix__),
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XExposeEvent.man b/man/XExposeEvent.man
index 84cf7129..638f690b 100644
--- a/man/XExposeEvent.man
+++ b/man/XExposeEvent.man
@@ -205,30 +205,30 @@ between subareas of its window can just ignore all
 events with nonzero counts and perform full redisplays
 on events with zero counts.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XExtentsOfFontSet.man b/man/XExtentsOfFontSet.man
index 35d4c7b7..8362e94b 100644
--- a/man/XExtentsOfFontSet.man
+++ b/man/XExtentsOfFontSet.man
@@ -167,8 +167,8 @@ with the associated
 .ZN XFontSet .
 Until freed, its contents will not be modified by Xlib.
 .SH "SEE ALSO"
-XCreateFontSet(3X11),
-XFontsOfFontSet(3X11),
-XFontSetExtents(3X11)
+XCreateFontSet(__libmansuffix__),
+XFontsOfFontSet(__libmansuffix__),
+XFontSetExtents(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XFillRectangle.man b/man/XFillRectangle.man
index 5061f722..e55aecb2 100644
--- a/man/XFillRectangle.man
+++ b/man/XFillRectangle.man
@@ -388,8 +388,8 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XDrawArc(3X11),
-XDrawPoint(3X11),
-XDrawRectangle(3X11)
+XDrawArc(__libmansuffix__),
+XDrawPoint(__libmansuffix__),
+XDrawRectangle(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XFilterEvent.man b/man/XFilterEvent.man
index ea6bdce8..6584308b 100644
--- a/man/XFilterEvent.man
+++ b/man/XFilterEvent.man
@@ -182,6 +182,6 @@ returns
 .ZN True ,
 the client should ungrab the keyboard.
 .SH "SEE ALSO"
-XNextEvent(3X11)
+XNextEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XFlush.man b/man/XFlush.man
index fa3fc363..5b439c8c 100644
--- a/man/XFlush.man
+++ b/man/XFlush.man
@@ -257,9 +257,9 @@ with the mode
 .ZN QueuedAfterFlush
 specified.
 .SH "SEE ALSO"
-AllPlanes(3X11),
-XIfEvent(3X11),
-XNextEvent(3X11),
-XPutBackEvent(3X11)
+AllPlanes(__libmansuffix__),
+XIfEvent(__libmansuffix__),
+XNextEvent(__libmansuffix__),
+XPutBackEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XFocusChangeEvent.man b/man/XFocusChangeEvent.man
index 61f38a7d..e573f214 100644
--- a/man/XFocusChangeEvent.man
+++ b/man/XFocusChangeEvent.man
@@ -239,30 +239,30 @@ the detail member is set to indicate the notify detail and can be
 or
 .ZN NotifyDetailNone .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XFontSetExtents.man b/man/XFontSetExtents.man
index d70428fb..cb82d3f8 100644
--- a/man/XFontSetExtents.man
+++ b/man/XFontSetExtents.man
@@ -188,8 +188,8 @@ appending a given character to a string may change
 the string's extent by an amount other than that character's
 individual extent.
 .SH "SEE ALSO"
-XCreateFontSet(3X11),
-XExtentsOfFontSet(3X11),
-XFontsOfFontSet(3X11)
+XCreateFontSet(__libmansuffix__),
+XExtentsOfFontSet(__libmansuffix__),
+XFontsOfFontSet(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XFontsOfFontSet.man b/man/XFontsOfFontSet.man
index 7e2dc478..3409f3af 100644
--- a/man/XFontsOfFontSet.man
+++ b/man/XFontsOfFontSet.man
@@ -280,10 +280,10 @@ if the drawing functions implement implicit text directionality;
 otherwise, it returns
 .ZN False .
 .SH "SEE ALSO"
-XCreateFontSet(3X11),
-XCreateOM(3X11),
-XCreateOC(3X11),
-XExtentsOfFontSet(3X11),
-XFontSetExtents(3X11)
+XCreateFontSet(__libmansuffix__),
+XCreateOM(__libmansuffix__),
+XCreateOC(__libmansuffix__),
+XExtentsOfFontSet(__libmansuffix__),
+XFontSetExtents(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XGetEventData.man b/man/XGetEventData.man
index 10008edc..fdbab45d 100644
--- a/man/XGetEventData.man
+++ b/man/XGetEventData.man
@@ -217,7 +217,7 @@ is called before the next call to
 .ZN XNextEvent .
 
 .SH "SEE ALSO"
-XNextEvent(3X11),
+XNextEvent(__libmansuffix__),
 .br
 \fI\*(xL\fP
 
diff --git a/man/XGetVisualInfo.man b/man/XGetVisualInfo.man
index e4f79379..5e634e5d 100644
--- a/man/XGetVisualInfo.man
+++ b/man/XGetVisualInfo.man
@@ -310,6 +310,6 @@ typedef struct {
 } XVisualInfo;
 .De
 .SH "SEE ALSO"
-XFree(3X11)
+XFree(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XGetWindowAttributes.man b/man/XGetWindowAttributes.man
index 2aa86e41..011dcd3b 100644
--- a/man/XGetWindowAttributes.man
+++ b/man/XGetWindowAttributes.man
@@ -391,7 +391,7 @@ A value for a Drawable argument does not name a defined Window or Pixmap.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XQueryPointer(3X11),
-XQueryTree(3X11)
+XQueryPointer(__libmansuffix__),
+XQueryTree(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XGetWindowProperty.man b/man/XGetWindowProperty.man
index a1d19ff8..ea7c9502 100644
--- a/man/XGetWindowProperty.man
+++ b/man/XGetWindowProperty.man
@@ -471,7 +471,7 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XFree(3X11),
-XInternAtom(3X11)
+XFree(__libmansuffix__),
+XInternAtom(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XGetXCBConnection.man b/man/XGetXCBConnection.man
index eaf71b40..3b4ad11f 100644
--- a/man/XGetXCBConnection.man
+++ b/man/XGetXCBConnection.man
@@ -38,7 +38,7 @@ XCB library, just as they would with an XCB connection created with XCB.
 Callers of this function must link to libX11-xcb and a version of Xlib built
 with XCB support.
 .SH "SEE ALSO"
-XOpenDisplay(3X11),
-XSetEventQueueOwner(3X11),
+XOpenDisplay(__libmansuffix__),
+XSetEventQueueOwner(__libmansuffix__),
 .br
 \fIXlib \- C Language X Interface\fP
diff --git a/man/XGrabButton.man b/man/XGrabButton.man
index a6c20fed..475e696c 100644
--- a/man/XGrabButton.man
+++ b/man/XGrabButton.man
@@ -305,9 +305,9 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllowEvents(3X11),
-XGrabPointer(3X11),
-XGrabKey(3X11),
-XGrabKeyboard(3X11),
+XAllowEvents(__libmansuffix__),
+XGrabPointer(__libmansuffix__),
+XGrabKey(__libmansuffix__),
+XGrabKeyboard(__libmansuffix__),
 .br
 \fI\*(xL\fP
diff --git a/man/XGrabKey.man b/man/XGrabKey.man
index b0cfd8bc..bc0066c9 100644
--- a/man/XGrabKey.man
+++ b/man/XGrabKey.man
@@ -291,9 +291,9 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllowAccess(3X11),
-XGrabButton(3X11),
-XGrabKeyboard(3X11),
-XGrabPointer(3X11)
+XAllowAccess(__libmansuffix__),
+XGrabButton(__libmansuffix__),
+XGrabKeyboard(__libmansuffix__),
+XGrabPointer(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XGrabKeyboard.man b/man/XGrabKeyboard.man
index db1255fd..f6257f6a 100644
--- a/man/XGrabKeyboard.man
+++ b/man/XGrabKeyboard.man
@@ -290,9 +290,9 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllowEvents(3X11),
-XGrabButton(3X11),
-XGrabKey(3X11),
-XGrabPointer(3X11)
+XAllowEvents(__libmansuffix__),
+XGrabButton(__libmansuffix__),
+XGrabKey(__libmansuffix__),
+XGrabPointer(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XGrabPointer.man b/man/XGrabPointer.man
index 46a99869..46c33c0f 100644
--- a/man/XGrabPointer.man
+++ b/man/XGrabPointer.man
@@ -358,9 +358,9 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllowEvents(3X11),
-XGrabButton(3X11),
-XGrabKey(3X11),
-XGrabKeyboard(3X11)
+XAllowEvents(__libmansuffix__),
+XGrabButton(__libmansuffix__),
+XGrabKey(__libmansuffix__),
+XGrabKeyboard(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XGrabServer.man b/man/XGrabServer.man
index e3701c70..dea6b780 100644
--- a/man/XGrabServer.man
+++ b/man/XGrabServer.man
@@ -163,9 +163,9 @@ The
 function restarts processing of requests and close downs on other connections.
 You should avoid grabbing the X server as much as possible.
 .SH "SEE ALSO"
-XGrabButton(3X11),
-XGrabKey(3X11),
-XGrabKeyboard(3X11),
-XGrabPointer(3X11)
+XGrabButton(__libmansuffix__),
+XGrabKey(__libmansuffix__),
+XGrabKeyboard(__libmansuffix__),
+XGrabPointer(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XGraphicsExposeEvent.man b/man/XGraphicsExposeEvent.man
index a5637c84..b463b761 100644
--- a/man/XGraphicsExposeEvent.man
+++ b/man/XGraphicsExposeEvent.man
@@ -248,31 +248,31 @@ However, if count is nonzero, at least that number of
 .ZN GraphicsExpose
 events (and possibly more) are to follow for this window.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCopyArea(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCopyArea(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XGravityEvent.man b/man/XGravityEvent.man
index c49719e1..a23a2d8f 100644
--- a/man/XGravityEvent.man
+++ b/man/XGravityEvent.man
@@ -197,30 +197,30 @@ new parent window's origin
 and indicate the position of the upper-left outside corner of the 
 window.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XIconifyWindow.man b/man/XIconifyWindow.man
index edb1101a..2142ed4f 100644
--- a/man/XIconifyWindow.man
+++ b/man/XIconifyWindow.man
@@ -246,12 +246,12 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XChangeWindowAttributes(3X11),
-XConfigureWindow(3X11),
-XCreateWindow(3X11),
-XDestroyWindow(3X11),
-XRaiseWindow(3X11),
-XMapWindow(3X11),
-XUnmapWindow(3X11)
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XRaiseWindow(__libmansuffix__),
+XMapWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XIfEvent.man b/man/XIfEvent.man
index 17c483b4..e7780630 100644
--- a/man/XIfEvent.man
+++ b/man/XIfEvent.man
@@ -244,9 +244,9 @@ After finding a match, the predicate procedure must return
 If it did not find a match, it must return
 .ZN False .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XNextEvent(3X11),
-XPutBackEvent(3X11)
-XSendEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XNextEvent(__libmansuffix__),
+XPutBackEvent(__libmansuffix__)
+XSendEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XInitImage.man b/man/XInitImage.man
index e2c82a6f..a860eb44 100644
--- a/man/XInitImage.man
+++ b/man/XInitImage.man
@@ -310,6 +310,6 @@ function deallocates the memory associated with the
 .ZN XImage
 structure.
 .SH "SEE ALSO"
-XPutImage(3X11)
+XPutImage(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XInstallColormap.man b/man/XInstallColormap.man
index 249ba495..9ec19bd8 100644
--- a/man/XInstallColormap.man
+++ b/man/XInstallColormap.man
@@ -239,9 +239,9 @@ A value for a Colormap argument does not name a defined Colormap.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XChangeWindowAttributes(3X11),
-XCreateColormap(3X11),
-XCreateWindow(3X11),
-XFree(3X11)
+XChangeWindowAttributes(__libmansuffix__),
+XCreateColormap(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XFree(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XInternAtom.man b/man/XInternAtom.man
index 4c7b56f4..4d4906d9 100644
--- a/man/XInternAtom.man
+++ b/man/XInternAtom.man
@@ -274,7 +274,7 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XFree(3X11),
-XGetWindowProperty(3X11)
+XFree(__libmansuffix__),
+XGetWindowProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XIntersectRegion.man b/man/XIntersectRegion.man
index c4482f53..a7d31879 100644
--- a/man/XIntersectRegion.man
+++ b/man/XIntersectRegion.man
@@ -219,8 +219,8 @@ function reduces the specified region by a specified amount.
 Positive values shrink the size of the region,
 and negative values expand the region.
 .SH "SEE ALSO"
-XCreateRegion(3X11),
-XDrawRectangle(3X11),
-XEmptyRegion(3X11)
+XCreateRegion(__libmansuffix__),
+XDrawRectangle(__libmansuffix__),
+XEmptyRegion(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XKeymapEvent.man b/man/XKeymapEvent.man
index 356865d7..0ee04186 100644
--- a/man/XKeymapEvent.man
+++ b/man/XKeymapEvent.man
@@ -193,30 +193,30 @@ The vector is represented as 32 bytes.
 Byte N (from 0) contains the bits for keys 8N to 8N + 7 
 with the least significant bit in the byte representing key 8N.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XListFonts.man b/man/XListFonts.man
index 880ff0c4..74cf5bee 100644
--- a/man/XListFonts.man
+++ b/man/XListFonts.man
@@ -260,7 +260,7 @@ is not thread-safe. If other threads make X requests on the same
 .ZN Display ,
 then this function's behavior is undefined.
 .SH "SEE ALSO"
-XLoadFont(3X11),
-XSetFontPath(3X11)
+XLoadFont(__libmansuffix__),
+XSetFontPath(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XLoadFont.man b/man/XLoadFont.man
index a13ed844..0fbf61b8 100644
--- a/man/XLoadFont.man
+++ b/man/XLoadFont.man
@@ -534,8 +534,8 @@ A value for a Font or GContext argument does not name a defined Font.
 .ZN BadName
 A font or color of the specified name does not exist.
 .SH "SEE ALSO"
-XCreateGC(3X11),
-XListFonts(3X11),
-XSetFontPath(3X11)
+XCreateGC(__libmansuffix__),
+XListFonts(__libmansuffix__),
+XSetFontPath(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XLookupKeysym.man b/man/XLookupKeysym.man
index 7e1ac4ae..4449f2a9 100644
--- a/man/XLookupKeysym.man
+++ b/man/XLookupKeysym.man
@@ -265,8 +265,8 @@ No text conversions are performed;
 the client is responsible for supplying appropriately encoded strings.
 Note that you can rebind a KeySym that may not exist.
 .SH "SEE ALSO"
-XButtonEvent(3X11),
-XMapEvent(3X11),
-XStringToKeysym(3X11)
+XButtonEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XStringToKeysym(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XMapEvent.man b/man/XMapEvent.man
index 7f2747c6..29739e16 100644
--- a/man/XMapEvent.man
+++ b/man/XMapEvent.man
@@ -263,30 +263,30 @@ The number in first_keycode represents the first number in the range
 of the altered mapping, 
 and count represents the number of keycodes altered.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XMapRequestEvent.man b/man/XMapRequestEvent.man
index a8ece726..15182e86 100644
--- a/man/XMapRequestEvent.man
+++ b/man/XMapRequestEvent.man
@@ -187,30 +187,30 @@ dispatchers.
 The parent member is set to the parent window.
 The window member is set to the window to be mapped.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XMapWindow.man b/man/XMapWindow.man
index b56fa82b..f164491b 100644
--- a/man/XMapWindow.man
+++ b/man/XMapWindow.man
@@ -268,11 +268,11 @@ error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XChangeWindowAttributes(3X11),
-XConfigureWindow(3X11),
-XCreateWindow(3X11),
-XDestroyWindow(3X11),
-XRaiseWindow(3X11),
-XUnmapWindow(3X11)
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XRaiseWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XNextEvent.man b/man/XNextEvent.man
index cef74855..6c461919 100644
--- a/man/XNextEvent.man
+++ b/man/XNextEvent.man
@@ -302,9 +302,9 @@ returns
 .ZN False ,
 and the output buffer will have been flushed.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XIfEvent(3X11),
-XPutBackEvent(3X11),
-XSendEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XIfEvent(__libmansuffix__),
+XPutBackEvent(__libmansuffix__),
+XSendEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XOpenDisplay.man b/man/XOpenDisplay.man
index 04ae8519..cb5af5c9 100644
--- a/man/XOpenDisplay.man
+++ b/man/XOpenDisplay.man
@@ -250,8 +250,8 @@ can generate a
 .ZN BadGC
 error.
 .SH "SEE ALSO"
-AllPlanes(3X11),
-XFlush(3X11),
-XSetCloseDownMode(3X11)
+AllPlanes(__libmansuffix__),
+XFlush(__libmansuffix__),
+XSetCloseDownMode(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XOpenIM.man b/man/XOpenIM.man
index 56171bba..d3fe2bb3 100644
--- a/man/XOpenIM.man
+++ b/man/XOpenIM.man
@@ -297,9 +297,9 @@ The function returns
 if it succeeds; otherwise, it returns 
 .ZN False .
 .SH "SEE ALSO"
-XCreateIC(3X11),
-XSetICFocus(3X11),
-XSetICValues(3X11),
-XmbResetIC(3X11)
+XCreateIC(__libmansuffix__),
+XSetICFocus(__libmansuffix__),
+XSetICValues(__libmansuffix__),
+XmbResetIC(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XOpenOM.man b/man/XOpenOM.man
index 498c0163..a81c3dcb 100644
--- a/man/XOpenOM.man
+++ b/man/XOpenOM.man
@@ -252,7 +252,7 @@ The
 .ZN XLocaleOfOM
 returns the locale associated with the specified output method.
 .SH "SEE ALSO"
-XCreateOC(3X11),
-XCreateFontSet(3X11)
+XCreateOC(__libmansuffix__),
+XCreateFontSet(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XParseGeometry.man b/man/XParseGeometry.man
index 1f5068c0..9e6f1fa2 100644
--- a/man/XParseGeometry.man
+++ b/man/XParseGeometry.man
@@ -279,6 +279,6 @@ of zero to be returned.
 The caller may pass the address of the hints win_gravity field 
 as gravity_return to update the hints directly.
 .SH "SEE ALSO"
-XSetWMProperties(3X11)
+XSetWMProperties(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XPolygonRegion.man b/man/XPolygonRegion.man
index 8be420cc..98440453 100644
--- a/man/XPolygonRegion.man
+++ b/man/XPolygonRegion.man
@@ -176,8 +176,8 @@ The
 .ZN XClipBox
 function returns the smallest rectangle enclosing the specified region.
 .SH "SEE ALSO"
-XCreateGC(3X11),
-XDrawPoint(3X11),
-XDrawRectangle(3X11)
+XCreateGC(__libmansuffix__),
+XDrawPoint(__libmansuffix__),
+XDrawRectangle(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XPropertyEvent.man b/man/XPropertyEvent.man
index 30ac75a2..92b6f60b 100644
--- a/man/XPropertyEvent.man
+++ b/man/XPropertyEvent.man
@@ -216,31 +216,31 @@ or, if the delete argument is
 .ZN True ,
 .ZN XGetWindowProperty .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGetWindowProperty(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGetWindowProperty(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XPutBackEvent.man b/man/XPutBackEvent.man
index 0fc4bca2..82e38303 100644
--- a/man/XPutBackEvent.man
+++ b/man/XPutBackEvent.man
@@ -161,9 +161,9 @@ would rather deal with it later.
 There is no limit to the number of times in succession that you can call
 .ZN XPutBackEvent .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XIfEvent(3X11),
-XNextEvent(3X11),
-XSendEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XIfEvent(__libmansuffix__),
+XNextEvent(__libmansuffix__),
+XSendEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XQueryBestSize.man b/man/XQueryBestSize.man
index 667d15b4..8aec1cf1 100644
--- a/man/XQueryBestSize.man
+++ b/man/XQueryBestSize.man
@@ -276,13 +276,13 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XCreateGC(3X11),
-XSetArcMode(3X11),
-XSetClipOrigin(3X11),
-XSetFillStyle(3X11),
-XSetFont(3X11),
-XSetLineAttributes(3X11),
-XSetState(3X11),
-XSetTile(3X11)
+XCreateGC(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XQueryColor.man b/man/XQueryColor.man
index e2e884b7..4c389e57 100644
--- a/man/XQueryColor.man
+++ b/man/XQueryColor.man
@@ -338,8 +338,8 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XAllocColor(3X11),
-XCreateColormap(3X11),
-XStoreColors(3X11)
+XAllocColor(__libmansuffix__),
+XCreateColormap(__libmansuffix__),
+XStoreColors(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XQueryPointer.man b/man/XQueryPointer.man
index 708ef2df..670f532a 100644
--- a/man/XQueryPointer.man
+++ b/man/XQueryPointer.man
@@ -214,7 +214,7 @@ error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XGetWindowAttributes(3X11),
-XQueryTree(3X11)
+XGetWindowAttributes(__libmansuffix__),
+XQueryTree(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XQueryTree.man b/man/XQueryTree.man
index 81338d2a..42215387 100644
--- a/man/XQueryTree.man
+++ b/man/XQueryTree.man
@@ -179,8 +179,8 @@ To free a non-NULL children list when it is no longer needed, use
 .SH BUGS
 This really should return a screen *, not a root window ID.
 .SH "SEE ALSO"
-XFree(3X11),
-XGetWindowAttributes(3X11),
-XQueryPointer(3X11)
+XFree(__libmansuffix__),
+XGetWindowAttributes(__libmansuffix__),
+XQueryPointer(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XRaiseWindow.man b/man/XRaiseWindow.man
index 5acb18d8..3717bb86 100644
--- a/man/XRaiseWindow.man
+++ b/man/XRaiseWindow.man
@@ -337,11 +337,11 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XChangeWindowAttributes(3X11),
-XConfigureWindow(3X11),
-XCreateWindow(3X11),
-XDestroyWindow(3X11),
-XMapWindow(3X11),
-XUnmapWindow(3X11)
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XMapWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XReadBitmapFile.man b/man/XReadBitmapFile.man
index 1042ffa9..877f7771 100644
--- a/man/XReadBitmapFile.man
+++ b/man/XReadBitmapFile.man
@@ -351,7 +351,7 @@ An
 .ZN InputOnly
 window is used as a Drawable.
 .SH "SEE ALSO"
-XCreatePixmap(3X11),
-XPutImage(3X11)
+XCreatePixmap(__libmansuffix__),
+XPutImage(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XRecolorCursor.man b/man/XRecolorCursor.man
index 420228da..3586d02d 100644
--- a/man/XRecolorCursor.man
+++ b/man/XRecolorCursor.man
@@ -226,8 +226,8 @@ A value for a Cursor argument does not name a defined Cursor.
 .ZN BadDrawable
 A value for a Drawable argument does not name a defined Window or Pixmap.
 .SH "SEE ALSO"
-XCreateColormap(3X11),
-XCreateFontCursor(3X11),
-XDefineCursor(3X11)
+XCreateColormap(__libmansuffix__),
+XCreateFontCursor(__libmansuffix__),
+XDefineCursor(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XReparentEvent.man b/man/XReparentEvent.man
index 228661c4..4f25eb84 100644
--- a/man/XReparentEvent.man
+++ b/man/XReparentEvent.man
@@ -204,30 +204,30 @@ Window manager clients normally should ignore this window
 if the override_redirect member is
 .ZN True .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XReparentWindow.man b/man/XReparentWindow.man
index ae3363fa..43c30f6d 100644
--- a/man/XReparentWindow.man
+++ b/man/XReparentWindow.man
@@ -224,6 +224,6 @@ errors.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XChangeSaveSet(3X11)
+XChangeSaveSet(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XResizeRequestEvent.man b/man/XResizeRequestEvent.man
index eb522f35..4b22b038 100644
--- a/man/XResizeRequestEvent.man
+++ b/man/XResizeRequestEvent.man
@@ -189,30 +189,30 @@ client attempted to change.
 The width and height members are set to the inside size of the window, 
 excluding the border.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSelectionClearEvent.man b/man/XSelectionClearEvent.man
index d1860349..6ac8f3cc 100644
--- a/man/XSelectionClearEvent.man
+++ b/man/XSelectionClearEvent.man
@@ -193,31 +193,31 @@ The window member is the window that was specified by the current owner
 .ZN XSetSelectionOwner
 call.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XSetSelectionOwner(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XSetSelectionOwner(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSelectionEvent.man b/man/XSelectionEvent.man
index e68eef70..89c0f7f3 100644
--- a/man/XSelectionEvent.man
+++ b/man/XSelectionEvent.man
@@ -202,30 +202,30 @@ The time member is set to the time the conversion took place and
 can be a timestamp or
 .ZN CurrentTime .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSelectionRequestEvent.man b/man/XSelectionRequestEvent.man
index ae15700a..d8aaa0dc 100644
--- a/man/XSelectionRequestEvent.man
+++ b/man/XSelectionRequestEvent.man
@@ -205,31 +205,31 @@ value from the
 .ZN ConvertSelection
 request.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSetSelectionOwner(3X11),
-XUnmapEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSetSelectionOwner(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSendEvent.man b/man/XSendEvent.man
index 5c897159..a83db14a 100644
--- a/man/XSendEvent.man
+++ b/man/XSendEvent.man
@@ -307,9 +307,9 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XIfEvent(3X11),
-XNextEvent(3X11),
-XPutBackEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XIfEvent(__libmansuffix__),
+XNextEvent(__libmansuffix__),
+XPutBackEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetArcMode.man b/man/XSetArcMode.man
index 0862e95a..5668059b 100644
--- a/man/XSetArcMode.man
+++ b/man/XSetArcMode.man
@@ -230,14 +230,14 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XCopyArea(3X11),
-XCreateGC(3X11),
-XQueryBestSize(3X11),
-XSetClipOrigin(3X11),
-XSetFillStyle(3X11),
-XSetFont(3X11),
-XSetLineAttributes(3X11),
-XSetState(3X11),
-XSetTile(3X11)
+XCopyArea(__libmansuffix__),
+XCreateGC(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetClipOrigin.man b/man/XSetClipOrigin.man
index ddbe6cfe..94198b8f 100644
--- a/man/XSetClipOrigin.man
+++ b/man/XSetClipOrigin.man
@@ -282,14 +282,14 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XCreateGC(3X11),
-XDrawRectangle(3X11),
-XQueryBestSize(3X11),
-XSetArcMode(3X11),
-XSetFillStyle(3X11),
-XSetFont(3X11),
-XSetLineAttributes(3X11),
-XSetState(3X11),
-XSetTile(3X11)
+XCreateGC(__libmansuffix__),
+XDrawRectangle(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetCommand.man b/man/XSetCommand.man
index c64e2705..cbcd29e1 100644
--- a/man/XSetCommand.man
+++ b/man/XSetCommand.man
@@ -208,18 +208,18 @@ The server failed to allocate the requested resource or server memory.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocIconSize(3X11),
-XAllocSizeHints(3X11),
-XAllocWMHints(3X11),
-XSetTransientForHint(3X11),
-XSetTextProperty(3X11),
-XSetWMClientMachine(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMIconName(3X11),
-XSetWMName(3X11),
-XSetWMProperties(3X11),
-XSetWMProtocols(3X11),
-XStringListToTextProperty(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetErrorHandler.man b/man/XSetErrorHandler.man
index 5ccf3a91..3ead230d 100644
--- a/man/XSetErrorHandler.man
+++ b/man/XSetErrorHandler.man
@@ -270,7 +270,7 @@ is used for the message argument.
 If no string is found in the error database,
 the default_string is returned to the buffer argument.
 .SH "SEE ALSO"
-XOpenDisplay(3X11),
-XSynchronize(3X11)
+XOpenDisplay(__libmansuffix__),
+XSynchronize(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetEventQueueOwner.man b/man/XSetEventQueueOwner.man
index e3306aa7..d9740d4c 100644
--- a/man/XSetEventQueueOwner.man
+++ b/man/XSetEventQueueOwner.man
@@ -52,7 +52,7 @@ clients.  Clients can call \fIXSetEventQueueOwner\fP immediately after
 call \fIXSetEventQueueOwner\fP at any other time, as this will potentially
 lose responses.
 .SH "SEE ALSO"
-XOpenDisplay(3X11),
-XGetXCBConnection(3X11),
+XOpenDisplay(__libmansuffix__),
+XGetXCBConnection(__libmansuffix__),
 .br
 \fIXlib \- C Language X Interface\fP
diff --git a/man/XSetFillStyle.man b/man/XSetFillStyle.man
index e8700db1..cb6e663e 100644
--- a/man/XSetFillStyle.man
+++ b/man/XSetFillStyle.man
@@ -207,13 +207,13 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XCreateGC(3X11),
-XQueryBestSize(3X11),
-XSetArcMode(3X11),
-XSetClipOrigin(3X11),
-XSetFont(3X11),
-XSetLineAttributes(3X11),
-XSetState(3X11),
-XSetTile(3X11)
+XCreateGC(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetFont.man b/man/XSetFont.man
index 4b44e226..e2422d37 100644
--- a/man/XSetFont.man
+++ b/man/XSetFont.man
@@ -176,13 +176,13 @@ A value for a Font or GContext argument does not name a defined Font.
 .ZN BadGC
 A value for a GContext argument does not name a defined GContext.
 .SH "SEE ALSO"
-XCreateGC(3X11),
-XQueryBestSize(3X11),
-XSetArcMode(3X11),
-XSetClipOrigin(3X11),
-XSetFillStyle(3X11),
-XSetLineAttributes(3X11),
-XSetState(3X11),
-XSetTile(3X11)
+XCreateGC(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetFontPath.man b/man/XSetFontPath.man
index 2548a5f3..4ae4efbf 100644
--- a/man/XSetFontPath.man
+++ b/man/XSetFontPath.man
@@ -208,7 +208,7 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XListFont(3X11),
-XLoadFonts(3X11)
+XListFont(__libmansuffix__),
+XLoadFonts(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetICFocus.man b/man/XSetICFocus.man
index 19b81849..c759bfca 100644
--- a/man/XSetICFocus.man
+++ b/man/XSetICFocus.man
@@ -177,9 +177,9 @@ does not affect the focus window value;
 the client may still receive 
 events from the input method that are directed to the focus window.
 .SH "SEE ALSO"
-XCreateIC(3X11),
-XOpenIM(3X11),
-XSetICValues(3X11),
-XmbResetIC(3X11)
+XCreateIC(__libmansuffix__),
+XOpenIM(__libmansuffix__),
+XSetICValues(__libmansuffix__),
+XmbResetIC(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetICValues.man b/man/XSetICValues.man
index 1e072f73..4d5c1aeb 100644
--- a/man/XSetICValues.man
+++ b/man/XSetICValues.man
@@ -228,9 +228,9 @@ A value for a Pixmap argument does not name a defined Pixmap.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XCreateIC(3X11),
-XOpenIM(3X11),
-XSetICFocus(3X11),
-XmbResetIC(3X11)
+XCreateIC(__libmansuffix__),
+XOpenIM(__libmansuffix__),
+XSetICFocus(__libmansuffix__),
+XmbResetIC(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetInputFocus.man b/man/XSetInputFocus.man
index 14d26550..45408e71 100644
--- a/man/XSetInputFocus.man
+++ b/man/XSetInputFocus.man
@@ -271,6 +271,6 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XWarpPointer(3X11)
+XWarpPointer(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetLineAttributes.man b/man/XSetLineAttributes.man
index 09be3f58..6c7c44a6 100644
--- a/man/XSetLineAttributes.man
+++ b/man/XSetLineAttributes.man
@@ -256,13 +256,13 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XCreateGC(3X11),
-XQueryBestSize(3X11),
-XSetArcMode(3X11),
-XSetClipOrigin(3X11),
-XSetFillStyle(3X11),
-XSetFont(3X11),
-XSetState(3X11),
-XSetTile(3X11)
+XCreateGC(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetPointerMapping.man b/man/XSetPointerMapping.man
index 7b0845a1..0e420338 100644
--- a/man/XSetPointerMapping.man
+++ b/man/XSetPointerMapping.man
@@ -212,7 +212,7 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XChangeKeyboardControl(3X11),
-XChangeKeyboardMapping(3X11)
+XChangeKeyboardControl(__libmansuffix__),
+XChangeKeyboardMapping(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetState.man b/man/XSetState.man
index aa0143d1..c1a3fb29 100644
--- a/man/XSetState.man
+++ b/man/XSetState.man
@@ -245,13 +245,13 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XCreateGC(3X11),
-XQueryBestSize(3X11),
-XSetArcMode(3X11),
-XSetClipOrigin(3X11),
-XSetFillStyle(3X11),
-XSetFont(3X11),
-XSetLineAttributes(3X11),
-XSetTile(3X11)
+XCreateGC(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetTile(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetTextProperty.man b/man/XSetTextProperty.man
index b7ae9ea5..8a49bd5a 100644
--- a/man/XSetTextProperty.man
+++ b/man/XSetTextProperty.man
@@ -251,18 +251,18 @@ alternatives can generate this error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocIconSize(3X11),
-XAllocSizeHints(3X11),
-XAllocWMHints(3X11),
-XSetCommand(3X11),
-XSetTransientForHint(3X11),
-XSetWMClientMachine(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMIconName(3X11),
-XSetWMName(3X11),
-XSetWMProperties(3X11),
-XSetWMProtocols(3X11),
-XStringListToTextProperty(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetTile.man b/man/XSetTile.man
index 0fa1e041..50ea868d 100644
--- a/man/XSetTile.man
+++ b/man/XSetTile.man
@@ -230,13 +230,13 @@ to match in some other way required by the request.
 .ZN BadPixmap
 A value for a Pixmap argument does not name a defined Pixmap.
 .SH "SEE ALSO"
-XCreateGC(3X11),
-XQueryBestSize(3X11),
-XSetArcMode(3X11),
-XSetClipOrigin(3X11),
-XSetFillStyle(3X11),
-XSetFont(3X11),
-XSetLineAttributes(3X11),
-XSetState(3X11)
+XCreateGC(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetTransientForHint.man b/man/XSetTransientForHint.man
index 03c292d2..52ff295e 100644
--- a/man/XSetTransientForHint.man
+++ b/man/XSetTransientForHint.man
@@ -195,18 +195,18 @@ The server failed to allocate the requested resource or server memory.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocIconSize(3X11),
-XAllocSizeHints(3X11),
-XAllocWMHints(3X11),
-XSetCommand(3X11),
-XSetTextProperty(3X11),
-XSetWMClientMachine(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMIconName(3X11),
-XSetWMName(3X11),
-XSetWMProperties(3X11),
-XSetWMProtocols(3X11),
-XStringListToTextProperty(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetWMClientMachine.man b/man/XSetWMClientMachine.man
index 504a5940..252b4a26 100644
--- a/man/XSetWMClientMachine.man
+++ b/man/XSetWMClientMachine.man
@@ -182,18 +182,18 @@ otherwise, it returns a zero status.
 \s-1WM_CLIENT_MACHINE\s+1
 The string name of the machine on which the client application is running.
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocIconSize(3X11),
-XAllocSizeHints(3X11),
-XAllocWMHints(3X11),
-XSetCommand(3X11),
-XSetTransientForHint(3X11),
-XSetTextProperty(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMIconName(3X11),
-XSetWMName(3X11),
-XSetWMProperties(3X11),
-XSetWMProtocols(3X11),
-XStringListToTextProperty(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetWMColormapWindows.man b/man/XSetWMColormapWindows.man
index b9eca2e7..eff4773c 100644
--- a/man/XSetWMColormapWindows.man
+++ b/man/XSetWMColormapWindows.man
@@ -221,19 +221,19 @@ The server failed to allocate the requested resource or server memory.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocIconSize(3X11),
-XAllocSizeHints(3X11),
-XAllocWMHints(3X11),
-XFree(3X11),
-XSetCommand(3X11),
-XSetTransientForHint(3X11),
-XSetTextProperty(3X11),
-XSetWMClientMachine(3X11),
-XSetWMIconName(3X11),
-XSetWMName(3X11),
-XSetWMProperties(3X11),
-XSetWMProtocols(3X11),
-XStringListToTextProperty(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetWMIconName.man b/man/XSetWMIconName.man
index b389a906..28f33b98 100644
--- a/man/XSetWMIconName.man
+++ b/man/XSetWMIconName.man
@@ -233,19 +233,19 @@ The server failed to allocate the requested resource or server memory.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocIconSize(3X11),
-XAllocSizeHints(3X11),
-XAllocWMHints(3X11),
-XFree(3X11),
-XSetCommand(3X11),
-XSetTransientForHint(3X11),
-XSetTextProperty(3X11),
-XSetWMClientMachine(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMName(3X11),
-XSetWMProperties(3X11),
-XSetWMProtocols(3X11),
-XStringListToTextProperty(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetWMName.man b/man/XSetWMName.man
index 5a040718..80f3cd64 100644
--- a/man/XSetWMName.man
+++ b/man/XSetWMName.man
@@ -240,19 +240,19 @@ The server failed to allocate the requested resource or server memory.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocIconSize(3X11),
-XAllocSizeHints(3X11),
-XAllocWMHints(3X11),
-XFree(3X11),
-XSetCommand(3X11),
-XSetTransientForHint(3X11),
-XSetTextProperty(3X11),
-XSetWMClientMachine(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMIconName(3X11),
-XSetWMProperties(3X11),
-XSetWMProtocols(3X11),
-XStringListToTextProperty(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetWMProperties.man b/man/XSetWMProperties.man
index 7c4ce585..348b51bc 100644
--- a/man/XSetWMProperties.man
+++ b/man/XSetWMProperties.man
@@ -372,20 +372,20 @@ The server failed to allocate the requested resource or server memory.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocIconSize(3X11),
-XAllocSizeHints(3X11),
-XAllocWMHints(3X11),
-XParseGeometry(3X11),
-XSetCommand(3X11),
-XSetTransientForHint(3X11),
-XSetTextProperty(3X11),
-XSetWMClientMachine(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMIconName(3X11),
-XSetWMName(3X11),
-XSetWMProtocols(3X11),
-XStringListToTextProperty(3X11),
-XTextListToTextProperty(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XParseGeometry(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__),
+XTextListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSetWMProtocols.man b/man/XSetWMProtocols.man
index d75f4081..4c59fe0a 100644
--- a/man/XSetWMProtocols.man
+++ b/man/XSetWMProtocols.man
@@ -219,19 +219,19 @@ The server failed to allocate the requested resource or server memory.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocIconSize(3X11),
-XAllocSizeHints(3X11),
-XAllocWMHints(3X11),
-XFree(3X11),
-XSetCommand(3X11),
-XSetTransientForHint(3X11),
-XSetTextProperty(3X11),
-XSetWMClientMachine(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMIconName(3X11),
-XSetWMName(3X11),
-XSetWMProperties(3X11),
-XStringListToTextProperty(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XStoreBytes.man b/man/XStoreBytes.man
index dda24e02..e32fb5fb 100644
--- a/man/XStoreBytes.man
+++ b/man/XStoreBytes.man
@@ -249,6 +249,6 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XFree(3X11)
+XFree(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XStoreColors.man b/man/XStoreColors.man
index 6b516ada..66dadb1c 100644
--- a/man/XStoreColors.man
+++ b/man/XStoreColors.man
@@ -298,8 +298,8 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XAllocColor(3X11),
-XCreateColormap(3X11),
-XQueryColor(3X11)
+XAllocColor(__libmansuffix__),
+XCreateColormap(__libmansuffix__),
+XQueryColor(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XStringListToTextProperty.man b/man/XStringListToTextProperty.man
index abba4194..3bd38e95 100644
--- a/man/XStringListToTextProperty.man
+++ b/man/XStringListToTextProperty.man
@@ -237,19 +237,19 @@ typedef struct {
 } XTextProperty;
 .De
 .SH "SEE ALSO"
-XAllocClassHint(3X11),
-XAllocIconSize(3X11),
-XAllocSizeHints(3X11),
-XAllocWMHints(3X11),
-XFree(3X11),
-XSetCommand(3X11),
-XSetTransientForHint(3X11),
-XSetTextProperty(3X11),
-XSetWMClientMachine(3X11),
-XSetWMColormapWindows(3X11),
-XSetWMIconName(3X11),
-XSetWMName(3X11),
-XSetWMProperties(3X11),
-XSetWMProtocols(3X11)
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XStringToKeysym.man b/man/XStringToKeysym.man
index 511bd3aa..30792f1b 100644
--- a/man/XStringToKeysym.man
+++ b/man/XStringToKeysym.man
@@ -217,6 +217,6 @@ upper_return.
 Support for conversion of other than Latin and Cyrillic KeySyms is
 implementation-dependent.
 .SH "SEE ALSO"
-XLookupKeysym(3X11)
+XLookupKeysym(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XSynchronize.man b/man/XSynchronize.man
index 404631e9..5b251116 100644
--- a/man/XSynchronize.man
+++ b/man/XSynchronize.man
@@ -175,6 +175,6 @@ The specified procedure is called with only a display pointer.
 .ZN XSetAfterFunction
 returns the previous after function.
 .SH "SEE ALSO"
-XSetErrorHandler(3X11)
+XSetErrorHandler(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XTextExtents.man b/man/XTextExtents.man
index becf7f44..85724baa 100644
--- a/man/XTextExtents.man
+++ b/man/XTextExtents.man
@@ -285,7 +285,7 @@ A value for a Font or GContext argument does not name a defined Font.
 .ZN BadGC
 A value for a GContext argument does not name a defined GContext.
 .SH "SEE ALSO"
-XLoadFont(3X11),
-XTextWidth(3X11)
+XLoadFont(__libmansuffix__),
+XTextWidth(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XTextWidth.man b/man/XTextWidth.man
index 2e2c7948..bc454114 100644
--- a/man/XTextWidth.man
+++ b/man/XTextWidth.man
@@ -164,7 +164,7 @@ and
 .ZN XTextWidth16
 functions return the width of the specified 8-bit or 2-byte character strings.
 .SH "SEE ALSO"
-XLoadFont(3X11),
-XTextExtents(3X11)
+XLoadFont(__libmansuffix__),
+XTextExtents(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XUnmapEvent.man b/man/XUnmapEvent.man
index a0623f75..43101375 100644
--- a/man/XUnmapEvent.man
+++ b/man/XUnmapEvent.man
@@ -199,30 +199,30 @@ if the event was generated as a result of a resizing of the window's parent when
 the window itself had a win_gravity of
 .ZN UnmapGravity .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XVisibilityEvent(3X11)
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XUnmapWindow.man b/man/XUnmapWindow.man
index 0c5f5aaa..4ed20496 100644
--- a/man/XUnmapWindow.man
+++ b/man/XUnmapWindow.man
@@ -201,11 +201,11 @@ error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XChangeWindowAttributes(3X11),
-XConfigureWindow(3X11),
-XCreateWindow(3X11),
-XDestroyWindow(3X11),
-XMapWindow(3X11)
-XRaiseWindow(3X11)
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XMapWindow(__libmansuffix__)
+XRaiseWindow(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XVisibilityEvent.man b/man/XVisibilityEvent.man
index 7b878cf5..90bce0d7 100644
--- a/man/XVisibilityEvent.man
+++ b/man/XVisibilityEvent.man
@@ -217,30 +217,30 @@ the X server generates the event with the state member of the
 structure set to
 .ZN VisibilityFullyObscured .
 .SH "SEE ALSO"
-XAnyEvent(3X11),
-XButtonEvent(3X11),
-XCreateWindowEvent(3X11),
-XCirculateEvent(3X11),
-XCirculateRequestEvent(3X11),
-XColormapEvent(3X11),
-XConfigureEvent(3X11),
-XConfigureRequestEvent(3X11),
-XCrossingEvent(3X11),
-XDestroyWindowEvent(3X11),
-XErrorEvent(3X11),
-XExposeEvent(3X11),
-XFocusChangeEvent(3X11),
-XGraphicsExposeEvent(3X11),
-XGravityEvent(3X11),
-XKeymapEvent(3X11),
-XMapEvent(3X11),
-XMapRequestEvent(3X11),
-XPropertyEvent(3X11),
-XReparentEvent(3X11),
-XResizeRequestEvent(3X11),
-XSelectionClearEvent(3X11),
-XSelectionEvent(3X11),
-XSelectionRequestEvent(3X11),
-XUnmapEvent(3X11),
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
 .br
 \fI\*(xL\fP
diff --git a/man/XWarpPointer.man b/man/XWarpPointer.man
index 07ec5d53..21549a74 100644
--- a/man/XWarpPointer.man
+++ b/man/XWarpPointer.man
@@ -213,6 +213,6 @@ error.
 .ZN BadWindow
 A value for a Window argument does not name a defined Window.
 .SH "SEE ALSO"
-XSetInputFocus(3X11)
+XSetInputFocus(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XcmsAllocColor.man b/man/XcmsAllocColor.man
index bf93c736..da571e04 100644
--- a/man/XcmsAllocColor.man
+++ b/man/XcmsAllocColor.man
@@ -250,7 +250,7 @@ errors.
 .ZN BadColor
 A value for a Colormap argument does not name a defined Colormap.
 .SH "SEE ALSO"
-XcmsQueryColor(3X11),
-XcmsStoreColor(3X11)
+XcmsQueryColor(__libmansuffix__),
+XcmsStoreColor(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XcmsCCCOfColormap.man b/man/XcmsCCCOfColormap.man
index 0303cd36..58e3c1c2 100644
--- a/man/XcmsCCCOfColormap.man
+++ b/man/XcmsCCCOfColormap.man
@@ -179,10 +179,10 @@ Several colormaps may share the same CCC without restriction; this
 includes the CCCs generated by Xlib with each colormap.  Xlib, however,
 creates a new CCC with each new colormap.
 .SH "SEE ALSO"
-DisplayOfCCC(3X11),
-XcmsConvertColors(3X11),
-XcmsCreateCCC(3X11),
-XcmsDefaultCCC(3X11),
-XcmsSetWhitePoint(3X11)
+DisplayOfCCC(__libmansuffix__),
+XcmsConvertColors(__libmansuffix__),
+XcmsCreateCCC(__libmansuffix__),
+XcmsDefaultCCC(__libmansuffix__),
+XcmsSetWhitePoint(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XcmsCIELabQueryMaxC.man b/man/XcmsCIELabQueryMaxC.man
index 58484b42..7a000950 100644
--- a/man/XcmsCIELabQueryMaxC.man
+++ b/man/XcmsCIELabQueryMaxC.man
@@ -215,8 +215,8 @@ An
 return value usually indicates that the given chroma
 is beyond maximum for the given hue angle.
 .SH "SEE ALSO"
-XcmsCIELuvQueryMaxC(3X11),
-XcmsTekHVCQueryMaxC(3X11),
-XcmsQueryBlack(3X11)
+XcmsCIELuvQueryMaxC(__libmansuffix__),
+XcmsTekHVCQueryMaxC(__libmansuffix__),
+XcmsQueryBlack(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XcmsCIELuvQueryMaxC.man b/man/XcmsCIELuvQueryMaxC.man
index af469c5f..355c398f 100644
--- a/man/XcmsCIELuvQueryMaxC.man
+++ b/man/XcmsCIELuvQueryMaxC.man
@@ -215,8 +215,8 @@ An
 return value usually indicates that the given chroma
 is beyond maximum for the given hue angle.
 .SH "SEE ALSO"
-XcmsCIELabQueryMaxC(3X11),
-XcmsTekHVCQueryMaxC(3X11),
-XcmsQueryBlack(3X11)
+XcmsCIELabQueryMaxC(__libmansuffix__),
+XcmsTekHVCQueryMaxC(__libmansuffix__),
+XcmsQueryBlack(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XcmsColor.man b/man/XcmsColor.man
index c039cbf3..ee44e8dd 100644
--- a/man/XcmsColor.man
+++ b/man/XcmsColor.man
@@ -258,8 +258,8 @@ The
 structure contains a union of substructures,
 each supporting color specification encoding for a particular color space.
 .SH "SEE ALSO"
-XcmsAllocColor(3X11),
-XcmsStoreColor(3X11),
-XcmsConvertColors(3X11),
+XcmsAllocColor(__libmansuffix__),
+XcmsStoreColor(__libmansuffix__),
+XcmsConvertColors(__libmansuffix__),
 .LP
 \fI\*(xL\fP
diff --git a/man/XcmsConvertColors.man b/man/XcmsConvertColors.man
index 9e3ca616..96c41547 100644
--- a/man/XcmsConvertColors.man
+++ b/man/XcmsConvertColors.man
@@ -193,10 +193,10 @@ a device-dependent format (for example,
 all specifications are converted to CIE XYZ format and then to the target
 device-dependent format.
 .SH "SEE ALSO"
-DisplayOfCCC(3X11),
-XcmsCCCOfColormap(3X11),
-XcmsCreateCCC(3X11),
-XcmsDefaultCCC(3X11),
-XcmsSetWhitePoint(3X11)
+DisplayOfCCC(__libmansuffix__),
+XcmsCCCOfColormap(__libmansuffix__),
+XcmsCreateCCC(__libmansuffix__),
+XcmsDefaultCCC(__libmansuffix__),
+XcmsSetWhitePoint(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XcmsCreateCCC.man b/man/XcmsCreateCCC.man
index 24fcee8e..dc19f9fc 100644
--- a/man/XcmsCreateCCC.man
+++ b/man/XcmsCreateCCC.man
@@ -194,10 +194,10 @@ function frees the memory used for the specified CCC.
 Note that default CCCs and those currently associated with colormaps
 are ignored.
 .SH "SEE ALSO"
-DisplayOfCCC(3X11),
-XcmsCCCOfColormap(3X11),
-XcmsConvertColors(3X11),
-XcmsDefaultCCC(3X11),
-XcmsSetWhitePoint(3X11)
+DisplayOfCCC(__libmansuffix__),
+XcmsCCCOfColormap(__libmansuffix__),
+XcmsConvertColors(__libmansuffix__),
+XcmsDefaultCCC(__libmansuffix__),
+XcmsSetWhitePoint(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XcmsDefaultCCC.man b/man/XcmsDefaultCCC.man
index fe703c1a..95dc1806 100644
--- a/man/XcmsDefaultCCC.man
+++ b/man/XcmsDefaultCCC.man
@@ -161,10 +161,10 @@ Its initial gamut compression and white point
 adjustment procedures as well as the associated client data are implementation
 specific.
 .SH "SEE ALSO"
-DisplayOfCCC(3X11),
-XcmsCCCOfColormap(3X11),
-XcmsConvertColors(3X11),
-XcmsCreateCCC(3X11),
-XcmsSetWhitePoint(3X11)
+DisplayOfCCC(__libmansuffix__),
+XcmsCCCOfColormap(__libmansuffix__),
+XcmsConvertColors(__libmansuffix__),
+XcmsCreateCCC(__libmansuffix__),
+XcmsSetWhitePoint(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XcmsQueryBlack.man b/man/XcmsQueryBlack.man
index de67a6ec..29556b43 100644
--- a/man/XcmsQueryBlack.man
+++ b/man/XcmsQueryBlack.man
@@ -199,8 +199,8 @@ The
 function returns the color specification in the specified target format
 for full-intensity red, green, and blue.
 .SH "SEE ALSO"
-XcmsCIELabQueryMaxC(3X11),
-XcmsCIELuvQueryMaxC(3X11),
-XcmsTekHVCQueryMaxC(3X11)
+XcmsCIELabQueryMaxC(__libmansuffix__),
+XcmsCIELuvQueryMaxC(__libmansuffix__),
+XcmsTekHVCQueryMaxC(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XcmsQueryColor.man b/man/XcmsQueryColor.man
index b32b8c65..a42a3830 100644
--- a/man/XcmsQueryColor.man
+++ b/man/XcmsQueryColor.man
@@ -260,8 +260,8 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XcmsAllocColor(3X11),
-XcmsStoreColor(3X11),
-XQueryColor(3X11)
+XcmsAllocColor(__libmansuffix__),
+XcmsStoreColor(__libmansuffix__),
+XQueryColor(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XcmsSetWhitePoint.man b/man/XcmsSetWhitePoint.man
index 1af22e20..b87afe7b 100644
--- a/man/XcmsSetWhitePoint.man
+++ b/man/XcmsSetWhitePoint.man
@@ -189,10 +189,10 @@ function first sets the white point adjustment procedure and client data
 in the specified CCC with the newly specified procedure and client data
 and then returns the old procedure.
 .SH "SEE ALSO"
-DisplayOfCCC(3X11),
-XcmsCCCOfColormap(3X11),
-XcmsConvertColors(3X11),
-XcmsCreateCCC(3X11),
-XcmsDefaultCCC(3X11)
+DisplayOfCCC(__libmansuffix__),
+XcmsCCCOfColormap(__libmansuffix__),
+XcmsConvertColors(__libmansuffix__),
+XcmsCreateCCC(__libmansuffix__),
+XcmsDefaultCCC(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XcmsStoreColor.man b/man/XcmsStoreColor.man
index b51889be..270e61fb 100644
--- a/man/XcmsStoreColor.man
+++ b/man/XcmsStoreColor.man
@@ -301,7 +301,7 @@ Unless a specific range is specified for an argument, the full range defined
 by the argument's type is accepted.  Any argument defined as a set of
 alternatives can generate this error.
 .SH "SEE ALSO"
-XcmsAllocColor(3X11),
-XcmsQueryColor(3X11)
+XcmsAllocColor(__libmansuffix__),
+XcmsQueryColor(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XcmsTekHVCQueryMaxC.man b/man/XcmsTekHVCQueryMaxC.man
index e98de022..2407b85e 100644
--- a/man/XcmsTekHVCQueryMaxC.man
+++ b/man/XcmsTekHVCQueryMaxC.man
@@ -237,8 +237,8 @@ determines the minimum Value in TekHVC color space displayable by the screen.
 It returns the minimum Value and the actual Hue and Chroma at which
 the minimum Value was found.
 .SH "SEE ALSO"
-XcmsCIELabQueryMaxC(3X11),
-XcmsCIELuvQueryMaxC(3X11),
-XcmsQueryBlack(3X11)
+XcmsCIELabQueryMaxC(__libmansuffix__),
+XcmsCIELuvQueryMaxC(__libmansuffix__),
+XcmsQueryBlack(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XmbDrawImageString.man b/man/XmbDrawImageString.man
index 335077fd..9632f68a 100644
--- a/man/XmbDrawImageString.man
+++ b/man/XmbDrawImageString.man
@@ -208,10 +208,10 @@ release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
-XDrawImageString(3X11),
-XDrawString(3X11),
-XDrawText(3X11),
-XmbDrawString(3X11),
-XmbDrawText(3X11)
+XDrawImageString(__libmansuffix__),
+XDrawString(__libmansuffix__),
+XDrawText(__libmansuffix__),
+XmbDrawString(__libmansuffix__),
+XmbDrawText(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XmbDrawString.man b/man/XmbDrawString.man
index 0af25f15..b1072fd9 100644
--- a/man/XmbDrawString.man
+++ b/man/XmbDrawString.man
@@ -199,10 +199,10 @@ release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
-XDrawImageString(3X11),
-XDrawString(3X11),
-XDrawText(3X11),
-XmbDrawImageString(3X11),
-XmbDrawText(3X11)
+XDrawImageString(__libmansuffix__),
+XDrawString(__libmansuffix__),
+XDrawText(__libmansuffix__),
+XmbDrawImageString(__libmansuffix__),
+XmbDrawText(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XmbDrawText.man b/man/XmbDrawText.man
index b857f5a1..933f1ad5 100644
--- a/man/XmbDrawText.man
+++ b/man/XmbDrawText.man
@@ -248,10 +248,10 @@ typedef struct {
 } XwcTextItem;
 .De
 .SH "SEE ALSO"
-XDrawImageString(3X11),
-XDrawString(3X11),
-XDrawText(3X11),
-XmbDrawImageString(3X11),
-XmbDrawString(3X11)
+XDrawImageString(__libmansuffix__),
+XDrawString(__libmansuffix__),
+XDrawText(__libmansuffix__),
+XmbDrawImageString(__libmansuffix__),
+XmbDrawString(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XmbLookupString.man b/man/XmbLookupString.man
index c2413aec..c5c1ef43 100644
--- a/man/XmbLookupString.man
+++ b/man/XmbLookupString.man
@@ -306,6 +306,6 @@ release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
-XLookupKeysym(3X11)
+XLookupKeysym(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XmbResetIC.man b/man/XmbResetIC.man
index 79392145..53507147 100644
--- a/man/XmbResetIC.man
+++ b/man/XmbResetIC.man
@@ -204,9 +204,9 @@ release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
-XCreateIC(3X11),
-XOpenIM(3X11),
-XSetICFocus(3X11),
-XSetICValues(3X11)
+XCreateIC(__libmansuffix__),
+XOpenIM(__libmansuffix__),
+XSetICFocus(__libmansuffix__),
+XSetICValues(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XmbTextEscapement.man b/man/XmbTextEscapement.man
index 85c44d6a..8ed00853 100644
--- a/man/XmbTextEscapement.man
+++ b/man/XmbTextEscapement.man
@@ -186,6 +186,6 @@ release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
-XmbTextExtents(3X11),
-XmbTextPerCharExtents(3X11)
+XmbTextExtents(__libmansuffix__),
+XmbTextPerCharExtents(__libmansuffix__)
 \fI\*(xL\fP
diff --git a/man/XmbTextExtents.man b/man/XmbTextExtents.man
index 7275224f..055a6b18 100644
--- a/man/XmbTextExtents.man
+++ b/man/XmbTextExtents.man
@@ -222,6 +222,6 @@ release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
-XmbTextEscapement(3X11),
-XmbTextPerCharExtents(3X11)
+XmbTextEscapement(__libmansuffix__),
+XmbTextPerCharExtents(__libmansuffix__)
 \fI\*(xL\fP
diff --git a/man/XmbTextListToTextProperty.man b/man/XmbTextListToTextProperty.man
index 23501e9b..bd802948 100644
--- a/man/XmbTextListToTextProperty.man
+++ b/man/XmbTextListToTextProperty.man
@@ -455,7 +455,7 @@ typedef enum {
 } XICCEncodingStyle;
 .De
 .SH "SEE ALSO"
-XSetTextProperty(3X11),
-XStringListToTextProperty(3X11)
+XSetTextProperty(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XmbTextPerCharExtents.man b/man/XmbTextPerCharExtents.man
index 3f7b2c4c..9fda94df 100644
--- a/man/XmbTextPerCharExtents.man
+++ b/man/XmbTextPerCharExtents.man
@@ -252,6 +252,6 @@ release. Its presence is
 indicated by the macro
 .ZN X_HAVE_UTF8_STRING .
 .SH "SEE ALSO"
-XmbTextEscapement(3X11),
-XmbTextExtents(3X11)
+XmbTextEscapement(__libmansuffix__),
+XmbTextExtents(__libmansuffix__)
 \fI\*(xL\fP
diff --git a/man/XrmEnumerateDatabase.man b/man/XrmEnumerateDatabase.man
index 67bc1e05..73ff07f3 100644
--- a/man/XrmEnumerateDatabase.man
+++ b/man/XrmEnumerateDatabase.man
@@ -228,8 +228,8 @@ If Xlib has been initialized for threads, the procedure is called with
 the database locked and the result of a call by the procedure to any
 Xlib function using the same database is not defined.
 .SH "SEE ALSO"
-XrmGetResource(3X11),
-XrmInitialize(3X11),
-XrmPutResource(3X11)
+XrmGetResource(__libmansuffix__),
+XrmInitialize(__libmansuffix__),
+XrmPutResource(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XrmGetFileDatabase.man b/man/XrmGetFileDatabase.man
index c46994a9..2cf051fc 100644
--- a/man/XrmGetFileDatabase.man
+++ b/man/XrmGetFileDatabase.man
@@ -317,8 +317,8 @@ the octal value specified by the sequence.
 Finally, the two-character sequence ``\^\\\\'' is recognized
 and replaced with a single backslash.
 .SH "SEE ALSO"
-XrmGetResource(3X11),
-XrmInitialize(3X11),
-XrmPutResource(3X11)
+XrmGetResource(__libmansuffix__),
+XrmInitialize(__libmansuffix__),
+XrmPutResource(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XrmGetResource.man b/man/XrmGetResource.man
index 06d467c3..4eff90ee 100644
--- a/man/XrmGetResource.man
+++ b/man/XrmGetResource.man
@@ -318,9 +318,9 @@ entries that match using the character ``?''.
 An entry preceded by a tight binding takes precedence over entries
 preceded by a loose binding.
 .SH "SEE ALSO"
-XrmInitialize(3X11),
-XrmMergeDatabases(3X11),
-XrmPutResource(3X11),
-XrmUniqueQuark(3X11)
+XrmInitialize(__libmansuffix__),
+XrmMergeDatabases(__libmansuffix__),
+XrmPutResource(__libmansuffix__),
+XrmUniqueQuark(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XrmInitialize.man b/man/XrmInitialize.man
index c481bef0..3f47861f 100644
--- a/man/XrmInitialize.man
+++ b/man/XrmInitialize.man
@@ -257,9 +257,9 @@ typedef struct {
 } XrmOptionDescRec, *XrmOptionDescList;
 .De
 .SH "SEE ALSO"
-XrmGetResource(3X11),
-XrmMergeDatabases(3X11),
-XrmPutResource(3X11),
-XrmUniqueQuark(3X11)
+XrmGetResource(__libmansuffix__),
+XrmMergeDatabases(__libmansuffix__),
+XrmPutResource(__libmansuffix__),
+XrmUniqueQuark(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XrmMergeDatabases.man b/man/XrmMergeDatabases.man
index e1dc75ad..5480eb42 100644
--- a/man/XrmMergeDatabases.man
+++ b/man/XrmMergeDatabases.man
@@ -209,8 +209,8 @@ The database entries are merged without changing values or types,
 regardless of the locale of the database.
 The locale of the target database is not modified.
 .SH "SEE ALSO"
-XrmGetResource(3X11),
-XrmInitialize(3X11),
-XrmPutResource(3X11)
+XrmGetResource(__libmansuffix__),
+XrmInitialize(__libmansuffix__),
+XrmPutResource(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XrmPutResource.man b/man/XrmPutResource.man
index e42fbf81..55d699f8 100644
--- a/man/XrmPutResource.man
+++ b/man/XrmPutResource.man
@@ -245,9 +245,9 @@ is not in the Host Portable Character Encoding,
 the result is implementation-dependent.
 Note that comment lines are not stored.
 .SH "SEE ALSO"
-XrmGetResource(3X11),
-XrmInitialize(3X11),
-XrmMergeDatabases(3X11),
-XrmUniqueQuark(3X11)
+XrmGetResource(__libmansuffix__),
+XrmInitialize(__libmansuffix__),
+XrmMergeDatabases(__libmansuffix__),
+XrmUniqueQuark(__libmansuffix__)
 .br
 \fI\*(xL\fP
diff --git a/man/XrmUniqueQuark.man b/man/XrmUniqueQuark.man
index baaeac97..ea32c6a2 100644
--- a/man/XrmUniqueQuark.man
+++ b/man/XrmUniqueQuark.man
@@ -296,9 +296,9 @@ quarks	a	b	c
 bindings	loose	tight	loose
 .TE
 .SH "SEE ALSO"
-XrmGetResource(3X11),
-XrmInitialize(3X11),
-XrmMergeDatabases(3X11),
-XrmPutResource(3X11)
+XrmGetResource(__libmansuffix__),
+XrmInitialize(__libmansuffix__),
+XrmMergeDatabases(__libmansuffix__),
+XrmPutResource(__libmansuffix__)
 .LP
 \fI\*(xL\fP
diff --git a/man/xkb/XkbBell.man b/man/xkb/XkbBell.man
index 2a8a0e1f..f3f6cae9 100644
--- a/man/xkb/XkbBell.man
+++ b/man/xkb/XkbBell.man
@@ -330,7 +330,7 @@ receives
 a bell event, use the window ID in the XkbBellNotifyEvent, if present.
 
 .SH "SEE ALSO"
-.BR XBell (3X11),
+.BR XBell (__libmansuffix__),
 .BR XkbBellNotify (__libmansuffix__),
 .BR XkbChangeEnabledControls (__libmansuffix__),
 .BR XkbDeviceBell (__libmansuffix__),
diff --git a/man/xkb/XkbDeviceBell.man b/man/xkb/XkbDeviceBell.man
index d5d05cde..5b27cc3a 100644
--- a/man/xkb/XkbDeviceBell.man
+++ b/man/xkb/XkbDeviceBell.man
@@ -302,7 +302,7 @@ If your application needs to generate visual bell feedback on the screen when it
 a bell event, use the window ID in the XkbBellNotifyEvent, if present.
 
 .SH "SEE ALSO"
-.BR XBell (3X11),
+.BR XBell (__libmansuffix__),
 .BR XkbBellNotify (__libmansuffix__),
 .BR XkbChangeEnabledControls (__libmansuffix__),
 .BR XkbDeviceBell (__libmansuffix__),
diff --git a/man/xkb/XkbDeviceBellEvent.man b/man/xkb/XkbDeviceBellEvent.man
index a28a868f..049e32ce 100644
--- a/man/xkb/XkbDeviceBellEvent.man
+++ b/man/xkb/XkbDeviceBellEvent.man
@@ -330,7 +330,7 @@ receives
 a bell event, use the window ID in the XkbBellNotifyEvent, if present.
 
 .SH "SEE ALSO"
-.BR XBell (3X11),
+.BR XBell (__libmansuffix__),
 .BR XkbBellNotify (__libmansuffix__),
 .BR XkbChangeEnabledControls (__libmansuffix__),
 .BR XkbDeviceBell (__libmansuffix__),
diff --git a/man/xkb/XkbForceBell.man b/man/xkb/XkbForceBell.man
index b149974a..d7d10608 100644
--- a/man/xkb/XkbForceBell.man
+++ b/man/xkb/XkbForceBell.man
@@ -318,7 +318,7 @@ receives
 a bell event, use the window ID in the XkbBellNotifyEvent, if present.
 
 .SH "SEE ALSO"
-.BR XBell (3X11),
+.BR XBell (__libmansuffix__),
 .BR XkbBell (__libmansuffix__),
 .BR XkbChangeEnabledControls (__libmansuffix__),
 .BR XkbForceDeviceBell (__libmansuffix__),
diff --git a/man/xkb/XkbForceDeviceBell.man b/man/xkb/XkbForceDeviceBell.man
index 6842aa69..98dcd0c2 100644
--- a/man/xkb/XkbForceDeviceBell.man
+++ b/man/xkb/XkbForceDeviceBell.man
@@ -304,7 +304,7 @@ If your application needs to generate visual bell feedback on the screen when it
 receives 
 a bell event, use the window ID in the XkbBellNotifyEvent, if present.
 .SH "SEE ALSO"
-.BR XBell (3X11),
+.BR XBell (__libmansuffix__),
 .BR XkbBell (__libmansuffix__),
 .BR XkbBellNotify (__libmansuffix__),
 .BR XkbChangeEnabledControls (__libmansuffix__),
diff --git a/man/xkb/XkbGetDeviceInfo.man b/man/xkb/XkbGetDeviceInfo.man
index 4157296e..e2a85cba 100644
--- a/man/xkb/XkbGetDeviceInfo.man
+++ b/man/xkb/XkbGetDeviceInfo.man
@@ -262,4 +262,4 @@ typedef struct {
 .fi
 .SH "SEE ALSO"
 .BR XkbAllocDeviceInfo (__libmansuffix__),
-.BR XListInputDevices (3X11)
+.BR XListInputDevices (__libmansuffix__)
diff --git a/man/xkb/XkbIgnoreExtension.man b/man/xkb/XkbIgnoreExtension.man
index 8b0cc4a7..ad59b502 100644
--- a/man/xkb/XkbIgnoreExtension.man
+++ b/man/xkb/XkbIgnoreExtension.man
@@ -86,4 +86,4 @@ The
 .I XkbIgnoreExtension 
 function returns False if it was unable to apply the ignore request.
 .SH "SEE ALSO"
-.BR XOpenDisplay (3X11)
+.BR XOpenDisplay (__libmansuffix__)
diff --git a/man/xkb/XkbLookupKeyBinding.man b/man/xkb/XkbLookupKeyBinding.man
index 6f202227..25ad9613 100644
--- a/man/xkb/XkbLookupKeyBinding.man
+++ b/man/xkb/XkbLookupKeyBinding.man
@@ -100,5 +100,5 @@ returns the number of bytes that it placed into
 .I buf.
 .SH "SEE ALSO"
 .BR XkbTranslateKeySym (__libmansuffix__),
-.BR XLookupString (3X11),
-.BR XRebindKeysym (3X11)
+.BR XLookupString (__libmansuffix__),
+.BR XRebindKeysym (__libmansuffix__)
diff --git a/man/xkb/XkbLookupKeySym.man b/man/xkb/XkbLookupKeySym.man
index c3af29b4..f7f8c002 100644
--- a/man/xkb/XkbLookupKeySym.man
+++ b/man/xkb/XkbLookupKeySym.man
@@ -85,5 +85,5 @@ parameter is the state from a KeyPress or KeyRelease event.
 .I XkbLookupKeySym 
 returns True if it succeeds.
 .SH "SEE ALSO"
-.BR XLookupKeySym (3X11)
+.BR XLookupKeySym (__libmansuffix__)
 
diff --git a/man/xkb/XkbOpenDisplay.man b/man/xkb/XkbOpenDisplay.man
index 22a44c81..1403dde9 100644
--- a/man/xkb/XkbOpenDisplay.man
+++ b/man/xkb/XkbOpenDisplay.man
@@ -167,4 +167,4 @@ The Xkb extension has not been properly initialized
 .SH "SEE ALSO"
 .BR XkbLibraryVersion (__libmansuffix__),
 .BR XkbQueryExtension (__libmansuffix__),
-.BR XOpenDisplay (3X11)
+.BR XOpenDisplay (__libmansuffix__)
diff --git a/man/xkb/XkbRefreshKeyboardMapping.man b/man/xkb/XkbRefreshKeyboardMapping.man
index 4e910eb1..f7f1513a 100644
--- a/man/xkb/XkbRefreshKeyboardMapping.man
+++ b/man/xkb/XkbRefreshKeyboardMapping.man
@@ -75,4 +75,4 @@ type and range, but is otherwise invalid
 .BR XkbChangeMap (__libmansuffix__),
 .BR XkbGetKeyboardByName (__libmansuffix__),
 .BR XkbSetMap (__libmansuffix__),
-.BR XRefreshKeyboardMapping (3X11)
+.BR XRefreshKeyboardMapping (__libmansuffix__)
diff --git a/man/xkb/XkbTranslateKeyCode.man b/man/xkb/XkbTranslateKeyCode.man
index 4e4455be..09874d5a 100644
--- a/man/xkb/XkbTranslateKeyCode.man
+++ b/man/xkb/XkbTranslateKeyCode.man
@@ -86,4 +86,4 @@ to consume the Shift and Lock modifiers when processing all keys, even if the
 definition for the key type does not specify these modifiers. The 
 AlwaysConsumeShiftAndLock control is unset by default. 
 .SH "SEE ALSO"
-.BR XLookupString (3X11)
+.BR XLookupString (__libmansuffix__)