Attachment 9857 Details for Bug 2607 – Add _X_EXPORT's for libX11

[patch] Add _X_EXPORT's for libX11

libx11-export.diff (text/plain), 281.48 KB, created by Tilman Sauerbeck on 2007-05-03 12:13:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tilman Sauerbeck

Created: 2007-05-03 12:13:03 UTC

Size: 281.48 KB

patch

obsolete

>diff --git a/configure.ac b/configure.ac
>index e3bc143..cfbfa9d 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -378,6 +378,7 @@ AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
> 
> XORG_CHECK_MALLOC_ZERO
> XORG_RELEASE_VERSION
>+XORG_VISIBILITY
> 
> AC_OUTPUT([Makefile
>            include/Makefile
>diff --git a/include/X11/ImUtil.h b/include/X11/ImUtil.h
>index 89f0381..1d43135 100644
>--- a/include/X11/ImUtil.h
>+++ b/include/X11/ImUtil.h
>@@ -3,16 +3,19 @@
> #ifndef _IMUTIL_H_
> #define _IMUTIL_H_
> 
>+_X_EXPORT
> extern int
> _XGetScanlinePad(
>     Display *dpy,
>     int depth);
> 
>+_X_EXPORT
> extern int
> _XGetBitsPerPixel(
>  Display *dpy,
>  int depth);
> 
>+_X_EXPORT
> extern int
> _XSetImage(
>     XImage *srcimg,
>@@ -20,10 +23,13 @@ _XSetImage(
>     register int x,
>     register int y);
> 
>+_X_EXPORT
> extern int
> _XReverse_Bytes(
>     register unsigned char *bpt,
>     register int nb);
>+
>+_X_EXPORT
> extern void
> _XInitImageFuncPtrs(
>     register XImage *image);
>diff --git a/include/X11/XKBlib.h b/include/X11/XKBlib.h
>index 6a5dc8a..841f810 100644
>--- a/include/X11/XKBlib.h
>+++ b/include/X11/XKBlib.h
>@@ -294,10 +294,12 @@ typedef struct	_XkbKbdDpyState	XkbKbdDpyStateRec,*XkbKbdDpyStatePtr;
> 
> _XFUNCPROTOBEGIN
> 
>+_X_EXPORT
> extern	Bool	XkbIgnoreExtension(
> 	Bool			/* ignore */
> );
> 
>+_X_EXPORT
> extern	Display *XkbOpenDisplay(
> 	char *			/* name */,
> 	int *			/* ev_rtrn */,
>@@ -307,6 +309,7 @@ extern	Display *XkbOpenDisplay(
> 	int *			/* reason */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbQueryExtension(
> 	Display *		/* dpy */,
> 	int *			/* opcodeReturn */,
>@@ -316,27 +319,32 @@ extern	Bool	XkbQueryExtension(
> 	int *			/* minorRtrn */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbUseExtension(
> 	Display *		/* dpy */,
> 	int *			/* major_rtrn */,
> 	int *			/* minor_rtrn */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbLibraryVersion(
> 	int *			/* libMajorRtrn */,
> 	int *			/* libMinorRtrn */
> );
> 
>+_X_EXPORT
> extern	unsigned int	XkbSetXlibControls(
> 	Display*		/* dpy */,
> 	unsigned int		/* affect */,
> 	unsigned int		/* values */
> );
> 
>+_X_EXPORT
> extern	unsigned int	XkbGetXlibControls(
> 	Display*		/* dpy */
> );
> 
>+_X_EXPORT
> extern	unsigned int	XkbXlibControlsImplemented(void);
> 
> typedef	Atom	(*XkbInternAtomFunc)(
>@@ -350,11 +358,13 @@ typedef char *	(*XkbGetAtomNameFunc)(
> 	Atom			/* atom */
> );
> 
>+_X_EXPORT
> extern void		XkbSetAtomFuncs(
> 	XkbInternAtomFunc	/* getAtom */,
> 	XkbGetAtomNameFunc	/* getName */
> );
> 
>+_X_EXPORT
> extern	KeySym XkbKeycodeToKeysym(
> 		Display *	/* dpy */,
> #if NeedWidePrototypes
>@@ -366,11 +376,13 @@ extern	KeySym XkbKeycodeToKeysym(
> 		 int		/* level */
> );
> 
>+_X_EXPORT
> extern	unsigned int	XkbKeysymToModifiers(
>     Display *			/* dpy */,
>     KeySym 			/* ks */
> );
> 
>+_X_EXPORT
> extern	Bool		XkbLookupKeySym(
>     Display *			/* dpy */,
>     KeyCode 			/* keycode */,
>@@ -379,6 +391,7 @@ extern	Bool		XkbLookupKeySym(
>     KeySym *			/* keysym_return */
> );
> 
>+_X_EXPORT
> extern	int		XkbLookupKeyBinding(
>     Display *			/* dpy */,
>     KeySym 			/* sym_rtrn */,
>@@ -388,6 +401,7 @@ extern	int		XkbLookupKeyBinding(
>     int * 			/* extra_rtrn */
> );
> 
>+_X_EXPORT
> extern	Bool		XkbTranslateKeyCode(
>     XkbDescPtr			/* xkb */,
>     KeyCode 			/* keycode */,
>@@ -396,6 +410,7 @@ extern	Bool		XkbTranslateKeyCode(
>     KeySym *			/* keysym_return */
> );
> 
>+_X_EXPORT
> extern	int		XkbTranslateKeySym(
>     Display *			/* dpy */,
>     register KeySym *		/* sym_return */,
>@@ -405,6 +420,7 @@ extern	int		XkbTranslateKeySym(
>     int *			/* extra_rtrn */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSetAutoRepeatRate(
> 	Display *		/* dpy */,
> 	unsigned int		/* deviceSpec */,
>@@ -412,6 +428,7 @@ extern	Bool	XkbSetAutoRepeatRate(
> 	unsigned int		/* interval */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbGetAutoRepeatRate(
> 	Display *		/* dpy */,
> 	unsigned int		/* deviceSpec */,
>@@ -419,6 +436,7 @@ extern	Bool	XkbGetAutoRepeatRate(
> 	unsigned int *		/* intervalRtrn */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbChangeEnabledControls(
> 	Display *		/* dpy */,
> 	unsigned int		/* deviceSpec */,
>@@ -426,6 +444,7 @@ extern	Bool	XkbChangeEnabledControls(
> 	unsigned int		/* values */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbDeviceBell(
> 	Display *		/* dpy */,
> 	Window			/* win */,
>@@ -436,6 +455,7 @@ extern	Bool	XkbDeviceBell(
> 	Atom			/* name */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbForceDeviceBell(
> 	Display *		/* dpy */,
> 	int			/* deviceSpec */,
>@@ -444,6 +464,7 @@ extern	Bool	XkbForceDeviceBell(
> 	int			/* percent */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbDeviceBellEvent(
> 	Display *		/* dpy */,
> 	Window			/* win */,
>@@ -454,6 +475,7 @@ extern	Bool	XkbDeviceBellEvent(
> 	Atom			/* name */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbBell(
> 	Display *		/* dpy */,
> 	Window			/* win */,
>@@ -461,11 +483,13 @@ extern	Bool	XkbBell(
> 	Atom			/* name */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbForceBell(
> 	Display *		/* dpy */,
> 	int			/* percent */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbBellEvent(
> 	Display *		/* dpy */,
> 	Window			/* win */,
>@@ -473,6 +497,7 @@ extern	Bool	XkbBellEvent(
> 	Atom			/* name */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSelectEvents(
> 	Display *		/* dpy */,
> 	unsigned int		/* deviceID */,
>@@ -480,6 +505,7 @@ extern	Bool	XkbSelectEvents(
> 	unsigned int 		/* values */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSelectEventDetails(
> 	Display *		/* dpy */,
> 	unsigned int 		/* deviceID */,
>@@ -488,24 +514,28 @@ extern	Bool	XkbSelectEventDetails(
> 	unsigned long 		/* details */
> );
> 
>+_X_EXPORT
> extern	void	XkbNoteMapChanges(
>     XkbMapChangesPtr		/* old */,
>     XkbMapNotifyEvent	*	/* new */,
>     unsigned int	 	/* wanted */
> );
> 
>+_X_EXPORT
> extern	void	XkbNoteNameChanges(
>     XkbNameChangesPtr		/* old */,
>     XkbNamesNotifyEvent	*	/* new */,
>     unsigned int	 	/* wanted */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetIndicatorState(
> 	Display *		/* dpy */,
> 	unsigned int		/* deviceSpec */,
> 	unsigned int *		/* pStateRtrn */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetDeviceIndicatorState(
> 	Display *		/* dpy */,
> 	unsigned int		/* deviceSpec */,
>@@ -514,12 +544,14 @@ extern	Status	XkbGetDeviceIndicatorState(
> 	unsigned int *		/* pStateRtrn */
> );
> 
>+_X_EXPORT
> extern	Status	 XkbGetIndicatorMap(
> 	Display *		/* dpy */,
> 	unsigned long		/* which */,
> 	XkbDescPtr		/* desc */
> );
> 
>+_X_EXPORT
> extern	Bool	 XkbSetIndicatorMap(
> 	Display *		/* dpy */,
> 	unsigned long 		/* which */,
>@@ -535,6 +567,7 @@ extern	Bool	 XkbSetIndicatorMap(
> #define	XkbChangeIndicatorMaps(d,x,c) \
> 				(XkbSetIndicatorMap((d),(c)->map_changes,x))
> 
>+_X_EXPORT
> extern	Bool	XkbGetNamedIndicator(
> 	Display *		/* dpy */,
> 	Atom			/* name */,
>@@ -544,6 +577,7 @@ extern	Bool	XkbGetNamedIndicator(
> 	Bool *			/* pRealRtrn */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbGetNamedDeviceIndicator(
> 	Display *		/* dpy */,
> 	unsigned int		/* deviceSpec */,
>@@ -556,6 +590,7 @@ extern	Bool	XkbGetNamedDeviceIndicator(
> 	Bool *			/* pRealRtrn */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSetNamedIndicator(
> 	Display *		/* dpy */,
> 	Atom			/* name */,
>@@ -565,6 +600,7 @@ extern	Bool	XkbSetNamedIndicator(
> 	XkbIndicatorMapPtr	/* pMap */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSetNamedDeviceIndicator(
> 	Display *		/* dpy */,
> 	unsigned int		/* deviceSpec */,
>@@ -577,6 +613,7 @@ extern	Bool	XkbSetNamedDeviceIndicator(
> 	XkbIndicatorMapPtr	/* pMap */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbLockModifiers(
> 	Display *		/* dpy */,
> 	unsigned int 		/* deviceSpec */,
>@@ -584,6 +621,7 @@ extern	Bool	XkbLockModifiers(
> 	unsigned int 		/* values */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbLatchModifiers(
> 	Display *		/* dpy */,
> 	unsigned int 		/* deviceSpec */,
>@@ -591,18 +629,21 @@ extern	Bool	XkbLatchModifiers(
> 	unsigned int 		/* values */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbLockGroup(
> 	Display *		/* dpy */,
> 	unsigned int 		/* deviceSpec */,
> 	unsigned int 		/* group */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbLatchGroup(
> 	Display *		/* dpy */,
> 	unsigned int 		/* deviceSpec */,
> 	unsigned int 		/* group */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSetServerInternalMods(
> 	Display *		/* dpy */,
> 	unsigned int 		/* deviceSpec */,
>@@ -612,6 +653,7 @@ extern	Bool	XkbSetServerInternalMods(
> 	unsigned int		/* virtualValues */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSetIgnoreLockMods(
> 	Display *		/* dpy */,
> 	unsigned int 		/* deviceSpec */,
>@@ -621,59 +663,68 @@ extern	Bool	XkbSetIgnoreLockMods(
> 	unsigned int		/* virtualValues */
> );
> 
>-
>+_X_EXPORT
> extern	Bool	XkbVirtualModsToReal(
> 	XkbDescPtr		/* xkb */,
> 	unsigned int		/* virtual_mask */,
> 	unsigned int *		/* mask_rtrn */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbComputeEffectiveMap(
> 	XkbDescPtr 		/* xkb */,
> 	XkbKeyTypePtr		/* type */,
> 	unsigned char *		/* map_rtrn */
> );
> 
>+_X_EXPORT
> extern	Status XkbInitCanonicalKeyTypes(
>     XkbDescPtr			/* xkb */,
>     unsigned int		/* which */,
>     int				/* keypadVMod */
> );
> 
>+_X_EXPORT
> extern	XkbDescPtr XkbAllocKeyboard(
> 	void
> );
> 
>+_X_EXPORT
> extern	void	XkbFreeKeyboard(
> 	XkbDescPtr		/* xkb */,
> 	unsigned int		/* which */,
> 	Bool			/* freeDesc */
> );
> 
>+_X_EXPORT
> extern	Status XkbAllocClientMap(
> 	XkbDescPtr		/* xkb */,
> 	unsigned int		/* which */,
> 	unsigned int		/* nTypes */
> );
> 
>+_X_EXPORT
> extern	Status XkbAllocServerMap(
> 	XkbDescPtr		/* xkb */,
> 	unsigned int		/* which */,
> 	unsigned int		/* nActions */
> );
> 
>+_X_EXPORT
> extern	void	XkbFreeClientMap(
>     XkbDescPtr			/* xkb */,
>     unsigned int		/* what */,
>     Bool			/* freeMap */
> );
> 
>+_X_EXPORT
> extern	void	XkbFreeServerMap(
>     XkbDescPtr			/* xkb */,
>     unsigned int		/* what */,
>     Bool			/* freeMap */
> );
> 
>+_X_EXPORT
> extern	XkbKeyTypePtr	XkbAddKeyType(
>     XkbDescPtr			/* xkb */,
>     Atom			/* name */,
>@@ -682,37 +733,43 @@ extern	XkbKeyTypePtr	XkbAddKeyType(
>     int				/* num_lvls */
> );
> 
>+_X_EXPORT
> extern	Status XkbAllocIndicatorMaps(
> 	XkbDescPtr		/* xkb */
> );
> 
>+_X_EXPORT
> extern	void XkbFreeIndicatorMaps(
>     XkbDescPtr			/* xkb */
> );
> 
>+_X_EXPORT
> extern	XkbDescPtr XkbGetMap(
> 	Display *		/* dpy */,
> 	unsigned int 		/* which */,
> 	unsigned int 		/* deviceSpec */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetUpdatedMap(
> 	Display *		/* dpy */,
> 	unsigned int 		/* which */,
> 	XkbDescPtr		/* desc */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetMapChanges(
>     Display *			/* dpy */,
>     XkbDescPtr			/* xkb */,
>     XkbMapChangesPtr		/* changes */
> );
> 
>-
>+_X_EXPORT
> extern	Status	XkbRefreshKeyboardMapping(
>     XkbMapNotifyEvent *		/* event */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetKeyTypes(
>     Display *			/* dpy */,
>     unsigned int		/* first */,
>@@ -720,6 +777,7 @@ extern	Status	XkbGetKeyTypes(
>     XkbDescPtr			/* xkb */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetKeySyms(
>     Display *			/* dpy */,
>     unsigned int		/* first */,
>@@ -727,6 +785,7 @@ extern	Status	XkbGetKeySyms(
>     XkbDescPtr			/* xkb */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetKeyActions(
>     Display *			/* dpy */,
>     unsigned int 		/* first */,
>@@ -734,6 +793,7 @@ extern	Status	XkbGetKeyActions(
>     XkbDescPtr			/* xkb */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetKeyBehaviors(
> 	Display *		/* dpy */,
> 	unsigned int 		/* firstKey */,
>@@ -741,12 +801,14 @@ extern	Status	XkbGetKeyBehaviors(
> 	XkbDescPtr		/* desc */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetVirtualMods(
> 	Display *		/* dpy */,
> 	unsigned int 		/* which */,
> 	XkbDescPtr		/* desc */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetKeyExplicitComponents(
> 	Display *		/* dpy */,
> 	unsigned int 		/* firstKey */,
>@@ -754,6 +816,7 @@ extern	Status	XkbGetKeyExplicitComponents(
> 	XkbDescPtr		/* desc */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetKeyModifierMap(
> 	Display *		/* dpy */,
> 	unsigned int 		/* firstKey */,
>@@ -761,6 +824,7 @@ extern	Status	XkbGetKeyModifierMap(
> 	XkbDescPtr		/* desc */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetKeyVirtualModMap(
> 	Display *		/* dpy */,
> 	unsigned int		/* first */,
>@@ -768,29 +832,34 @@ extern	Status	XkbGetKeyVirtualModMap(
> 	XkbDescPtr		/* xkb */
> );
> 
>+_X_EXPORT
> extern	Status	XkbAllocControls(
> 	XkbDescPtr		/* xkb */,
> 	unsigned int		/* which*/
> );
> 
>+_X_EXPORT
> extern	void	XkbFreeControls(
> 	XkbDescPtr		/* xkb */,
> 	unsigned int		/* which */,
> 	Bool			/* freeMap */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetControls(
> 	Display *		/* dpy */,
> 	unsigned long		/* which */,
> 	XkbDescPtr		/* desc */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSetControls(
> 	Display *		/* dpy */,
> 	unsigned long		/* which */,
> 	XkbDescPtr		/* desc */
> );
> 
>+_X_EXPORT
> extern	void	XkbNoteControlsChanges(
>     XkbControlsChangesPtr	/* old */,
>     XkbControlsNotifyEvent *	/* new */,
>@@ -800,24 +869,28 @@ extern	void	XkbNoteControlsChanges(
> #define	XkbGetControlsChanges(d,x,c)	XkbGetControls(d,(c)->changed_ctrls,x)
> #define	XkbChangeControls(d,x,c)	XkbSetControls(d,(c)->changed_ctrls,x)
> 
>+_X_EXPORT
> extern	Status	XkbAllocCompatMap(
>     XkbDescPtr			/* xkb */,
>     unsigned int		/* which */,
>     unsigned int		/* nInterpret */
> );
> 
>+_X_EXPORT
> extern	void	XkbFreeCompatMap(
>     XkbDescPtr			/* xkb */,
>     unsigned int		/* which */,
>     Bool			/* freeMap */
> );
> 
>+_X_EXPORT
> extern Status XkbGetCompatMap(
> 	Display *		/* dpy */,
> 	unsigned int 		/* which */,
> 	XkbDescPtr 		/* xkb */
> );
> 
>+_X_EXPORT
> extern Bool XkbSetCompatMap(
> 	Display *		/* dpy */,
> 	unsigned int 		/* which */,
>@@ -825,6 +898,7 @@ extern Bool XkbSetCompatMap(
> 	Bool			/* updateActions */
> );
> 
>+_X_EXPORT
> extern	XkbSymInterpretPtr XkbAddSymInterpret(
> 	XkbDescPtr		/* xkb */,
> 	XkbSymInterpretPtr	/* si */,
>@@ -832,6 +906,7 @@ extern	XkbSymInterpretPtr XkbAddSymInterpret(
> 	XkbChangesPtr		/* changes */
> );
> 
>+_X_EXPORT
> extern	Status XkbAllocNames(
> 	XkbDescPtr		/* xkb */,
> 	unsigned int		/* which */,
>@@ -839,12 +914,14 @@ extern	Status XkbAllocNames(
> 	int			/* nTotalAliases */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetNames(
> 	Display *		/* dpy */,
> 	unsigned int		/* which */,
> 	XkbDescPtr		/* desc */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSetNames(
> 	Display *		/* dpy */,
> 	unsigned int		/* which */,
>@@ -853,48 +930,55 @@ extern	Bool	XkbSetNames(
> 	XkbDescPtr		/* desc */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbChangeNames(
> 	Display *		/* dpy */,
> 	XkbDescPtr		/* xkb */,
> 	XkbNameChangesPtr	/* changes */
> );
> 
>+_X_EXPORT
> extern	void XkbFreeNames(
> 	XkbDescPtr		/* xkb */,
> 	unsigned int		/* which */,
> 	Bool			/* freeMap */
> );
> 
>-
>+_X_EXPORT
> extern	Status	XkbGetState(
> 	Display *		/* dpy */,
> 	unsigned int 		/* deviceSpec */,
> 	XkbStatePtr		/* rtrnState */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSetMap(
> 	Display *		/* dpy */,
> 	unsigned int		/* which */,
> 	XkbDescPtr		/* desc */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbChangeMap(
> 	Display*		/* dpy */,
> 	XkbDescPtr		/* desc */,
> 	XkbMapChangesPtr	/* changes */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSetDetectableAutoRepeat(
> 	Display *		/* dpy */,
> 	Bool			/* detectable */,
> 	Bool *			/* supported */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbGetDetectableAutoRepeat(
> 	Display *		/* dpy */,
> 	Bool *			/* supported */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSetAutoResetControls(
>     Display *			/* dpy */,
>     unsigned int 		/* changes */,
>@@ -902,34 +986,40 @@ extern	Bool	XkbSetAutoResetControls(
>     unsigned int *		/* auto_values */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbGetAutoResetControls(
>     Display *			/* dpy */,
>     unsigned int *		/* auto_ctrls */,
>     unsigned int *		/* auto_ctrl_values */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSetPerClientControls(
>     Display *			/* dpy */,
>     unsigned int		/* change */,
>     unsigned int *		/* values */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbGetPerClientControls(
>     Display *			/* dpy */,
>     unsigned int *		/* ctrls */
> );
> 
>+_X_EXPORT
> extern Status XkbCopyKeyType(
>     XkbKeyTypePtr	/* from */,
>     XkbKeyTypePtr	/* into */
> );
> 
>+_X_EXPORT
> extern Status XkbCopyKeyTypes(
>     XkbKeyTypePtr	/* from */,
>     XkbKeyTypePtr	/* into */,
>     int			/* num_types */
> );
> 
>+_X_EXPORT
> extern	Status	XkbResizeKeyType(
>     XkbDescPtr		/* xkb */,
>     int			/* type_ndx */,
>@@ -938,18 +1028,21 @@ extern	Status	XkbResizeKeyType(
>     int			/* new_num_lvls */
> );
> 
>+_X_EXPORT
> extern	KeySym *XkbResizeKeySyms(
> 	XkbDescPtr		/* desc */,
> 	int 			/* forKey */,
> 	int 			/* symsNeeded */
> );
> 
>+_X_EXPORT
> extern	XkbAction *XkbResizeKeyActions(
> 	XkbDescPtr		/* desc */,
> 	int 			/* forKey */,
> 	int 			/* actsNeeded */
> );
> 
>+_X_EXPORT
> extern	Status XkbChangeTypesOfKey(
> 	XkbDescPtr		/* xkb */,
> 	int 			/* key */,
>@@ -959,6 +1052,7 @@ extern	Status XkbChangeTypesOfKey(
> 	XkbMapChangesPtr	/* pChanges */
> );
> 
>+_X_EXPORT
> extern  Status   XkbChangeKeycodeRange(
> 	XkbDescPtr		/* xkb */,
> 	int			/* minKC */,
>@@ -968,6 +1062,7 @@ extern  Status   XkbChangeKeycodeRange(
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> extern	XkbComponentListPtr	XkbListComponents(
> 	Display *		/* dpy */,
> 	unsigned int		/* deviceSpec */,
>@@ -975,16 +1070,19 @@ extern	XkbComponentListPtr	XkbListComponents(
> 	int *			/* max_inout */
> );
> 
>+_X_EXPORT
> extern	void XkbFreeComponentList(
> 	XkbComponentListPtr	/* list */
> );
> 
>+_X_EXPORT
> extern	XkbDescPtr XkbGetKeyboard(
> 	Display *		/* dpy */,
> 	unsigned int 		/* which */,
> 	unsigned int 		/* deviceSpec */
> );
> 
>+_X_EXPORT
> extern XkbDescPtr XkbGetKeyboardByName(
>     Display *			/* dpy */,
>     unsigned int		/* deviceSpec */,
>@@ -996,6 +1094,7 @@ extern XkbDescPtr XkbGetKeyboardByName(
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> extern	int	XkbKeyTypesForCoreSymbols(	/* returns # of groups */
>     XkbDescPtr	/* xkb */,			/* keyboard device */
>     int		/* map_width */,		/* width of core KeySym array */
>@@ -1005,12 +1104,14 @@ extern	int	XkbKeyTypesForCoreSymbols(	/* returns # of groups */
>     KeySym * 	/* xkb_syms_rtrn */		/* must have enough space */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbApplyCompatMapToKey(	/* False only on error */
>     XkbDescPtr		/* xkb */,		/* keymap to be edited */
>     KeyCode		/* key */,		/* key to be updated */
>     XkbChangesPtr	/* changes */		/* resulting changes to map */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbUpdateMapFromCore( /* False only on error */
>     XkbDescPtr		/* xkb */,		/* XKB keyboard to be edited */
>     KeyCode		/* first_key */,	/* first changed key */
>@@ -1022,35 +1123,41 @@ extern	Bool	XkbUpdateMapFromCore( /* False only on error */
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> extern	XkbDeviceLedInfoPtr	XkbAddDeviceLedInfo(
> 	XkbDeviceInfoPtr	/* devi */,
> 	unsigned int		/* ledClass */,
> 	unsigned int		/* ledId */
> );
> 
>+_X_EXPORT
> extern	Status			XkbResizeDeviceButtonActions(
> 	XkbDeviceInfoPtr	/* devi */,
> 	unsigned int		/* newTotal */
> );
> 
>+_X_EXPORT
> extern	XkbDeviceInfoPtr	XkbAllocDeviceInfo(
> 	unsigned int		/* deviceSpec */,
> 	unsigned int		/* nButtons */,
> 	unsigned int		/* szLeds */
> );
> 
>+_X_EXPORT
> extern	void XkbFreeDeviceInfo(
> 	XkbDeviceInfoPtr	/* devi */,
> 	unsigned int		/* which */,
> 	Bool			/* freeDevI */
> );
> 
>+_X_EXPORT
> extern	void	XkbNoteDeviceChanges(
>     XkbDeviceChangesPtr			/* old */,
>     XkbExtensionDeviceNotifyEvent *	/* new */,
>     unsigned int	 		/* wanted */
> );
> 
>+_X_EXPORT
> extern	XkbDeviceInfoPtr XkbGetDeviceInfo(
> 	Display *		/* dpy */,
> 	unsigned int 		/* which */,
>@@ -1059,12 +1166,14 @@ extern	XkbDeviceInfoPtr XkbGetDeviceInfo(
> 	unsigned int		/* ledID */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetDeviceInfoChanges(
> 	Display *		/* dpy */,
> 	XkbDeviceInfoPtr	/* devi */,
> 	XkbDeviceChangesPtr 	/* changes */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetDeviceButtonActions(
> 	Display *		/* dpy */,
> 	XkbDeviceInfoPtr	/* devi */,
>@@ -1073,6 +1182,7 @@ extern	Status	XkbGetDeviceButtonActions(
> 	unsigned int		/* nBtns */
> );
> 
>+_X_EXPORT
> extern	Status	XkbGetDeviceLedInfo(
> 	Display *		/* dpy */,
> 	XkbDeviceInfoPtr	/* devi */,
>@@ -1081,18 +1191,21 @@ extern	Status	XkbGetDeviceLedInfo(
> 	unsigned int		/* which (XkbXI_Indicator{Names,Map}Mask */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbSetDeviceInfo(
> 	Display *		/* dpy */,
> 	unsigned int		/* which */,
> 	XkbDeviceInfoPtr	/* devi */
> );
> 
>+_X_EXPORT
> extern	Bool	XkbChangeDeviceInfo(
> 	Display*		/* dpy */,
> 	XkbDeviceInfoPtr	/* desc */,
> 	XkbDeviceChangesPtr	/* changes */
> );
> 
>+_X_EXPORT
> extern  Bool XkbSetDeviceLedInfo(
> 	Display *		/* dpy */,
> 	XkbDeviceInfoPtr	/* devi */,
>@@ -1101,6 +1214,7 @@ extern  Bool XkbSetDeviceLedInfo(
> 	unsigned int		/* which */
> );
> 
>+_X_EXPORT
> extern	Bool XkbSetDeviceButtonActions(
> 	Display *		/* dpy */,
> 	XkbDeviceInfoPtr	/* devi */,
>@@ -1110,12 +1224,14 @@ extern	Bool XkbSetDeviceButtonActions(
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> extern	char	XkbToControl(
> 	char		/* c */
> );
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> extern	Bool XkbSetDebuggingFlags(
>     Display *		/* dpy */,
>     unsigned int	/* mask */,
>@@ -1127,18 +1243,21 @@ extern	Bool XkbSetDebuggingFlags(
>     unsigned int *	/* rtrn_ctrls */
> );
> 
>+_X_EXPORT
> extern	Bool XkbApplyVirtualModChanges(
>    XkbDescPtr		/* xkb */,
>    unsigned int		/* changed */,
>    XkbChangesPtr	/* changes */
> );
> 
>+_X_EXPORT
> extern Bool XkbUpdateActionVirtualMods(
> 	XkbDescPtr		/* xkb */,
> 	XkbAction *		/* act */,
> 	unsigned int		/* changed */
> );
> 
>+_X_EXPORT
> extern void XkbUpdateKeyTypeVirtualMods(
> 	XkbDescPtr		/* xkb */,
> 	XkbKeyTypePtr		/* type */,
>diff --git a/include/X11/Xcms.h b/include/X11/Xcms.h
>index 779bc52..d380256 100644
>--- a/include/X11/Xcms.h
>+++ b/include/X11/Xcms.h
>@@ -336,14 +336,17 @@ typedef struct _XcmsFunctionSet {
> 
> _XFUNCPROTOBEGIN
> 
>+_X_EXPORT
> extern Status XcmsAddColorSpace (
>     XcmsColorSpace*	/* pColorSpace */
> );
> 
>+_X_EXPORT
> extern Status XcmsAddFunctionSet (
>     XcmsFunctionSet*	/* functionSet */
> );
> 
>+_X_EXPORT
> extern Status XcmsAllocColor (
>     Display*		/* dpy */,
>     Colormap		/* colormap */,
>@@ -351,6 +354,7 @@ extern Status XcmsAllocColor (
>     XcmsColorFormat		/* result_format */
> );
> 
>+_X_EXPORT
> extern Status XcmsAllocNamedColor (
>     Display*		/* dpy */,
>     Colormap		/* colormap */,
>@@ -360,11 +364,13 @@ extern Status XcmsAllocNamedColor (
>     XcmsColorFormat		/* result_format */
> );
> 
>+_X_EXPORT
> extern XcmsCCC XcmsCCCOfColormap (
>     Display*		/* dpy */,
>     Colormap		/* colormap */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELabClipab(
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors_in_out */,
>@@ -373,6 +379,7 @@ extern Status XcmsCIELabClipab(
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELabClipL(
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors_in_out */,
>@@ -381,6 +388,7 @@ extern Status XcmsCIELabClipL(
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELabClipLab(
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors_in_out */,
>@@ -389,6 +397,7 @@ extern Status XcmsCIELabClipLab(
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELabQueryMaxC (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue_angle */,
>@@ -396,6 +405,7 @@ extern Status XcmsCIELabQueryMaxC (
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELabQueryMaxL (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue_angle */,
>@@ -403,12 +413,14 @@ extern Status XcmsCIELabQueryMaxL (
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELabQueryMaxLC (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue_angle */,
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELabQueryMinL (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue_angle */,
>@@ -416,6 +428,7 @@ extern Status XcmsCIELabQueryMinL (
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELabToCIEXYZ (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* white_point */,
>@@ -423,6 +436,7 @@ extern Status XcmsCIELabToCIEXYZ (
>     unsigned int	/* ncolors */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELabWhiteShiftColors(
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* initial_white_point*/,
>@@ -433,6 +447,7 @@ extern Status XcmsCIELabWhiteShiftColors(
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELuvClipL(
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors_in_out */,
>@@ -441,6 +456,7 @@ extern Status XcmsCIELuvClipL(
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELuvClipLuv(
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors_in_out */,
>@@ -449,6 +465,7 @@ extern Status XcmsCIELuvClipLuv(
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELuvClipuv(
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors_in_out */,
>@@ -457,6 +474,7 @@ extern Status XcmsCIELuvClipuv(
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELuvQueryMaxC (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue_angle */,
>@@ -464,6 +482,7 @@ extern Status XcmsCIELuvQueryMaxC (
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELuvQueryMaxL (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue_angle */,
>@@ -471,12 +490,14 @@ extern Status XcmsCIELuvQueryMaxL (
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELuvQueryMaxLC (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue_angle */,
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELuvQueryMinL (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue_angle */,
>@@ -484,6 +505,7 @@ extern Status XcmsCIELuvQueryMinL (
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELuvToCIEuvY (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* white_point */,
>@@ -491,6 +513,7 @@ extern Status XcmsCIELuvToCIEuvY (
>     unsigned int	/* ncolors */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIELuvWhiteShiftColors(
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* initial_white_point*/,
>@@ -501,6 +524,7 @@ extern Status XcmsCIELuvWhiteShiftColors(
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIEXYZToCIELab (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* white_point */,
>@@ -508,6 +532,7 @@ extern Status XcmsCIEXYZToCIELab (
>     unsigned int	/* ncolors */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIEXYZToCIEuvY (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* white_point */,
>@@ -515,6 +540,7 @@ extern Status XcmsCIEXYZToCIEuvY (
>     unsigned int	/* ncolors */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIEXYZToCIExyY (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* white_point */,
>@@ -522,6 +548,7 @@ extern Status XcmsCIEXYZToCIExyY (
>     unsigned int	/* ncolors */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIEXYZToRGBi (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors */,
>@@ -529,6 +556,7 @@ extern Status XcmsCIEXYZToRGBi (
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIEuvYToCIELuv (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* white_point */,
>@@ -536,6 +564,7 @@ extern Status XcmsCIEuvYToCIELuv (
>     unsigned int	/* ncolors */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIEuvYToCIEXYZ (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* white_point */,
>@@ -543,6 +572,7 @@ extern Status XcmsCIEuvYToCIEXYZ (
>     unsigned int	/* ncolors */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIEuvYToTekHVC (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* white_point */,
>@@ -550,6 +580,7 @@ extern Status XcmsCIEuvYToTekHVC (
>     unsigned int	/* ncolors */
> );
> 
>+_X_EXPORT
> extern Status XcmsCIExyYToCIEXYZ (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* white_point */,
>@@ -557,10 +588,12 @@ extern Status XcmsCIExyYToCIEXYZ (
>     unsigned int	/* ncolors */
> );
> 
>+_X_EXPORT
> extern XcmsColor *XcmsClientWhitePointOfCCC (
>     XcmsCCC		/* ccc */
> );
> 
>+_X_EXPORT
> extern Status XcmsConvertColors (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colorArry_in_out */,
>@@ -569,6 +602,7 @@ extern Status XcmsConvertColors (
>     Bool*		/* compArry_return */
> );
> 
>+_X_EXPORT
> extern XcmsCCC XcmsCreateCCC (
>     Display*		/* dpy */,
>     int			/* screenNumber */,
>@@ -580,23 +614,28 @@ extern XcmsCCC XcmsCreateCCC (
>     XPointer		/* whitePtAdjClientData */
> );
> 
>+_X_EXPORT
> extern XcmsCCC XcmsDefaultCCC (
>     Display*		/* dpy */,
>     int			/* screenNumber */
> );
> 
>+_X_EXPORT
> extern Display *XcmsDisplayOfCCC (
>     XcmsCCC		/* ccc */
> );
> 
>+_X_EXPORT
> extern XcmsColorFormat XcmsFormatOfPrefix (
>     char*		/* prefix */
> );
> 
>+_X_EXPORT
> extern void XcmsFreeCCC (
>     XcmsCCC		/* ccc */
> );
> 
>+_X_EXPORT
> extern Status XcmsLookupColor (
>     Display*		/* dpy */,
>     Colormap		/* colormap */,
>@@ -606,22 +645,26 @@ extern Status XcmsLookupColor (
>     XcmsColorFormat		/* result_format */
> );
> 
>+_X_EXPORT
> extern char *XcmsPrefixOfFormat (
>     XcmsColorFormat		/* id */
> );
> 
>+_X_EXPORT
> extern Status XcmsQueryBlack (
>     XcmsCCC		/* ccc */,
>     XcmsColorFormat	/* target_format */,
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsQueryBlue (
>     XcmsCCC		/* ccc */,
>     XcmsColorFormat	/* target_format */,
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsQueryColor (
>     Display*		/* dpy */,
>     Colormap		/* colormap */,
>@@ -629,6 +672,7 @@ extern Status XcmsQueryColor (
>     XcmsColorFormat		/* result_format */
> );
> 
>+_X_EXPORT
> extern Status XcmsQueryColors (
>     Display*		/* dpy */,
>     Colormap		/* colormap */,
>@@ -637,24 +681,28 @@ extern Status XcmsQueryColors (
>     XcmsColorFormat	/* result_format */
> );
> 
>+_X_EXPORT
> extern Status XcmsQueryGreen (
>     XcmsCCC		/* ccc */,
>     XcmsColorFormat	/* target_format */,
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsQueryRed (
>     XcmsCCC		/* ccc */,
>     XcmsColorFormat	/* target_format */,
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsQueryWhite (
>     XcmsCCC		/* ccc */,
>     XcmsColorFormat	/* target_format */,
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsRGBiToCIEXYZ (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors */,
>@@ -662,6 +710,7 @@ extern Status XcmsRGBiToCIEXYZ (
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsRGBiToRGB (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors */,
>@@ -669,6 +718,7 @@ extern Status XcmsRGBiToRGB (
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsRGBToRGBi (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors */,
>@@ -676,43 +726,51 @@ extern Status XcmsRGBToRGBi (
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern int XcmsScreenNumberOfCCC (
>     XcmsCCC		/* ccc */
> );
> 
>+_X_EXPORT
> extern XcmsColor *XcmsScreenWhitePointOfCCC (
>     XcmsCCC		/* ccc */
> );
> 
>+_X_EXPORT
> extern XcmsCCC XcmsSetCCCOfColormap(
>     Display*		/* dpy */,
>     Colormap		/* colormap */,
>     XcmsCCC		/* ccc */
> );
> 
>+_X_EXPORT
> extern XcmsCompressionProc XcmsSetCompressionProc (
>     XcmsCCC		/* ccc */,
>     XcmsCompressionProc	/* compression_proc */,
>     XPointer		/* client_data */
> );
> 
>+_X_EXPORT
> extern XcmsWhiteAdjustProc XcmsSetWhiteAdjustProc (
>     XcmsCCC		/* ccc */,
>     XcmsWhiteAdjustProc	/* white_adjust_proc */,
>     XPointer		/* client_data */
> );
> 
>+_X_EXPORT
> extern Status XcmsSetWhitePoint (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* color */
> );
> 
>+_X_EXPORT
> extern Status XcmsStoreColor (
>     Display*		/* dpy */,
>     Colormap		/* colormap */,
>     XcmsColor*		/* pColor_in */
> );
> 
>+_X_EXPORT
> extern Status XcmsStoreColors (
>     Display*		/* dpy */,
>     Colormap		/* colormap */,
>@@ -721,6 +779,7 @@ extern Status XcmsStoreColors (
>     Bool*		/* compArry_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsTekHVCClipC(
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors_in_out */,
>@@ -729,6 +788,7 @@ extern Status XcmsTekHVCClipC(
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsTekHVCClipV(
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors_in_out */,
>@@ -737,6 +797,7 @@ extern Status XcmsTekHVCClipV(
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsTekHVCClipVC(
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* colors_in_out */,
>@@ -745,6 +806,7 @@ extern Status XcmsTekHVCClipVC(
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsTekHVCQueryMaxC (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue */,
>@@ -752,6 +814,7 @@ extern Status XcmsTekHVCQueryMaxC (
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsTekHVCQueryMaxV (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue */,
>@@ -759,12 +822,14 @@ extern Status XcmsTekHVCQueryMaxV (
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsTekHVCQueryMaxVC (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue */,
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsTekHVCQueryMaxVSamples (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue */,
>@@ -772,6 +837,7 @@ extern Status XcmsTekHVCQueryMaxVSamples (
>     unsigned int	/* nsamples */
> );
> 
>+_X_EXPORT
> extern Status XcmsTekHVCQueryMinV (
>     XcmsCCC		/* ccc */,
>     XcmsFloat		/* hue */,
>@@ -779,6 +845,7 @@ extern Status XcmsTekHVCQueryMinV (
>     XcmsColor*		/* color_return */
> );
> 
>+_X_EXPORT
> extern Status XcmsTekHVCToCIEuvY (
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* white_point */,
>@@ -786,6 +853,7 @@ extern Status XcmsTekHVCToCIEuvY (
>     unsigned int	/* ncolors */
> );
> 
>+_X_EXPORT
> extern Status XcmsTekHVCWhiteShiftColors(
>     XcmsCCC		/* ccc */,
>     XcmsColor*		/* initial_white_point*/,
>@@ -796,6 +864,7 @@ extern Status XcmsTekHVCWhiteShiftColors(
>     Bool*		/* compression_flags_return */
> );
> 
>+_X_EXPORT
> extern Visual *XcmsVisualOfCCC (
>     XcmsCCC		/* ccc */
> );
>diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h
>index a26789b..9635dd9 100644
>--- a/include/X11/Xlib.h
>+++ b/include/X11/Xlib.h
>@@ -90,6 +90,7 @@ typedef unsigned long wchar_t;
> #endif
> #endif
> 
>+_X_EXPORT
> extern int
> _Xmblen(
> #ifdef ISC
>@@ -1392,19 +1393,22 @@ _XFUNCPROTOBEGIN
> #define _Xdebug (*_Xdebug_p)
> #endif
> 
>+_X_EXPORT
> extern int _Xdebug;
> 
>+_X_EXPORT
> extern XFontStruct *XLoadQueryFont(
>     Display*		/* display */,
>     _Xconst char*	/* name */
> );
> 
>+_X_EXPORT
> extern XFontStruct *XQueryFont(
>     Display*		/* display */,
>     XID			/* font_ID */
> );
> 
>-
>+_X_EXPORT
> extern XTimeCoord *XGetMotionEvents(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -1413,6 +1417,7 @@ extern XTimeCoord *XGetMotionEvents(
>     int*		/* nevents_return */
> );
> 
>+_X_EXPORT
> extern XModifierKeymap *XDeleteModifiermapEntry(
>     XModifierKeymap*	/* modmap */,
> #if NeedWidePrototypes
>@@ -1423,10 +1428,12 @@ extern XModifierKeymap *XDeleteModifiermapEntry(
>     int			/* modifier */
> );
> 
>+_X_EXPORT
> extern XModifierKeymap	*XGetModifierMapping(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern XModifierKeymap	*XInsertModifiermapEntry(
>     XModifierKeymap*	/* modmap */,
> #if NeedWidePrototypes
>@@ -1437,10 +1444,12 @@ extern XModifierKeymap	*XInsertModifiermapEntry(
>     int			/* modifier */    
> );
> 
>+_X_EXPORT
> extern XModifierKeymap *XNewModifiermap(
>     int			/* max_keys_per_mod */
> );
> 
>+_X_EXPORT
> extern XImage *XCreateImage(
>     Display*		/* display */,
>     Visual*		/* visual */,
>@@ -1453,9 +1462,13 @@ extern XImage *XCreateImage(
>     int			/* bitmap_pad */,
>     int			/* bytes_per_line */
> );
>+
>+_X_EXPORT
> extern Status XInitImage(
>     XImage*		/* image */
> );
>+
>+_X_EXPORT
> extern XImage *XGetImage(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -1466,6 +1479,8 @@ extern XImage *XGetImage(
>     unsigned long	/* plane_mask */,
>     int			/* format */
> );
>+
>+_X_EXPORT
> extern XImage *XGetSubImage(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -1483,51 +1498,69 @@ extern XImage *XGetSubImage(
> /* 
>  * X function declarations.
>  */
>+_X_EXPORT
> extern Display *XOpenDisplay(
>     _Xconst char*	/* display_name */
> );
> 
>+_X_EXPORT
> extern void XrmInitialize(
>     void
> );
> 
>+_X_EXPORT
> extern char *XFetchBytes(
>     Display*		/* display */,
>     int*		/* nbytes_return */
> );
>+
>+_X_EXPORT
> extern char *XFetchBuffer(
>     Display*		/* display */,
>     int*		/* nbytes_return */,
>     int			/* buffer */
> );
>+
>+_X_EXPORT
> extern char *XGetAtomName(
>     Display*		/* display */,
>     Atom		/* atom */
> );
>+
>+_X_EXPORT
> extern Status XGetAtomNames(
>     Display*		/* dpy */,
>     Atom*		/* atoms */,
>     int			/* count */,
>     char**		/* names_return */
> );
>+
>+_X_EXPORT
> extern char *XGetDefault(
>     Display*		/* display */,
>     _Xconst char*	/* program */,
>     _Xconst char*	/* option */		  
> );
>+
>+_X_EXPORT
> extern char *XDisplayName(
>     _Xconst char*	/* string */
> );
>+
>+_X_EXPORT
> extern char *XKeysymToString(
>     KeySym		/* keysym */
> );
> 
>+_X_EXPORT
> extern int (*XSynchronize(
>     Display*		/* display */,
>     Bool		/* onoff */
> ))(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern int (*XSetAfterFunction(
>     Display*		/* display */,
>     int (*) (
>@@ -1536,11 +1569,15 @@ extern int (*XSetAfterFunction(
> ))(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern Atom XInternAtom(
>     Display*		/* display */,
>     _Xconst char*	/* atom_name */,
>     Bool		/* only_if_exists */		 
> );
>+
>+_X_EXPORT
> extern Status XInternAtoms(
>     Display*		/* dpy */,
>     char**		/* names */,
>@@ -1548,16 +1585,22 @@ extern Status XInternAtoms(
>     Bool		/* onlyIfExists */,
>     Atom*		/* atoms_return */
> );
>+
>+_X_EXPORT
> extern Colormap XCopyColormapAndFree(
>     Display*		/* display */,
>     Colormap		/* colormap */
> );
>+
>+_X_EXPORT
> extern Colormap XCreateColormap(
>     Display*		/* display */,
>     Window		/* w */,
>     Visual*		/* visual */,
>     int			/* alloc */			 
> );
>+
>+_X_EXPORT
> extern Cursor XCreatePixmapCursor(
>     Display*		/* display */,
>     Pixmap		/* source */,
>@@ -1567,6 +1610,8 @@ extern Cursor XCreatePixmapCursor(
>     unsigned int	/* x */,
>     unsigned int	/* y */			   
> );
>+
>+_X_EXPORT
> extern Cursor XCreateGlyphCursor(
>     Display*		/* display */,
>     Font		/* source_font */,
>@@ -1576,27 +1621,39 @@ extern Cursor XCreateGlyphCursor(
>     XColor _Xconst *	/* foreground_color */,
>     XColor _Xconst *	/* background_color */
> );
>+
>+_X_EXPORT
> extern Cursor XCreateFontCursor(
>     Display*		/* display */,
>     unsigned int	/* shape */
> );
>+
>+_X_EXPORT
> extern Font XLoadFont(
>     Display*		/* display */,
>     _Xconst char*	/* name */
> );
>+
>+_X_EXPORT
> extern GC XCreateGC(
>     Display*		/* display */,
>     Drawable		/* d */,
>     unsigned long	/* valuemask */,
>     XGCValues*		/* values */
> );
>+
>+_X_EXPORT
> extern GContext XGContextFromGC(
>     GC			/* gc */
> );
>+
>+_X_EXPORT
> extern void XFlushGC(
>     Display*		/* display */,
>     GC			/* gc */
> );
>+
>+_X_EXPORT
> extern Pixmap XCreatePixmap(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -1604,6 +1661,8 @@ extern Pixmap XCreatePixmap(
>     unsigned int	/* height */,
>     unsigned int	/* depth */		        
> );
>+
>+_X_EXPORT
> extern Pixmap XCreateBitmapFromData(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -1611,6 +1670,8 @@ extern Pixmap XCreateBitmapFromData(
>     unsigned int	/* width */,
>     unsigned int	/* height */
> );
>+
>+_X_EXPORT
> extern Pixmap XCreatePixmapFromBitmapData(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -1621,6 +1682,8 @@ extern Pixmap XCreatePixmapFromBitmapData(
>     unsigned long	/* bg */,
>     unsigned int	/* depth */
> );
>+
>+_X_EXPORT
> extern Window XCreateSimpleWindow(
>     Display*		/* display */,
>     Window		/* parent */,
>@@ -1632,10 +1695,14 @@ extern Window XCreateSimpleWindow(
>     unsigned long	/* border */,
>     unsigned long	/* background */
> );
>+
>+_X_EXPORT
> extern Window XGetSelectionOwner(
>     Display*		/* display */,
>     Atom		/* selection */
> );
>+
>+_X_EXPORT
> extern Window XCreateWindow(
>     Display*		/* display */,
>     Window		/* parent */,
>@@ -1650,17 +1717,23 @@ extern Window XCreateWindow(
>     unsigned long	/* valuemask */,
>     XSetWindowAttributes*	/* attributes */
> ); 
>+
>+_X_EXPORT
> extern Colormap *XListInstalledColormaps(
>     Display*		/* display */,
>     Window		/* w */,
>     int*		/* num_return */
> );
>+
>+_X_EXPORT
> extern char **XListFonts(
>     Display*		/* display */,
>     _Xconst char*	/* pattern */,
>     int			/* maxnames */,
>     int*		/* actual_count_return */
> );
>+
>+_X_EXPORT
> extern char **XListFontsWithInfo(
>     Display*		/* display */,
>     _Xconst char*	/* pattern */,
>@@ -1668,24 +1741,34 @@ extern char **XListFontsWithInfo(
>     int*		/* count_return */,
>     XFontStruct**	/* info_return */
> );
>+
>+_X_EXPORT
> extern char **XGetFontPath(
>     Display*		/* display */,
>     int*		/* npaths_return */
> );
>+
>+_X_EXPORT
> extern char **XListExtensions(
>     Display*		/* display */,
>     int*		/* nextensions_return */
> );
>+
>+_X_EXPORT
> extern Atom *XListProperties(
>     Display*		/* display */,
>     Window		/* w */,
>     int*		/* num_prop_return */
> );
>+
>+_X_EXPORT
> extern XHostAddress *XListHosts(
>     Display*		/* display */,
>     int*		/* nhosts_return */,
>     Bool*		/* state_return */
> );
>+
>+_X_EXPORT
> extern KeySym XKeycodeToKeysym(
>     Display*		/* display */,
> #if NeedWidePrototypes
>@@ -1695,10 +1778,14 @@ extern KeySym XKeycodeToKeysym(
> #endif
>     int			/* index */
> );
>+
>+_X_EXPORT
> extern KeySym XLookupKeysym(
>     XKeyEvent*		/* key_event */,
>     int			/* index */
> );
>+
>+_X_EXPORT
> extern KeySym *XGetKeyboardMapping(
>     Display*		/* display */,
> #if NeedWidePrototypes
>@@ -1709,135 +1796,203 @@ extern KeySym *XGetKeyboardMapping(
>     int			/* keycode_count */,
>     int*		/* keysyms_per_keycode_return */
> );
>+
>+_X_EXPORT
> extern KeySym XStringToKeysym(
>     _Xconst char*	/* string */
> );
>+
>+_X_EXPORT
> extern long XMaxRequestSize(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern long XExtendedMaxRequestSize(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern char *XResourceManagerString(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern char *XScreenResourceString(
> 	Screen*		/* screen */
> );
>+
>+_X_EXPORT
> extern unsigned long XDisplayMotionBufferSize(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern VisualID XVisualIDFromVisual(
>     Visual*		/* visual */
> );
> 
> /* multithread routines */
> 
>+_X_EXPORT
> extern Status XInitThreads(
>     void
> );
> 
>+_X_EXPORT
> extern void XLockDisplay(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern void XUnlockDisplay(
>     Display*		/* display */
> );
> 
> /* routines for dealing with extensions */
> 
>+_X_EXPORT
> extern XExtCodes *XInitExtension(
>     Display*		/* display */,
>     _Xconst char*	/* name */
> );
> 
>+_X_EXPORT
> extern XExtCodes *XAddExtension(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern XExtData *XFindOnExtensionList(
>     XExtData**		/* structure */,
>     int			/* number */
> );
>+
>+_X_EXPORT
> extern XExtData **XEHeadOfExtensionList(
>     XEDataObject	/* object */
> );
> 
> /* these are routines for which there are also macros */
>+_X_EXPORT
> extern Window XRootWindow(
>     Display*		/* display */,
>     int			/* screen_number */
> );
>+
>+_X_EXPORT
> extern Window XDefaultRootWindow(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern Window XRootWindowOfScreen(
>     Screen*		/* screen */
> );
>+
>+_X_EXPORT
> extern Visual *XDefaultVisual(
>     Display*		/* display */,
>     int			/* screen_number */
> );
>+
>+_X_EXPORT
> extern Visual *XDefaultVisualOfScreen(
>     Screen*		/* screen */
> );
>+
>+_X_EXPORT
> extern GC XDefaultGC(
>     Display*		/* display */,
>     int			/* screen_number */
> );
>+
>+_X_EXPORT
> extern GC XDefaultGCOfScreen(
>     Screen*		/* screen */
> );
>+
>+_X_EXPORT
> extern unsigned long XBlackPixel(
>     Display*		/* display */,
>     int			/* screen_number */
> );
>+
>+_X_EXPORT
> extern unsigned long XWhitePixel(
>     Display*		/* display */,
>     int			/* screen_number */
> );
>+
>+_X_EXPORT
> extern unsigned long XAllPlanes(
>     void
> );
>+
>+_X_EXPORT
> extern unsigned long XBlackPixelOfScreen(
>     Screen*		/* screen */
> );
>+
>+_X_EXPORT
> extern unsigned long XWhitePixelOfScreen(
>     Screen*		/* screen */
> );
>+
>+_X_EXPORT
> extern unsigned long XNextRequest(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern unsigned long XLastKnownRequestProcessed(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern char *XServerVendor(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern char *XDisplayString(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern Colormap XDefaultColormap(
>     Display*		/* display */,
>     int			/* screen_number */
> );
>+
>+_X_EXPORT
> extern Colormap XDefaultColormapOfScreen(
>     Screen*		/* screen */
> );
>+
>+_X_EXPORT
> extern Display *XDisplayOfScreen(
>     Screen*		/* screen */
> );
>+
>+_X_EXPORT
> extern Screen *XScreenOfDisplay(
>     Display*		/* display */,
>     int			/* screen_number */
> );
>+
>+_X_EXPORT
> extern Screen *XDefaultScreenOfDisplay(
>     Display*		/* display */
> );
>+
>+_X_EXPORT
> extern long XEventMaskOfScreen(
>     Screen*		/* screen */
> );
> 
>+
>+_X_EXPORT
> extern int XScreenNumberOfScreen(
>     Screen*		/* screen */
> );
>@@ -1847,6 +2002,7 @@ typedef int (*XErrorHandler) (	    /* WARNING, this type not in Xlib spec */
>     XErrorEvent*	/* error_event */
> );
> 
>+_X_EXPORT
> extern XErrorHandler XSetErrorHandler (
>     XErrorHandler	/* handler */
> );
>@@ -1856,15 +2012,18 @@ typedef int (*XIOErrorHandler) (    /* WARNING, this type not in Xlib spec */
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern XIOErrorHandler XSetIOErrorHandler (
>     XIOErrorHandler	/* handler */
> );
> 
>-
>+_X_EXPORT
> extern XPixmapFormatValues *XListPixmapFormats(
>     Display*		/* display */,
>     int*		/* count_return */
> );
>+
>+_X_EXPORT
> extern int *XListDepths(
>     Display*		/* display */,
>     int			/* screen_number */,
>@@ -1873,6 +2032,8 @@ extern int *XListDepths(
> 
> /* ICCCM routines for things that don't require special include files; */
> /* other declarations are given in Xutil.h                             */
>+
>+_X_EXPORT
> extern Status XReconfigureWMWindow(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -1881,49 +2042,66 @@ extern Status XReconfigureWMWindow(
>     XWindowChanges*	/* changes */
> );
> 
>+_X_EXPORT
> extern Status XGetWMProtocols(
>     Display*		/* display */,
>     Window		/* w */,
>     Atom**		/* protocols_return */,
>     int*		/* count_return */
> );
>+
>+_X_EXPORT
> extern Status XSetWMProtocols(
>     Display*		/* display */,
>     Window		/* w */,
>     Atom*		/* protocols */,
>     int			/* count */
> );
>+
>+_X_EXPORT
> extern Status XIconifyWindow(
>     Display*		/* display */,
>     Window		/* w */,
>     int			/* screen_number */
> );
>+
>+_X_EXPORT
> extern Status XWithdrawWindow(
>     Display*		/* display */,
>     Window		/* w */,
>     int			/* screen_number */
> );
>+
>+_X_EXPORT
> extern Status XGetCommand(
>     Display*		/* display */,
>     Window		/* w */,
>     char***		/* argv_return */,
>     int*		/* argc_return */
> );
>+
>+_X_EXPORT
> extern Status XGetWMColormapWindows(
>     Display*		/* display */,
>     Window		/* w */,
>     Window**		/* windows_return */,
>     int*		/* count_return */
> );
>+
>+_X_EXPORT
> extern Status XSetWMColormapWindows(
>     Display*		/* display */,
>     Window		/* w */,
>     Window*		/* colormap_windows */,
>     int			/* count */
> );
>+
>+_X_EXPORT
> extern void XFreeStringList(
>     char**		/* list */
> );
>+
>+_X_EXPORT
> extern int XSetTransientForHint(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -1932,37 +2110,44 @@ extern int XSetTransientForHint(
> 
> /* The following are given in alphabetical order */
> 
>+_X_EXPORT
> extern int XActivateScreenSaver(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XAddHost(
>     Display*		/* display */,
>     XHostAddress*	/* host */
> );
> 
>+_X_EXPORT
> extern int XAddHosts(
>     Display*		/* display */,
>     XHostAddress*	/* hosts */,
>     int			/* num_hosts */    
> );
> 
>+_X_EXPORT
> extern int XAddToExtensionList(
>     struct _XExtData**	/* structure */,
>     XExtData*		/* ext_data */
> );
> 
>+_X_EXPORT
> extern int XAddToSaveSet(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern Status XAllocColor(
>     Display*		/* display */,
>     Colormap		/* colormap */,
>     XColor*		/* screen_in_out */
> );
> 
>+_X_EXPORT
> extern Status XAllocColorCells(
>     Display*		/* display */,
>     Colormap		/* colormap */,
>@@ -1973,6 +2158,7 @@ extern Status XAllocColorCells(
>     unsigned int 	/* npixels */
> );
> 
>+_X_EXPORT
> extern Status XAllocColorPlanes(
>     Display*		/* display */,
>     Colormap		/* colormap */,
>@@ -1987,6 +2173,7 @@ extern Status XAllocColorPlanes(
>     unsigned long*	/* bmask_return */
> );
> 
>+_X_EXPORT
> extern Status XAllocNamedColor(
>     Display*		/* display */,
>     Colormap		/* colormap */,
>@@ -1995,41 +2182,50 @@ extern Status XAllocNamedColor(
>     XColor*		/* exact_def_return */
> );
> 
>+_X_EXPORT
> extern int XAllowEvents(
>     Display*		/* display */,
>     int			/* event_mode */,
>     Time		/* time */
> );
> 
>+_X_EXPORT
> extern int XAutoRepeatOff(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XAutoRepeatOn(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XBell(
>     Display*		/* display */,
>     int			/* percent */
> );
> 
>+_X_EXPORT
> extern int XBitmapBitOrder(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XBitmapPad(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XBitmapUnit(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XCellsOfScreen(
>     Screen*		/* screen */
> );
> 
>+_X_EXPORT
> extern int XChangeActivePointerGrab(
>     Display*		/* display */,
>     unsigned int	/* event_mask */,
>@@ -2037,6 +2233,7 @@ extern int XChangeActivePointerGrab(
>     Time		/* time */
> );
> 
>+_X_EXPORT
> extern int XChangeGC(
>     Display*		/* display */,
>     GC			/* gc */,
>@@ -2044,12 +2241,14 @@ extern int XChangeGC(
>     XGCValues*		/* values */
> );
> 
>+_X_EXPORT
> extern int XChangeKeyboardControl(
>     Display*		/* display */,
>     unsigned long	/* value_mask */,
>     XKeyboardControl*	/* values */
> );
> 
>+_X_EXPORT
> extern int XChangeKeyboardMapping(
>     Display*		/* display */,
>     int			/* first_keycode */,
>@@ -2058,6 +2257,7 @@ extern int XChangeKeyboardMapping(
>     int			/* num_codes */
> );
> 
>+_X_EXPORT
> extern int XChangePointerControl(
>     Display*		/* display */,
>     Bool		/* do_accel */,
>@@ -2067,6 +2267,7 @@ extern int XChangePointerControl(
>     int			/* threshold */
> );
> 
>+_X_EXPORT
> extern int XChangeProperty(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -2078,12 +2279,14 @@ extern int XChangeProperty(
>     int			/* nelements */
> );
> 
>+_X_EXPORT
> extern int XChangeSaveSet(
>     Display*		/* display */,
>     Window		/* w */,
>     int			/* change_mode */
> );
> 
>+_X_EXPORT
> extern int XChangeWindowAttributes(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -2091,6 +2294,7 @@ extern int XChangeWindowAttributes(
>     XSetWindowAttributes* /* attributes */
> );
> 
>+_X_EXPORT
> extern Bool XCheckIfEvent(
>     Display*		/* display */,
>     XEvent*		/* event_return */,
>@@ -2102,18 +2306,21 @@ extern Bool XCheckIfEvent(
>     XPointer		/* arg */
> );
> 
>+_X_EXPORT
> extern Bool XCheckMaskEvent(
>     Display*		/* display */,
>     long		/* event_mask */,
>     XEvent*		/* event_return */
> );
> 
>+_X_EXPORT
> extern Bool XCheckTypedEvent(
>     Display*		/* display */,
>     int			/* event_type */,
>     XEvent*		/* event_return */
> );
> 
>+_X_EXPORT
> extern Bool XCheckTypedWindowEvent(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -2121,6 +2328,7 @@ extern Bool XCheckTypedWindowEvent(
>     XEvent*		/* event_return */
> );
> 
>+_X_EXPORT
> extern Bool XCheckWindowEvent(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -2128,22 +2336,26 @@ extern Bool XCheckWindowEvent(
>     XEvent*		/* event_return */
> );
> 
>+_X_EXPORT
> extern int XCirculateSubwindows(
>     Display*		/* display */,
>     Window		/* w */,
>     int			/* direction */
> );
> 
>+_X_EXPORT
> extern int XCirculateSubwindowsDown(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XCirculateSubwindowsUp(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XClearArea(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -2154,15 +2366,18 @@ extern int XClearArea(
>     Bool		/* exposures */
> );
> 
>+_X_EXPORT
> extern int XClearWindow(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XCloseDisplay(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XConfigureWindow(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -2170,10 +2385,12 @@ extern int XConfigureWindow(
>     XWindowChanges*	/* values */		 
> );
> 
>+_X_EXPORT
> extern int XConnectionNumber(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XConvertSelection(
>     Display*		/* display */,
>     Atom		/* selection */,
>@@ -2183,6 +2400,7 @@ extern int XConvertSelection(
>     Time		/* time */
> );
> 
>+_X_EXPORT
> extern int XCopyArea(
>     Display*		/* display */,
>     Drawable		/* src */,
>@@ -2196,6 +2414,7 @@ extern int XCopyArea(
>     int			/* dest_y */
> );
> 
>+_X_EXPORT
> extern int XCopyGC(
>     Display*		/* display */,
>     GC			/* src */,
>@@ -2203,6 +2422,7 @@ extern int XCopyGC(
>     GC			/* dest */
> );
> 
>+_X_EXPORT
> extern int XCopyPlane(
>     Display*		/* display */,
>     Drawable		/* src */,
>@@ -2217,90 +2437,107 @@ extern int XCopyPlane(
>     unsigned long	/* plane */
> );
> 
>+_X_EXPORT
> extern int XDefaultDepth(
>     Display*		/* display */,
>     int			/* screen_number */
> );
> 
>+_X_EXPORT
> extern int XDefaultDepthOfScreen(
>     Screen*		/* screen */
> );
> 
>+_X_EXPORT
> extern int XDefaultScreen(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XDefineCursor(
>     Display*		/* display */,
>     Window		/* w */,
>     Cursor		/* cursor */
> );
> 
>+_X_EXPORT
> extern int XDeleteProperty(
>     Display*		/* display */,
>     Window		/* w */,
>     Atom		/* property */
> );
> 
>+_X_EXPORT
> extern int XDestroyWindow(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XDestroySubwindows(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XDoesBackingStore(
>     Screen*		/* screen */    
> );
> 
>+_X_EXPORT
> extern Bool XDoesSaveUnders(
>     Screen*		/* screen */
> );
> 
>+_X_EXPORT
> extern int XDisableAccessControl(
>     Display*		/* display */
> );
> 
>-
>+_X_EXPORT
> extern int XDisplayCells(
>     Display*		/* display */,
>     int			/* screen_number */
> );
> 
>+_X_EXPORT
> extern int XDisplayHeight(
>     Display*		/* display */,
>     int			/* screen_number */
> );
> 
>+_X_EXPORT
> extern int XDisplayHeightMM(
>     Display*		/* display */,
>     int			/* screen_number */
> );
> 
>+_X_EXPORT
> extern int XDisplayKeycodes(
>     Display*		/* display */,
>     int*		/* min_keycodes_return */,
>     int*		/* max_keycodes_return */
> );
> 
>+_X_EXPORT
> extern int XDisplayPlanes(
>     Display*		/* display */,
>     int			/* screen_number */
> );
> 
>+_X_EXPORT
> extern int XDisplayWidth(
>     Display*		/* display */,
>     int			/* screen_number */
> );
> 
>+_X_EXPORT
> extern int XDisplayWidthMM(
>     Display*		/* display */,
>     int			/* screen_number */
> );
> 
>+_X_EXPORT
> extern int XDrawArc(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2313,6 +2550,7 @@ extern int XDrawArc(
>     int			/* angle2 */
> );
> 
>+_X_EXPORT
> extern int XDrawArcs(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2321,6 +2559,7 @@ extern int XDrawArcs(
>     int			/* narcs */
> );
> 
>+_X_EXPORT
> extern int XDrawImageString(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2331,6 +2570,7 @@ extern int XDrawImageString(
>     int			/* length */
> );
> 
>+_X_EXPORT
> extern int XDrawImageString16(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2341,6 +2581,7 @@ extern int XDrawImageString16(
>     int			/* length */
> );
> 
>+_X_EXPORT
> extern int XDrawLine(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2351,6 +2592,7 @@ extern int XDrawLine(
>     int			/* y2 */
> );
> 
>+_X_EXPORT
> extern int XDrawLines(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2360,6 +2602,7 @@ extern int XDrawLines(
>     int			/* mode */
> );
> 
>+_X_EXPORT
> extern int XDrawPoint(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2368,6 +2611,7 @@ extern int XDrawPoint(
>     int			/* y */
> );
> 
>+_X_EXPORT
> extern int XDrawPoints(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2377,6 +2621,7 @@ extern int XDrawPoints(
>     int			/* mode */
> );
> 
>+_X_EXPORT
> extern int XDrawRectangle(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2387,6 +2632,7 @@ extern int XDrawRectangle(
>     unsigned int	/* height */
> );
> 
>+_X_EXPORT
> extern int XDrawRectangles(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2395,6 +2641,7 @@ extern int XDrawRectangles(
>     int			/* nrectangles */
> );
> 
>+_X_EXPORT
> extern int XDrawSegments(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2403,6 +2650,7 @@ extern int XDrawSegments(
>     int			/* nsegments */
> );
> 
>+_X_EXPORT
> extern int XDrawString(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2413,6 +2661,7 @@ extern int XDrawString(
>     int			/* length */
> );
> 
>+_X_EXPORT
> extern int XDrawString16(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2423,6 +2672,7 @@ extern int XDrawString16(
>     int			/* length */
> );
> 
>+_X_EXPORT
> extern int XDrawText(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2433,6 +2683,7 @@ extern int XDrawText(
>     int			/* nitems */
> );
> 
>+_X_EXPORT
> extern int XDrawText16(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2443,21 +2694,25 @@ extern int XDrawText16(
>     int			/* nitems */
> );
> 
>+_X_EXPORT
> extern int XEnableAccessControl(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XEventsQueued(
>     Display*		/* display */,
>     int			/* mode */
> );
> 
>+_X_EXPORT
> extern Status XFetchName(
>     Display*		/* display */,
>     Window		/* w */,
>     char**		/* window_name_return */
> );
> 
>+_X_EXPORT
> extern int XFillArc(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2470,6 +2725,7 @@ extern int XFillArc(
>     int			/* angle2 */
> );
> 
>+_X_EXPORT
> extern int XFillArcs(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2478,6 +2734,7 @@ extern int XFillArcs(
>     int			/* narcs */
> );
> 
>+_X_EXPORT
> extern int XFillPolygon(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2488,6 +2745,7 @@ extern int XFillPolygon(
>     int			/* mode */
> );
> 
>+_X_EXPORT
> extern int XFillRectangle(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2498,6 +2756,7 @@ extern int XFillRectangle(
>     unsigned int	/* height */
> );
> 
>+_X_EXPORT
> extern int XFillRectangles(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2506,24 +2765,29 @@ extern int XFillRectangles(
>     int			/* nrectangles */
> );
> 
>+_X_EXPORT
> extern int XFlush(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XForceScreenSaver(
>     Display*		/* display */,
>     int			/* mode */
> );
> 
>+_X_EXPORT
> extern int XFree(
>     void*		/* data */
> );
> 
>+_X_EXPORT
> extern int XFreeColormap(
>     Display*		/* display */,
>     Colormap		/* colormap */
> );
> 
>+_X_EXPORT
> extern int XFreeColors(
>     Display*		/* display */,
>     Colormap		/* colormap */,
>@@ -2532,48 +2796,58 @@ extern int XFreeColors(
>     unsigned long	/* planes */
> );
> 
>+_X_EXPORT
> extern int XFreeCursor(
>     Display*		/* display */,
>     Cursor		/* cursor */
> );
> 
>+_X_EXPORT
> extern int XFreeExtensionList(
>     char**		/* list */    
> );
> 
>+_X_EXPORT
> extern int XFreeFont(
>     Display*		/* display */,
>     XFontStruct*	/* font_struct */
> );
> 
>+_X_EXPORT
> extern int XFreeFontInfo(
>     char**		/* names */,
>     XFontStruct*	/* free_info */,
>     int			/* actual_count */
> );
> 
>+_X_EXPORT
> extern int XFreeFontNames(
>     char**		/* list */
> );
> 
>+_X_EXPORT
> extern int XFreeFontPath(
>     char**		/* list */
> );
> 
>+_X_EXPORT
> extern int XFreeGC(
>     Display*		/* display */,
>     GC			/* gc */
> );
> 
>+_X_EXPORT
> extern int XFreeModifiermap(
>     XModifierKeymap*	/* modmap */
> );
> 
>+_X_EXPORT
> extern int XFreePixmap(
>     Display*		/* display */,
>     Pixmap		/* pixmap */
> );
> 
>+_X_EXPORT
> extern int XGeometry(
>     Display*		/* display */,
>     int			/* screen */,
>@@ -2590,6 +2864,7 @@ extern int XGeometry(
>     int*		/* height_return */
> );
> 
>+_X_EXPORT
> extern int XGetErrorDatabaseText(
>     Display*		/* display */,
>     _Xconst char*	/* name */,
>@@ -2599,6 +2874,7 @@ extern int XGetErrorDatabaseText(
>     int			/* length */
> );
> 
>+_X_EXPORT
> extern int XGetErrorText(
>     Display*		/* display */,
>     int			/* code */,
>@@ -2606,12 +2882,14 @@ extern int XGetErrorText(
>     int			/* length */
> );
> 
>+_X_EXPORT
> extern Bool XGetFontProperty(
>     XFontStruct*	/* font_struct */,
>     Atom		/* atom */,
>     unsigned long*	/* value_return */
> );
> 
>+_X_EXPORT
> extern Status XGetGCValues(
>     Display*		/* display */,
>     GC			/* gc */,
>@@ -2619,6 +2897,7 @@ extern Status XGetGCValues(
>     XGCValues*		/* values_return */
> );
> 
>+_X_EXPORT
> extern Status XGetGeometry(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2631,23 +2910,27 @@ extern Status XGetGeometry(
>     unsigned int*	/* depth_return */
> );
> 
>+_X_EXPORT
> extern Status XGetIconName(
>     Display*		/* display */,
>     Window		/* w */,
>     char**		/* icon_name_return */
> );
> 
>+_X_EXPORT
> extern int XGetInputFocus(
>     Display*		/* display */,
>     Window*		/* focus_return */,
>     int*		/* revert_to_return */
> );
> 
>+_X_EXPORT
> extern int XGetKeyboardControl(
>     Display*		/* display */,
>     XKeyboardState*	/* values_return */
> );
> 
>+_X_EXPORT
> extern int XGetPointerControl(
>     Display*		/* display */,
>     int*		/* accel_numerator_return */,
>@@ -2655,12 +2938,14 @@ extern int XGetPointerControl(
>     int*		/* threshold_return */
> );
> 
>+_X_EXPORT
> extern int XGetPointerMapping(
>     Display*		/* display */,
>     unsigned char*	/* map_return */,
>     int			/* nmap */
> );
> 
>+_X_EXPORT
> extern int XGetScreenSaver(
>     Display*		/* display */,
>     int*		/* timeout_return */,
>@@ -2669,12 +2954,14 @@ extern int XGetScreenSaver(
>     int*		/* allow_exposures_return */
> );
> 
>+_X_EXPORT
> extern Status XGetTransientForHint(
>     Display*		/* display */,
>     Window		/* w */,
>     Window*		/* prop_window_return */
> );
> 
>+_X_EXPORT
> extern int XGetWindowProperty(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -2690,12 +2977,14 @@ extern int XGetWindowProperty(
>     unsigned char**	/* prop_return */
> );
> 
>+_X_EXPORT
> extern Status XGetWindowAttributes(
>     Display*		/* display */,
>     Window		/* w */,
>     XWindowAttributes*	/* window_attributes_return */
> );
> 
>+_X_EXPORT
> extern int XGrabButton(
>     Display*		/* display */,
>     unsigned int	/* button */,
>@@ -2709,6 +2998,7 @@ extern int XGrabButton(
>     Cursor		/* cursor */
> );
> 
>+_X_EXPORT
> extern int XGrabKey(
>     Display*		/* display */,
>     int			/* keycode */,
>@@ -2719,6 +3009,7 @@ extern int XGrabKey(
>     int			/* keyboard_mode */
> );
> 
>+_X_EXPORT
> extern int XGrabKeyboard(
>     Display*		/* display */,
>     Window		/* grab_window */,
>@@ -2728,6 +3019,7 @@ extern int XGrabKeyboard(
>     Time		/* time */
> );
> 
>+_X_EXPORT
> extern int XGrabPointer(
>     Display*		/* display */,
>     Window		/* grab_window */,
>@@ -2740,18 +3032,22 @@ extern int XGrabPointer(
>     Time		/* time */
> );
> 
>+_X_EXPORT
> extern int XGrabServer(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XHeightMMOfScreen(
>     Screen*		/* screen */
> );
> 
>+_X_EXPORT
> extern int XHeightOfScreen(
>     Screen*		/* screen */
> );
> 
>+_X_EXPORT
> extern int XIfEvent(
>     Display*		/* display */,
>     XEvent*		/* event_return */,
>@@ -2763,25 +3059,30 @@ extern int XIfEvent(
>     XPointer		/* arg */
> );
> 
>+_X_EXPORT
> extern int XImageByteOrder(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XInstallColormap(
>     Display*		/* display */,
>     Colormap		/* colormap */
> );
> 
>+_X_EXPORT
> extern KeyCode XKeysymToKeycode(
>     Display*		/* display */,
>     KeySym		/* keysym */
> );
> 
>+_X_EXPORT
> extern int XKillClient(
>     Display*		/* display */,
>     XID			/* resource */
> );
> 
>+_X_EXPORT
> extern Status XLookupColor(
>     Display*		/* display */,
>     Colormap		/* colormap */,
>@@ -2790,40 +3091,48 @@ extern Status XLookupColor(
>     XColor*		/* screen_def_return */
> );
> 
>+_X_EXPORT
> extern int XLowerWindow(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XMapRaised(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XMapSubwindows(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XMapWindow(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XMaskEvent(
>     Display*		/* display */,
>     long		/* event_mask */,
>     XEvent*		/* event_return */
> );
> 
>+_X_EXPORT
> extern int XMaxCmapsOfScreen(
>     Screen*		/* screen */
> );
> 
>+_X_EXPORT
> extern int XMinCmapsOfScreen(
>     Screen*		/* screen */
> );
> 
>+_X_EXPORT
> extern int XMoveResizeWindow(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -2833,6 +3142,7 @@ extern int XMoveResizeWindow(
>     unsigned int	/* height */
> );
> 
>+_X_EXPORT
> extern int XMoveWindow(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -2840,15 +3150,18 @@ extern int XMoveWindow(
>     int			/* y */
> );
> 
>+_X_EXPORT
> extern int XNextEvent(
>     Display*		/* display */,
>     XEvent*		/* event_return */
> );
> 
>+_X_EXPORT
> extern int XNoOp(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern Status XParseColor(
>     Display*		/* display */,
>     Colormap		/* colormap */,
>@@ -2856,6 +3169,7 @@ extern Status XParseColor(
>     XColor*		/* exact_def_return */
> );
> 
>+_X_EXPORT
> extern int XParseGeometry(
>     _Xconst char*	/* parsestring */,
>     int*		/* x_return */,
>@@ -2864,11 +3178,13 @@ extern int XParseGeometry(
>     unsigned int*	/* height_return */
> );
> 
>+_X_EXPORT
> extern int XPeekEvent(
>     Display*		/* display */,
>     XEvent*		/* event_return */
> );
> 
>+_X_EXPORT
> extern int XPeekIfEvent(
>     Display*		/* display */,
>     XEvent*		/* event_return */,
>@@ -2880,28 +3196,33 @@ extern int XPeekIfEvent(
>     XPointer		/* arg */
> );
> 
>+_X_EXPORT
> extern int XPending(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XPlanesOfScreen(
>     Screen*		/* screen */
> );
> 
>+_X_EXPORT
> extern int XProtocolRevision(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XProtocolVersion(
>     Display*		/* display */
> );
> 
>-
>+_X_EXPORT
> extern int XPutBackEvent(
>     Display*		/* display */,
>     XEvent*		/* event */
> );
> 
>+_X_EXPORT
> extern int XPutImage(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2915,10 +3236,12 @@ extern int XPutImage(
>     unsigned int	/* height */	  
> );
> 
>+_X_EXPORT
> extern int XQLength(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern Status XQueryBestCursor(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -2928,6 +3251,7 @@ extern Status XQueryBestCursor(
>     unsigned int*	/* height_return */
> );
> 
>+_X_EXPORT
> extern Status XQueryBestSize(
>     Display*		/* display */,
>     int			/* class */,
>@@ -2938,6 +3262,7 @@ extern Status XQueryBestSize(
>     unsigned int*	/* height_return */
> );
> 
>+_X_EXPORT
> extern Status XQueryBestStipple(
>     Display*		/* display */,
>     Drawable		/* which_screen */,
>@@ -2947,6 +3272,7 @@ extern Status XQueryBestStipple(
>     unsigned int*	/* height_return */
> );
> 
>+_X_EXPORT
> extern Status XQueryBestTile(
>     Display*		/* display */,
>     Drawable		/* which_screen */,
>@@ -2956,12 +3282,14 @@ extern Status XQueryBestTile(
>     unsigned int*	/* height_return */
> );
> 
>+_X_EXPORT
> extern int XQueryColor(
>     Display*		/* display */,
>     Colormap		/* colormap */,
>     XColor*		/* def_in_out */
> );
> 
>+_X_EXPORT
> extern int XQueryColors(
>     Display*		/* display */,
>     Colormap		/* colormap */,
>@@ -2969,6 +3297,7 @@ extern int XQueryColors(
>     int			/* ncolors */
> );
> 
>+_X_EXPORT
> extern Bool XQueryExtension(
>     Display*		/* display */,
>     _Xconst char*	/* name */,
>@@ -2977,11 +3306,13 @@ extern Bool XQueryExtension(
>     int*		/* first_error_return */
> );
> 
>+_X_EXPORT
> extern int XQueryKeymap(
>     Display*		/* display */,
>     char [32]		/* keys_return */
> );
> 
>+_X_EXPORT
> extern Bool XQueryPointer(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -2994,6 +3325,7 @@ extern Bool XQueryPointer(
>     unsigned int*       /* mask_return */
> );
> 
>+_X_EXPORT
> extern int XQueryTextExtents(
>     Display*		/* display */,
>     XID			/* font_ID */,
>@@ -3005,6 +3337,7 @@ extern int XQueryTextExtents(
>     XCharStruct*	/* overall_return */    
> );
> 
>+_X_EXPORT
> extern int XQueryTextExtents16(
>     Display*		/* display */,
>     XID			/* font_ID */,
>@@ -3016,6 +3349,7 @@ extern int XQueryTextExtents16(
>     XCharStruct*	/* overall_return */
> );
> 
>+_X_EXPORT
> extern Status XQueryTree(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -3025,11 +3359,13 @@ extern Status XQueryTree(
>     unsigned int*	/* nchildren_return */
> );
> 
>+_X_EXPORT
> extern int XRaiseWindow(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XReadBitmapFile(
>     Display*		/* display */,
>     Drawable 		/* d */,
>@@ -3041,6 +3377,7 @@ extern int XReadBitmapFile(
>     int*		/* y_hot_return */
> );
> 
>+_X_EXPORT
> extern int XReadBitmapFileData(
>     _Xconst char*	/* filename */,
>     unsigned int*	/* width_return */,
>@@ -3050,6 +3387,7 @@ extern int XReadBitmapFileData(
>     int*		/* y_hot_return */
> );
> 
>+_X_EXPORT
> extern int XRebindKeysym(
>     Display*		/* display */,
>     KeySym		/* keysym */,
>@@ -3059,6 +3397,7 @@ extern int XRebindKeysym(
>     int			/* bytes_string */
> );
> 
>+_X_EXPORT
> extern int XRecolorCursor(
>     Display*		/* display */,
>     Cursor		/* cursor */,
>@@ -3066,26 +3405,31 @@ extern int XRecolorCursor(
>     XColor*		/* background_color */
> );
> 
>+_X_EXPORT
> extern int XRefreshKeyboardMapping(
>     XMappingEvent*	/* event_map */    
> );
> 
>+_X_EXPORT
> extern int XRemoveFromSaveSet(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XRemoveHost(
>     Display*		/* display */,
>     XHostAddress*	/* host */
> );
> 
>+_X_EXPORT
> extern int XRemoveHosts(
>     Display*		/* display */,
>     XHostAddress*	/* hosts */,
>     int			/* num_hosts */
> );
> 
>+_X_EXPORT
> extern int XReparentWindow(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -3094,10 +3438,12 @@ extern int XReparentWindow(
>     int			/* y */
> );
> 
>+_X_EXPORT
> extern int XResetScreenSaver(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XResizeWindow(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -3105,17 +3451,20 @@ extern int XResizeWindow(
>     unsigned int	/* height */
> );
> 
>+_X_EXPORT
> extern int XRestackWindows(
>     Display*		/* display */,
>     Window*		/* windows */,
>     int			/* nwindows */
> );
> 
>+_X_EXPORT
> extern int XRotateBuffers(
>     Display*		/* display */,
>     int			/* rotate */
> );
> 
>+_X_EXPORT
> extern int XRotateWindowProperties(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -3124,16 +3473,19 @@ extern int XRotateWindowProperties(
>     int			/* npositions */
> );
> 
>+_X_EXPORT
> extern int XScreenCount(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XSelectInput(
>     Display*		/* display */,
>     Window		/* w */,
>     long		/* event_mask */
> );
> 
>+_X_EXPORT
> extern Status XSendEvent(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -3142,29 +3494,34 @@ extern Status XSendEvent(
>     XEvent*		/* event_send */
> );
> 
>+_X_EXPORT
> extern int XSetAccessControl(
>     Display*		/* display */,
>     int			/* mode */
> );
> 
>+_X_EXPORT
> extern int XSetArcMode(
>     Display*		/* display */,
>     GC			/* gc */,
>     int			/* arc_mode */
> );
> 
>+_X_EXPORT
> extern int XSetBackground(
>     Display*		/* display */,
>     GC			/* gc */,
>     unsigned long	/* background */
> );
> 
>+_X_EXPORT
> extern int XSetClipMask(
>     Display*		/* display */,
>     GC			/* gc */,
>     Pixmap		/* pixmap */
> );
> 
>+_X_EXPORT
> extern int XSetClipOrigin(
>     Display*		/* display */,
>     GC			/* gc */,
>@@ -3172,6 +3529,7 @@ extern int XSetClipOrigin(
>     int			/* clip_y_origin */
> );
> 
>+_X_EXPORT
> extern int XSetClipRectangles(
>     Display*		/* display */,
>     GC			/* gc */,
>@@ -3182,11 +3540,13 @@ extern int XSetClipRectangles(
>     int			/* ordering */
> );
> 
>+_X_EXPORT
> extern int XSetCloseDownMode(
>     Display*		/* display */,
>     int			/* close_mode */
> );
> 
>+_X_EXPORT
> extern int XSetCommand(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -3194,6 +3554,7 @@ extern int XSetCommand(
>     int			/* argc */
> );
> 
>+_X_EXPORT
> extern int XSetDashes(
>     Display*		/* display */,
>     GC			/* gc */,
>@@ -3202,54 +3563,63 @@ extern int XSetDashes(
>     int			/* n */
> );
> 
>+_X_EXPORT
> extern int XSetFillRule(
>     Display*		/* display */,
>     GC			/* gc */,
>     int			/* fill_rule */
> );
> 
>+_X_EXPORT
> extern int XSetFillStyle(
>     Display*		/* display */,
>     GC			/* gc */,
>     int			/* fill_style */
> );
> 
>+_X_EXPORT
> extern int XSetFont(
>     Display*		/* display */,
>     GC			/* gc */,
>     Font		/* font */
> );
> 
>+_X_EXPORT
> extern int XSetFontPath(
>     Display*		/* display */,
>     char**		/* directories */,
>     int			/* ndirs */	     
> );
> 
>+_X_EXPORT
> extern int XSetForeground(
>     Display*		/* display */,
>     GC			/* gc */,
>     unsigned long	/* foreground */
> );
> 
>+_X_EXPORT
> extern int XSetFunction(
>     Display*		/* display */,
>     GC			/* gc */,
>     int			/* function */
> );
> 
>+_X_EXPORT
> extern int XSetGraphicsExposures(
>     Display*		/* display */,
>     GC			/* gc */,
>     Bool		/* graphics_exposures */
> );
> 
>+_X_EXPORT
> extern int XSetIconName(
>     Display*		/* display */,
>     Window		/* w */,
>     _Xconst char*	/* icon_name */
> );
> 
>+_X_EXPORT
> extern int XSetInputFocus(
>     Display*		/* display */,
>     Window		/* focus */,
>@@ -3257,6 +3627,7 @@ extern int XSetInputFocus(
>     Time		/* time */
> );
> 
>+_X_EXPORT
> extern int XSetLineAttributes(
>     Display*		/* display */,
>     GC			/* gc */,
>@@ -3266,23 +3637,27 @@ extern int XSetLineAttributes(
>     int			/* join_style */
> );
> 
>+_X_EXPORT
> extern int XSetModifierMapping(
>     Display*		/* display */,
>     XModifierKeymap*	/* modmap */
> );
> 
>+_X_EXPORT
> extern int XSetPlaneMask(
>     Display*		/* display */,
>     GC			/* gc */,
>     unsigned long	/* plane_mask */
> );
> 
>+_X_EXPORT
> extern int XSetPointerMapping(
>     Display*		/* display */,
>     _Xconst unsigned char*	/* map */,
>     int			/* nmap */
> );
> 
>+_X_EXPORT
> extern int XSetScreenSaver(
>     Display*		/* display */,
>     int			/* timeout */,
>@@ -3291,6 +3666,7 @@ extern int XSetScreenSaver(
>     int			/* allow_exposures */
> );
> 
>+_X_EXPORT
> extern int XSetSelectionOwner(
>     Display*		/* display */,
>     Atom	        /* selection */,
>@@ -3298,6 +3674,7 @@ extern int XSetSelectionOwner(
>     Time		/* time */
> );
> 
>+_X_EXPORT
> extern int XSetState(
>     Display*		/* display */,
>     GC			/* gc */,
>@@ -3307,18 +3684,21 @@ extern int XSetState(
>     unsigned long	/* plane_mask */
> );
> 
>+_X_EXPORT
> extern int XSetStipple(
>     Display*		/* display */,
>     GC			/* gc */,
>     Pixmap		/* stipple */
> );
> 
>+_X_EXPORT
> extern int XSetSubwindowMode(
>     Display*		/* display */,
>     GC			/* gc */,
>     int			/* subwindow_mode */
> );
> 
>+_X_EXPORT
> extern int XSetTSOrigin(
>     Display*		/* display */,
>     GC			/* gc */,
>@@ -3326,48 +3706,56 @@ extern int XSetTSOrigin(
>     int			/* ts_y_origin */
> );
> 
>+_X_EXPORT
> extern int XSetTile(
>     Display*		/* display */,
>     GC			/* gc */,
>     Pixmap		/* tile */
> );
> 
>+_X_EXPORT
> extern int XSetWindowBackground(
>     Display*		/* display */,
>     Window		/* w */,
>     unsigned long	/* background_pixel */
> );
> 
>+_X_EXPORT
> extern int XSetWindowBackgroundPixmap(
>     Display*		/* display */,
>     Window		/* w */,
>     Pixmap		/* background_pixmap */
> );
> 
>+_X_EXPORT
> extern int XSetWindowBorder(
>     Display*		/* display */,
>     Window		/* w */,
>     unsigned long	/* border_pixel */
> );
> 
>+_X_EXPORT
> extern int XSetWindowBorderPixmap(
>     Display*		/* display */,
>     Window		/* w */,
>     Pixmap		/* border_pixmap */
> );
> 
>+_X_EXPORT
> extern int XSetWindowBorderWidth(
>     Display*		/* display */,
>     Window		/* w */,
>     unsigned int	/* width */
> );
> 
>+_X_EXPORT
> extern int XSetWindowColormap(
>     Display*		/* display */,
>     Window		/* w */,
>     Colormap		/* colormap */
> );
> 
>+_X_EXPORT
> extern int XStoreBuffer(
>     Display*		/* display */,
>     _Xconst char*	/* bytes */,
>@@ -3375,18 +3763,21 @@ extern int XStoreBuffer(
>     int			/* buffer */
> );
> 
>+_X_EXPORT
> extern int XStoreBytes(
>     Display*		/* display */,
>     _Xconst char*	/* bytes */,
>     int			/* nbytes */
> );
> 
>+_X_EXPORT
> extern int XStoreColor(
>     Display*		/* display */,
>     Colormap		/* colormap */,
>     XColor*		/* color */
> );
> 
>+_X_EXPORT
> extern int XStoreColors(
>     Display*		/* display */,
>     Colormap		/* colormap */,
>@@ -3394,12 +3785,14 @@ extern int XStoreColors(
>     int			/* ncolors */
> );
> 
>+_X_EXPORT
> extern int XStoreName(
>     Display*		/* display */,
>     Window		/* w */,
>     _Xconst char*	/* window_name */
> );
> 
>+_X_EXPORT
> extern int XStoreNamedColor(
>     Display*		/* display */,
>     Colormap		/* colormap */,
>@@ -3408,11 +3801,13 @@ extern int XStoreNamedColor(
>     int			/* flags */
> );
> 
>+_X_EXPORT
> extern int XSync(
>     Display*		/* display */,
>     Bool		/* discard */
> );
> 
>+_X_EXPORT
> extern int XTextExtents(
>     XFontStruct*	/* font_struct */,
>     _Xconst char*	/* string */,
>@@ -3423,6 +3818,7 @@ extern int XTextExtents(
>     XCharStruct*	/* overall_return */
> );
> 
>+_X_EXPORT
> extern int XTextExtents16(
>     XFontStruct*	/* font_struct */,
>     _Xconst XChar2b*	/* string */,
>@@ -3433,18 +3829,21 @@ extern int XTextExtents16(
>     XCharStruct*	/* overall_return */
> );
> 
>+_X_EXPORT
> extern int XTextWidth(
>     XFontStruct*	/* font_struct */,
>     _Xconst char*	/* string */,
>     int			/* count */
> );
> 
>+_X_EXPORT
> extern int XTextWidth16(
>     XFontStruct*	/* font_struct */,
>     _Xconst XChar2b*	/* string */,
>     int			/* count */
> );
> 
>+_X_EXPORT
> extern Bool XTranslateCoordinates(
>     Display*		/* display */,
>     Window		/* src_w */,
>@@ -3456,11 +3855,13 @@ extern Bool XTranslateCoordinates(
>     Window*		/* child_return */
> );
> 
>+_X_EXPORT
> extern int XUndefineCursor(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XUngrabButton(
>     Display*		/* display */,
>     unsigned int	/* button */,
>@@ -3468,6 +3869,7 @@ extern int XUngrabButton(
>     Window		/* grab_window */
> );
> 
>+_X_EXPORT
> extern int XUngrabKey(
>     Display*		/* display */,
>     int			/* keycode */,
>@@ -3475,44 +3877,53 @@ extern int XUngrabKey(
>     Window		/* grab_window */
> );
> 
>+_X_EXPORT
> extern int XUngrabKeyboard(
>     Display*		/* display */,
>     Time		/* time */
> );
> 
>+_X_EXPORT
> extern int XUngrabPointer(
>     Display*		/* display */,
>     Time		/* time */
> );
> 
>+_X_EXPORT
> extern int XUngrabServer(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XUninstallColormap(
>     Display*		/* display */,
>     Colormap		/* colormap */
> );
> 
>+_X_EXPORT
> extern int XUnloadFont(
>     Display*		/* display */,
>     Font		/* font */
> );
> 
>+_X_EXPORT
> extern int XUnmapSubwindows(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XUnmapWindow(
>     Display*		/* display */,
>     Window		/* w */
> );
> 
>+_X_EXPORT
> extern int XVendorRelease(
>     Display*		/* display */
> );
> 
>+_X_EXPORT
> extern int XWarpPointer(
>     Display*		/* display */,
>     Window		/* src_w */,
>@@ -3525,14 +3936,17 @@ extern int XWarpPointer(
>     int			/* dest_y */	     
> );
> 
>+_X_EXPORT
> extern int XWidthMMOfScreen(
>     Screen*		/* screen */
> );
> 
>+_X_EXPORT
> extern int XWidthOfScreen(
>     Screen*		/* screen */
> );
> 
>+_X_EXPORT
> extern int XWindowEvent(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -3540,6 +3954,7 @@ extern int XWindowEvent(
>     XEvent*		/* event_return */
> );
> 
>+_X_EXPORT
> extern int XWriteBitmapFile(
>     Display*		/* display */,
>     _Xconst char*	/* filename */,
>@@ -3550,12 +3965,15 @@ extern int XWriteBitmapFile(
>     int			/* y_hot */		     
> );
> 
>+_X_EXPORT
> extern Bool XSupportsLocale (void);
> 
>+_X_EXPORT
> extern char *XSetLocaleModifiers(
>     const char*		/* modifier_list */
> );
> 
>+_X_EXPORT
> extern XOM XOpenOM(
>     Display*			/* display */,
>     struct _XrmHashBucketRec*	/* rdb */,
>@@ -3563,51 +3981,62 @@ extern XOM XOpenOM(
>     _Xconst char*		/* res_class */
> );
> 
>+_X_EXPORT
> extern Status XCloseOM(
>     XOM			/* om */
> );
> 
>+_X_EXPORT
> extern char *XSetOMValues(
>     XOM			/* om */,
>     ...
> ) _X_SENTINEL(0);
> 
>+_X_EXPORT
> extern char *XGetOMValues(
>     XOM			/* om */,
>     ...
> ) _X_SENTINEL(0);
> 
>+_X_EXPORT
> extern Display *XDisplayOfOM(
>     XOM			/* om */
> );
> 
>+_X_EXPORT
> extern char *XLocaleOfOM(
>     XOM			/* om */
> );
> 
>+_X_EXPORT
> extern XOC XCreateOC(
>     XOM			/* om */,
>     ...
> ) _X_SENTINEL(0);
> 
>+_X_EXPORT
> extern void XDestroyOC(
>     XOC			/* oc */
> );
> 
>+_X_EXPORT
> extern XOM XOMOfOC(
>     XOC			/* oc */
> );
> 
>+_X_EXPORT
> extern char *XSetOCValues(
>     XOC			/* oc */,
>     ...
> ) _X_SENTINEL(0);
> 
>+_X_EXPORT
> extern char *XGetOCValues(
>     XOC			/* oc */,
>     ...
> ) _X_SENTINEL(0);
> 
>+_X_EXPORT
> extern XFontSet XCreateFontSet(
>     Display*		/* display */,
>     _Xconst char*	/* base_font_name_list */,
>@@ -3616,59 +4045,71 @@ extern XFontSet XCreateFontSet(
>     char**		/* def_string */
> );
> 
>+_X_EXPORT
> extern void XFreeFontSet(
>     Display*		/* display */,
>     XFontSet		/* font_set */
> );
> 
>+_X_EXPORT
> extern int XFontsOfFontSet(
>     XFontSet		/* font_set */,
>     XFontStruct***	/* font_struct_list */,
>     char***		/* font_name_list */
> );
> 
>+_X_EXPORT
> extern char *XBaseFontNameListOfFontSet(
>     XFontSet		/* font_set */
> );
> 
>+_X_EXPORT
> extern char *XLocaleOfFontSet(
>     XFontSet		/* font_set */
> );
> 
>+_X_EXPORT
> extern Bool XContextDependentDrawing(
>     XFontSet		/* font_set */
> );
> 
>+_X_EXPORT
> extern Bool XDirectionalDependentDrawing(
>     XFontSet		/* font_set */
> );
> 
>+_X_EXPORT
> extern Bool XContextualDrawing(
>     XFontSet		/* font_set */
> );
> 
>+_X_EXPORT
> extern XFontSetExtents *XExtentsOfFontSet(
>     XFontSet		/* font_set */
> );
> 
>+_X_EXPORT
> extern int XmbTextEscapement(
>     XFontSet		/* font_set */,
>     _Xconst char*	/* text */,
>     int			/* bytes_text */
> );
> 
>+_X_EXPORT
> extern int XwcTextEscapement(
>     XFontSet		/* font_set */,
>     _Xconst wchar_t*	/* text */,
>     int			/* num_wchars */
> );
> 
>+_X_EXPORT
> extern int Xutf8TextEscapement(
>     XFontSet		/* font_set */,
>     _Xconst char*	/* text */,
>     int			/* bytes_text */
> );
> 
>+_X_EXPORT
> extern int XmbTextExtents(
>     XFontSet		/* font_set */,
>     _Xconst char*	/* text */,
>@@ -3677,6 +4118,7 @@ extern int XmbTextExtents(
>     XRectangle*		/* overall_logical_return */
> );
> 
>+_X_EXPORT
> extern int XwcTextExtents(
>     XFontSet		/* font_set */,
>     _Xconst wchar_t*	/* text */,
>@@ -3685,6 +4127,7 @@ extern int XwcTextExtents(
>     XRectangle*		/* overall_logical_return */
> );
> 
>+_X_EXPORT
> extern int Xutf8TextExtents(
>     XFontSet		/* font_set */,
>     _Xconst char*	/* text */,
>@@ -3693,6 +4136,7 @@ extern int Xutf8TextExtents(
>     XRectangle*		/* overall_logical_return */
> );
> 
>+_X_EXPORT
> extern Status XmbTextPerCharExtents(
>     XFontSet		/* font_set */,
>     _Xconst char*	/* text */,
>@@ -3705,6 +4149,7 @@ extern Status XmbTextPerCharExtents(
>     XRectangle*		/* overall_logical_return */
> );
> 
>+_X_EXPORT
> extern Status XwcTextPerCharExtents(
>     XFontSet		/* font_set */,
>     _Xconst wchar_t*	/* text */,
>@@ -3717,6 +4162,7 @@ extern Status XwcTextPerCharExtents(
>     XRectangle*		/* overall_logical_return */
> );
> 
>+_X_EXPORT
> extern Status Xutf8TextPerCharExtents(
>     XFontSet		/* font_set */,
>     _Xconst char*	/* text */,
>@@ -3729,6 +4175,7 @@ extern Status Xutf8TextPerCharExtents(
>     XRectangle*		/* overall_logical_return */
> );
> 
>+_X_EXPORT
> extern void XmbDrawText(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -3739,6 +4186,7 @@ extern void XmbDrawText(
>     int			/* nitems */
> );
> 
>+_X_EXPORT
> extern void XwcDrawText(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -3749,6 +4197,7 @@ extern void XwcDrawText(
>     int			/* nitems */
> );
> 
>+_X_EXPORT
> extern void Xutf8DrawText(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -3759,6 +4208,7 @@ extern void Xutf8DrawText(
>     int			/* nitems */
> );
> 
>+_X_EXPORT
> extern void XmbDrawString(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -3770,6 +4220,7 @@ extern void XmbDrawString(
>     int			/* bytes_text */
> );
> 
>+_X_EXPORT
> extern void XwcDrawString(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -3781,6 +4232,7 @@ extern void XwcDrawString(
>     int			/* num_wchars */
> );
> 
>+_X_EXPORT
> extern void Xutf8DrawString(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -3792,6 +4244,7 @@ extern void Xutf8DrawString(
>     int			/* bytes_text */
> );
> 
>+_X_EXPORT
> extern void XmbDrawImageString(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -3803,6 +4256,7 @@ extern void XmbDrawImageString(
>     int			/* bytes_text */
> );
> 
>+_X_EXPORT
> extern void XwcDrawImageString(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -3814,6 +4268,7 @@ extern void XwcDrawImageString(
>     int			/* num_wchars */
> );
> 
>+_X_EXPORT
> extern void Xutf8DrawImageString(
>     Display*		/* display */,
>     Drawable		/* d */,
>@@ -3825,6 +4280,7 @@ extern void Xutf8DrawImageString(
>     int			/* bytes_text */
> );
> 
>+_X_EXPORT
> extern XIM XOpenIM(
>     Display*			/* dpy */,
>     struct _XrmHashBucketRec*	/* rdb */,
>@@ -3832,71 +4288,88 @@ extern XIM XOpenIM(
>     char*			/* res_class */
> );
> 
>+_X_EXPORT
> extern Status XCloseIM(
>     XIM /* im */
> );
> 
>+_X_EXPORT
> extern char *XGetIMValues(
>     XIM /* im */, ...
> ) _X_SENTINEL(0);
> 
>+_X_EXPORT
> extern char *XSetIMValues(
>     XIM /* im */, ...
> ) _X_SENTINEL(0);
> 
>+_X_EXPORT
> extern Display *XDisplayOfIM(
>     XIM /* im */
> );
> 
>+_X_EXPORT
> extern char *XLocaleOfIM(
>     XIM /* im*/
> );
> 
>+_X_EXPORT
> extern XIC XCreateIC(
>     XIM /* im */, ...
> ) _X_SENTINEL(0);
> 
>+_X_EXPORT
> extern void XDestroyIC(
>     XIC /* ic */
> );
> 
>+_X_EXPORT
> extern void XSetICFocus(
>     XIC /* ic */
> );
> 
>+_X_EXPORT
> extern void XUnsetICFocus(
>     XIC /* ic */
> );
> 
>+_X_EXPORT
> extern wchar_t *XwcResetIC(
>     XIC /* ic */
> );
> 
>+_X_EXPORT
> extern char *XmbResetIC(
>     XIC /* ic */
> );
> 
>+_X_EXPORT
> extern char *Xutf8ResetIC(
>     XIC /* ic */
> );
> 
>+_X_EXPORT
> extern char *XSetICValues(
>     XIC /* ic */, ...
> ) _X_SENTINEL(0);
> 
>+_X_EXPORT
> extern char *XGetICValues(
>     XIC /* ic */, ...
> ) _X_SENTINEL(0);
> 
>+_X_EXPORT
> extern XIM XIMOfIC(
>     XIC /* ic */
> );
> 
>+_X_EXPORT
> extern Bool XFilterEvent(
>     XEvent*	/* event */,
>     Window	/* window */
> );
> 
>+_X_EXPORT
> extern int XmbLookupString(
>     XIC			/* ic */,
>     XKeyPressedEvent*	/* event */,
>@@ -3906,6 +4379,7 @@ extern int XmbLookupString(
>     Status*		/* status_return */
> );
> 
>+_X_EXPORT
> extern int XwcLookupString(
>     XIC			/* ic */,
>     XKeyPressedEvent*	/* event */,
>@@ -3915,6 +4389,7 @@ extern int XwcLookupString(
>     Status*		/* status_return */
> );
> 
>+_X_EXPORT
> extern int Xutf8LookupString(
>     XIC			/* ic */,
>     XKeyPressedEvent*	/* event */,
>@@ -3924,12 +4399,14 @@ extern int Xutf8LookupString(
>     Status*		/* status_return */
> );
> 
>+_X_EXPORT
> extern XVaNestedList XVaCreateNestedList(
>     int /*unused*/, ...
> ) _X_SENTINEL(0);
> 
> /* internal connections for IMs */
> 
>+_X_EXPORT
> extern Bool XRegisterIMInstantiateCallback(
>     Display*			/* dpy */,
>     struct _XrmHashBucketRec*	/* rdb */,
>@@ -3939,6 +4416,7 @@ extern Bool XRegisterIMInstantiateCallback(
>     XPointer			/* client_data */
> );
> 
>+_X_EXPORT
> extern Bool XUnregisterIMInstantiateCallback(
>     Display*			/* dpy */,
>     struct _XrmHashBucketRec*	/* rdb */,
>@@ -3957,29 +4435,34 @@ typedef void (*XConnectionWatchProc)(
> );
>     
> 
>+_X_EXPORT
> extern Status XInternalConnectionNumbers(
>     Display*			/* dpy */,
>     int**			/* fd_return */,
>     int*			/* count_return */
> );
> 
>+_X_EXPORT
> extern void XProcessInternalConnection(
>     Display*			/* dpy */,
>     int				/* fd */
> );
> 
>+_X_EXPORT
> extern Status XAddConnectionWatch(
>     Display*			/* dpy */,
>     XConnectionWatchProc	/* callback */,
>     XPointer			/* client_data */
> );
> 
>+_X_EXPORT
> extern void XRemoveConnectionWatch(
>     Display*			/* dpy */,
>     XConnectionWatchProc	/* callback */,
>     XPointer			/* client_data */
> );
> 
>+_X_EXPORT
> extern void XSetAuthorization(
>     char *			/* name */,
>     int				/* namelen */, 
>@@ -3987,6 +4470,7 @@ extern void XSetAuthorization(
>     int				/* datalen */
> );
> 
>+_X_EXPORT
> extern int _Xmbtowc(
>     wchar_t *			/* wstr */,
> #ifdef ISC
>@@ -3998,6 +4482,7 @@ extern int _Xmbtowc(
> #endif
> );
> 
>+_X_EXPORT
> extern int _Xwctomb(
>     char *			/* str */,
>     wchar_t			/* wc */
>diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
>index 8aab764..54c438b 100644
>--- a/include/X11/Xlibint.h
>+++ b/include/X11/Xlibint.h
>@@ -275,12 +275,17 @@ struct _XLockPtrs {
> #endif
> 
> /* in XlibInt.c */
>+_X_EXPORT
> extern void (*_XCreateMutex_fn)(
>     LockInfoPtr /* lock */
> );
>+
>+_X_EXPORT
> extern void (*_XFreeMutex_fn)(
>     LockInfoPtr /* lock */
> );
>+
>+_X_EXPORT
> extern void (*_XLockMutex_fn)(
>     LockInfoPtr	/* lock */
> #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
>@@ -288,6 +293,8 @@ extern void (*_XLockMutex_fn)(
>     , int /* line */
> #endif
> );
>+
>+_X_EXPORT
> extern void (*_XUnlockMutex_fn)(
>     LockInfoPtr	/* lock */
> #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
>@@ -296,6 +303,7 @@ extern void (*_XUnlockMutex_fn)(
> #endif
> );
> 
>+_X_EXPORT
> extern LockInfoPtr _Xglobal_lock;
> 
> #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
>@@ -580,6 +588,7 @@ extern LockInfoPtr _Xglobal_lock;
> #define SyncHandle() \
> 	if (dpy->synchandler) (*dpy->synchandler)(dpy)
> 
>+_X_EXPORT
> extern void _XFlushGCCache(Display *dpy, GC gc);
> #define FlushGC(dpy, gc) \
> 	if ((gc)->dirty) _XFlushGCCache((dpy), (gc))
>@@ -632,11 +641,15 @@ extern void _XFlushGCCache(Display *dpy, GC gc);
> #define _XRead16(dpy, data, len) _XRead((dpy), (char *)(data), (len))
> #ifdef LONG64
> #define Data32(dpy, data, len) _XData32(dpy, (long *)data, len)
>+
>+_X_EXPORT
> extern int _XData32(
> 	     Display *dpy,
> 	     register long *data,
> 	     unsigned len
> );
>+
>+_X_EXPORT
> extern void _XRead32(
> 	     Display *dpy,
> 	     register long *data,
>@@ -760,6 +773,7 @@ typedef struct _XAsyncEState {
>     int error_count;
> } _XAsyncErrorState;
> 
>+_X_EXPORT
> extern void _XDeqAsyncHandler(Display *dpy, _XAsyncHandler *handler);
> #define DeqAsyncHandler(dpy,handler) { \
>     if (dpy->async_handlers == (handler)) \
>@@ -885,55 +899,82 @@ typedef struct _XExten {		/* private to extension mechanism */
> /* extension hooks */
> 
> #ifdef DataRoutineIsProcedure
>+_X_EXPORT
> extern void Data(Display *dpy, char *data, long len);
> #endif
>+
>+_X_EXPORT
> extern int _XError(
>     Display*	/* dpy */,
>     xError*	/* rep */
> );
>+
>+_X_EXPORT
> extern int _XIOError(
>     Display*	/* dpy */
> );
>+
>+_X_EXPORT
> extern int (*_XIOErrorFunction)(
>     Display*	/* dpy */
> );
>+
>+_X_EXPORT
> extern int (*_XErrorFunction)(
>     Display*		/* dpy */,
>     XErrorEvent*	/* error_event */
> );
>+
>+_X_EXPORT
> extern void _XEatData(
>     Display*		/* dpy */,
>     unsigned long	/* n */
> );
>+
>+_X_EXPORT
> extern char *_XAllocScratch(
>     Display*		/* dpy */,
>     unsigned long	/* nbytes */
> );
>+
>+_X_EXPORT
> extern char *_XAllocTemp(
>     Display*		/* dpy */,
>     unsigned long	/* nbytes */
> );
>+
>+_X_EXPORT
> extern void _XFreeTemp(
>     Display*		/* dpy */,
>     char*		/* buf */,
>     unsigned long	/* nbytes */
> );
>+
>+_X_EXPORT
> extern Visual *_XVIDtoVisual(
>     Display*	/* dpy */,
>     VisualID	/* id */
> );
>+
>+_X_EXPORT
> extern unsigned long _XSetLastRequestRead(
>     Display*		/* dpy */,
>     xGenericReply*	/* rep */
> );
>+
>+_X_EXPORT
> extern int _XGetHostname(
>     char*	/* buf */,
>     int		/* maxlen */
> );
>+
>+_X_EXPORT
> extern Screen *_XScreenOfWindow(
>     Display*	/* dpy */,
>     Window	/* w */
> );
>+
>+_X_EXPORT
> extern Bool _XAsyncErrorHandler(
>     Display*	/* dpy */,
>     xReply*	/* rep */,
>@@ -941,6 +982,8 @@ extern Bool _XAsyncErrorHandler(
>     int		/* len */,
>     XPointer	/* data */
> );
>+
>+_X_EXPORT
> extern char *_XGetAsyncReply(
>     Display*	/* dpy */,
>     char*	/* replbuf */,
>@@ -950,6 +993,8 @@ extern char *_XGetAsyncReply(
>     int		/* extra */,
>     Bool	/* discard */
> );
>+
>+_X_EXPORT
> extern void _XGetAsyncData(
>     Display*	/* dpy */,
>     char *	/* data */,
>@@ -959,73 +1004,111 @@ extern void _XGetAsyncData(
>     int		/* datalen */,
>     int		/* discardtotal */
> );
>+
>+_X_EXPORT
> extern void _XSetSeqSyncFunction(
>     Display*	/* dpy */
> );
>+
>+_X_EXPORT
> extern void _XFlush(
>     Display*	/* dpy */
> );
>+
>+_X_EXPORT
> extern int _XEventsQueued(
>     Display*	/* dpy */,
>     int 	/* mode */
> );
>+
>+_X_EXPORT
> extern void _XReadEvents(
>     Display*	/* dpy */
> );
>+
>+_X_EXPORT
> extern int _XRead(
>     Display*	/* dpy */,
>     char*	/* data */,
>     long	/* size */
> );
>+
>+_X_EXPORT
> extern void _XReadPad(
>     Display*	/* dpy */,
>     char*	/* data */,
>     long	/* size */
> );
>+
>+_X_EXPORT
> extern void _XSend(
>     Display*		/* dpy */,
>     _Xconst char*	/* data */,
>     long		/* size */
> );
>+
>+_X_EXPORT
> extern Status _XReply(
>     Display*	/* dpy */,
>     xReply*	/* rep */,
>     int		/* extra */,
>     Bool	/* discard */
> );
>+
>+_X_EXPORT
> extern void _XEnq(
>     Display*	/* dpy */,
>     xEvent*	/* event */
> );
>+
>+_X_EXPORT
> extern void _XDeq(
>     Display*	/* dpy */,
>     _XQEvent*	/* prev */,
>     _XQEvent*	/* qelt */
> );
> 
>+_X_EXPORT
> extern Bool _XUnknownWireEvent(
>     Display*	/* dpy */,
>     XEvent*	/* re */,
>     xEvent*	/* event */
> );
>+
>+_X_EXPORT
> extern Status _XUnknownNativeEvent(
>     Display*	/* dpy */,
>     XEvent*	/* re */,
>     xEvent*	/* event */
> );
> 
>+_X_EXPORT
> extern Bool _XWireToEvent(Display *dpy, XEvent *re, xEvent *event);
>+
>+_X_EXPORT
> extern Bool _XDefaultWireError(Display *display, XErrorEvent *he, xError *we);
>+
>+_X_EXPORT
> extern Bool _XPollfdCacheInit(Display *dpy);
>+
>+_X_EXPORT
> extern void _XPollfdCacheAdd(Display *dpy, int fd);
>+
>+_X_EXPORT
> extern void _XPollfdCacheDel(Display *dpy, int fd);
>+
>+_X_EXPORT
> extern XID _XAllocID(Display *dpy);
>+
>+_X_EXPORT
> extern void _XAllocIDs(Display *dpy, XID *ids, int count);
> 
>+_X_EXPORT
> extern int _XFreeExtData(
>     XExtData*	/* extension */
> );
> 
>+_X_EXPORT
> extern int (*XESetCreateGC(
>     Display*		/* display */,
>     int			/* extension */,
>@@ -1038,6 +1121,7 @@ extern int (*XESetCreateGC(
>     Display*, GC, XExtCodes*
> );
> 
>+_X_EXPORT
> extern int (*XESetCopyGC(
>     Display*		/* display */,
>     int			/* extension */,
>@@ -1050,6 +1134,7 @@ extern int (*XESetCopyGC(
>     Display*, GC, XExtCodes*
> );
> 
>+_X_EXPORT
> extern int (*XESetFlushGC(
>     Display*		/* display */,
>     int			/* extension */,
>@@ -1062,6 +1147,7 @@ extern int (*XESetFlushGC(
>     Display*, GC, XExtCodes*
> );
> 
>+_X_EXPORT
> extern int (*XESetFreeGC(
>     Display*		/* display */,
>     int			/* extension */,
>@@ -1074,6 +1160,7 @@ extern int (*XESetFreeGC(
>     Display*, GC, XExtCodes*
> );
> 
>+_X_EXPORT
> extern int (*XESetCreateFont(
>     Display*		/* display */,
>     int			/* extension */,
>@@ -1086,6 +1173,7 @@ extern int (*XESetCreateFont(
>     Display*, XFontStruct*, XExtCodes*
> );
> 
>+_X_EXPORT
> extern int (*XESetFreeFont(
>     Display*		/* display */,
>     int			/* extension */,
>@@ -1098,6 +1186,7 @@ extern int (*XESetFreeFont(
>     Display*, XFontStruct*, XExtCodes*
> ); 
> 
>+_X_EXPORT
> extern int (*XESetCloseDisplay(
>     Display*		/* display */,
>     int			/* extension */,
>@@ -1109,6 +1198,7 @@ extern int (*XESetCloseDisplay(
>     Display*, XExtCodes*
> );
> 
>+_X_EXPORT
> extern int (*XESetError(
>     Display*		/* display */,
>     int			/* extension */,
>@@ -1122,6 +1212,7 @@ extern int (*XESetError(
>     Display*, xError*, XExtCodes*, int*
> );
> 
>+_X_EXPORT
> extern char* (*XESetErrorString(
>     Display*		/* display */,
>     int			/* extension */,
>@@ -1136,6 +1227,7 @@ extern char* (*XESetErrorString(
>     Display*, int, XExtCodes*, char*, int
> );
> 
>+_X_EXPORT
> extern void (*XESetPrintErrorValues (
>     Display*		/* display */,
>     int			/* extension */,
>@@ -1148,6 +1240,7 @@ extern void (*XESetPrintErrorValues (
>     Display*, XErrorEvent*, void*
> );
> 
>+_X_EXPORT
> extern Bool (*XESetWireToEvent(
>     Display*		/* display */,
>     int			/* event_number */,
>@@ -1160,6 +1253,7 @@ extern Bool (*XESetWireToEvent(
>     Display*, XEvent*, xEvent*
> );
> 
>+_X_EXPORT
> extern Status (*XESetEventToWire(
>     Display*		/* display */,
>     int			/* event_number */,
>@@ -1172,6 +1266,7 @@ extern Status (*XESetEventToWire(
>     Display*, XEvent*, xEvent*
> );
> 
>+_X_EXPORT
> extern Bool (*XESetWireToError(
>     Display*		/* display */,
>     int			/* error_number */,
>@@ -1184,6 +1279,7 @@ extern Bool (*XESetWireToError(
>     Display*, XErrorEvent*, xError*
> );
> 
>+_X_EXPORT
> extern void (*XESetBeforeFlush(
>     Display*		/* display */,
>     int			/* error_number */,
>@@ -1206,6 +1302,7 @@ typedef void (*_XInternalConnectionProc)(
> );
> 
> 
>+_X_EXPORT
> extern Status _XRegisterInternalConnection(
>     Display*			/* dpy */,
>     int				/* fd */,
>@@ -1213,11 +1310,13 @@ extern Status _XRegisterInternalConnection(
>     XPointer			/* call_data */
> );
> 
>+_X_EXPORT
> extern void _XUnregisterInternalConnection(
>     Display*			/* dpy */,
>     int				/* fd */
> );
> 
>+_X_EXPORT
> extern void _XProcessInternalConnection(
>     Display*			/* dpy */,
>     struct _XConnectionInfo*	/* conn_info */
>@@ -1240,17 +1339,20 @@ struct _XConnWatchInfo {	/* info from XAddConnectionWatch */
> };
> 
> #ifdef __UNIXOS2__
>+_X_EXPORT
> extern char* __XOS2RedirRoot(
>     char*
> );
> #endif
> 
>+_X_EXPORT
> extern int _XTextHeight(
>     XFontStruct*	/* font_struct */,
>     _Xconst char*	/* string */,
>     int			/* count */
> );
> 
>+_X_EXPORT
> extern int _XTextHeight16(
>     XFontStruct*	/* font_struct */,
>     _Xconst XChar2b*	/* string */,
>@@ -1259,22 +1361,26 @@ extern int _XTextHeight16(
> 
> #if defined(WIN32)
> 
>+_X_EXPORT
> extern int _XOpenFile(
>     _Xconst char*	/* path */,
>     int			/* flags */
> );
> 
>+_X_EXPORT
> extern int _XOpenFileMode(
>     _Xconst char*	/* path */,
>     int			/* flags */,
>     mode_t              /* mode */
> );
> 
>+_X_EXPORT
> extern void* _XFopenFile(
>     _Xconst char*	/* path */,
>     _Xconst char*	/* mode */
> );
> 
>+_X_EXPORT
> extern int _XAccessFile(
>     _Xconst char*	/* path */
> );
>@@ -1285,8 +1391,10 @@ extern int _XAccessFile(
> #endif
> 
> /* EvToWire.c */
>+_X_EXPORT
> extern Status _XEventToWire(Display *dpy, XEvent *re, xEvent *event);
> 
>+_X_EXPORT
> extern int _XF86LoadQueryLocaleFont(
>     Display*		/* dpy */,
>     _Xconst char*	/* name*/,
>@@ -1294,19 +1402,23 @@ extern int _XF86LoadQueryLocaleFont(
>     Font*		/* fidp */
> );
> 
>+_X_EXPORT
> extern void _XProcessWindowAttributes (
>     register Display *dpy,
>     xChangeWindowAttributesReq *req,
>     register unsigned long valuemask,
>     register XSetWindowAttributes *attributes);
> 
>+_X_EXPORT
> extern int _XDefaultError(
>         Display *dpy,
>         XErrorEvent *event);
> 
>+_X_EXPORT
> extern int _XDefaultIOError(
>         Display *dpy);
> 
>+_X_EXPORT
> extern void _XSetClipRectangles (
>     register Display *dpy,
>     GC gc,
>@@ -1315,11 +1427,13 @@ extern void _XSetClipRectangles (
>     int n,
>     int ordering);
> 
>+_X_EXPORT
> Status _XGetWindowAttributes(
>     register Display *dpy,
>     Window w,
>     XWindowAttributes *attr);
> 
>+_X_EXPORT
> int _XPutBackEvent (
>     register Display *dpy, 
>     register XEvent *event);
>diff --git a/include/X11/Xresource.h b/include/X11/Xresource.h
>index ce12137..ff616e2 100644
>--- a/include/X11/Xresource.h
>+++ b/include/X11/Xresource.h
>@@ -73,6 +73,7 @@ _XFUNCPROTOBEGIN
>  *
>  ****************************************************************/
> 
>+_X_EXPORT
> extern char *Xpermalloc(
>     unsigned int	/* size */
> );
>@@ -90,19 +91,23 @@ typedef char *XrmString;
> #define NULLSTRING ((XrmString) 0)
> 
> /* find quark for string, create new quark if none already exists */
>+_X_EXPORT
> extern XrmQuark XrmStringToQuark(
>     _Xconst char* 	/* string */
> );
> 
>+_X_EXPORT
> extern XrmQuark XrmPermStringToQuark(
>     _Xconst char* 	/* string */
> );
> 
> /* find string for quark */
>+_X_EXPORT
> extern XrmString XrmQuarkToString(
>     XrmQuark 		/* quark */
> );
> 
>+_X_EXPORT
> extern XrmQuark XrmUniqueQuark(
>     void
> );
>@@ -118,11 +123,13 @@ extern XrmQuark XrmUniqueQuark(
> 
> typedef enum {XrmBindTightly, XrmBindLoosely} XrmBinding, *XrmBindingList;
> 
>+_X_EXPORT
> extern void XrmStringToQuarkList(
>     _Xconst char*	/* string */,
>     XrmQuarkList	/* quarks_return */
> );
> 
>+_X_EXPORT
> extern void XrmStringToBindingQuarkList(
>     _Xconst char*	/* string */,
>     XrmBindingList	/* bindings_return */,
>@@ -177,10 +184,12 @@ typedef XrmHashTable XrmSearchList[];
> typedef struct _XrmHashBucketRec *XrmDatabase;
> 
> 
>+_X_EXPORT
> extern void XrmDestroyDatabase(
>     XrmDatabase		/* database */    
> );
> 
>+_X_EXPORT
> extern void XrmQPutResource(
>     XrmDatabase*	/* database */,
>     XrmBindingList	/* bindings */,
>@@ -189,6 +198,7 @@ extern void XrmQPutResource(
>     XrmValue*		/* value */
> );
> 
>+_X_EXPORT
> extern void XrmPutResource(
>     XrmDatabase*	/* database */,
>     _Xconst char*	/* specifier */,
>@@ -196,6 +206,7 @@ extern void XrmPutResource(
>     XrmValue*		/* value */
> );
> 
>+_X_EXPORT
> extern void XrmQPutStringResource(
>     XrmDatabase*	/* database */,
>     XrmBindingList      /* bindings */,
>@@ -203,17 +214,20 @@ extern void XrmQPutStringResource(
>     _Xconst char*	/* value */
> );
> 
>+_X_EXPORT
> extern void XrmPutStringResource(
>     XrmDatabase*	/* database */,
>     _Xconst char*	/* specifier */,
>     _Xconst char*	/* value */
> );
> 
>+_X_EXPORT
> extern void XrmPutLineResource(
>     XrmDatabase*	/* database */,
>     _Xconst char*	/* line */
> );
> 
>+_X_EXPORT
> extern Bool XrmQGetResource(
>     XrmDatabase		/* database */,
>     XrmNameList		/* quark_name */,
>@@ -222,6 +236,7 @@ extern Bool XrmQGetResource(
>     XrmValue*		/* value_return */
> );
> 
>+_X_EXPORT
> extern Bool XrmGetResource(
>     XrmDatabase		/* database */,
>     _Xconst char*	/* str_name */,
>@@ -230,6 +245,7 @@ extern Bool XrmGetResource(
>     XrmValue*		/* value_return */
> );
> 
>+_X_EXPORT
> extern Bool XrmQGetSearchList(
>     XrmDatabase		/* database */,
>     XrmNameList		/* names */,
>@@ -238,6 +254,7 @@ extern Bool XrmQGetSearchList(
>     int			/* list_length */
> );
> 
>+_X_EXPORT
> extern Bool XrmQGetSearchResource(
>     XrmSearchList	/* list */,
>     XrmName		/* name */,
>@@ -254,41 +271,49 @@ extern Bool XrmQGetSearchResource(
> 
> #ifndef _XP_PRINT_SERVER_
> 
>+_X_EXPORT
> extern void XrmSetDatabase(
>     Display*		/* display */,
>     XrmDatabase		/* database */
> );
> 
>+_X_EXPORT
> extern XrmDatabase XrmGetDatabase(
>     Display*		/* display */
> );
> 
> #endif /* !_XP_PRINT_SERVER_ */
> 
>+_X_EXPORT
> extern XrmDatabase XrmGetFileDatabase(
>     _Xconst char*	/* filename */
> );
> 
>+_X_EXPORT
> extern Status XrmCombineFileDatabase(
>     _Xconst char* 	/* filename */,
>     XrmDatabase*	/* target */,
>     Bool		/* override */
> );
> 
>+_X_EXPORT
> extern XrmDatabase XrmGetStringDatabase(
>     _Xconst char*	/* data */  /*  null terminated string */
> );
> 
>+_X_EXPORT
> extern void XrmPutFileDatabase(
>     XrmDatabase		/* database */,
>     _Xconst char*	/* filename */
> );
> 
>+_X_EXPORT
> extern void XrmMergeDatabases(
>     XrmDatabase		/* source_db */,
>     XrmDatabase*	/* target_db */
> );
> 
>+_X_EXPORT
> extern void XrmCombineDatabase(
>     XrmDatabase		/* source_db */,
>     XrmDatabase*	/* target_db */,
>@@ -298,6 +323,7 @@ extern void XrmCombineDatabase(
> #define XrmEnumAllLevels 0
> #define XrmEnumOneLevel  1
> 
>+_X_EXPORT
> extern Bool XrmEnumerateDatabase(
>     XrmDatabase		/* db */,
>     XrmNameList		/* name_prefix */,
>@@ -314,6 +340,7 @@ extern Bool XrmEnumerateDatabase(
>     XPointer		/* closure */
> );
> 
>+_X_EXPORT
> extern const char *XrmLocaleOfDatabase(
>     XrmDatabase 	/* database */
> );
>@@ -345,6 +372,7 @@ typedef struct {
> } XrmOptionDescRec, *XrmOptionDescList;
> 
> 
>+_X_EXPORT
> extern void XrmParseCommand(
>     XrmDatabase*	/* database */,
>     XrmOptionDescList	/* table */,
>diff --git a/include/X11/Xutil.h b/include/X11/Xutil.h
>index 9f2ef63..325372b 100644
>--- a/include/X11/Xutil.h
>+++ b/include/X11/Xutil.h
>@@ -186,19 +186,29 @@ typedef struct {
> } XClassHint;
> 
> #ifdef XUTIL_DEFINE_FUNCTIONS
>+
>+_X_EXPORT
> extern int XDestroyImage(
>         XImage *ximage);
>+
>+_X_EXPORT
> extern unsigned long XGetPixel(
>         XImage *ximage,
>         int x, int y);
>+
>+_X_EXPORT
> extern int XPutPixel(
>         XImage *ximage,
>         int x, int y,
>         unsigned long pixel);
>+
>+_X_EXPORT
> extern XImage *XSubImage(
>         XImage *ximage,
>         int x, int y,
>         unsigned int width, unsigned int height);
>+
>+_X_EXPORT
> extern int XAddPixel(
>         XImage *ximage,
>         long value);
>@@ -357,56 +367,69 @@ _XFUNCPROTOBEGIN
> 
> /* The following declarations are alphabetized. */
> 
>+_X_EXPORT
> extern XClassHint *XAllocClassHint (
>     void
> );
> 
>+_X_EXPORT
> extern XIconSize *XAllocIconSize (
>     void
> );
> 
>+_X_EXPORT
> extern XSizeHints *XAllocSizeHints (
>     void
> );
> 
>+_X_EXPORT
> extern XStandardColormap *XAllocStandardColormap (
>     void
> );
> 
>+_X_EXPORT
> extern XWMHints *XAllocWMHints (
>     void
> );
> 
>+_X_EXPORT
> extern int XClipBox(
>     Region		/* r */,
>     XRectangle*		/* rect_return */
> );
> 
>+_X_EXPORT
> extern Region XCreateRegion(
>     void
> );
> 
>+_X_EXPORT
> extern const char *XDefaultString (void);
> 
>+_X_EXPORT
> extern int XDeleteContext(
>     Display*		/* display */,
>     XID			/* rid */,
>     XContext		/* context */
> );
> 
>+_X_EXPORT
> extern int XDestroyRegion(
>     Region		/* r */
> );
> 
>+_X_EXPORT
> extern int XEmptyRegion(
>     Region		/* r */
> );
> 
>+_X_EXPORT
> extern int XEqualRegion(
>     Region		/* r1 */,
>     Region		/* r2 */
> );
> 
>+_X_EXPORT
> extern int XFindContext(
>     Display*		/* display */,
>     XID			/* rid */,
>@@ -414,12 +437,14 @@ extern int XFindContext(
>     XPointer*		/* data_return */
> );
> 
>+_X_EXPORT
> extern Status XGetClassHint(
>     Display*		/* display */,
>     Window		/* w */,
>     XClassHint*		/* class_hints_return */
> );
> 
>+_X_EXPORT
> extern Status XGetIconSizes(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -427,12 +452,14 @@ extern Status XGetIconSizes(
>     int*		/* count_return */
> );
> 
>+_X_EXPORT
> extern Status XGetNormalHints(
>     Display*		/* display */,
>     Window		/* w */,
>     XSizeHints*		/* hints_return */
> );
> 
>+_X_EXPORT
> extern Status XGetRGBColormaps(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -441,6 +468,7 @@ extern Status XGetRGBColormaps(
>     Atom		/* property */
> );
> 
>+_X_EXPORT
> extern Status XGetSizeHints(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -448,6 +476,7 @@ extern Status XGetSizeHints(
>     Atom		/* property */
> );
> 
>+_X_EXPORT
> extern Status XGetStandardColormap(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -455,6 +484,7 @@ extern Status XGetStandardColormap(
>     Atom		/* property */			    
> );
> 
>+_X_EXPORT
> extern Status XGetTextProperty(
>     Display*		/* display */,
>     Window		/* window */,
>@@ -462,6 +492,7 @@ extern Status XGetTextProperty(
>     Atom		/* property */
> );
> 
>+_X_EXPORT
> extern XVisualInfo *XGetVisualInfo(
>     Display*		/* display */,
>     long		/* vinfo_mask */,
>@@ -469,29 +500,34 @@ extern XVisualInfo *XGetVisualInfo(
>     int*		/* nitems_return */
> );
> 
>+_X_EXPORT
> extern Status XGetWMClientMachine(
>     Display*		/* display */,
>     Window		/* w */,
>     XTextProperty*	/* text_prop_return */
> );
> 
>+_X_EXPORT
> extern XWMHints *XGetWMHints(
>     Display*		/* display */,
>     Window		/* w */		      
> );
> 
>+_X_EXPORT
> extern Status XGetWMIconName(
>     Display*		/* display */,
>     Window		/* w */,
>     XTextProperty*	/* text_prop_return */
> );
> 
>+_X_EXPORT
> extern Status XGetWMName(
>     Display*		/* display */,
>     Window		/* w */,
>     XTextProperty*	/* text_prop_return */
> );
> 
>+_X_EXPORT
> extern Status XGetWMNormalHints(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -499,6 +535,7 @@ extern Status XGetWMNormalHints(
>     long*		/* supplied_return */ 
> );
> 
>+_X_EXPORT
> extern Status XGetWMSizeHints(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -507,24 +544,28 @@ extern Status XGetWMSizeHints(
>     Atom		/* property */
> );
> 
>+_X_EXPORT
> extern Status XGetZoomHints(
>     Display*		/* display */,
>     Window		/* w */,
>     XSizeHints*		/* zhints_return */
> );
> 
>+_X_EXPORT
> extern int XIntersectRegion(
>     Region		/* sra */,
>     Region		/* srb */,
>     Region		/* dr_return */
> );
> 
>+_X_EXPORT
> extern void XConvertCase(
>     KeySym		/* sym */,
>     KeySym*		/* lower */,
>     KeySym*		/* upper */
> );
> 
>+_X_EXPORT
> extern int XLookupString(
>     XKeyEvent*		/* event_struct */,
>     char*		/* buffer_return */,
>@@ -533,6 +574,7 @@ extern int XLookupString(
>     XComposeStatus*	/* status_in_out */
> );
> 
>+_X_EXPORT
> extern Status XMatchVisualInfo(
>     Display*		/* display */,
>     int			/* screen */,
>@@ -541,24 +583,28 @@ extern Status XMatchVisualInfo(
>     XVisualInfo*	/* vinfo_return */
> );
> 
>+_X_EXPORT
> extern int XOffsetRegion(
>     Region		/* r */,
>     int			/* dx */,
>     int			/* dy */
> );
> 
>+_X_EXPORT
> extern Bool XPointInRegion(
>     Region		/* r */,
>     int			/* x */,
>     int			/* y */
> );
> 
>+_X_EXPORT
> extern Region XPolygonRegion(
>     XPoint*		/* points */,
>     int			/* n */,
>     int			/* fill_rule */
> );
> 
>+_X_EXPORT
> extern int XRectInRegion(
>     Region		/* r */,
>     int			/* x */,
>@@ -567,6 +613,7 @@ extern int XRectInRegion(
>     unsigned int	/* height */
> );
> 
>+_X_EXPORT
> extern int XSaveContext(
>     Display*		/* display */,
>     XID			/* rid */,
>@@ -574,12 +621,14 @@ extern int XSaveContext(
>     _Xconst char*	/* data */
> );
> 
>+_X_EXPORT
> extern int XSetClassHint(
>     Display*		/* display */,
>     Window		/* w */,
>     XClassHint*		/* class_hints */
> );
> 
>+_X_EXPORT
> extern int XSetIconSizes(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -587,12 +636,14 @@ extern int XSetIconSizes(
>     int			/* count */    
> );
> 
>+_X_EXPORT
> extern int XSetNormalHints(
>     Display*		/* display */,
>     Window		/* w */,
>     XSizeHints*		/* hints */
> );
> 
>+_X_EXPORT
> extern void XSetRGBColormaps(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -601,6 +652,7 @@ extern void XSetRGBColormaps(
>     Atom		/* property */
> );
> 
>+_X_EXPORT
> extern int XSetSizeHints(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -608,6 +660,7 @@ extern int XSetSizeHints(
>     Atom		/* property */
> );
> 
>+_X_EXPORT
> extern int XSetStandardProperties(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -619,6 +672,7 @@ extern int XSetStandardProperties(
>     XSizeHints*		/* hints */
> );
> 
>+_X_EXPORT
> extern void XSetTextProperty(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -626,36 +680,42 @@ extern void XSetTextProperty(
>     Atom		/* property */
> );
> 
>+_X_EXPORT
> extern void XSetWMClientMachine(
>     Display*		/* display */,
>     Window		/* w */,
>     XTextProperty*	/* text_prop */
> );
> 
>+_X_EXPORT
> extern int XSetWMHints(
>     Display*		/* display */,
>     Window		/* w */,
>     XWMHints*		/* wm_hints */
> );
> 
>+_X_EXPORT
> extern void XSetWMIconName(
>     Display*		/* display */,
>     Window		/* w */,
>     XTextProperty*	/* text_prop */
> );
> 
>+_X_EXPORT
> extern void XSetWMName(
>     Display*		/* display */,
>     Window		/* w */,
>     XTextProperty*	/* text_prop */
> );
> 
>+_X_EXPORT
> extern void XSetWMNormalHints(
>     Display*		/* display */,
>     Window		/* w */,
>     XSizeHints*		/* hints */
> );
> 
>+_X_EXPORT
> extern void XSetWMProperties(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -668,6 +728,7 @@ extern void XSetWMProperties(
>     XClassHint*		/* class_hints */
> );
> 
>+_X_EXPORT
> extern void XmbSetWMProperties(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -680,6 +741,7 @@ extern void XmbSetWMProperties(
>     XClassHint*		/* class_hints */
> );
> 
>+_X_EXPORT
> extern void Xutf8SetWMProperties(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -692,6 +754,7 @@ extern void Xutf8SetWMProperties(
>     XClassHint*		/* class_hints */
> );
> 
>+_X_EXPORT
> extern void XSetWMSizeHints(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -699,12 +762,14 @@ extern void XSetWMSizeHints(
>     Atom		/* property */
> );
> 
>+_X_EXPORT
> extern int XSetRegion(
>     Display*		/* display */,
>     GC			/* gc */,
>     Region		/* r */
> );
> 
>+_X_EXPORT
> extern void XSetStandardColormap(
>     Display*		/* display */,
>     Window		/* w */,
>@@ -712,30 +777,35 @@ extern void XSetStandardColormap(
>     Atom		/* property */
> );
> 
>+_X_EXPORT
> extern int XSetZoomHints(
>     Display*		/* display */,
>     Window		/* w */,
>     XSizeHints*		/* zhints */
> );
> 
>+_X_EXPORT
> extern int XShrinkRegion(
>     Region		/* r */,
>     int			/* dx */,
>     int			/* dy */
> );
> 
>+_X_EXPORT
> extern Status XStringListToTextProperty(
>     char**		/* list */,
>     int			/* count */,
>     XTextProperty*	/* text_prop_return */
> );
> 
>+_X_EXPORT
> extern int XSubtractRegion(
>     Region		/* sra */,
>     Region		/* srb */,
>     Region		/* dr_return */
> );
> 
>+_X_EXPORT
> extern int XmbTextListToTextProperty(
>     Display*		display,
>     char**		list,
>@@ -744,6 +814,7 @@ extern int XmbTextListToTextProperty(
>     XTextProperty*	text_prop_return
> );
> 
>+_X_EXPORT
> extern int XwcTextListToTextProperty(
>     Display*		display,
>     wchar_t**		list,
>@@ -752,6 +823,7 @@ extern int XwcTextListToTextProperty(
>     XTextProperty*	text_prop_return
> );
> 
>+_X_EXPORT
> extern int Xutf8TextListToTextProperty(
>     Display*		display,
>     char**		list,
>@@ -760,16 +832,19 @@ extern int Xutf8TextListToTextProperty(
>     XTextProperty*	text_prop_return
> );
> 
>+_X_EXPORT
> extern void XwcFreeStringList(
>     wchar_t**		list
> );
> 
>+_X_EXPORT
> extern Status XTextPropertyToStringList(
>     XTextProperty*	/* text_prop */,
>     char***		/* list_return */,
>     int*		/* count_return */
> );
> 
>+_X_EXPORT
> extern int XmbTextPropertyToTextList(
>     Display*		display,
>     const XTextProperty* text_prop,
>@@ -777,6 +852,7 @@ extern int XmbTextPropertyToTextList(
>     int*		count_return
> );
> 
>+_X_EXPORT
> extern int XwcTextPropertyToTextList(
>     Display*		display,
>     const XTextProperty* text_prop,
>@@ -784,6 +860,7 @@ extern int XwcTextPropertyToTextList(
>     int*		count_return
> );
> 
>+_X_EXPORT
> extern int Xutf8TextPropertyToTextList(
>     Display*		display,
>     const XTextProperty* text_prop,
>@@ -791,18 +868,21 @@ extern int Xutf8TextPropertyToTextList(
>     int*		count_return
> );
> 
>+_X_EXPORT
> extern int XUnionRectWithRegion(
>     XRectangle*		/* rectangle */,
>     Region		/* src_region */,
>     Region		/* dest_region_return */
> );
> 
>+_X_EXPORT
> extern int XUnionRegion(
>     Region		/* sra */,
>     Region		/* srb */,
>     Region		/* dr_return */
> );
> 
>+_X_EXPORT
> extern int XWMGeometry(
>     Display*		/* display */,
>     int			/* screen_number */,
>@@ -817,6 +897,7 @@ extern int XWMGeometry(
>     int*		/* gravity_return */
> );
> 
>+_X_EXPORT
> extern int XXorRegion(
>     Region		/* sra */,
>     Region		/* srb */,
>diff --git a/src/AllCells.c b/src/AllCells.c
>index 9642f73..36fb626 100644
>--- a/src/AllCells.c
>+++ b/src/AllCells.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Status XAllocColorCells(
>     register Display *dpy,
>     Colormap cmap,
>diff --git a/src/AllPlanes.c b/src/AllPlanes.c
>index 7e714c0..4cd5805 100644
>--- a/src/AllPlanes.c
>+++ b/src/AllPlanes.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Status XAllocColorPlanes(
>     register Display *dpy,
>     Colormap cmap,
>diff --git a/src/AllowEv.c b/src/AllowEv.c
>index c995213..646e6b2 100644
>--- a/src/AllowEv.c
>+++ b/src/AllowEv.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XAllowEvents(
>     register Display *dpy,
>diff --git a/src/AutoRep.c b/src/AutoRep.c
>index 59434f7..64e5991 100644
>--- a/src/AutoRep.c
>+++ b/src/AutoRep.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XAutoRepeatOn (register Display *dpy)
> {
>@@ -40,6 +41,7 @@ XAutoRepeatOn (register Display *dpy)
> 	return 1;
> }
> 
>+_X_EXPORT
> int
> XAutoRepeatOff (register Display *dpy)
> {
>diff --git a/src/Backgnd.c b/src/Backgnd.c
>index 46c71ee..a115e03 100644
>--- a/src/Backgnd.c
>+++ b/src/Backgnd.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetWindowBackground(
>     register Display *dpy,
>diff --git a/src/BdrWidth.c b/src/BdrWidth.c
>index 13bfd73..fce7e86 100644
>--- a/src/BdrWidth.c
>+++ b/src/BdrWidth.c
>@@ -34,6 +34,7 @@ from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetWindowBorderWidth(
>     Display *dpy,
>diff --git a/src/Bell.c b/src/Bell.c
>index 9b2f7ea..2cff2bf 100644
>--- a/src/Bell.c
>+++ b/src/Bell.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XBell(
>     register Display *dpy,
>diff --git a/src/ChAccCon.c b/src/ChAccCon.c
>index ecc4b15..5c4bcda 100644
>--- a/src/ChAccCon.c
>+++ b/src/ChAccCon.c
>@@ -31,18 +31,21 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XEnableAccessControl(register Display *dpy)
> {
>     return XSetAccessControl(dpy, EnableAccess);
> }
> 
>+_X_EXPORT
> int
> XDisableAccessControl(register Display *dpy)
> {
>     return XSetAccessControl(dpy, DisableAccess);
> }
> 
>+_X_EXPORT
> int
> XSetAccessControl(
>     register Display *dpy,
>diff --git a/src/ChActPGb.c b/src/ChActPGb.c
>index f57bdbc..d84a0f7 100644
>--- a/src/ChActPGb.c
>+++ b/src/ChActPGb.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XChangeActivePointerGrab(
>     register Display *dpy,
>diff --git a/src/ChClMode.c b/src/ChClMode.c
>index 80895b6..30f4b82 100644
>--- a/src/ChClMode.c
>+++ b/src/ChClMode.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetCloseDownMode(
>     register Display *dpy, 
>diff --git a/src/ChCmap.c b/src/ChCmap.c
>index 7fd3778..6380e9d 100644
>--- a/src/ChCmap.c
>+++ b/src/ChCmap.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetWindowColormap(
>     register Display *dpy,
>diff --git a/src/ChGC.c b/src/ChGC.c
>index 058c1f6..1b4d1d4 100644
>--- a/src/ChGC.c
>+++ b/src/ChGC.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #include "Xlibint.h"
> #include "Cr.h"
> 
>+_X_EXPORT
> int
> XChangeGC (
>     register Display *dpy,
>diff --git a/src/ChKeyCon.c b/src/ChKeyCon.c
>index 495f3df..3dc566d 100644
>--- a/src/ChKeyCon.c
>+++ b/src/ChKeyCon.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XChangeKeyboardControl(
>     register Display *dpy,
>diff --git a/src/ChPntCon.c b/src/ChPntCon.c
>index 265079c..acaccca 100644
>--- a/src/ChPntCon.c
>+++ b/src/ChPntCon.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XChangePointerControl(
>      register Display *dpy,
>diff --git a/src/ChProp.c b/src/ChProp.c
>index 8c524ca..42aacdf 100644
>--- a/src/ChProp.c
>+++ b/src/ChProp.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XChangeProperty (
>     register Display *dpy,
>diff --git a/src/ChSaveSet.c b/src/ChSaveSet.c
>index 3276cc1..b824ba6 100644
>--- a/src/ChSaveSet.c
>+++ b/src/ChSaveSet.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XChangeSaveSet(
>     register Display *dpy,
>@@ -48,6 +49,7 @@ XChangeSaveSet(
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XAddToSaveSet(
>     register Display *dpy,
>@@ -56,6 +58,7 @@ XAddToSaveSet(
>     return XChangeSaveSet(dpy,win,SetModeInsert);
> }
> 
>+_X_EXPORT
> int
> XRemoveFromSaveSet (
>     register Display *dpy,
>diff --git a/src/ChWAttrs.c b/src/ChWAttrs.c
>index 6b6088e..f727815 100644
>--- a/src/ChWAttrs.c
>+++ b/src/ChWAttrs.c
>@@ -37,6 +37,7 @@ in this Software without prior written authorization from The Open Group.
> 		     CWOverrideRedirect|CWSaveUnder|CWEventMask|\
> 		     CWDontPropagate|CWColormap|CWCursor)
> 
>+_X_EXPORT
> int
> XChangeWindowAttributes (
>     register Display *dpy,
>diff --git a/src/ChWindow.c b/src/ChWindow.c
>index 2eec660..02614be 100644
>--- a/src/ChWindow.c
>+++ b/src/ChWindow.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XResizeWindow(
>     register Display *dpy,
>diff --git a/src/ChkIfEv.c b/src/ChkIfEv.c
>index 037fe29..05d86d5 100644
>--- a/src/ChkIfEv.c
>+++ b/src/ChkIfEv.c
>@@ -38,6 +38,7 @@ in this Software without prior written authorization from The Open Group.
>  * matches, return.  If all else fails, tell the user no events found.
>  */
> 
>+_X_EXPORT
> Bool XCheckIfEvent (
> 	register Display *dpy,
> 	register XEvent *event,		/* XEvent to be filled in. */
>diff --git a/src/ChkMaskEv.c b/src/ChkMaskEv.c
>index 3d1e787..2c171c8 100644
>--- a/src/ChkMaskEv.c
>+++ b/src/ChkMaskEv.c
>@@ -44,6 +44,7 @@ extern long const _Xevent_to_mask[];
>  * matches, return.  If all else fails, tell the user no events found.
>  */
> 
>+_X_EXPORT
> Bool XCheckMaskEvent (
> 	register Display *dpy,
> 	long mask,		/* Selected event mask. */
>diff --git a/src/ChkTypEv.c b/src/ChkTypEv.c
>index ef54f76..db98c6d 100644
>--- a/src/ChkTypEv.c
>+++ b/src/ChkTypEv.c
>@@ -38,6 +38,7 @@ in this Software without prior written authorization from The Open Group.
>  * matches, return.  If all else fails, tell the user no events found.
>  */
> 
>+_X_EXPORT
> Bool XCheckTypedEvent (
> 	register Display *dpy,
> 	int type,		/* Selected event type. */
>diff --git a/src/ChkTypWEv.c b/src/ChkTypWEv.c
>index acd6b94..b8aa1a8 100644
>--- a/src/ChkTypWEv.c
>+++ b/src/ChkTypWEv.c
>@@ -38,6 +38,7 @@ in this Software without prior written authorization from The Open Group.
>  * matches, return.  If all else fails, tell the user no events found.
>  */
> 
>+_X_EXPORT
> Bool XCheckTypedWindowEvent (
> 	register Display *dpy,
> 	Window w,		/* Selected window. */
>diff --git a/src/ChkWinEv.c b/src/ChkWinEv.c
>index ff1dc91..70ff496 100644
>--- a/src/ChkWinEv.c
>+++ b/src/ChkWinEv.c
>@@ -43,6 +43,7 @@ extern long const _Xevent_to_mask[];
>  * matches, return.  If all else fails, tell the user no events found.
>  */
> 
>+_X_EXPORT
> Bool XCheckWindowEvent (
> 	register Display *dpy,
> 	Window w,		/* Selected window. */
>diff --git a/src/CirWin.c b/src/CirWin.c
>index 76d8820..a0dcd52 100644
>--- a/src/CirWin.c
>+++ b/src/CirWin.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XCirculateSubwindows(
>     register Display *dpy,
>diff --git a/src/CirWinDn.c b/src/CirWinDn.c
>index 82cf2c0..f013950 100644
>--- a/src/CirWinDn.c
>+++ b/src/CirWinDn.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XCirculateSubwindowsDown(
>     register Display *dpy,
>diff --git a/src/CirWinUp.c b/src/CirWinUp.c
>index ed7647b..e41972f 100644
>--- a/src/CirWinUp.c
>+++ b/src/CirWinUp.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XCirculateSubwindowsUp(
>     register Display *dpy,
>diff --git a/src/ClDisplay.c b/src/ClDisplay.c
>index 3a52d8b..4c3d86e 100644
>--- a/src/ClDisplay.c
>+++ b/src/ClDisplay.c
>@@ -47,6 +47,7 @@ from The Open Group.
>  * memory and must be careful about the types of requests they generate.
>  */
> 
>+_X_EXPORT
> int
> XCloseDisplay (
> 	register Display *dpy)
>diff --git a/src/Clear.c b/src/Clear.c
>index 5e381fb..0a8f19d 100644
>--- a/src/Clear.c
>+++ b/src/Clear.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XClearWindow(
>     register Display *dpy,
>diff --git a/src/ClearArea.c b/src/ClearArea.c
>index 95b1f49..dca2d2a 100644
>--- a/src/ClearArea.c
>+++ b/src/ClearArea.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XClearArea (
>     register Display *dpy,
>diff --git a/src/ConfWind.c b/src/ConfWind.c
>index 7f153cb..df16cd8 100644
>--- a/src/ConfWind.c
>+++ b/src/ConfWind.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XMoveResizeWindow(
>     register Display *dpy,
>diff --git a/src/ConnDis.c b/src/ConnDis.c
>index 95a836d..ffb5d14 100644
>--- a/src/ConnDis.c
>+++ b/src/ConnDis.c
>@@ -669,6 +669,7 @@ static _Xconst int  *xauth_lengths = default_xauth_lengths;
> 
> static int  xauth_names_length = NUM_DEFAULT_AUTH;
> 
>+_X_EXPORT
> void XSetAuthorization (name, namelen, data, datalen)
>     int namelen, datalen;		/* lengths of name and data */
>     char *name, *data;			/* NULL or arbitrary array of bytes */
>diff --git a/src/Context.c b/src/Context.c
>index 747bb6b..69ad104 100644
>--- a/src/Context.c
>+++ b/src/Context.c
>@@ -158,6 +158,7 @@ static void _XFreeContextDB(Display *display)
>    Possible errors are Out-of-memory.
> */   
> 
>+_X_EXPORT
> int XSaveContext(
>     Display *display,
>     register XID rid,
>@@ -235,6 +236,7 @@ int XSaveContext(
>    if an error has occured, 0 otherwise.  Possible errors are Entry-not-found.
> */
> 
>+_X_EXPORT
> int XFindContext(display, rid, context, data)
>     Display *display;
>     register XID rid;
>@@ -274,6 +276,7 @@ int XFindContext(display, rid, context, data)
>    with the same arguments.
> */
> 
>+_X_EXPORT
> int XDeleteContext(display, rid, context)
>     Display *display;
>     register XID rid;
>diff --git a/src/ConvSel.c b/src/ConvSel.c
>index e60148e..b15d647 100644
>--- a/src/ConvSel.c
>+++ b/src/ConvSel.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XConvertSelection(
>     register Display *dpy,
>diff --git a/src/CopyArea.c b/src/CopyArea.c
>index a2dc6fa..d8b20be 100644
>--- a/src/CopyArea.c
>+++ b/src/CopyArea.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XCopyArea(
>      register Display *dpy,
>diff --git a/src/CopyCmap.c b/src/CopyCmap.c
>index 127c15b..a54dbd2 100644
>--- a/src/CopyCmap.c
>+++ b/src/CopyCmap.c
>@@ -42,6 +42,7 @@ extern XcmsCmapRec * _XcmsCopyCmapRecAndFree(Display *dpy,
> 					     Colormap copy_cmap);
> #endif
> 
>+_X_EXPORT
> Colormap XCopyColormapAndFree(
>     register Display *dpy,
>     Colormap src_cmap)
>diff --git a/src/CopyGC.c b/src/CopyGC.c
>index f94914a..7b1b3e0 100644
>--- a/src/CopyGC.c
>+++ b/src/CopyGC.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XCopyGC (
>      register Display *dpy,
>diff --git a/src/CopyPlane.c b/src/CopyPlane.c
>index 5d1dbb9..da0282b 100644
>--- a/src/CopyPlane.c
>+++ b/src/CopyPlane.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XCopyPlane(
>      register Display *dpy,
>diff --git a/src/CrBFData.c b/src/CrBFData.c
>index 2e665df..164d59b 100644
>--- a/src/CrBFData.c
>+++ b/src/CrBFData.c
>@@ -48,6 +48,7 @@ in this Software without prior written authorization from The Open Group.
>  *    xoffset=0
>  *    no extra bytes per line
>  */  
>+_X_EXPORT
> Pixmap XCreateBitmapFromData(
>      Display *display,
>      Drawable d,
>diff --git a/src/CrCmap.c b/src/CrCmap.c
>index 1725fec..910b7e5 100644
>--- a/src/CrCmap.c
>+++ b/src/CrCmap.c
>@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #include "Xlibint.h"
> #include "Xcmsint.h"
> 
>-
>+_X_EXPORT
> Colormap XCreateColormap(
>     register Display *dpy,
>     Window w,
>diff --git a/src/CrCursor.c b/src/CrCursor.c
>index ba1b0c2..5685552 100644
>--- a/src/CrCursor.c
>+++ b/src/CrCursor.c
>@@ -42,6 +42,7 @@ _XTryShapeBitmapCursor (Display		*dpy,
> 			unsigned int	y);
> #endif
>     
>+_X_EXPORT
> Cursor XCreatePixmapCursor(
>      register Display *dpy,
>      Pixmap source,
>diff --git a/src/CrGC.c b/src/CrGC.c
>index e6aa358..3142168 100644
>--- a/src/CrGC.c
>+++ b/src/CrGC.c
>@@ -63,6 +63,7 @@ static void _XGenerateGCList(
>     GC gc,
>     xReq *req);
> 
>+_X_EXPORT
> GC XCreateGC (
>      register Display *dpy,
>      Drawable d,		/* Window or Pixmap for which depth matches */
>@@ -314,6 +315,7 @@ _XUpdateGCCache (
> 
> /* can only call when display is already locked. */
> 
>+_X_EXPORT
> void _XFlushGCCache(
>      Display *dpy,
>      GC gc)
>@@ -333,6 +335,7 @@ void _XFlushGCCache(
>     }
> }
> 
>+_X_EXPORT
> void 
> XFlushGC(
>     Display *dpy,
>@@ -341,6 +344,7 @@ XFlushGC(
>     FlushGC(dpy, gc);
> }
> 
>+_X_EXPORT
> GContext XGContextFromGC(GC gc)
> { 
>     return (gc->gid);
>diff --git a/src/CrGlCur.c b/src/CrGlCur.c
>index 0adb4a4..2a2cbb3 100644
>--- a/src/CrGlCur.c
>+++ b/src/CrGlCur.c
>@@ -220,6 +220,7 @@ _XTryShapeBitmapCursor (Display		*dpy,
> }
> #endif
> 
>+_X_EXPORT
> Cursor XCreateGlyphCursor(
>      register Display *dpy,
>      Font source_font,
>diff --git a/src/CrPFBData.c b/src/CrPFBData.c
>index e08b65c..7698857 100644
>--- a/src/CrPFBData.c
>+++ b/src/CrPFBData.c
>@@ -49,6 +49,7 @@ in this Software without prior written authorization from The Open Group.
>  *    xoffset=0
>  *    no extra bytes per line
>  */  
>+_X_EXPORT
> Pixmap XCreatePixmapFromBitmapData(
>     Display *display,
>     Drawable d,
>diff --git a/src/CrPixmap.c b/src/CrPixmap.c
>index 5656a6c..746e040 100644
>--- a/src/CrPixmap.c
>+++ b/src/CrPixmap.c
>@@ -39,6 +39,7 @@ _XNoticeCreateBitmap (Display	    *dpy,
> 		      unsigned int  height);
> #endif
> 
>+_X_EXPORT
> Pixmap XCreatePixmap (
>     register Display *dpy,
>     Drawable d,
>diff --git a/src/CrWindow.c b/src/CrWindow.c
>index d0b17a2..4192f30 100644
>--- a/src/CrWindow.c
>+++ b/src/CrWindow.c
>@@ -30,6 +30,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Window XCreateSimpleWindow(
>     register Display *dpy,
>     Window parent,
>diff --git a/src/Cursor.c b/src/Cursor.c
>index 76ac3be..7c5fe4d 100644
>--- a/src/Cursor.c
>+++ b/src/Cursor.c
>@@ -33,6 +33,7 @@ in this Software without prior written authorization from The Open Group.
> static XColor _Xconst foreground = { 0,    0,     0,     0  };  /* black */
> static XColor _Xconst background = { 0, 65535, 65535, 65535 };  /* white */
> 
>+_X_EXPORT
> Cursor XCreateFontCursor(
> 	Display *dpy,
> 	unsigned int which)
>diff --git a/src/DefCursor.c b/src/DefCursor.c
>index 1715ddb..c62812c 100644
>--- a/src/DefCursor.c
>+++ b/src/DefCursor.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDefineCursor (
>     register Display *dpy,
>diff --git a/src/DelProp.c b/src/DelProp.c
>index a108a1a..a146644 100644
>--- a/src/DelProp.c
>+++ b/src/DelProp.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDeleteProperty(
>     register Display *dpy,
>diff --git a/src/Depths.c b/src/Depths.c
>index dba1471..91473ed 100644
>--- a/src/Depths.c
>+++ b/src/Depths.c
>@@ -34,6 +34,7 @@ in this Software without prior written authorization from The Open Group.
> /*
>  * XListDepths - return info from connection setup
>  */
>+_X_EXPORT
> int *XListDepths (
>     Display *dpy,
>     int scrnum,
>diff --git a/src/DestSubs.c b/src/DestSubs.c
>index 236ba66..5b23b44 100644
>--- a/src/DestSubs.c
>+++ b/src/DestSubs.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDestroySubwindows(
>     register Display *dpy,
>diff --git a/src/DestWind.c b/src/DestWind.c
>index 221da26..53663ca 100644
>--- a/src/DestWind.c
>+++ b/src/DestWind.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDestroyWindow (
> 	register Display *dpy,
>diff --git a/src/DisName.c b/src/DisName.c
>index 59b5b3e..1479f6c 100644
>--- a/src/DisName.c
>+++ b/src/DisName.c
>@@ -53,6 +53,7 @@ from The Open Group.
> #include <stdlib.h>
> #include "Xlib.h"
> 
>+_X_EXPORT
> char *
> XDisplayName(
>     _Xconst char *display)
>diff --git a/src/DrArc.c b/src/DrArc.c
>index 1f1c86a..421aa16 100644
>--- a/src/DrArc.c
>+++ b/src/DrArc.c
>@@ -37,6 +37,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDrawArc(
>     register Display *dpy,
>diff --git a/src/DrArcs.c b/src/DrArcs.c
>index bc3bda3..d55859d 100644
>--- a/src/DrArcs.c
>+++ b/src/DrArcs.c
>@@ -33,6 +33,7 @@ in this Software without prior written authorization from The Open Group.
> 
> #define arc_scale (SIZEOF(xArc) / 4)
> 
>+_X_EXPORT
> int
> XDrawArcs(
>     register Display *dpy,
>diff --git a/src/DrLine.c b/src/DrLine.c
>index 9c5275b..a63d187 100644
>--- a/src/DrLine.c
>+++ b/src/DrLine.c
>@@ -36,6 +36,7 @@ in this Software without prior written authorization from The Open Group.
> #define wsize (SIZEOF(xPolySegmentReq) + WLNSPERBATCH * SIZEOF(xSegment))
> #define zsize (SIZEOF(xPolySegmentReq) + ZLNSPERBATCH * SIZEOF(xSegment))
> 
>+_X_EXPORT
> int
> XDrawLine (
>     register Display *dpy,
>diff --git a/src/DrLines.c b/src/DrLines.c
>index bf0529f..bd8c587 100644
>--- a/src/DrLines.c
>+++ b/src/DrLines.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDrawLines (
>     register Display *dpy,
>diff --git a/src/DrPoint.c b/src/DrPoint.c
>index 6ad0678..5a64417 100644
>--- a/src/DrPoint.c
>+++ b/src/DrPoint.c
>@@ -35,6 +35,7 @@ in this Software without prior written authorization from The Open Group.
> 
> #define size (SIZEOF(xPolyPointReq) + PTSPERBATCH * SIZEOF(xPoint))
> 
>+_X_EXPORT
> int
> XDrawPoint(
>     register Display *dpy,
>diff --git a/src/DrPoints.c b/src/DrPoints.c
>index aff96ba..e5ea4b1 100644
>--- a/src/DrPoints.c
>+++ b/src/DrPoints.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDrawPoints(
>     register Display *dpy,
>diff --git a/src/DrRect.c b/src/DrRect.c
>index 682c002..5f27310 100644
>--- a/src/DrRect.c
>+++ b/src/DrRect.c
>@@ -36,6 +36,7 @@ in this Software without prior written authorization from The Open Group.
> #define wsize (SIZEOF(xPolyRectangleReq) + WRCTSPERBATCH * SIZEOF(xRectangle))
> #define zsize (SIZEOF(xPolyRectangleReq) + ZRCTSPERBATCH * SIZEOF(xRectangle))
> 
>+_X_EXPORT
> int
> XDrawRectangle(
>     register Display *dpy,
>diff --git a/src/DrRects.c b/src/DrRects.c
>index ab257a5..e48f1f4 100644
>--- a/src/DrRects.c
>+++ b/src/DrRects.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDrawRectangles(
>     register Display *dpy,
>diff --git a/src/DrSegs.c b/src/DrSegs.c
>index 78e0484..be8d9b2 100644
>--- a/src/DrSegs.c
>+++ b/src/DrSegs.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDrawSegments (
>     register Display *dpy,
>diff --git a/src/ErrDes.c b/src/ErrDes.c
>index eb5b4c2..bb2a9b6 100644
>--- a/src/ErrDes.c
>+++ b/src/ErrDes.c
>@@ -92,7 +92,7 @@ static const char * const _XErrorList[] = {
>     /* BadImplementation */	"BadImplementation",
> };
> 
>-
>+_X_EXPORT
> int
> XGetErrorText(
>     register Display *dpy,
>@@ -129,6 +129,7 @@ XGetErrorText(
>     return 0;
> }
> 
>+_X_EXPORT
> int
> /*ARGSUSED*/
> XGetErrorDatabaseText(
>diff --git a/src/ErrHndlr.c b/src/ErrHndlr.c
>index b3c2ce5..478b5f3 100644
>--- a/src/ErrHndlr.c
>+++ b/src/ErrHndlr.c
>@@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group.
>  * (_XErrorFunction) to be the specified routine.  If NULL is passed in
>  * the original error handler is restored.
>  */
>- 
>+_X_EXPORT
> XErrorHandler
> XSetErrorHandler(XErrorHandler handler)
> {
>@@ -64,7 +64,7 @@ XSetErrorHandler(XErrorHandler handler)
>  * (_XIOErrorFunction) to be the specified routine.  If NULL is passed in 
>  * the original error handler is restored.
>  */
>- 
>+_X_EXPORT
> XIOErrorHandler
> XSetIOErrorHandler(XIOErrorHandler handler)
> {
>diff --git a/src/EvToWire.c b/src/EvToWire.c
>index 1433527..cf7e998 100644
>--- a/src/EvToWire.c
>+++ b/src/EvToWire.c
>@@ -44,6 +44,7 @@ from The Open Group.
> /*
>  * reformat a wire event into an XEvent structure of the right type.
>  */
>+_X_EXPORT
> Status
> _XEventToWire(
> register Display *dpy,	/* pointer to display structure */
>diff --git a/src/FSSaver.c b/src/FSSaver.c
>index e4c17f8..f7ce59e 100644
>--- a/src/FSSaver.c
>+++ b/src/FSSaver.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XActivateScreenSaver(register Display *dpy)
> {
>@@ -38,6 +39,7 @@ XActivateScreenSaver(register Display *dpy)
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XResetScreenSaver(register Display *dpy)
> {
>@@ -45,6 +47,7 @@ XResetScreenSaver(register Display *dpy)
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XForceScreenSaver(
>     register Display *dpy,
>diff --git a/src/FSWrap.c b/src/FSWrap.c
>index b4e17e4..ad01c14 100644
>--- a/src/FSWrap.c
>+++ b/src/FSWrap.c
>@@ -163,6 +163,7 @@ copy_string_list(
>     return string_list_ret;
> }
> 
>+_X_EXPORT
> XFontSet
> XCreateFontSet (
>     Display        *dpy,
>@@ -207,6 +208,7 @@ XCreateFontSet (
>     return (XFontSet) oc;
> }
> 
>+_X_EXPORT
> int
> XFontsOfFontSet(
>     XFontSet        font_set,
>@@ -218,36 +220,42 @@ XFontsOfFontSet(
>     return font_set->core.font_info.num_font;
> }
> 
>+_X_EXPORT
> char *
> XBaseFontNameListOfFontSet(XFontSet font_set)
> {
>     return font_set->core.base_name_list;
> }
> 
>+_X_EXPORT
> char *
> XLocaleOfFontSet(XFontSet font_set)
> {
>     return font_set->core.om->core.lcd->core->name;
> }
> 
>+_X_EXPORT
> Bool
> XContextDependentDrawing(XFontSet font_set)
> {
>     return font_set->core.om->core.context_dependent;
> }
> 
>+_X_EXPORT
> Bool
> XDirectionalDependentDrawing(XFontSet font_set)
> {
>     return font_set->core.om->core.directional_dependent;
> }
> 
>+_X_EXPORT
> Bool
> XContextualDrawing(XFontSet font_set)
> {
>     return font_set->core.om->core.contextual_drawing;
> }
> 
>+_X_EXPORT
> XFontSetExtents *
> XExtentsOfFontSet(XFontSet font_set)
> {
>@@ -256,6 +264,7 @@ XExtentsOfFontSet(XFontSet font_set)
>     return &font_set->core.font_set_extents;
> }
> 
>+_X_EXPORT
> void
> XFreeFontSet(
>     Display        *dpy,
>diff --git a/src/FetchName.c b/src/FetchName.c
>index 16b2f7a..aed4c1b 100644
>--- a/src/FetchName.c
>+++ b/src/FetchName.c
>@@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group.
> #include <X11/Xos.h>
> #include <stdio.h>
> 
>-
>+_X_EXPORT
> Status XFetchName (
>     register Display *dpy,
>     Window w,
>@@ -64,6 +64,7 @@ Status XFetchName (
>     return(0);
> }
> 
>+_X_EXPORT
> Status XGetIconName (
>     register Display *dpy,
>     Window w,
>diff --git a/src/FillArc.c b/src/FillArc.c
>index 9d8060f..451b2f0 100644
>--- a/src/FillArc.c
>+++ b/src/FillArc.c
>@@ -35,6 +35,7 @@ in this Software without prior written authorization from The Open Group.
> 
> #define size (SIZEOF(xPolyFillArcReq) + FARCSPERBATCH * SIZEOF(xArc))
> 
>+_X_EXPORT
> int
> XFillArc(
>     register Display *dpy,
>diff --git a/src/FillArcs.c b/src/FillArcs.c
>index b66083c..fb7e222 100644
>--- a/src/FillArcs.c
>+++ b/src/FillArcs.c
>@@ -33,6 +33,7 @@ in this Software without prior written authorization from The Open Group.
> 
> #define arc_scale (SIZEOF(xArc) / 4)
> 
>+_X_EXPORT
> int
> XFillArcs(
>     register Display *dpy,
>diff --git a/src/FillPoly.c b/src/FillPoly.c
>index b3a7f63..f09d702 100644
>--- a/src/FillPoly.c
>+++ b/src/FillPoly.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XFillPolygon(
>     register Display *dpy,
>diff --git a/src/FillRct.c b/src/FillRct.c
>index 09bc542..222b406 100644
>--- a/src/FillRct.c
>+++ b/src/FillRct.c
>@@ -35,6 +35,7 @@ in this Software without prior written authorization from The Open Group.
> 
> #define size (SIZEOF(xPolyFillRectangleReq) + FRCTSPERBATCH * SIZEOF(xRectangle))
> 
>+_X_EXPORT
> int
> XFillRectangle(
>     register Display *dpy,
>diff --git a/src/FillRcts.c b/src/FillRcts.c
>index 54011f6..a1299a3 100644
>--- a/src/FillRcts.c
>+++ b/src/FillRcts.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XFillRectangles(
>     register Display *dpy,
>diff --git a/src/FilterEv.c b/src/FilterEv.c
>index 3191759..f29b1cb 100644
>--- a/src/FilterEv.c
>+++ b/src/FilterEv.c
>@@ -71,6 +71,7 @@ extern long const _Xevent_to_mask[];
> /*
>  * Look up if there is a specified filter for the event.
>  */
>+_X_EXPORT
> Bool
> XFilterEvent(
>     XEvent *ev,
>diff --git a/src/Flush.c b/src/Flush.c
>index cfdcce8..267e5b2 100644
>--- a/src/Flush.c
>+++ b/src/Flush.c
>@@ -34,6 +34,7 @@ in this Software without prior written authorization from The Open Group.
> /* Flush all buffered output requests. */
> /* NOTE: NOT necessary when calling any of the Xlib routines. */
> 
>+_X_EXPORT
> int
> XFlush (register Display *dpy)
> {
>diff --git a/src/Font.c b/src/Font.c
>index 5165d5e..f544c2c 100644
>--- a/src/Font.c
>+++ b/src/Font.c
>@@ -89,7 +89,7 @@ void _XF86BigfontFreeFontMetrics(
> 
> #endif /* USE_XF86BIGFONT */
> 
>-
>+_X_EXPORT
> XFontStruct *XLoadQueryFont(
>    register Display *dpy,
>    _Xconst char *name)
>@@ -126,6 +126,7 @@ XFontStruct *XLoadQueryFont(
>     return font_result;
> }
> 
>+_X_EXPORT
> XFontStruct *XQueryFont (
>     register Display *dpy,
>     Font fid)
>@@ -671,6 +672,7 @@ _XF86BigfontFreeFontMetrics (XFontStruct *fs)
> 
> #endif /* USE_XF86BIGFONT */
> 
>+_X_EXPORT
> int _XF86LoadQueryLocaleFont(
>    Display *dpy,
>    _Xconst char *name,
>diff --git a/src/FontInfo.c b/src/FontInfo.c
>index 0a741b9..83d6567 100644
>--- a/src/FontInfo.c
>+++ b/src/FontInfo.c
>@@ -41,6 +41,7 @@ extern void _XF86BigfontFreeFontMetrics(
> );
> #endif
> 
>+_X_EXPORT
> char **XListFontsWithInfo(
> register Display *dpy,
> _Xconst char *pattern,  /* null-terminated */
>@@ -225,6 +226,7 @@ XFontStruct **info)	/* RETURN */
>     return (char **) NULL;
> }
> 
>+_X_EXPORT
> int
> XFreeFontInfo (
>     char **names,
>diff --git a/src/FontNames.c b/src/FontNames.c
>index dc09785..cc62c45 100644
>--- a/src/FontNames.c
>+++ b/src/FontNames.c
>@@ -33,6 +33,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> char **
> XListFonts(
> register Display *dpy,
>diff --git a/src/FreeCmap.c b/src/FreeCmap.c
>index c399c1f..ec433c4 100644
>--- a/src/FreeCmap.c
>+++ b/src/FreeCmap.c
>@@ -33,6 +33,7 @@ in this Software without prior written authorization from The Open Group.
> #include "Xlibint.h"
> #include "Cmap.h"
> 
>+_X_EXPORT
> int
> XFreeColormap(
>     register Display *dpy,
>diff --git a/src/FreeCols.c b/src/FreeCols.c
>index 1002814..01fa972 100644
>--- a/src/FreeCols.c
>+++ b/src/FreeCols.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XFreeColors(
>     register Display *dpy,
>diff --git a/src/FreeCurs.c b/src/FreeCurs.c
>index 716af15..8b71ae2 100644
>--- a/src/FreeCurs.c
>+++ b/src/FreeCurs.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XFreeCursor(
>     register Display *dpy,
>diff --git a/src/FreeEData.c b/src/FreeEData.c
>index f70820b..e4d4fae 100644
>--- a/src/FreeEData.c
>+++ b/src/FreeEData.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> _XFreeExtData (XExtData *extension)
> {
>diff --git a/src/FreeGC.c b/src/FreeGC.c
>index e76f70b..fe50d37 100644
>--- a/src/FreeGC.c
>+++ b/src/FreeGC.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XFreeGC (
>     register Display *dpy,
>diff --git a/src/FreePix.c b/src/FreePix.c
>index 55bcd63..a50061a 100644
>--- a/src/FreePix.c
>+++ b/src/FreePix.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XFreePixmap(
>     register Display *dpy,
>diff --git a/src/GCMisc.c b/src/GCMisc.c
>index 1dc4573..7c1daf7 100644
>--- a/src/GCMisc.c
>+++ b/src/GCMisc.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetArcMode (
>     register Display *dpy,
>@@ -47,6 +48,7 @@ XSetArcMode (
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XSetFillRule (
>     register Display *dpy,
>@@ -63,6 +65,7 @@ XSetFillRule (
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XSetFillStyle (
>     register Display *dpy,
>@@ -79,6 +82,7 @@ XSetFillStyle (
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XSetGraphicsExposures (
>     register Display *dpy,
>@@ -95,6 +99,7 @@ XSetGraphicsExposures (
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XSetSubwindowMode (
>     register Display *dpy,
>diff --git a/src/Geom.c b/src/Geom.c
>index 498c445..a248e3d 100644
>--- a/src/Geom.c
>+++ b/src/Geom.c
>@@ -41,6 +41,7 @@ from The Open Group.
>  * returns 0 if there was some problem, else the position bitmask.
>  */
> 
>+_X_EXPORT
> int
> XGeometry (
>      Display *dpy,			/* user's display connection */
>diff --git a/src/GetAtomNm.c b/src/GetAtomNm.c
>index 45b4f48..e70fc13 100644
>--- a/src/GetAtomNm.c
>+++ b/src/GetAtomNm.c
>@@ -59,6 +59,7 @@ char *_XGetAtomName(
>     return (char *)NULL;
> }
> 
>+_X_EXPORT
> char *XGetAtomName(
>     register Display *dpy,
>     Atom atom)
>@@ -141,6 +142,7 @@ Bool _XGetAtomNameHandler(
>     return True;
> }
> 
>+_X_EXPORT
> Status
> XGetAtomNames (
>     Display *dpy,
>diff --git a/src/GetColor.c b/src/GetColor.c
>index 530f479..946f0cc 100644
>--- a/src/GetColor.c
>+++ b/src/GetColor.c
>@@ -34,6 +34,7 @@ in this Software without prior written authorization from The Open Group.
> #include "Xlibint.h"
> #include "Xcmsint.h"
> 
>+_X_EXPORT
> Status
> XAllocNamedColor(
> register Display *dpy,
>diff --git a/src/GetDflt.c b/src/GetDflt.c
>index 2098e81..fb22e77 100644
>--- a/src/GetDflt.c
>+++ b/src/GetDflt.c
>@@ -195,6 +195,7 @@ InitDefaults(
> #endif
> }
> 
>+_X_EXPORT
> char *
> XGetDefault(
> 	Display *dpy,			/* display for defaults.... */
>diff --git a/src/GetFPath.c b/src/GetFPath.c
>index 3a630fe..6cf487b 100644
>--- a/src/GetFPath.c
>+++ b/src/GetFPath.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> char **XGetFontPath(
>     register Display *dpy,
>     int *npaths)	/* RETURN */
>@@ -83,6 +84,7 @@ char **XGetFontPath(
> 	return (flist);
> }
> 
>+_X_EXPORT
> int
> XFreeFontPath (char **list)
> {
>diff --git a/src/GetFProp.c b/src/GetFProp.c
>index e64d909..ccbebca 100644
>--- a/src/GetFProp.c
>+++ b/src/GetFProp.c
>@@ -30,6 +30,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Bool XGetFontProperty (
>     XFontStruct *fs,
>     register Atom name,
>diff --git a/src/GetGCVals.c b/src/GetGCVals.c
>index 2a33b15..d17f849 100644
>--- a/src/GetGCVals.c
>+++ b/src/GetGCVals.c
>@@ -43,6 +43,7 @@ in this Software without prior written authorization from The Open Group.
> 			   GCClipXOrigin | GCClipYOrigin | GCDashOffset | \
> 			   GCArcMode)
> 
>+_X_EXPORT
> /*ARGSUSED*/
> Status XGetGCValues (
>     Display *dpy,
>diff --git a/src/GetGeom.c b/src/GetGeom.c
>index 7b44be9..f31d06e 100644
>--- a/src/GetGeom.c
>+++ b/src/GetGeom.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Status XGetGeometry (
>     register Display *dpy,
>     Drawable d,
>diff --git a/src/GetHColor.c b/src/GetHColor.c
>index 6a4a285..c8117dc 100644
>--- a/src/GetHColor.c
>+++ b/src/GetHColor.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Status XAllocColor(
>     register Display *dpy,
>     Colormap cmap,
>diff --git a/src/GetHints.c b/src/GetHints.c
>index e5ccbcf..b961658 100644
>--- a/src/GetHints.c
>+++ b/src/GetHints.c
>@@ -58,6 +58,7 @@ SOFTWARE.
> #include <X11/Xatom.h>
> #include <stdio.h>
> 
>+_X_EXPORT
> Status XGetSizeHints (
> 	Display *dpy,
> 	Window w,
>@@ -105,6 +106,7 @@ Status XGetSizeHints (
>  * on.
>  */
> 
>+_X_EXPORT
> XWMHints *XGetWMHints (
> 	Display *dpy,
> 	Window w)
>@@ -148,6 +150,7 @@ XWMHints *XGetWMHints (
> 	return(hints);
> }
> 
>+_X_EXPORT
> Status
> XGetZoomHints (
> 	Display *dpy,
>@@ -157,6 +160,7 @@ XGetZoomHints (
> 	return (XGetSizeHints(dpy, w, zhints, XA_WM_ZOOM_HINTS));
> }
> 
>+_X_EXPORT
> Status
> XGetNormalHints (
> 	Display *dpy,
>@@ -172,6 +176,7 @@ XGetNormalHints (
>  *	ICONSIZE_ATOM	type: ICONSIZE_ATOM format: 32
>  */
> 
>+_X_EXPORT
> Status XGetIconSizes (
> 	Display *dpy,
> 	Window w,	/* typically, root */
>@@ -228,7 +233,7 @@ Status XGetIconSizes (
> 	return(1);
> }
> 
>-
>+_X_EXPORT
> Status XGetCommand (
>     Display *dpy,
>     Window w,
>@@ -267,7 +272,7 @@ Status XGetCommand (
>     return 1;
> }
> 
>-
>+_X_EXPORT
> Status
> XGetTransientForHint(
> 	Display *dpy,
>@@ -298,6 +303,7 @@ XGetTransientForHint(
>     return(0);
> }
> 
>+_X_EXPORT
> Status
> XGetClassHint(
> 	Display *dpy,
>diff --git a/src/GetIFocus.c b/src/GetIFocus.c
>index 6e6f544..1efc5c9 100644
>--- a/src/GetIFocus.c
>+++ b/src/GetIFocus.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XGetInputFocus(
>      register Display *dpy,
>diff --git a/src/GetImage.c b/src/GetImage.c
>index 4a376c6..db35180 100644
>--- a/src/GetImage.c
>+++ b/src/GetImage.c
>@@ -46,6 +46,7 @@ static unsigned int Ones(                /* HACKMEM 169 */
>     return ((unsigned int) (((y + (y >> 3)) & 030707070707) % 077));
> }
> 
>+_X_EXPORT
> XImage *XGetImage (
>      register Display *dpy,
>      Drawable d,
>@@ -107,6 +108,7 @@ XImage *XGetImage (
> 	return (image);
> }
> 
>+_X_EXPORT
> XImage *XGetSubImage(
>      register Display *dpy,
>      Drawable d,
>diff --git a/src/GetKCnt.c b/src/GetKCnt.c
>index 2cd41d0..9236bfd 100644
>--- a/src/GetKCnt.c
>+++ b/src/GetKCnt.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XGetKeyboardControl (
>     register Display *dpy,
>diff --git a/src/GetMoEv.c b/src/GetMoEv.c
>index 2aa6c1a..aefad9b 100644
>--- a/src/GetMoEv.c
>+++ b/src/GetMoEv.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> XTimeCoord *XGetMotionEvents(
>     register Display *dpy,
>     Time start, 
>diff --git a/src/GetNrmHint.c b/src/GetNrmHint.c
>index 46841a6..0e1583a 100644
>--- a/src/GetNrmHint.c
>+++ b/src/GetNrmHint.c
>@@ -61,6 +61,7 @@ from The Open Group.
> #include <X11/Xutil.h>
> #include <stdio.h>
> 
>+_X_EXPORT
> Status XGetWMSizeHints (
>     Display *dpy,
>     Window w,
>@@ -118,6 +119,7 @@ Status XGetWMSizeHints (
> }
> 
> 
>+_X_EXPORT
> Status XGetWMNormalHints (
>     Display *dpy,
>     Window w,
>diff --git a/src/GetPCnt.c b/src/GetPCnt.c
>index 55a2f21..35f6331 100644
>--- a/src/GetPCnt.c
>+++ b/src/GetPCnt.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XGetPointerControl(
>      register Display *dpy,
>diff --git a/src/GetPntMap.c b/src/GetPntMap.c
>index 426c9ac..782cc00 100644
>--- a/src/GetPntMap.c
>+++ b/src/GetPntMap.c
>@@ -38,6 +38,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #define MIN(a, b) ((a) < (b) ? (a) : (b))
> 
>+_X_EXPORT
> int XGetPointerMapping (
>     register Display *dpy,
>     unsigned char *map,	/* RETURN */
>@@ -79,6 +80,7 @@ int XGetPointerMapping (
>     return ((int) rep.nElts);
> }
> 
>+_X_EXPORT
> KeySym *
> XGetKeyboardMapping (Display *dpy,
> #if NeedWidePrototypes
>diff --git a/src/GetProp.c b/src/GetProp.c
>index 12c641e..402571a 100644
>--- a/src/GetProp.c
>+++ b/src/GetProp.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XGetWindowProperty(
>     register Display *dpy,
>diff --git a/src/GetRGBCMap.c b/src/GetRGBCMap.c
>index 45a94b7..4e2c705 100644
>--- a/src/GetRGBCMap.c
>+++ b/src/GetRGBCMap.c
>@@ -36,6 +36,7 @@ from The Open Group.
> #include "Xatomtype.h"
> #include <X11/Xatom.h>
> 
>+_X_EXPORT
> Status XGetRGBColormaps (
>     Display *dpy,
>     Window w,
>diff --git a/src/GetSOwner.c b/src/GetSOwner.c
>index 4a87137..5e0417e 100644
>--- a/src/GetSOwner.c
>+++ b/src/GetSOwner.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Window XGetSelectionOwner(
>     register Display *dpy,
>     Atom selection)
>diff --git a/src/GetSSaver.c b/src/GetSSaver.c
>index 0806804..2029916 100644
>--- a/src/GetSSaver.c
>+++ b/src/GetSSaver.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XGetScreenSaver(
>      register Display *dpy,
>diff --git a/src/GetStCmap.c b/src/GetStCmap.c
>index 0c05cbb..97b1dec 100644
>--- a/src/GetStCmap.c
>+++ b/src/GetStCmap.c
>@@ -62,6 +62,7 @@ SOFTWARE.
>  * in the XStandardColormap structure.
>  */
> 
>+_X_EXPORT
> Status XGetStandardColormap (
>     Display *dpy,
>     Window w,
>diff --git a/src/GetTxtProp.c b/src/GetTxtProp.c
>index 90db0d4..89838cb 100644
>--- a/src/GetTxtProp.c
>+++ b/src/GetTxtProp.c
>@@ -58,6 +58,7 @@ from The Open Group.
> #include <X11/Xos.h>
> #include <stdio.h>
> 
>+_X_EXPORT
> Status XGetTextProperty (
>     Display *display,
>     Window window,
>@@ -88,6 +89,7 @@ Status XGetTextProperty (
>     return False;
> }
> 
>+_X_EXPORT
> Status XGetWMName (
>     Display *dpy,
>     Window w,
>@@ -96,6 +98,7 @@ Status XGetWMName (
>     return (XGetTextProperty (dpy, w, tp, XA_WM_NAME));
> }
> 
>+_X_EXPORT
> Status XGetWMIconName (
>     Display *dpy,
>     Window w,
>@@ -104,6 +107,7 @@ Status XGetWMIconName (
>     return (XGetTextProperty (dpy, w, tp, XA_WM_ICON_NAME));
> }
> 
>+_X_EXPORT
> Status XGetWMClientMachine (
>     Display *dpy,
>     Window w,
>diff --git a/src/GetWAttrs.c b/src/GetWAttrs.c
>index 05f1c11..bb8c589 100644
>--- a/src/GetWAttrs.c
>+++ b/src/GetWAttrs.c
>@@ -86,6 +86,7 @@ _XWAttrsHandler(
>     return True;
> }
> 
>+_X_EXPORT
> Status
> _XGetWindowAttributes(
>     register Display *dpy,
>@@ -139,6 +140,7 @@ _XGetWindowAttributes(
>     return(1);
> }
> 
>+_X_EXPORT
> Status
> XGetWindowAttributes(
>     Display *dpy,
>diff --git a/src/GetWMCMapW.c b/src/GetWMCMapW.c
>index a99fb62..f2ec4e3 100644
>--- a/src/GetWMCMapW.c
>+++ b/src/GetWMCMapW.c
>@@ -54,6 +54,7 @@ SOFTWARE.
> #include <X11/Xatom.h>
> #include <stdio.h>
> 
>+_X_EXPORT
> Status XGetWMColormapWindows (
>     Display *dpy,
>     Window w,
>diff --git a/src/GetWMProto.c b/src/GetWMProto.c
>index f0be1bb..f518298 100644
>--- a/src/GetWMProto.c
>+++ b/src/GetWMProto.c
>@@ -54,6 +54,7 @@ SOFTWARE.
> #include <X11/Xatom.h>
> #include <stdio.h>
> 
>+_X_EXPORT
> Status XGetWMProtocols (
>     Display *dpy,
>     Window w,
>diff --git a/src/GrButton.c b/src/GrButton.c
>index 17177fd..011b807 100644
>--- a/src/GrButton.c
>+++ b/src/GrButton.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XGrabButton(
>     register Display *dpy,
>diff --git a/src/GrKey.c b/src/GrKey.c
>index 47983b5..6de9948 100644
>--- a/src/GrKey.c
>+++ b/src/GrKey.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XGrabKey(
>     register Display *dpy,
>diff --git a/src/GrKeybd.c b/src/GrKeybd.c
>index e4ea053..d777b47 100644
>--- a/src/GrKeybd.c
>+++ b/src/GrKeybd.c
>@@ -30,6 +30,8 @@ in this Software without prior written authorization from The Open Group.
> #include <config.h>
> #endif
> #include "Xlibint.h"
>+
>+_X_EXPORT
> int XGrabKeyboard (
>     register Display *dpy,
>     Window window,
>diff --git a/src/GrPointer.c b/src/GrPointer.c
>index 8aab686..9a59bc1 100644
>--- a/src/GrPointer.c
>+++ b/src/GrPointer.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int XGrabPointer(
>     register Display *dpy,
>     Window grab_window,
>diff --git a/src/GrServer.c b/src/GrServer.c
>index b3d7641..00f32aa 100644
>--- a/src/GrServer.c
>+++ b/src/GrServer.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XGrabServer (register Display *dpy)
> {
>diff --git a/src/Host.c b/src/Host.c
>index a1ca870..c9cf9f3 100644
>--- a/src/Host.c
>+++ b/src/Host.c
>@@ -44,6 +44,7 @@ X Window System is a trademark of The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XAddHost (
>     register Display *dpy,
>@@ -81,6 +82,7 @@ XAddHost (
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XRemoveHost (
>     register Display *dpy,
>@@ -118,6 +120,7 @@ XRemoveHost (
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XAddHosts (
>     register Display *dpy,
>@@ -131,6 +134,7 @@ XAddHosts (
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XRemoveHosts (
>     register Display *dpy,
>diff --git a/src/Iconify.c b/src/Iconify.c
>index 973f3d5..b4329f0 100644
>--- a/src/Iconify.c
>+++ b/src/Iconify.c
>@@ -64,6 +64,7 @@ from The Open Group.
>  * This function instructs the window manager to change this window from
>  * NormalState to IconicState.
>  */
>+_X_EXPORT
> Status XIconifyWindow (
>     Display *dpy,
>     Window w,
>diff --git a/src/IfEvent.c b/src/IfEvent.c
>index 73a36b4..51dc376 100644
>--- a/src/IfEvent.c
>+++ b/src/IfEvent.c
>@@ -37,6 +37,7 @@ in this Software without prior written authorization from The Open Group.
>  * predicate in the queue.
>  */
> 
>+_X_EXPORT
> int
> XIfEvent (
> 	register Display *dpy,
>diff --git a/src/ImText.c b/src/ImText.c
>index 4d2f147..7c9cf31 100644
>--- a/src/ImText.c
>+++ b/src/ImText.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDrawImageString(
>     register Display *dpy,
>diff --git a/src/ImText16.c b/src/ImText16.c
>index d0b5e9b..d51df32 100644
>--- a/src/ImText16.c
>+++ b/src/ImText16.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDrawImageString16(
>     register Display *dpy,
>diff --git a/src/ImUtil.c b/src/ImUtil.c
>index d1df7ae..f623466 100644
>--- a/src/ImUtil.c
>+++ b/src/ImUtil.c
>@@ -55,6 +55,7 @@ static unsigned char const _himask[0x09] = { 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0,
> 	associated with a specific depth of ZPixmap format image for a 
> 	display. */
> 
>+_X_EXPORT
> int
> _XGetScanlinePad(
>  Display *dpy,
>@@ -70,6 +71,7 @@ _XGetScanlinePad(
>  	return(dpy->bitmap_pad);
>  }
>  
>+_X_EXPORT
> int
> _XGetBitsPerPixel(
>  Display *dpy,
>@@ -270,6 +272,7 @@ static void _putbits(
>  * routines always have to check to make sure the optimization is still
>  * valid, and reinit the functions if not.
>  */
>+_X_EXPORT
> void _XInitImageFuncPtrs (
>     register XImage *image)
> {
>@@ -307,6 +310,7 @@ void _XInitImageFuncPtrs (
>  * 
>  */
> 
>+_X_EXPORT
> XImage *XCreateImage (
>     register Display *dpy,
>     register Visual *visual,
>@@ -386,6 +390,7 @@ XImage *XCreateImage (
> 	return image;
> }
> 
>+_X_EXPORT
> Status XInitImage (XImage *image)
> {
> 	int min_bytes_per_line;
>@@ -925,6 +930,7 @@ static XImage *_XSubImage (
>  *
>  */
> 
>+_X_EXPORT
> int _XSetImage(
>     XImage *srcimg,
>     register XImage *dstimg,
>diff --git a/src/InitExt.c b/src/InitExt.c
>index 925b986..4e6e233 100644
>--- a/src/InitExt.c
>+++ b/src/InitExt.c
>@@ -40,6 +40,7 @@ from The Open Group.
>  * at appropriate times.
>  */
> 
>+_X_EXPORT
> XExtCodes *XInitExtension (
> 	Display *dpy,
> 	_Xconst char *name)
>@@ -69,6 +70,7 @@ XExtCodes *XInitExtension (
> 	return (&ext->codes);		/* tell him which extension */
> }
> 
>+_X_EXPORT
> XExtCodes *XAddExtension (Display *dpy)
> {
>     register _XExtension *ext;
>@@ -98,11 +100,13 @@ static _XExtension *XLookupExtension (
> 	return (NULL);
> }
> 
>+_X_EXPORT
> XExtData **XEHeadOfExtensionList(XEDataObject object)
> {
>     return *(XExtData ***)&object;
> }
> 
>+_X_EXPORT
> int
> XAddToExtensionList(
>     XExtData **structure,
>@@ -113,6 +117,7 @@ XAddToExtensionList(
>     return 1;
> }
> 
>+_X_EXPORT
> XExtData *XFindOnExtensionList(
>     XExtData **structure,
>     int number)
>@@ -128,6 +133,7 @@ XExtData *XFindOnExtensionList(
> /*
>  * Routines to hang procs on the extension structure.
>  */
>+_X_EXPORT
> CreateGCType XESetCreateGC(
> 	Display *dpy,		/* display */
> 	int extension,		/* extension number */
>@@ -143,6 +149,7 @@ CreateGCType XESetCreateGC(
> 	return (CreateGCType)oldproc;
> }
> 
>+_X_EXPORT
> CopyGCType XESetCopyGC(
> 	Display *dpy,		/* display */
> 	int extension,		/* extension number */
>@@ -158,6 +165,7 @@ CopyGCType XESetCopyGC(
> 	return (CopyGCType)oldproc;
> }
> 
>+_X_EXPORT
> FlushGCType XESetFlushGC(
> 	Display *dpy,		/* display */
> 	int extension,		/* extension number */
>@@ -173,6 +181,7 @@ FlushGCType XESetFlushGC(
> 	return (FlushGCType)oldproc;
> }
> 
>+_X_EXPORT
> FreeGCType XESetFreeGC(
> 	Display *dpy,		/* display */
> 	int extension,		/* extension number */
>@@ -188,6 +197,7 @@ FreeGCType XESetFreeGC(
> 	return (FreeGCType)oldproc;
> }
> 
>+_X_EXPORT
> CreateFontType XESetCreateFont(
> 	Display *dpy,		/* display */
> 	int extension,		/* extension number */
>@@ -203,6 +213,7 @@ CreateFontType XESetCreateFont(
> 	return (CreateFontType)oldproc;
> }
> 
>+_X_EXPORT
> FreeFontType XESetFreeFont(
> 	Display *dpy,		/* display */
> 	int extension,		/* extension number */
>@@ -218,6 +229,7 @@ FreeFontType XESetFreeFont(
> 	return (FreeFontType)oldproc;
> }
> 
>+_X_EXPORT
> CloseDisplayType XESetCloseDisplay(
> 	Display *dpy,		/* display */
> 	int extension,		/* extension number */
>@@ -239,6 +251,7 @@ typedef Bool (*WireToEventType) (
>     xEvent*	/* event */
> );
> 
>+_X_EXPORT
> WireToEventType XESetWireToEvent(
> 	Display *dpy,		/* display */
> 	int event_number,	/* event routine to replace */
>@@ -259,6 +272,7 @@ typedef Status (*EventToWireType) (
>     xEvent*	/* event */
> );
> 
>+_X_EXPORT
> EventToWireType XESetEventToWire(
> 	Display *dpy,		/* display */
> 	int event_number,	/* event routine to replace */
>@@ -279,6 +293,7 @@ typedef Bool (*WireToErrorType) (
>     xError*	/* we */
> );
> 
>+_X_EXPORT
> WireToErrorType XESetWireToError(
> 	Display *dpy,		/* display */
> 	int error_number,	/* error routine to replace */
>@@ -301,6 +316,7 @@ WireToErrorType XESetWireToError(
> 	return (WireToErrorType)oldproc;
> }
> 
>+_X_EXPORT
> ErrorType XESetError(
> 	Display *dpy,		/* display */
> 	int extension,		/* extension number */
>@@ -316,6 +332,7 @@ ErrorType XESetError(
> 	return (ErrorType)oldproc;
> }
> 
>+_X_EXPORT
> ErrorStringType XESetErrorString(
> 	Display *dpy,		/* display */
> 	int extension,		/* extension number */
>@@ -331,6 +348,7 @@ ErrorStringType XESetErrorString(
> 	return (ErrorStringType)oldproc;
> }
> 
>+_X_EXPORT
> PrintErrorType XESetPrintErrorValues(
> 	Display *dpy,		/* display */
> 	int extension,		/* extension number */
>@@ -346,6 +364,7 @@ PrintErrorType XESetPrintErrorValues(
> 	return (PrintErrorType)oldproc;
> }
> 
>+_X_EXPORT
> BeforeFlushType XESetBeforeFlush(
> 	Display *dpy,		/* display */
> 	int extension,		/* extension number */
>diff --git a/src/InsCmap.c b/src/InsCmap.c
>index 1b59ad5..3f2ccf3 100644
>--- a/src/InsCmap.c
>+++ b/src/InsCmap.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XInstallColormap(
>     register Display *dpy,
>diff --git a/src/IntAtom.c b/src/IntAtom.c
>index 6f16081..3989a51 100644
>--- a/src/IntAtom.c
>+++ b/src/IntAtom.c
>@@ -161,6 +161,7 @@ _XUpdateAtomCache(
>     }
> }
> 
>+_X_EXPORT
> Atom
> XInternAtom (
>     Display *dpy,
>diff --git a/src/KeyBind.c b/src/KeyBind.c
>index 3d0551b..c4fb375 100644
>--- a/src/KeyBind.c
>+++ b/src/KeyBind.c
>@@ -121,6 +121,7 @@ KeyCodetoKeySym(register Display *dpy, KeyCode keycode, int col)
>     return syms[col];
> }
> 
>+_X_EXPORT
> KeySym
> XKeycodeToKeysym(Display *dpy,
> #if NeedWidePrototypes
>@@ -135,6 +136,7 @@ XKeycodeToKeysym(Display *dpy,
>     return KeyCodetoKeySym(dpy, kc, col);
> }
> 
>+_X_EXPORT
> KeyCode
> XKeysymToKeycode(
>     Display *dpy,
>@@ -153,6 +155,7 @@ XKeysymToKeycode(
>     return 0;
> }
> 
>+_X_EXPORT
> KeySym
> XLookupKeysym(
>     register XKeyEvent *event,
>@@ -231,6 +234,7 @@ InitModMap(
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XRefreshKeyboardMapping(register XMappingEvent *event)
> {
>@@ -643,6 +647,7 @@ UCSConvertCase( register unsigned code,
>         *upper -= 0x28;
> }
> 
>+_X_EXPORT
> void
> XConvertCase(
>     register KeySym sym,
>@@ -877,6 +882,7 @@ _XTranslateKeySym(
>     return 1;
> }
>   
>+_X_EXPORT
> /*ARGSUSED*/
> int
> XLookupString (
>@@ -981,6 +987,7 @@ _XFreeKeyBindings(
>     }   
> }
> 
>+_X_EXPORT
> int
> XRebindKeysym (
>     Display *dpy,
>diff --git a/src/KeysymStr.c b/src/KeysymStr.c
>index ce82761..6d4b8ab 100644
>--- a/src/KeysymStr.c
>+++ b/src/KeysymStr.c
>@@ -71,6 +71,7 @@ SameValue(
>     return False;
> }
> 
>+_X_EXPORT
> char *XKeysymToString(KeySym ks)
> {
>     register int i, n;
>diff --git a/src/KillCl.c b/src/KillCl.c
>index 2c72c10..e045714 100644
>--- a/src/KillCl.c
>+++ b/src/KillCl.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XKillClient(
> 	register Display *dpy,
>diff --git a/src/LiHosts.c b/src/LiHosts.c
>index ebfb245..37dca05 100644
>--- a/src/LiHosts.c
>+++ b/src/LiHosts.c
>@@ -47,6 +47,7 @@ X Window System is a trademark of The Open Group.
>  * can be freed using XFree.
>  */
> 
>+_X_EXPORT
> XHostAddress *XListHosts (
>     register Display *dpy,
>     int *nhosts,	/* RETURN */
>diff --git a/src/LiICmaps.c b/src/LiICmaps.c
>index 9381f49..8ef56f0 100644
>--- a/src/LiICmaps.c
>+++ b/src/LiICmaps.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Colormap *XListInstalledColormaps(
>     register Display *dpy,
>     Window win,
>diff --git a/src/LiProps.c b/src/LiProps.c
>index 681959d..3d01db9 100644
>--- a/src/LiProps.c
>+++ b/src/LiProps.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Atom *XListProperties(
>     register Display *dpy,
>     Window window,
>diff --git a/src/ListExt.c b/src/ListExt.c
>index 82d44d7..def7c58 100644
>--- a/src/ListExt.c
>+++ b/src/ListExt.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> char **XListExtensions(
>     register Display *dpy,
>     int *nextensions)	/* RETURN */
>@@ -89,6 +90,7 @@ char **XListExtensions(
> 	return (list);
> }
> 
>+_X_EXPORT
> int
> XFreeExtensionList (char **list)
> {
>diff --git a/src/LoadFont.c b/src/LoadFont.c
>index de5f5ce..a4f8286 100644
>--- a/src/LoadFont.c
>+++ b/src/LoadFont.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Font
> XLoadFont (
>     register Display *dpy,
>diff --git a/src/LockDis.c b/src/LockDis.c
>index d99d3bb..2d41767 100644
>--- a/src/LockDis.c
>+++ b/src/LockDis.c
>@@ -41,6 +41,7 @@ in this Software without prior written authorization from The Open Group.
> #include "locking.h"
> #endif
> 
>+_X_EXPORT
> void
> XLockDisplay(
>     register Display* dpy)
>@@ -73,6 +74,7 @@ XLockDisplay(
> #endif
> }
> 
>+_X_EXPORT
> void
> XUnlockDisplay(
>     register Display* dpy)
>diff --git a/src/LookupCol.c b/src/LookupCol.c
>index 02f831a..26ae010 100644
>--- a/src/LookupCol.c
>+++ b/src/LookupCol.c
>@@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group.
> #include "Xlibint.h"
> #include "Xcmsint.h"
> 
>-
>+_X_EXPORT
> Status
> XLookupColor (
> 	register Display *dpy,
>diff --git a/src/LowerWin.c b/src/LowerWin.c
>index 39c8dd1..60bd6f2 100644
>--- a/src/LowerWin.c
>+++ b/src/LowerWin.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XLowerWindow(
>     Display *dpy,
>diff --git a/src/Macros.c b/src/Macros.c
>index f720a26..d98e7c2 100644
>--- a/src/Macros.c
>+++ b/src/Macros.c
>@@ -39,104 +39,133 @@ in this Software without prior written authorization from The Open Group.
>  * need them.
>  */
> 
>+_X_EXPORT
> int XConnectionNumber(Display *dpy) { return (ConnectionNumber(dpy)); }
> 
>+_X_EXPORT
> Window XRootWindow (Display *dpy, int scr)
> {
>     return (RootWindow(dpy,scr));
> }
> 
>+_X_EXPORT
> int XDefaultScreen(Display *dpy) { return (DefaultScreen(dpy)); }
> 
>+_X_EXPORT
> Window XDefaultRootWindow (Display *dpy)
> {
>     return (RootWindow(dpy,DefaultScreen(dpy)));
> }
> 
>+_X_EXPORT
> Visual *XDefaultVisual(Display *dpy, int scr)
> {
>     return (DefaultVisual(dpy, scr));
> }
> 
>+_X_EXPORT
> GC XDefaultGC(Display *dpy, int scr)
> {
>     return (DefaultGC(dpy,scr)); 
> }
> 
>+_X_EXPORT
> unsigned long XBlackPixel(Display *dpy, int scr) 
> {
>     return (BlackPixel(dpy, scr));
> }
> 
>+_X_EXPORT
> unsigned long XWhitePixel(Display *dpy, int scr) 
> {
>     return (WhitePixel(dpy,scr));
> }
> 
>+_X_EXPORT
> unsigned long XAllPlanes(void) { return AllPlanes; }
> 
>+_X_EXPORT
> int XQLength(Display *dpy) { return (QLength(dpy)); }
> 
>+_X_EXPORT
> int XDisplayWidth(Display *dpy, int scr)
> {
>     return (DisplayWidth(dpy,scr));
> }
> 
>+_X_EXPORT
> int XDisplayHeight(Display *dpy, int scr)
> {
>     return (DisplayHeight(dpy, scr)); 
> }
> 
>+_X_EXPORT
> int XDisplayWidthMM(Display *dpy, int scr)
> {
>     return (DisplayWidthMM(dpy, scr));
> }
> 
>+_X_EXPORT
> int XDisplayHeightMM(Display *dpy, int scr)
> {
>     return (DisplayHeightMM(dpy, scr));
> }
> 
>+_X_EXPORT
> int XDisplayPlanes(Display *dpy, int scr)
> { 
>     return (DisplayPlanes(dpy, scr));
> }
> 
>+_X_EXPORT
> int XDisplayCells(Display *dpy, int scr)
> {
>     return (DisplayCells (dpy, scr));
> }
> 
>+_X_EXPORT
> int XScreenCount(Display *dpy) { return (ScreenCount(dpy)); }
> 
>+_X_EXPORT
> char *XServerVendor(Display *dpy) { return (ServerVendor(dpy)); }
> 
>+_X_EXPORT
> int XProtocolVersion(Display *dpy) { return (ProtocolVersion(dpy)); }
> 
>+_X_EXPORT
> int XProtocolRevision(Display *dpy) { return (ProtocolRevision(dpy));}
> 
>+_X_EXPORT
> int XVendorRelease(Display *dpy) { return (VendorRelease(dpy)); }
> 
>+_X_EXPORT
> char *XDisplayString(Display *dpy) { return (DisplayString(dpy)); }
> 
>+_X_EXPORT
> int XDefaultDepth(Display *dpy, int scr)
> { 
>     return(DefaultDepth(dpy, scr));
> }
> 
>+_X_EXPORT
> Colormap XDefaultColormap(Display *dpy, int scr)
> { 
>     return (DefaultColormap(dpy, scr));
> }
> 
>+_X_EXPORT
> int XBitmapUnit(Display *dpy) { return (BitmapUnit(dpy)); }
> 
>+_X_EXPORT
> int XBitmapBitOrder(Display *dpy) { return (BitmapBitOrder(dpy)); }
> 
>+_X_EXPORT
> int XBitmapPad(Display *dpy) { return (BitmapPad(dpy)); }
> 
>+_X_EXPORT
> int XImageByteOrder(Display *dpy) { return (ImageByteOrder(dpy)); }
> 
>+_X_EXPORT
> unsigned long XNextRequest(Display *dpy)
> {
> #ifdef WORD64
>@@ -147,78 +176,101 @@ unsigned long XNextRequest(Display *dpy)
> #endif
> }
> 
>+_X_EXPORT
> unsigned long XLastKnownRequestProcessed(Display *dpy)
> {
>     return (LastKnownRequestProcessed(dpy));
> }
> 
> /* screen oriented macros (toolkit) */
>+_X_EXPORT
> Screen *XScreenOfDisplay(Display *dpy, int scr)
> {
>     return (ScreenOfDisplay(dpy, scr));
> }
> 
>+_X_EXPORT
> Screen *XDefaultScreenOfDisplay(Display *dpy)
> { 
>     return (DefaultScreenOfDisplay(dpy));
> }
> 
>+_X_EXPORT
> Display *XDisplayOfScreen(Screen *s) { return (DisplayOfScreen(s)); }
> 
>+_X_EXPORT
> Window XRootWindowOfScreen(Screen *s) { return (RootWindowOfScreen(s)); }
> 
>+_X_EXPORT
> unsigned long XBlackPixelOfScreen(Screen *s) 
> {
>     return (BlackPixelOfScreen(s));
> }
> 
>+_X_EXPORT
> unsigned long XWhitePixelOfScreen(Screen *s) 
> {
>     return (WhitePixelOfScreen(s));
> }
> 
>+_X_EXPORT
> Colormap XDefaultColormapOfScreen(Screen *s) 
> {
>     return (DefaultColormapOfScreen(s));
> }
> 
>+_X_EXPORT
> int XDefaultDepthOfScreen(Screen *s) 
> { 
>     return (DefaultDepthOfScreen(s));
> }
> 
>+_X_EXPORT
> GC XDefaultGCOfScreen(Screen *s) 
> { 
>     return (DefaultGCOfScreen(s));
> }
> 
>+_X_EXPORT
> Visual *XDefaultVisualOfScreen(Screen *s) 
> {
>     return (DefaultVisualOfScreen(s));
> }
> 
>+_X_EXPORT
> int XWidthOfScreen(Screen *s) { return (WidthOfScreen(s)); }
> 
>+_X_EXPORT
> int XHeightOfScreen(Screen *s) { return (HeightOfScreen(s)); }
> 
>+_X_EXPORT
> int XWidthMMOfScreen(Screen *s) { return (WidthMMOfScreen(s)); }
> 
>+_X_EXPORT
> int XHeightMMOfScreen(Screen *s) { return (HeightMMOfScreen(s)); }
> 
>+_X_EXPORT
> int XPlanesOfScreen(Screen *s) { return (PlanesOfScreen(s)); }
> 
>+_X_EXPORT
> int XCellsOfScreen(Screen *s) { return (CellsOfScreen(s)); }
> 
>+_X_EXPORT
> int XMinCmapsOfScreen(Screen *s) { return (MinCmapsOfScreen(s)); }
> 
>+_X_EXPORT
> int XMaxCmapsOfScreen(Screen *s) { return (MaxCmapsOfScreen(s)); }
> 
>+_X_EXPORT
> Bool XDoesSaveUnders(Screen *s) { return (DoesSaveUnders(s)); }
> 
>+_X_EXPORT
> int XDoesBackingStore(Screen *s) { return (DoesBackingStore(s)); }
> 
>+_X_EXPORT
> long XEventMaskOfScreen(Screen *s) { return (EventMaskOfScreen(s)); }
> 
>+_X_EXPORT
> int XScreenNumberOfScreen (register Screen *scr)
> {
>     register Display *dpy = scr->display;
>@@ -236,20 +288,28 @@ int XScreenNumberOfScreen (register Screen *scr)
>  * naive people are more comfortable with them.
>  */
> #undef XDestroyImage
>+
>+_X_EXPORT
> int
> XDestroyImage(
> 	XImage *ximage)
> {
> 	return((*((ximage)->f.destroy_image))((ximage)));
> }
>+
> #undef XGetPixel
>+
>+_X_EXPORT
> unsigned long XGetPixel(
> 	XImage *ximage,
> 	int x, int y)
> {
> 	return ((*((ximage)->f.get_pixel))((ximage), (x), (y)));
> }
>+
> #undef XPutPixel
>+
>+_X_EXPORT
> int XPutPixel(
> 	XImage *ximage,
> 	int x, int y,
>@@ -257,7 +317,10 @@ int XPutPixel(
> {
> 	return((*((ximage)->f.put_pixel))((ximage), (x), (y), (pixel)));
> }
>+
> #undef XSubImage
>+
>+_X_EXPORT
> XImage *XSubImage(
> 	XImage *ximage,
> 	int x, int y,
>@@ -266,7 +329,10 @@ XImage *XSubImage(
> 	return((*((ximage)->f.sub_image))((ximage), (x),
> 		(y), (width), (height)));
> }
>+
> #undef XAddPixel
>+
>+_X_EXPORT
> int XAddPixel(
> 	XImage *ximage,
> 	long value)
>@@ -274,7 +340,7 @@ int XAddPixel(
> 	return((*((ximage)->f.add_pixel))((ximage), (value)));
> }
> 
>-
>+_X_EXPORT
> int
> XNoOp (register Display *dpy)
> {
>diff --git a/src/MapRaised.c b/src/MapRaised.c
>index d709751..e88376c 100644
>--- a/src/MapRaised.c
>+++ b/src/MapRaised.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XMapRaised (
>     register Display *dpy,
>diff --git a/src/MapSubs.c b/src/MapSubs.c
>index 751dd77..1c74c18 100644
>--- a/src/MapSubs.c
>+++ b/src/MapSubs.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XMapSubwindows(
>     register Display *dpy,
>diff --git a/src/MapWindow.c b/src/MapWindow.c
>index ba1f519..b978463 100644
>--- a/src/MapWindow.c
>+++ b/src/MapWindow.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XMapWindow (
> 	register Display *dpy,
>diff --git a/src/MaskEvent.c b/src/MaskEvent.c
>index fbada5e..d74ac20 100644
>--- a/src/MaskEvent.c
>+++ b/src/MaskEvent.c
>@@ -43,6 +43,7 @@ extern long const _Xevent_to_mask[];
>  * Events earlier in the queue are not discarded.
>  */
> 
>+_X_EXPORT
> int
> XMaskEvent (
> 	register Display *dpy,
>diff --git a/src/Misc.c b/src/Misc.c
>index a34ac6d..80009eb 100644
>--- a/src/Misc.c
>+++ b/src/Misc.c
>@@ -31,21 +31,25 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> long XMaxRequestSize(Display *dpy)
> {
>     return dpy->max_request_size;
> }
> 
>+_X_EXPORT
> char *XResourceManagerString(Display *dpy)
> {
>     return dpy->xdefaults;
> }
> 
>+_X_EXPORT
> unsigned long XDisplayMotionBufferSize(Display *dpy)
> {
>     return dpy->motion_buffer;
> }
> 
>+_X_EXPORT
> int
> XDisplayKeycodes(
>     Display *dpy,
>@@ -57,11 +61,13 @@ XDisplayKeycodes(
>     return 1;
> }
> 
>+_X_EXPORT
> VisualID XVisualIDFromVisual(Visual *visual)
> {
>     return visual->visualid;
> }
> 
>+_X_EXPORT
> long XExtendedMaxRequestSize(Display *dpy)
> {
>     return dpy->bigreq_size;
>diff --git a/src/ModMap.c b/src/ModMap.c
>index b5cb422..5f19f81 100644
>--- a/src/ModMap.c
>+++ b/src/ModMap.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> XModifierKeymap *
> XGetModifierMapping(register Display *dpy)
> {       
>@@ -67,6 +68,7 @@ XGetModifierMapping(register Display *dpy)
>  *	1	Busy - one or more old or new modifiers are down
>  *	2	Failed - one or more new modifiers unacceptable
>  */
>+_X_EXPORT
> int
> XSetModifierMapping(
>     register Display *dpy,
>@@ -92,6 +94,7 @@ XSetModifierMapping(
>     return (rep.success);
> }
> 
>+_X_EXPORT
> XModifierKeymap *
> XNewModifiermap(int keyspermodifier)
> {
>@@ -109,7 +112,7 @@ XNewModifiermap(int keyspermodifier)
>     return (res);
> }
> 
>-
>+_X_EXPORT
> int
> XFreeModifiermap(XModifierKeymap *map)
> {
>@@ -121,6 +124,7 @@ XFreeModifiermap(XModifierKeymap *map)
>     return 1;
> }
> 
>+_X_EXPORT
> XModifierKeymap *
> XInsertModifiermapEntry(XModifierKeymap *map,
> #if NeedWidePrototypes
>@@ -163,6 +167,7 @@ XInsertModifiermapEntry(XModifierKeymap *map,
>     return(newmap);
> }
> 
>+_X_EXPORT
> XModifierKeymap *
> XDeleteModifiermapEntry(XModifierKeymap *map,
> #if NeedWidePrototypes
>diff --git a/src/MoveWin.c b/src/MoveWin.c
>index bd2a5a0..55551df 100644
>--- a/src/MoveWin.c
>+++ b/src/MoveWin.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XMoveWindow (
>     register Display *dpy,
>diff --git a/src/NextEvent.c b/src/NextEvent.c
>index 6303234..903151b 100644
>--- a/src/NextEvent.c
>+++ b/src/NextEvent.c
>@@ -37,6 +37,7 @@ in this Software without prior written authorization from The Open Group.
>  * events.
>  */
> 
>+_X_EXPORT
> int
> XNextEvent (
> 	register Display *dpy,
>diff --git a/src/OCWrap.c b/src/OCWrap.c
>index 05774c5..4b7f54b 100644
>--- a/src/OCWrap.c
>+++ b/src/OCWrap.c
>@@ -31,6 +31,7 @@
> #include "Xlibint.h"
> #include "Xlcint.h"
> 
>+_X_EXPORT
> XOC
> XCreateOC(XOM om, ...)
> {
>@@ -62,6 +63,7 @@ XCreateOC(XOM om, ...)
>     return oc;
> }
> 
>+_X_EXPORT
> void
> XDestroyOC(XOC oc)
> {
>@@ -83,12 +85,14 @@ XDestroyOC(XOC oc)
>     (*oc->methods->destroy)(oc);
> }
> 
>+_X_EXPORT
> XOM
> XOMOfOC(XOC oc)
> {
>     return oc->core.om;
> }
> 
>+_X_EXPORT
> char *
> XSetOCValues(XOC oc, ...)
> {
>@@ -115,6 +119,7 @@ XSetOCValues(XOC oc, ...)
>     return ret;
> }
> 
>+_X_EXPORT
> char *
> XGetOCValues(XOC oc, ...)
> {
>diff --git a/src/OMWrap.c b/src/OMWrap.c
>index 2373ef6..6e2042a 100644
>--- a/src/OMWrap.c
>+++ b/src/OMWrap.c
>@@ -31,6 +31,7 @@
> #include "Xlibint.h"
> #include "Xlcint.h"
> 
>+_X_EXPORT
> XOM
> XOpenOM(Display *dpy, XrmDatabase rdb, _Xconst char *res_name,
> 	_Xconst char *res_class)
>@@ -46,6 +47,7 @@ XOpenOM(Display *dpy, XrmDatabase rdb, _Xconst char *res_name,
>     return (XOM) NULL;
> }
> 
>+_X_EXPORT
> Status
> XCloseOM(XOM om)
> {
>@@ -66,6 +68,7 @@ XCloseOM(XOM om)
>     return (*om->methods->close)(om);
> }
> 
>+_X_EXPORT
> char *
> XSetOMValues(XOM om, ...)
> {
>@@ -92,6 +95,7 @@ XSetOMValues(XOM om, ...)
>     return ret;
> }
> 
>+_X_EXPORT
> char *
> XGetOMValues(XOM om, ...)
> {
>@@ -118,12 +122,14 @@ XGetOMValues(XOM om, ...)
>     return ret;
> }
> 
>+_X_EXPORT
> Display *
> XDisplayOfOM(XOM om)
> {
>     return om->core.display;
> }
> 
>+_X_EXPORT
> char *
> XLocaleOfOM(XOM om)
> {
>diff --git a/src/OpenDis.c b/src/OpenDis.c
>index 9c327d1..addaf35 100644
>--- a/src/OpenDis.c
>+++ b/src/OpenDis.c
>@@ -88,6 +88,7 @@ static Bool _XBigReqHandler(Display *dpy, xReply *rep, char *buf, int len,
>  * Connects to a server, creates a Display object and returns a pointer to
>  * the newly created Display back to the caller.
>  */
>+_X_EXPORT
> Display *
> XOpenDisplay (
> 	register _Xconst char *display)
>diff --git a/src/ParseCmd.c b/src/ParseCmd.c
>index fb79668..f72fb43 100644
>--- a/src/ParseCmd.c
>+++ b/src/ParseCmd.c
>@@ -72,6 +72,7 @@ static void _XReportParseError(XrmOptionDescRec *arg, const char *msg)
>     exit(1);
> }
> 
>+_X_EXPORT
> void
> XrmParseCommand(
>     XrmDatabase		*pdb,		/* data base */
>diff --git a/src/ParseCol.c b/src/ParseCol.c
>index 3736fad..98c94bf 100644
>--- a/src/ParseCol.c
>+++ b/src/ParseCol.c
>@@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group.
> #include "Xlibint.h"
> #include "Xcmsint.h"
> 
>-
>+_X_EXPORT
> Status
> XParseColor (
> 	register Display *dpy,
>diff --git a/src/ParseGeom.c b/src/ParseGeom.c
>index 6aaaccf..532580e 100644
>--- a/src/ParseGeom.c
>+++ b/src/ParseGeom.c
>@@ -89,6 +89,7 @@ ReadInteger(char *string, char **NextString)
> 	return (-Result);
> }
> 
>+_X_EXPORT
> int
> XParseGeometry (
> _Xconst char *string,
>diff --git a/src/PeekEvent.c b/src/PeekEvent.c
>index c28f114..3546cd6 100644
>--- a/src/PeekEvent.c
>+++ b/src/PeekEvent.c
>@@ -38,6 +38,7 @@ in this Software without prior written authorization from The Open Group.
>  * If none found, flush and wait until there is an event to peek.
>  */
> 
>+_X_EXPORT
> int
> XPeekEvent (
> 	register Display *dpy,
>diff --git a/src/PeekIfEv.c b/src/PeekIfEv.c
>index 1d5b1ab..de56017 100644
>--- a/src/PeekIfEv.c
>+++ b/src/PeekIfEv.c
>@@ -38,6 +38,7 @@ in this Software without prior written authorization from The Open Group.
>  * If none found, flush, and then wait until one satisfies the predicate.
>  */
> 
>+_X_EXPORT
> int
> XPeekIfEvent (
> 	register Display *dpy,
>diff --git a/src/Pending.c b/src/Pending.c
>index 8ab7b1e..72eafc7 100644
>--- a/src/Pending.c
>+++ b/src/Pending.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> 
> /* Read in pending events if needed and return the number of queued events. */
> 
>+_X_EXPORT
> int XEventsQueued (
>     register Display *dpy,
>     int mode)
>@@ -46,6 +47,7 @@ int XEventsQueued (
>     return ret_val;
> }
> 
>+_X_EXPORT
> int XPending (register Display *dpy)
> {
>     int ret_val;
>diff --git a/src/PixFormats.c b/src/PixFormats.c
>index 684d0c7..66074cd 100644
>--- a/src/PixFormats.c
>+++ b/src/PixFormats.c
>@@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group.
> /*
>  * XListPixmapFormats - return info from connection setup
>  */
>-
>+_X_EXPORT
> XPixmapFormatValues *XListPixmapFormats (
>     Display *dpy,
>     int *count)	/* RETURN */
>diff --git a/src/PmapBgnd.c b/src/PmapBgnd.c
>index ee4581e..70df585 100644
>--- a/src/PmapBgnd.c
>+++ b/src/PmapBgnd.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetWindowBackgroundPixmap(
>     register Display *dpy,
>diff --git a/src/PmapBord.c b/src/PmapBord.c
>index b0d8f1f..12f7ec3 100644
>--- a/src/PmapBord.c
>+++ b/src/PmapBord.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetWindowBorderPixmap(
>     register Display *dpy,
>diff --git a/src/PolyReg.c b/src/PolyReg.c
>index d6f4c74..6f3e209 100644
>--- a/src/PolyReg.c
>+++ b/src/PolyReg.c
>@@ -472,6 +472,7 @@ static int PtsToRegion(
>  *     encoding of the resultant bitmap -- the run-length
>  *     encoding is in the form of an array of rectangles.
>  */
>+_X_EXPORT
> Region 
> XPolygonRegion(
>     XPoint     *Pts,		     /* the pts                 */
>diff --git a/src/PolyTxt.c b/src/PolyTxt.c
>index eb93ffd..ffc4b09 100644
>--- a/src/PolyTxt.c
>+++ b/src/PolyTxt.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDrawText(
>     register Display *dpy,
>diff --git a/src/PropAlloc.c b/src/PropAlloc.c
>index aab348b..e7f745c 100644
>--- a/src/PropAlloc.c
>+++ b/src/PropAlloc.c
>@@ -39,12 +39,14 @@ in this Software without prior written authorization from The Open Group.
>  * longer at some point.
>  */
> 
>+_X_EXPORT
> XSizeHints *XAllocSizeHints (void)
> {
>     return ((XSizeHints *) Xcalloc (1, (unsigned) sizeof (XSizeHints)));
> }
> 
> 
>+_X_EXPORT
> XStandardColormap *XAllocStandardColormap (void)
> {
>     return ((XStandardColormap *)
>@@ -52,12 +54,14 @@ XStandardColormap *XAllocStandardColormap (void)
> }
> 
> 
>+_X_EXPORT
> XWMHints *XAllocWMHints (void)
> {
>     return ((XWMHints *) Xcalloc (1, (unsigned) sizeof (XWMHints)));
> }
> 
> 
>+_X_EXPORT
> XClassHint *XAllocClassHint (void)
> {
>     register XClassHint *h;
>@@ -69,6 +73,7 @@ XClassHint *XAllocClassHint (void)
> }
> 
> 
>+_X_EXPORT
> XIconSize *XAllocIconSize (void)
> {
>     return ((XIconSize *) Xcalloc (1, (unsigned) sizeof (XIconSize)));
>diff --git a/src/PutBEvent.c b/src/PutBEvent.c
>index 8c1db72..ccc7f6e 100644
>--- a/src/PutBEvent.c
>+++ b/src/PutBEvent.c
>@@ -35,6 +35,7 @@ from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> _XPutBackEvent (
>     register Display *dpy, 
>@@ -60,6 +61,7 @@ _XPutBackEvent (
> 	return 0;
> 	}
> 
>+_X_EXPORT
> int
> XPutBackEvent (
>     register Display * dpy, 
>diff --git a/src/PutImage.c b/src/PutImage.c
>index b528eb9..bf1f347 100644
>--- a/src/PutImage.c
>+++ b/src/PutImage.c
>@@ -118,6 +118,7 @@ static unsigned char const _reverse_nibs[0x100] = {
> 	0x8f, 0x9f, 0xaf, 0xbf, 0xcf, 0xdf, 0xef, 0xff
> };
> 
>+_X_EXPORT
> int
> _XReverse_Bytes(
>     register unsigned char *bpt,
>@@ -939,7 +940,7 @@ PutSubImage (
>     }
> }
> 
>-
>+_X_EXPORT
> int
> XPutImage (
>     register Display *dpy,
>diff --git a/src/QuBest.c b/src/QuBest.c
>index 8678c28..49aaade 100644
>--- a/src/QuBest.c
>+++ b/src/QuBest.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Status XQueryBestSize(
>     register Display *dpy,
>     int class,
>diff --git a/src/QuColor.c b/src/QuColor.c
>index 31dd5a5..590e2d8 100644
>--- a/src/QuColor.c
>+++ b/src/QuColor.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XQueryColor(
>     register Display *dpy,
>diff --git a/src/QuColors.c b/src/QuColors.c
>index f2203c8..a25bdf8 100644
>--- a/src/QuColors.c
>+++ b/src/QuColors.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XQueryColors(
>     register Display *dpy,
>diff --git a/src/QuCurShp.c b/src/QuCurShp.c
>index 47675a8..0c54cfb 100644
>--- a/src/QuCurShp.c
>+++ b/src/QuCurShp.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Status XQueryBestCursor(
>     register Display *dpy,
>     Drawable drawable,
>diff --git a/src/QuExt.c b/src/QuExt.c
>index 19d8be5..22d500c 100644
>--- a/src/QuExt.c
>+++ b/src/QuExt.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Bool
> XQueryExtension(
>     register Display *dpy,
>diff --git a/src/QuKeybd.c b/src/QuKeybd.c
>index 9e1c88a..79e9fa3 100644
>--- a/src/QuKeybd.c
>+++ b/src/QuKeybd.c
>@@ -36,6 +36,7 @@ struct kmap {
>   char map[32];
> };
> 
>+_X_EXPORT
> int
> XQueryKeymap(
>     register Display *dpy,
>diff --git a/src/QuPntr.c b/src/QuPntr.c
>index e74a80d..6dd129d 100644
>--- a/src/QuPntr.c
>+++ b/src/QuPntr.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Bool XQueryPointer(
>      register Display *dpy,
>      Window w, 
>diff --git a/src/QuStipShp.c b/src/QuStipShp.c
>index 96fdf98..75c22f2 100644
>--- a/src/QuStipShp.c
>+++ b/src/QuStipShp.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Status XQueryBestStipple(
>      register Display *dpy,
>      Drawable drawable,
>diff --git a/src/QuTextE16.c b/src/QuTextE16.c
>index ee38172..624eaef 100644
>--- a/src/QuTextE16.c
>+++ b/src/QuTextE16.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XQueryTextExtents16 (
>     register Display *dpy,
>diff --git a/src/QuTextExt.c b/src/QuTextExt.c
>index a144865..8452058 100644
>--- a/src/QuTextExt.c
>+++ b/src/QuTextExt.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XQueryTextExtents (
>     register Display *dpy,
>diff --git a/src/QuTileShp.c b/src/QuTileShp.c
>index 5effa6c..bef40e0 100644
>--- a/src/QuTileShp.c
>+++ b/src/QuTileShp.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Status XQueryBestTile(
>      register Display *dpy,
>      Drawable drawable,
>diff --git a/src/QuTree.c b/src/QuTree.c
>index 3fd72f0..db4a4f4 100644
>--- a/src/QuTree.c
>+++ b/src/QuTree.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Status XQueryTree (
>     register Display *dpy,
>     Window w,
>diff --git a/src/Quarks.c b/src/Quarks.c
>index 2087396..b7854c7 100644
>--- a/src/Quarks.c
>+++ b/src/Quarks.c
>@@ -141,6 +141,7 @@ typedef struct {char a; unsigned long b;} TestType2;
> #ifdef XTHREADS
> static char *_Xpermalloc(unsigned int length);
> 
>+_X_EXPORT
> char *Xpermalloc(unsigned int length)
> {
>     char *p;
>@@ -350,6 +351,7 @@ nomatch:    if (!rehash)
>     return NULLQUARK;
> }
> 
>+_X_EXPORT
> XrmQuark
> XrmStringToQuark(
>     _Xconst char *name)
>@@ -366,6 +368,7 @@ XrmStringToQuark(
>     return _XrmInternalStringToQuark(name, tname-(char *)name-1, sig, False);
> }
> 
>+_X_EXPORT
> XrmQuark
> XrmPermStringToQuark(
>     _Xconst char *name)
>@@ -382,6 +385,7 @@ XrmPermStringToQuark(
>     return _XrmInternalStringToQuark(name, tname-(char *)name-1, sig, True);
> }
> 
>+_X_EXPORT
> XrmQuark XrmUniqueQuark(void)
> {
>     XrmQuark q;
>@@ -395,6 +399,7 @@ XrmQuark XrmUniqueQuark(void)
>     return q;
> }
> 
>+_X_EXPORT
> XrmString XrmQuarkToString(register XrmQuark quark)
> {
>     XrmString s;
>diff --git a/src/RaiseWin.c b/src/RaiseWin.c
>index 585e9b1..fe745df 100644
>--- a/src/RaiseWin.c
>+++ b/src/RaiseWin.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XRaiseWindow (
>     register Display *dpy,
>diff --git a/src/RdBitF.c b/src/RdBitF.c
>index 198e0e4..17870b8 100644
>--- a/src/RdBitF.c
>+++ b/src/RdBitF.c
>@@ -127,6 +127,7 @@ NextInt (
>     return value;
> }
> 
>+_X_EXPORT
> int
> XReadBitmapFileData (
>     _Xconst char *filename,
>@@ -256,6 +257,7 @@ XReadBitmapFileData (
>     return (BitmapSuccess);
> }
> 
>+_X_EXPORT
> int
> XReadBitmapFile (
>     Display *display,
>diff --git a/src/RecolorC.c b/src/RecolorC.c
>index 4f575ae..41e814c 100644
>--- a/src/RecolorC.c
>+++ b/src/RecolorC.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XRecolorCursor(
>      register Display *dpy,
>diff --git a/src/ReconfWM.c b/src/ReconfWM.c
>index 8c4ec16..88cf8d2 100644
>--- a/src/ReconfWM.c
>+++ b/src/ReconfWM.c
>@@ -37,6 +37,7 @@ from The Open Group.
> #define AllMaskBits (CWX|CWY|CWWidth|CWHeight|\
>                      CWBorderWidth|CWSibling|CWStackMode)
> 
>+_X_EXPORT
> Status XReconfigureWMWindow (
>     register Display *dpy,
>     Window w,
>diff --git a/src/ReconfWin.c b/src/ReconfWin.c
>index 694a671..afef597 100644
>--- a/src/ReconfWin.c
>+++ b/src/ReconfWin.c
>@@ -34,6 +34,7 @@ in this Software without prior written authorization from The Open Group.
> #define AllMaskBits (CWX|CWY|CWWidth|CWHeight|\
> 		     CWBorderWidth|CWSibling|CWStackMode)
> 
>+_X_EXPORT
> int
> XConfigureWindow(
>     register Display *dpy,
>diff --git a/src/Region.c b/src/Region.c
>index cdd223b..28fdd0d 100644
>--- a/src/Region.c
>+++ b/src/Region.c
>@@ -136,6 +136,7 @@ static void miRegionOp(
> 
> 
> /*	Create a new empty region	*/
>+_X_EXPORT
> Region
> XCreateRegion(void)
> {
>@@ -156,6 +157,7 @@ XCreateRegion(void)
>     return( temp );
> }
> 
>+_X_EXPORT
> int
> XClipBox(
>     Region r,
>@@ -168,6 +170,7 @@ XClipBox(
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XUnionRectWithRegion(
>     register XRectangle *rect,
>@@ -252,6 +255,7 @@ miSetExtents (
>     assert(pExtents->x1 < pExtents->x2);
> }
> 
>+_X_EXPORT
> int
> XSetRegion(
>     Display *dpy,
>@@ -282,6 +286,7 @@ XSetRegion(
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XDestroyRegion(
>     Region r)
>@@ -297,6 +302,7 @@ XDestroyRegion(
>    added by raymond
> */
> 
>+_X_EXPORT
> int
> XOffsetRegion(
>     register Region pRegion,
>@@ -377,6 +383,7 @@ Compress(
> #undef ZShiftRegion
> #undef ZCopyRegion
> 
>+_X_EXPORT
> int
> XShrinkRegion(
>     Region r,
>@@ -496,6 +503,7 @@ miIntersectO (
>     return 0;	/* lint */
> }
> 
>+_X_EXPORT
> int
> XIntersectRegion(
>     Region 	  	reg1,
>@@ -1280,6 +1288,7 @@ miUnionO (
>     return 0;	/* lint */
> }
> 
>+_X_EXPORT
> int
> XUnionRegion(
>     Region 	  reg1,
>@@ -1563,6 +1572,7 @@ miSubtractO (
>  *-----------------------------------------------------------------------
>  */
> 
>+_X_EXPORT
> int
> XSubtractRegion(
>     Region 	  	regM,
>@@ -1591,6 +1601,7 @@ XSubtractRegion(
>     return 1;
> }
> 
>+_X_EXPORT
> int
> XXorRegion(Region sra, Region srb, Region dr)
> {
>@@ -1610,6 +1621,7 @@ XXorRegion(Region sra, Region srb, Region dr)
>  * Check to see if the region is empty.  Assumes a region is passed 
>  * as a parameter
>  */
>+_X_EXPORT
> int 
> XEmptyRegion(
>     Region r)
>@@ -1621,6 +1633,7 @@ XEmptyRegion(
> /*
>  *	Check to see if two regions are equal	
>  */
>+_X_EXPORT
> int 
> XEqualRegion(Region r1, Region r2)
> {
>@@ -1641,6 +1654,7 @@ XEqualRegion(Region r1, Region r2)
>     return TRUE;
> }
> 
>+_X_EXPORT
> int 
> XPointInRegion(
>     Region pRegion,
>@@ -1660,6 +1674,7 @@ XPointInRegion(
>     return FALSE;
> }
> 
>+_X_EXPORT
> int 
> XRectInRegion(
>     register Region	region,
>diff --git a/src/RepWindow.c b/src/RepWindow.c
>index 89e5a78..3b24010 100644
>--- a/src/RepWindow.c
>+++ b/src/RepWindow.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XReparentWindow(
>     register Display *dpy,
>diff --git a/src/RestackWs.c b/src/RestackWs.c
>index 72228eb..e07960a 100644
>--- a/src/RestackWs.c
>+++ b/src/RestackWs.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XRestackWindows (
>     register Display *dpy,
>diff --git a/src/RotProp.c b/src/RotProp.c
>index 589a9d5..00ff7f7 100644
>--- a/src/RotProp.c
>+++ b/src/RotProp.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XRotateWindowProperties(
>     register Display *dpy,
>diff --git a/src/ScrResStr.c b/src/ScrResStr.c
>index 8948e24..f809379 100644
>--- a/src/ScrResStr.c
>+++ b/src/ScrResStr.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #include "Xlibint.h"
> #include <X11/Xatom.h>
> 
>+_X_EXPORT
> char *XScreenResourceString(Screen *screen)
> {
>     Atom prop_name;
>diff --git a/src/SelInput.c b/src/SelInput.c
>index e4bcad3..2515b37 100644
>--- a/src/SelInput.c
>+++ b/src/SelInput.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSelectInput (
>     register Display *dpy,
>diff --git a/src/SendEvent.c b/src/SendEvent.c
>index bc35647..b39338c 100644
>--- a/src/SendEvent.c
>+++ b/src/SendEvent.c
>@@ -36,6 +36,7 @@ in this Software without prior written authorization from The Open Group.
>  * In order to avoid all images requiring _XEventToWire, we install the
>  * event converter here if it has never been installed.
>  */
>+_X_EXPORT
> Status
> XSendEvent(
>     register Display *dpy,
>diff --git a/src/SetBack.c b/src/SetBack.c
>index 14f2b15..a75c5e3 100644
>--- a/src/SetBack.c
>+++ b/src/SetBack.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetBackground (
>     register Display *dpy,
>diff --git a/src/SetCRects.c b/src/SetCRects.c
>index 1e870f9..8debc7f 100644
>--- a/src/SetCRects.c
>+++ b/src/SetCRects.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #include "Xlibint.h"
> 
> /* can only call when display is locked. */
>+_X_EXPORT
> void _XSetClipRectangles (
>     register Display *dpy,
>     GC gc,
>@@ -63,6 +64,7 @@ void _XSetClipRectangles (
>     gc->dirty = dirty;
> }
> 
>+_X_EXPORT
> int
> XSetClipRectangles (
>     register Display *dpy,
>diff --git a/src/SetClMask.c b/src/SetClMask.c
>index a715d03..b4488a2 100644
>--- a/src/SetClMask.c
>+++ b/src/SetClMask.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetClipMask (
>     register Display *dpy,
>diff --git a/src/SetClOrig.c b/src/SetClOrig.c
>index 96d3713..c33b59f 100644
>--- a/src/SetClOrig.c
>+++ b/src/SetClOrig.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetClipOrigin (
>     register Display *dpy,
>diff --git a/src/SetDashes.c b/src/SetDashes.c
>index 6ecf955..fb51276 100644
>--- a/src/SetDashes.c
>+++ b/src/SetDashes.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetDashes (
>     register Display *dpy,
>diff --git a/src/SetFPath.c b/src/SetFPath.c
>index fe70ee2..b1ebbdc 100644
>--- a/src/SetFPath.c
>+++ b/src/SetFPath.c
>@@ -33,6 +33,7 @@ in this Software without prior written authorization from The Open Group.
> 
> #define safestrlen(s) ((s) ? strlen(s) : 0)
> 
>+_X_EXPORT
> int
> XSetFontPath (
>     register Display *dpy,
>diff --git a/src/SetFont.c b/src/SetFont.c
>index 4827b89..bcd8d51 100644
>--- a/src/SetFont.c
>+++ b/src/SetFont.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetFont (
>     register Display *dpy,
>diff --git a/src/SetFore.c b/src/SetFore.c
>index e04b4fd..d14c8eb 100644
>--- a/src/SetFore.c
>+++ b/src/SetFore.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetForeground (
>     register Display *dpy,
>diff --git a/src/SetFunc.c b/src/SetFunc.c
>index f29c617..2051501 100644
>--- a/src/SetFunc.c
>+++ b/src/SetFunc.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetFunction (
>     register Display *dpy,
>diff --git a/src/SetHints.c b/src/SetHints.c
>index 130e7ca..84a580b 100644
>--- a/src/SetHints.c
>+++ b/src/SetHints.c
>@@ -59,6 +59,7 @@ SOFTWARE.
> 
> #define safestrlen(s) ((s) ? strlen(s) : 0)
> 
>+_X_EXPORT
> int
> XSetSizeHints(		/* old routine */
> 	Display *dpy,
>@@ -105,6 +106,7 @@ XSetSizeHints(		/* old routine */
>  *	WM_HINTS 	type: WM_HINTS	format:32
>  */
> 
>+_X_EXPORT
> int
> XSetWMHints (
> 	Display *dpy,
>@@ -142,6 +144,7 @@ XSetWMHints (
>  *	WM_ZOOM_HINTS 	type: WM_SIZE_HINTS format: 32
>  */
> 
>+_X_EXPORT
> int
> XSetZoomHints (
> 	Display *dpy,
>@@ -157,6 +160,7 @@ XSetZoomHints (
>  *	WM_NORMAL_HINTS 	type: WM_SIZE_HINTS format: 32
>  */
> 
>+_X_EXPORT
> int
> XSetNormalHints (			/* old routine */
> 	Display *dpy,
>@@ -174,6 +178,7 @@ XSetNormalHints (			/* old routine */
>  * routine will take care of converting to host to network data structures.
>  */
> 
>+_X_EXPORT
> int
> XSetIconSizes (
> 	Display *dpy,
>@@ -205,6 +210,7 @@ XSetIconSizes (
> 	return 1;
> }
> 
>+_X_EXPORT
> int
> XSetCommand (
> 	Display *dpy,
>@@ -243,6 +249,7 @@ XSetCommand (
>  *	WM_NORMAL_HINTS	  type: WM_SIZE_HINTS 	format: 32
>  */
> 
>+_X_EXPORT
> int
> XSetStandardProperties (
>     	Display *dpy,
>@@ -277,6 +284,7 @@ XSetStandardProperties (
> 	return 1;
> }
> 
>+_X_EXPORT
> int
> XSetTransientForHint(
> 	Display *dpy,
>@@ -287,6 +295,7 @@ XSetTransientForHint(
> 			       PropModeReplace, (unsigned char *) &propWindow, 1);
> }
> 
>+_X_EXPORT
> int
> XSetClassHint(
> 	Display *dpy,
>diff --git a/src/SetIFocus.c b/src/SetIFocus.c
>index 37f796d..98ad852 100644
>--- a/src/SetIFocus.c
>+++ b/src/SetIFocus.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetInputFocus(
>     register Display *dpy,
>diff --git a/src/SetLStyle.c b/src/SetLStyle.c
>index 93bc97a..9b7c505 100644
>--- a/src/SetLStyle.c
>+++ b/src/SetLStyle.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetLineAttributes(
>     register Display *dpy,
>diff --git a/src/SetNrmHint.c b/src/SetNrmHint.c
>index 2b2f240..f17b9f2 100644
>--- a/src/SetNrmHint.c
>+++ b/src/SetNrmHint.c
>@@ -60,6 +60,7 @@ from The Open Group.
> #include <X11/Xatom.h>
> #include <X11/Xos.h>
> 
>+_X_EXPORT
> void XSetWMSizeHints (
>     Display *dpy,
>     Window w,
>@@ -118,6 +119,7 @@ void XSetWMSizeHints (
> }
> 
> 
>+_X_EXPORT
> void XSetWMNormalHints (
>     Display *dpy,
>     Window w,
>diff --git a/src/SetPMask.c b/src/SetPMask.c
>index b81ea9d..dd34843 100644
>--- a/src/SetPMask.c
>+++ b/src/SetPMask.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetPlaneMask (
>     register Display *dpy,
>diff --git a/src/SetPntMap.c b/src/SetPntMap.c
>index 94708f0..eae27ca 100644
>--- a/src/SetPntMap.c
>+++ b/src/SetPntMap.c
>@@ -34,6 +34,7 @@ in this Software without prior written authorization from The Open Group.
> #include "Xlibint.h"
> /* returns either  DeviceMappingSuccess or DeviceMappingBusy  */
> 
>+_X_EXPORT
> int
> XSetPointerMapping (
>     register Display *dpy,
>@@ -55,6 +56,7 @@ XSetPointerMapping (
>     return ((int) rep.success);
>     }
> 
>+_X_EXPORT
> int
> XChangeKeyboardMapping (
>     register Display *dpy,
>diff --git a/src/SetRGBCMap.c b/src/SetRGBCMap.c
>index d9eda53..bd7784a 100644
>--- a/src/SetRGBCMap.c
>+++ b/src/SetRGBCMap.c
>@@ -36,6 +36,7 @@ from The Open Group.
> #include "Xatomtype.h"
> #include <X11/Xatom.h>
> 
>+_X_EXPORT
> void XSetRGBColormaps (
>     Display *dpy,
>     Window w,
>diff --git a/src/SetSOwner.c b/src/SetSOwner.c
>index 5dfc133..cc44993 100644
>--- a/src/SetSOwner.c
>+++ b/src/SetSOwner.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetSelectionOwner(
>     register Display *dpy,
>diff --git a/src/SetSSaver.c b/src/SetSSaver.c
>index 3497727..b944389 100644
>--- a/src/SetSSaver.c
>+++ b/src/SetSSaver.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetScreenSaver(
>     register Display *dpy,
>diff --git a/src/SetStCmap.c b/src/SetStCmap.c
>index aeae6cd..f1c2545 100644
>--- a/src/SetStCmap.c
>+++ b/src/SetStCmap.c
>@@ -62,6 +62,7 @@ SOFTWARE.
>  * in the XStandardColormap structure.
>  */
> 
>+_X_EXPORT
> void XSetStandardColormap(
>     Display *dpy,
>     Window w,
>diff --git a/src/SetState.c b/src/SetState.c
>index 0f02611..8c93956 100644
>--- a/src/SetState.c
>+++ b/src/SetState.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetState(
>     register Display *dpy,
>diff --git a/src/SetStip.c b/src/SetStip.c
>index dad429e..8a24d54 100644
>--- a/src/SetStip.c
>+++ b/src/SetStip.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetStipple (
>     register Display *dpy,
>diff --git a/src/SetTSOrig.c b/src/SetTSOrig.c
>index 56914a1..6fbd493 100644
>--- a/src/SetTSOrig.c
>+++ b/src/SetTSOrig.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetTSOrigin (
>     register Display *dpy,
>diff --git a/src/SetTile.c b/src/SetTile.c
>index 574ba92..86bfe5f 100644
>--- a/src/SetTile.c
>+++ b/src/SetTile.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XSetTile (
>     register Display *dpy,
>diff --git a/src/SetTxtProp.c b/src/SetTxtProp.c
>index 65f9855..394d3df 100644
>--- a/src/SetTxtProp.c
>+++ b/src/SetTxtProp.c
>@@ -58,6 +58,7 @@ from The Open Group.
> #include <X11/Xos.h>
> #include <stdio.h>
> 
>+_X_EXPORT
> void XSetTextProperty (
>     Display *dpy,
>     Window w,
>@@ -68,6 +69,7 @@ void XSetTextProperty (
> 		     PropModeReplace, tp->value, tp->nitems);
> }
> 
>+_X_EXPORT
> void XSetWMName (
>     Display *dpy,
>     Window w,
>@@ -76,6 +78,7 @@ void XSetWMName (
>     XSetTextProperty (dpy, w, tp, XA_WM_NAME);
> }
> 
>+_X_EXPORT
> void XSetWMIconName (
>     Display *dpy,
>     Window w,
>@@ -84,6 +87,7 @@ void XSetWMIconName (
>     XSetTextProperty (dpy, w, tp, XA_WM_ICON_NAME);
> }
> 
>+_X_EXPORT
> void XSetWMClientMachine (
>     Display *dpy,
>     Window w,
>diff --git a/src/SetWMCMapW.c b/src/SetWMCMapW.c
>index efb3805..83a5b00 100644
>--- a/src/SetWMCMapW.c
>+++ b/src/SetWMCMapW.c
>@@ -58,6 +58,7 @@ SOFTWARE.
>  *	WM_COLORMAP_WINDOWS 	type: WINDOW	format:32
>  */
> 
>+_X_EXPORT
> Status XSetWMColormapWindows (
>     Display *dpy,
>     Window w,
>diff --git a/src/SetWMProto.c b/src/SetWMProto.c
>index ed07316..98df0cd 100644
>--- a/src/SetWMProto.c
>+++ b/src/SetWMProto.c
>@@ -58,6 +58,7 @@ SOFTWARE.
>  *	WM_PROTOCOLS 	type: ATOM	format: 32
>  */
> 
>+_X_EXPORT
> Status XSetWMProtocols (
>     Display *dpy,
>     Window w,
>diff --git a/src/StBytes.c b/src/StBytes.c
>index b81e7a1..f6b48ae 100644
>--- a/src/StBytes.c
>+++ b/src/StBytes.c
>@@ -43,6 +43,7 @@ static Atom n_to_atom[8] = {
> 	XA_CUT_BUFFER6,
> 	XA_CUT_BUFFER7};
> 
>+_X_EXPORT
> int
> XRotateBuffers (
>     register Display *dpy,
>@@ -51,6 +52,7 @@ XRotateBuffers (
>     return XRotateWindowProperties(dpy, RootWindow(dpy, 0), n_to_atom, 8, rotate);
> }
>     
>+_X_EXPORT
> char *XFetchBuffer (
>     register Display *dpy,
>     int *nbytes,
>@@ -77,6 +79,7 @@ char *XFetchBuffer (
>     return(NULL);
> }
> 
>+_X_EXPORT
> char *XFetchBytes (
>     register Display *dpy,
>     int *nbytes)
>@@ -84,6 +87,7 @@ char *XFetchBytes (
>     return (XFetchBuffer (dpy, nbytes, 0));
> }
> 
>+_X_EXPORT
> int
> XStoreBuffer (
>     register Display *dpy,
>@@ -96,6 +100,7 @@ XStoreBuffer (
> 	XA_STRING, 8, PropModeReplace, (unsigned char *) bytes, nbytes);
> }
> 
>+_X_EXPORT
> int
> XStoreBytes (
>     register Display *dpy,
>diff --git a/src/StColor.c b/src/StColor.c
>index b35d83b..c94c8b5 100644
>--- a/src/StColor.c
>+++ b/src/StColor.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XStoreColor(
>     register Display *dpy,
>diff --git a/src/StColors.c b/src/StColors.c
>index f3a6b58..be3e168 100644
>--- a/src/StColors.c
>+++ b/src/StColors.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XStoreColors(
>     register Display *dpy,
>diff --git a/src/StNColor.c b/src/StNColor.c
>index f7dbcb0..871cc24 100644
>--- a/src/StNColor.c
>+++ b/src/StNColor.c
>@@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group.
> #include "Xlibint.h"
> #include "Xcmsint.h"
> 
>-
>+_X_EXPORT
> int
> XStoreNamedColor(
> register Display *dpy,
>diff --git a/src/StName.c b/src/StName.c
>index ba01ffb..4e8ae2f 100644
>--- a/src/StName.c
>+++ b/src/StName.c
>@@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group.
> #include <X11/Xlibint.h>
> #include <X11/Xatom.h>
> 
>+_X_EXPORT
> int
> XStoreName (
>     register Display *dpy,
>@@ -43,6 +44,7 @@ XStoreName (
> 			   name ? strlen(name) : 0);
> }
> 
>+_X_EXPORT
> int
> XSetIconName (
>     register Display *dpy,
>diff --git a/src/StrKeysym.c b/src/StrKeysym.c
>index a6d7b2d..c824172 100644
>--- a/src/StrKeysym.c
>+++ b/src/StrKeysym.c
>@@ -71,6 +71,7 @@ _XInitKeysymDB(void)
>     return keysymdb;
> }
> 
>+_X_EXPORT
> KeySym
> XStringToKeysym(_Xconst char *s)
> {
>diff --git a/src/StrToText.c b/src/StrToText.c
>index 5ff6290..61bbca0 100644
>--- a/src/StrToText.c
>+++ b/src/StrToText.c
>@@ -39,6 +39,7 @@ in this Software without prior written authorization from The Open Group.
>  * count.
>  */
> 
>+_X_EXPORT
> Status XStringListToTextProperty (
>     char **argv,
>     int argc,
>diff --git a/src/Sync.c b/src/Sync.c
>index 3f2f4ce..fc9c247 100644
>--- a/src/Sync.c
>+++ b/src/Sync.c
>@@ -35,6 +35,7 @@ in this Software without prior written authorization from The Open Group.
> 
> /* Synchronize with errors and events, optionally discarding pending events */
> 
>+_X_EXPORT
> int
> XSync (
>     register Display *dpy,
>diff --git a/src/Synchro.c b/src/Synchro.c
>index 2688e79..a64b75c 100644
>--- a/src/Synchro.c
>+++ b/src/Synchro.c
>@@ -38,6 +38,7 @@ static int _XSyncFunction(register Display *dpy)
> 	return 0;
> }
> 
>+_X_EXPORT
> int (*XSynchronize(Display *dpy, int onoff))(Display *)
> {
>         int (*temp)(Display *);
>@@ -58,6 +59,7 @@ int (*XSynchronize(Display *dpy, int onoff))(Display *)
> 	return (temp);
> }
> 
>+_X_EXPORT
> int (*XSetAfterFunction(
>      Display *dpy,
>      int (*func)(
>diff --git a/src/Text.c b/src/Text.c
>index 95ad0d9..1cfa54b 100644
>--- a/src/Text.c
>+++ b/src/Text.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDrawString(
>     register Display *dpy,
>diff --git a/src/Text16.c b/src/Text16.c
>index 96d5911..3239290 100644
>--- a/src/Text16.c
>+++ b/src/Text16.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XDrawString16(
>     register Display *dpy,
>diff --git a/src/TextExt.c b/src/TextExt.c
>index fc70301..776e514 100644
>--- a/src/TextExt.c
>+++ b/src/TextExt.c
>@@ -72,6 +72,7 @@ from The Open Group.
>  * first row of the font (i.e. byte1 == 0), we can do some optimizations beyond
>  * what is done in XTextExtents16.
>  */
>+_X_EXPORT
> int
> XTextExtents (
>     XFontStruct *fs,
>@@ -146,6 +147,7 @@ XTextExtents (
>  * XTextWidth - compute the width of a string of eightbit bytes.  This is a 
>  * subset of XTextExtents.
>  */
>+_X_EXPORT
> int
> XTextWidth (
>     XFontStruct *fs,
>@@ -192,6 +194,7 @@ XTextWidth (
> /*
>  * _XTextHeight - compute the height of a string of eightbit bytes.
>  */
>+_X_EXPORT
> int
> _XTextHeight (
>     XFontStruct *fs,
>diff --git a/src/TextExt16.c b/src/TextExt16.c
>index 763350a..ca44791 100644
>--- a/src/TextExt16.c
>+++ b/src/TextExt16.c
>@@ -46,6 +46,7 @@ from The Open Group.
>  * XTextExtents16 - compute the extents of string given as a sequence of 
>  * XChar2bs.
>  */
>+_X_EXPORT
> int
> XTextExtents16 (
>     XFontStruct *fs,
>@@ -121,6 +122,7 @@ XTextExtents16 (
>  * XTextWidth16 - compute the width of sequence of XChar2bs.  This is a 
>  * subset of XTextExtents16.
>  */
>+_X_EXPORT
> int
> XTextWidth16 (
>     XFontStruct *fs,
>@@ -167,6 +169,7 @@ XTextWidth16 (
> /*
>  * _XTextHeight16 - compute the height of sequence of XChar2bs.
>  */
>+_X_EXPORT
> int
> _XTextHeight16 (
>     XFontStruct *fs,
>diff --git a/src/TextToStr.c b/src/TextToStr.c
>index a32de87..d7cc7f3 100644
>--- a/src/TextToStr.c
>+++ b/src/TextToStr.c
>@@ -40,6 +40,7 @@ in this Software without prior written authorization from The Open Group.
>  * null-separated STRING property.
>  */
> 
>+_X_EXPORT
> Status XTextPropertyToStringList (
>     XTextProperty *tp,
>     char ***list_return,
>@@ -108,7 +109,7 @@ Status XTextPropertyToStringList (
>     return True;
> }
> 
>-
>+_X_EXPORT
> void XFreeStringList (char **list)
> {
>     if (list) {
>diff --git a/src/TrCoords.c b/src/TrCoords.c
>index d0e0562..0ffd66a 100644
>--- a/src/TrCoords.c
>+++ b/src/TrCoords.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> Bool XTranslateCoordinates(
>      register Display *dpy,
>      Window src_win, 
>diff --git a/src/UndefCurs.c b/src/UndefCurs.c
>index 7cfc07b..8961fa8 100644
>--- a/src/UndefCurs.c
>+++ b/src/UndefCurs.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XUndefineCursor (
>     register Display *dpy,
>diff --git a/src/UngrabBut.c b/src/UngrabBut.c
>index 8d0e2a8..34b4435 100644
>--- a/src/UngrabBut.c
>+++ b/src/UngrabBut.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XUngrabButton(
>     register Display *dpy,
>diff --git a/src/UngrabKbd.c b/src/UngrabKbd.c
>index e0b2086..da9e6e3 100644
>--- a/src/UngrabKbd.c
>+++ b/src/UngrabKbd.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XUngrabKeyboard (
>         register Display *dpy,
>diff --git a/src/UngrabPtr.c b/src/UngrabPtr.c
>index 8a3bbed..5d6a91e 100644
>--- a/src/UngrabPtr.c
>+++ b/src/UngrabPtr.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XUngrabPointer(
>     register Display *dpy,
>diff --git a/src/UngrabSvr.c b/src/UngrabSvr.c
>index 3c974f1..a849068 100644
>--- a/src/UngrabSvr.c
>+++ b/src/UngrabSvr.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XUngrabServer (
>     register Display *dpy)
>diff --git a/src/UnldFont.c b/src/UnldFont.c
>index 2394e2d..2edfce8 100644
>--- a/src/UnldFont.c
>+++ b/src/UnldFont.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XUnloadFont(
>      register Display *dpy,
>diff --git a/src/UnmapSubs.c b/src/UnmapSubs.c
>index 8df63d4..d9c0dbb 100644
>--- a/src/UnmapSubs.c
>+++ b/src/UnmapSubs.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XUnmapSubwindows(
>     register Display *dpy,
>diff --git a/src/UnmapWin.c b/src/UnmapWin.c
>index dca0035..352a93d 100644
>--- a/src/UnmapWin.c
>+++ b/src/UnmapWin.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XUnmapWindow (
>         register Display *dpy,
>diff --git a/src/VisUtil.c b/src/VisUtil.c
>index 53320ca..f577249 100644
>--- a/src/VisUtil.c
>+++ b/src/VisUtil.c
>@@ -54,6 +54,7 @@ in this Software without prior written authorization from The Open Group.
>  *		VisualAllMask
>  */
> 
>+_X_EXPORT
> XVisualInfo *XGetVisualInfo(
>     Display *dpy,
>     register long visual_info_mask,
>@@ -189,6 +190,7 @@ XVisualInfo *XGetVisualInfo(
>  *	otherwise False is returned.
>  */
> 
>+_X_EXPORT
> Status XMatchVisualInfo(
> 	Display *dpy,
> 	int screen,
>diff --git a/src/WMGeom.c b/src/WMGeom.c
>index 59041a9..8fa39ae 100644
>--- a/src/WMGeom.c
>+++ b/src/WMGeom.c
>@@ -44,6 +44,7 @@ static int _GeometryMaskToGravity(
>  * be considered "negative".
>  */
> 
>+_X_EXPORT
> int
> XWMGeometry (
>     Display *dpy,			/* user's display connection */
>diff --git a/src/WMProps.c b/src/WMProps.c
>index 06c76a1..6739ff0 100644
>--- a/src/WMProps.c
>+++ b/src/WMProps.c
>@@ -73,6 +73,7 @@ SOFTWARE.
>  *	WM_CLASS	  type: STRING/STRING	format: 8
>  */
> 	
>+_X_EXPORT
> void XSetWMProperties (
>      Display *dpy,
>      Window w,			/* window to decorate */
>diff --git a/src/WarpPtr.c b/src/WarpPtr.c
>index d8b1bc9..f4d49b0 100644
>--- a/src/WarpPtr.c
>+++ b/src/WarpPtr.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> int
> XWarpPointer(
>      register Display *dpy,
>diff --git a/src/WinEvent.c b/src/WinEvent.c
>index 8839f35..089e816 100644
>--- a/src/WinEvent.c
>+++ b/src/WinEvent.c
>@@ -44,7 +44,7 @@ extern long const _Xevent_to_mask[];
>  * If none found, flush, and then wait until an event arrives which
>  * matches.
>  */
>-
>+_X_EXPORT
> int
> XWindowEvent (
>         register Display *dpy,
>diff --git a/src/Window.c b/src/Window.c
>index a40e748..bd84f5b 100644
>--- a/src/Window.c
>+++ b/src/Window.c
>@@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>+_X_EXPORT
> void _XProcessWindowAttributes (
>     register Display *dpy,
>     xChangeWindowAttributesReq *req,
>@@ -99,6 +100,7 @@ void _XProcessWindowAttributes (
> 		     CWOverrideRedirect|CWSaveUnder|CWEventMask|\
> 		     CWDontPropagate|CWColormap|CWCursor)
> 
>+_X_EXPORT
> Window XCreateWindow(
>     register Display *dpy,
>     Window parent,
>diff --git a/src/Withdraw.c b/src/Withdraw.c
>index 2d135c4..54bf8b5 100644
>--- a/src/Withdraw.c
>+++ b/src/Withdraw.c
>@@ -64,6 +64,7 @@ from The Open Group.
>  * This function instructs the window manager to change this window from
>  * NormalState or IconicState to Withdrawn.
>  */
>+_X_EXPORT
> Status XWithdrawWindow (
>     Display *dpy,
>     Window w,
>diff --git a/src/WrBitF.c b/src/WrBitF.c
>index 5062fdc..dd43cb9 100644
>--- a/src/WrBitF.c
>+++ b/src/WrBitF.c
>@@ -85,6 +85,7 @@ static char *Format_Image(
>    
> #define BYTES_PER_OUTPUT_LINE 12
> 
>+_X_EXPORT
> int
> XWriteBitmapFile(
>      Display *display,
>diff --git a/src/XlibAsync.c b/src/XlibAsync.c
>index 6e963a6..dcb9c97 100644
>--- a/src/XlibAsync.c
>+++ b/src/XlibAsync.c
>@@ -34,6 +34,7 @@ from The Open Group.
> #include <X11/Xlibint.h>
> #include <X11/Xos.h>
> 
>+_X_EXPORT
> /*ARGSUSED*/
> Bool
> _XAsyncErrorHandler(
>@@ -64,6 +65,7 @@ _XAsyncErrorHandler(
>     return False;
> }
> 
>+_X_EXPORT
> void _XDeqAsyncHandler(
>     Display *dpy,
>     register _XAsyncHandler *handler)
>@@ -79,6 +81,7 @@ void _XDeqAsyncHandler(
> 	*prev = async->next;
> }
> 
>+_X_EXPORT
> char *
> _XGetAsyncReply(
>     register Display *dpy,
>@@ -126,6 +129,7 @@ _XGetAsyncReply(
>     return (char *)rep;
> }
> 
>+_X_EXPORT
> void
> _XGetAsyncData(
>     Display *dpy,
>diff --git a/src/XlibInt.c b/src/XlibInt.c
>index 1d025c7..5692a86 100644
>--- a/src/XlibInt.c
>+++ b/src/XlibInt.c
>@@ -56,10 +56,17 @@ from The Open Group.
> #include "locking.h"
> 
> /* these pointers get initialized by XInitThreads */
>+_X_EXPORT
> LockInfoPtr _Xglobal_lock = NULL;
>+
>+_X_EXPORT
> void (*_XCreateMutex_fn)(LockInfoPtr) = NULL;
>+
> /* struct _XCVList *(*_XCreateCVL_fn)() = NULL; */
>+_X_EXPORT
> void (*_XFreeMutex_fn)(LockInfoPtr) = NULL;
>+
>+_X_EXPORT
> void (*_XLockMutex_fn)(
>     LockInfoPtr /* lock */
> #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
>@@ -67,6 +74,8 @@ void (*_XLockMutex_fn)(
>     , int /* line */
> #endif
>     ) = NULL;
>+
>+_X_EXPORT
> void (*_XUnlockMutex_fn)(
>     LockInfoPtr /* lock */
> #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
>@@ -381,6 +390,7 @@ _XWaitForWritable(
> #define POLLFD_CACHE_SIZE 5
> 
> /* initialize the struct array passed to poll() below */
>+_X_EXPORT
> Bool _XPollfdCacheInit(
>     Display *dpy)
> {
>@@ -398,6 +408,7 @@ Bool _XPollfdCacheInit(
>     return True;
> }
> 
>+_X_EXPORT
> void _XPollfdCacheAdd(
>     Display *dpy,
>     int fd)
>@@ -412,6 +423,7 @@ void _XPollfdCacheAdd(
> #endif
> }
> 
>+_X_EXPORT
> /* ARGSUSED */
> void _XPollfdCacheDel(
>     Display *dpy,
>@@ -587,6 +599,7 @@ int _XSeqSyncFunction(
>     return 0;
> }
> 
>+_X_EXPORT
> void _XSetSeqSyncFunction(
>     register Display *dpy)
> {
>@@ -610,6 +623,7 @@ static void _XFlushInt(
>  * action is taken.  This routine correctly handles incremental writes.
>  * This routine may have to be reworked if int < long.
>  */
>+_X_EXPORT
> void _XFlush(
> 	register Display *dpy)
> {
>@@ -718,6 +732,7 @@ static void _XFlushInt(
> #endif
> }
> 
>+_X_EXPORT
> int
> _XEventsQueued(
>     register Display *dpy,
>@@ -914,6 +929,7 @@ _XEventsQueued(
> /* _XReadEvents - Flush the output queue,
>  * then read as many events as possible (but at least 1) and enqueue them
>  */
>+_X_EXPORT
> void _XReadEvents(
> 	register Display *dpy)
> {
>@@ -1073,6 +1089,7 @@ void _XReadEvents(
>  * _XRead - Read bytes from the socket taking into account incomplete
>  * reads.  This routine may have to be reworked if int < long.
>  */
>+_X_EXPORT
> int _XRead(
> 	register Display *dpy,
> 	register char *data,
>@@ -1131,6 +1148,7 @@ int _XRead(
> #endif /* !USE_XCB */
> 
> #ifdef LONG64
>+_X_EXPORT
> void _XRead32(
>     Display *dpy,
>     register long *data,
>@@ -1276,6 +1294,7 @@ void _XRead16Pad(
>  * reads.  If the number of bytes is not 0 mod 4, read additional pad
>  * bytes. This routine may have to be reworked if int < long.
>  */
>+_X_EXPORT
> void _XReadPad(
>     	register Display *dpy,
> 	register char *data,
>@@ -1358,6 +1377,7 @@ void _XReadPad(
>  * transmission is used, if size is not 0 mod 4, extra bytes are transmitted.
>  * This routine may have to be reworked if int < long;
>  */
>+_X_EXPORT
> void
> _XSend (
> 	register Display *dpy,
>@@ -1543,6 +1563,7 @@ _XIDHandler(
> /*
>  * _XAllocID - resource ID allocation routine.
>  */
>+_X_EXPORT
> XID _XAllocID(
>     register Display *dpy)
> {
>@@ -1573,6 +1594,7 @@ XID _XAllocID(
> /*
>  * _XAllocIDs - multiple resource ID allocation routine.
>  */
>+_X_EXPORT
> void _XAllocIDs(
>     register Display *dpy,
>     XID *ids,
>@@ -1634,6 +1656,7 @@ void _XAllocIDs(
>  * by forcing syncs when we get close.
>  */
> 
>+_X_EXPORT
> unsigned long
> _XSetLastRequestRead(
>     register Display *dpy,
>@@ -1673,6 +1696,7 @@ _XSetLastRequestRead(
>  * specified rep.  Meanwhile we must handle error and event packets that
>  * we may encounter.
>  */
>+_X_EXPORT
> Status
> _XReply (
>     register Display *dpy,
>@@ -1949,6 +1973,7 @@ _XAsyncReply(
>  * because could not allocate memory.
>  * Assumes Display locked when called.
>  */
>+_X_EXPORT
> Status
> _XRegisterInternalConnection(
>     Display* dpy,
>@@ -1998,6 +2023,7 @@ _XRegisterInternalConnection(
>  *
>  * Assumes Display locked when called.
>  */
>+_X_EXPORT
> void
> _XUnregisterInternalConnection(
>     Display* dpy,
>@@ -2036,6 +2062,7 @@ _XUnregisterInternalConnection(
>  * The list is allocated with Xmalloc and should be freed by the caller
>  * with Xfree;
>  */
>+_X_EXPORT
> Status
> XInternalConnectionNumbers(
>     Display *dpy,
>@@ -2068,6 +2095,7 @@ XInternalConnectionNumbers(
>     return 1;
> }
> 
>+_X_EXPORT
> void _XProcessInternalConnection(
>     Display *dpy,
>     struct _XConnectionInfo *conn_info)
>@@ -2097,6 +2125,7 @@ void _XProcessInternalConnection(
>  * for this fd.
>  * The Display is NOT locked during the call.
>  */
>+_X_EXPORT
> void
> XProcessInternalConnection(
>     Display* dpy,
>@@ -2122,6 +2151,7 @@ XProcessInternalConnection(
>  * If any connections are already registered, the callback is immediately
>  * called for each of them.
>  */
>+_X_EXPORT
> Status
> XAddConnectionWatch(
>     Display* dpy,
>@@ -2177,6 +2207,7 @@ XAddConnectionWatch(
>  * Both callback and client_data must match what was passed to
>  * XAddConnectionWatch.
>  */ 
>+_X_EXPORT
> void
> XRemoveConnectionWatch(
>     Display* dpy,
>@@ -2220,6 +2251,7 @@ XRemoveConnectionWatch(
> #if !USE_XCB
> /* Read and discard "n" 8-bit bytes of data */
> 
>+_X_EXPORT
> void _XEatData(
>     Display *dpy,
>     register unsigned long n)
>@@ -2242,6 +2274,7 @@ void _XEatData(
>  * note that no squishing of move events in V11, since there
>  * is pointer motion hints....
>  */
>+_X_EXPORT
> void _XEnq(
> 	register Display *dpy,
> 	register xEvent *event)
>@@ -2277,6 +2310,7 @@ void _XEnq(
> /*
>  * _XDeq - Remove event packet from the display's queue.
>  */
>+_X_EXPORT
> void _XDeq(
>     register Display *dpy,
>     register _XQEvent *prev,	/* element before qelt */
>@@ -2300,6 +2334,7 @@ void _XDeq(
>  * EventToWire in separate file in that often not needed.
>  */
> 
>+_X_EXPORT
> /*ARGSUSED*/
> Bool
> _XUnknownWireEvent(
>@@ -2315,6 +2350,7 @@ _XUnknownWireEvent(
> 	return(False);
> }
> 
>+_X_EXPORT
> /*ARGSUSED*/
> Status
> _XUnknownNativeEvent(
>@@ -2332,6 +2368,7 @@ _XUnknownNativeEvent(
> /*
>  * reformat a wire event into an XEvent structure of the right type.
>  */
>+_X_EXPORT
> Bool
> _XWireToEvent(
>     register Display *dpy,	/* pointer to display structure */
>@@ -2707,6 +2744,7 @@ _XWireToEvent(
>  * _XDefaultIOError - Default fatal system error reporting routine.  Called 
>  * when an X internal system error is encountered.
>  */
>+_X_EXPORT
> int _XDefaultIOError(
> 	Display *dpy)
> {
>@@ -2845,6 +2883,7 @@ static int _XPrintDefaultError(
>     return 1;
> }
> 
>+_X_EXPORT
> int _XDefaultError(
> 	Display *dpy,
> 	XErrorEvent *event)
>@@ -2854,6 +2893,7 @@ int _XDefaultError(
>     /*NOTREACHED*/
> }
> 
>+_X_EXPORT
> /*ARGSUSED*/
> Bool _XDefaultWireError(display, he, we)
>     Display     *display;
>@@ -2866,6 +2906,7 @@ Bool _XDefaultWireError(display, he, we)
> /*
>  * _XError - upcall internal or user protocol error handler
>  */
>+_X_EXPORT
> int _XError (
>     Display *dpy,
>     register xError *rep)
>@@ -2917,6 +2958,7 @@ int _XError (
> /*
>  * _XIOError - call user connection error handler and exit
>  */
>+_X_EXPORT
> int
> _XIOError (
>     Display *dpy)
>@@ -2942,6 +2984,7 @@ _XIOError (
>  * GetReq* and a call to Data* or _XSend*, or in a context when the thread
>  * is guaranteed to not unlock the display.
>  */
>+_X_EXPORT
> char *_XAllocScratch(
> 	register Display *dpy,
> 	unsigned long nbytes)
>@@ -2959,6 +3002,7 @@ char *_XAllocScratch(
>  * Scratch space allocator you can call any time, multiple times, and be
>  * MT safe, but you must hand the buffer back with _XFreeTemp.
>  */
>+_X_EXPORT
> char *_XAllocTemp(
>     register Display *dpy,
>     unsigned long nbytes)
>@@ -2971,6 +3015,7 @@ char *_XAllocTemp(
>     return buf;
> }
> 
>+_X_EXPORT
> void _XFreeTemp(
>     register Display *dpy,
>     char *buf,
>@@ -2985,6 +3030,7 @@ void _XFreeTemp(
> /*
>  * Given a visual id, find the visual structure for this id on this display.
>  */
>+_X_EXPORT
> Visual *_XVIDtoVisual(
> 	Display *dpy,
> 	VisualID id)
>@@ -3007,6 +3053,7 @@ Visual *_XVIDtoVisual(
> 	return (NULL);
> }
> 
>+_X_EXPORT
> int
> XFree (void *data)
> {
>@@ -3032,6 +3079,7 @@ void _Xbcopy(b1, b2, length)
> #endif
> 
> #ifdef DataRoutineIsProcedure
>+_X_EXPORT
> void Data(
> 	Display *dpy,
> 	char *data,
>@@ -3048,6 +3096,7 @@ void Data(
> 
> 
> #ifdef LONG64
>+_X_EXPORT
> int
> _XData32(
>     Display *dpy,
>@@ -3210,6 +3259,7 @@ void _XData32(
> /*
>  * _XGetHostname - similar to gethostname but allows special processing.
>  */
>+_X_EXPORT
> int _XGetHostname (
>     char *buf,
>     int maxlen)
>@@ -3244,6 +3294,7 @@ int _XGetHostname (
>  * _XScreenOfWindow - get the Screen of a given window
>  */
> 
>+_X_EXPORT
> Screen *_XScreenOfWindow (dpy, w)
>     Display *dpy;
>     Window w;
>@@ -3369,6 +3420,7 @@ static int AccessFile (path, pathbuf, len_pathbuf, pathret)
>     return 0;
> }
> 
>+_X_EXPORT
> int _XOpenFile(path, flags)
>     _Xconst char* path;
>     int flags;
>@@ -3388,6 +3440,7 @@ int _XOpenFile(path, flags)
>     return ret;
> }
> 
>+_X_EXPORT
> int _XOpenFileMode(path, flags, mode)
>     _Xconst char* path;
>     int flags;
>@@ -3408,6 +3461,7 @@ int _XOpenFileMode(path, flags, mode)
>     return ret;
> }
> 
>+_X_EXPORT
> void* _XFopenFile(path, mode)
>     _Xconst char* path;
>     _Xconst char* mode;
>@@ -3427,6 +3481,7 @@ void* _XFopenFile(path, mode)
>     return ret;
> }
> 
>+_X_EXPORT
> int _XAccessFile(path)
>     _Xconst char* path;
> {
>@@ -3448,8 +3503,12 @@ int _XAccessFile(path)
> 
> #ifdef WIN32
> #undef _Xdebug
>+_X_EXPORT
> int _Xdebug = 0;
>+
>+_X_EXPORT
> int *_Xdebug_p = &_Xdebug;
>+
> void (**_XCreateMutex_fn_p)(LockInfoPtr) = &_XCreateMutex_fn;
> void (**_XFreeMutex_fn_p)(LockInfoPtr) = &_XFreeMutex_fn;
> void (**_XLockMutex_fn_p)(LockInfoPtr
>diff --git a/src/Xrm.c b/src/Xrm.c
>index a932a5c..1a3278f 100644
>--- a/src/Xrm.c
>+++ b/src/Xrm.c
>@@ -329,6 +329,7 @@ static XrmBits const xrmtypes[256] = {
>     /* The rest will be automatically initialized to zero. */
> };
> 
>+_X_EXPORT
> void XrmInitialize(void)
> {
>     XrmQString = XrmPermStringToQuark("String");
>@@ -336,6 +337,7 @@ void XrmInitialize(void)
> }
> 
> #ifndef _XP_PRINT_SERVER_
>+_X_EXPORT
> XrmDatabase XrmGetDatabase(
>     Display *display)
> {
>@@ -346,6 +348,7 @@ XrmDatabase XrmGetDatabase(
>     return retval;
> }
> 
>+_X_EXPORT
> void XrmSetDatabase(
>     Display *display,
>     XrmDatabase database)
>@@ -361,6 +364,7 @@ void XrmSetDatabase(
> }
> #endif /* !_XP_PRINT_SERVER_ */
> 
>+_X_EXPORT
> void
> XrmStringToQuarkList(
>     register _Xconst char  *name,
>@@ -394,6 +398,7 @@ XrmStringToQuarkList(
>     *quarks = NULLQUARK;
> }
> 
>+_X_EXPORT
> void
> XrmStringToBindingQuarkList(
>     register _Xconst char   *name,
>@@ -765,6 +770,7 @@ static void MergeTables(
>     GROW(pprev);
> }
> 
>+_X_EXPORT
> void XrmCombineDatabase(
>     XrmDatabase	from, XrmDatabase *into,
>     Bool override)
>@@ -814,6 +820,7 @@ void XrmCombineDatabase(
>     }
> }
> 
>+_X_EXPORT
> void XrmMergeDatabases(
>     XrmDatabase	from, XrmDatabase *into)
> {
>@@ -1014,6 +1021,7 @@ static void PutEntry(
> #undef NEWTABLE
> }
> 
>+_X_EXPORT
> void XrmQPutResource(
>     XrmDatabase		*pdb,
>     XrmBindingList      bindings,
>@@ -1027,6 +1035,7 @@ void XrmQPutResource(
>     _XUnlockMutex(&(*pdb)->linfo);
> }
> 
>+_X_EXPORT
> void
> XrmPutResource(
>     XrmDatabase     *pdb,
>@@ -1044,6 +1053,7 @@ XrmPutResource(
>     _XUnlockMutex(&(*pdb)->linfo);
> }
> 
>+_X_EXPORT
> void
> XrmQPutStringResource(
>     XrmDatabase     *pdb,
>@@ -1524,6 +1534,7 @@ static void GetDatabase(
>     (*db->methods->mbfinish)(db->mbstate);
> }
> 
>+_X_EXPORT
> void
> XrmPutStringResource(
>     XrmDatabase *pdb,
>@@ -1544,6 +1555,7 @@ XrmPutStringResource(
> }
> 
> 
>+_X_EXPORT
> void
> XrmPutLineResource(
>     XrmDatabase *pdb,
>@@ -1555,6 +1567,7 @@ XrmPutLineResource(
>     _XUnlockMutex(&(*pdb)->linfo);
> }
> 
>+_X_EXPORT
> XrmDatabase
> XrmGetStringDatabase(
>     _Xconst char    *data)
>@@ -1659,6 +1672,7 @@ GetIncludeFile(
>     Xfree(str);
> }
> 
>+_X_EXPORT
> XrmDatabase
> XrmGetFileDatabase(
>     _Xconst char    *filename)
>@@ -1677,6 +1691,7 @@ XrmGetFileDatabase(
>     return db;
> }
> 
>+_X_EXPORT
> Status
> XrmCombineFileDatabase(
>     _Xconst char    *filename,
>@@ -1950,6 +1965,7 @@ static Bool EnumNTable(
> /* call the proc for every value in the database, arbitrary order.
>  * stop if the proc returns True.
>  */
>+_X_EXPORT
> Bool XrmEnumerateDatabase(
>     XrmDatabase		db,
>     XrmNameList		names,
>@@ -2077,6 +2093,7 @@ void PrintTable(
> 
> #endif /* DEBUG */
> 
>+_X_EXPORT
> void
> XrmPutFileDatabase(
>     XrmDatabase db,
>@@ -2246,6 +2263,7 @@ static Bool SearchNEntry(
>     return False;
> }
> 
>+_X_EXPORT
> Bool XrmQGetSearchList(
>     XrmDatabase     db,
>     XrmNameList	    names,
>@@ -2291,6 +2309,7 @@ Bool XrmQGetSearchList(
>     return True;
> }
> 
>+_X_EXPORT
> Bool XrmQGetSearchResource(
> 	     XrmSearchList	searchList,
>     register XrmName		name,
>@@ -2529,6 +2548,7 @@ static Bool GetNEntry(
>     return False;
> }
> 
>+_X_EXPORT
> Bool XrmQGetResource(
>     XrmDatabase         db,
>     XrmNameList		names,
>@@ -2571,6 +2591,7 @@ Bool XrmQGetResource(
>     return False;
> }
> 
>+_X_EXPORT
> Bool
> XrmGetResource(db, name_str, class_str, pType_str, pValue)
>     XrmDatabase         db;
>@@ -2631,6 +2652,7 @@ static void DestroyNTable(
>     Xfree((char *)table);
> }
> 
>+_X_EXPORT
> const char *
> XrmLocaleOfDatabase(
>     XrmDatabase db)
>@@ -2642,6 +2664,7 @@ XrmLocaleOfDatabase(
>     return retval;
> }
> 
>+_X_EXPORT
> void XrmDestroyDatabase(
>     XrmDatabase   db)
> {
>diff --git a/src/evtomask.c b/src/evtomask.c
>index fbbb998..6ade2e3 100644
>--- a/src/evtomask.c
>+++ b/src/evtomask.c
>@@ -30,11 +30,15 @@ in this Software without prior written authorization from The Open Group.
> #include <config.h>
> #endif
> #include <X11/X.h>
>+#include <X11/Xfuncproto.h>
> 
> /*
>  * This array can be used given an event type to determine the mask bits
>  * that could have generated it.
>+ *
>+ * NOTE: dmx uses this symbol so we have to export it.
>  */
>+_X_EXPORT
> long const _Xevent_to_mask [LASTEvent] = {
> 	0,						/* no event 0 */
> 	0,						/* no event 1 */
>diff --git a/src/globals.c b/src/globals.c
>index 11965cb..9500bd3 100644
>--- a/src/globals.c
>+++ b/src/globals.c
>@@ -58,11 +58,15 @@ from The Open Group.
>  */
> #if !defined(UNIXCPP) || defined(ANSICPP)
> #define ZEROINIT(t,var,val) SetZero(t,var,val); \
>+  _X_EXPORT \
>   SetZero (long, _libX_##var##Flag, 0); \
>+  _X_EXPORT \
>   SetZero (void *, _libX_##var##Ptr, NULL)
> #else /* else pcc concatenation */
> #define ZEROINIT(t,var,val) SetZero(t,var,val); \
>+  _X_EXPORT \
>   SetZero (long, _libX_/**/var/**/Flag, 0); \
>+  _X_EXPORT \
>   SetZero (void *, _libX_/**/var/**/Ptr, NULL)
> #endif /* concat ANSI C vs. pcc */
> 
>diff --git a/src/locking.c b/src/locking.c
>index 537ffa3..d243a2b 100644
>--- a/src/locking.c
>+++ b/src/locking.c
>@@ -596,7 +596,7 @@ xthread_t __x11_thr_self() { return 0; }
> xthread_t (*_x11_thr_self)() = __x11_thr_self;
> #endif
> 
>-
>+_X_EXPORT
> Status XInitThreads()
> {
>     if (_Xglobal_lock)
>diff --git a/src/os2Stubs.c b/src/os2Stubs.c
>index 9d10902..95b426b 100644
>--- a/src/os2Stubs.c
>+++ b/src/os2Stubs.c
>@@ -50,6 +50,7 @@
> #include <sys/select.h>
> #include <sys/time.h>
> 
>+_X_EXPORT
> char *__XOS2RedirRoot(char *fname)
> {
>     /* This adds a further redirection by allowing the ProjectRoot
>diff --git a/src/xcms/AddDIC.c b/src/xcms/AddDIC.c
>index 6f2987f..f36006b 100644
>--- a/src/xcms/AddDIC.c
>+++ b/src/xcms/AddDIC.c
>@@ -56,6 +56,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsAddColorSpace(XcmsColorSpace *pCS)
> /*
>diff --git a/src/xcms/AddSF.c b/src/xcms/AddSF.c
>index 395a234..7eb35e5 100644
>--- a/src/xcms/AddSF.c
>+++ b/src/xcms/AddSF.c
>@@ -56,6 +56,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsAddFunctionSet(XcmsFunctionSet *pNewFS)
> /*
>diff --git a/src/xcms/CCC.c b/src/xcms/CCC.c
>index 3ba62cd..2f9be9f 100644
>--- a/src/xcms/CCC.c
>+++ b/src/xcms/CCC.c
>@@ -86,6 +86,7 @@ from The Open Group.
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> XcmsCCC 
> XcmsCreateCCC(
>     Display *dpy,
>@@ -172,6 +173,7 @@ XcmsCreateCCC(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> XcmsCCC 
> XcmsDefaultCCC(
>     Display *dpy,
>@@ -254,6 +256,7 @@ XcmsDefaultCCC(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> void
> XcmsFreeCCC(XcmsCCC ccc)
> /*
>diff --git a/src/xcms/CvCols.c b/src/xcms/CvCols.c
>index 0fcd55e..49d6ed6 100644
>--- a/src/xcms/CvCols.c
>+++ b/src/xcms/CvCols.c
>@@ -713,6 +713,7 @@ Continue:
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsConvertColors(
>     XcmsCCC ccc,
>diff --git a/src/xcms/HVC.c b/src/xcms/HVC.c
>index c242bac..0388a02 100644
>--- a/src/xcms/HVC.c
>+++ b/src/xcms/HVC.c
>@@ -329,6 +329,7 @@ XcmsTekHVC_ValidSpec(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsTekHVCToCIEuvY(
>     XcmsCCC ccc,
>@@ -450,6 +451,7 @@ XcmsTekHVCToCIEuvY(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIEuvYToTekHVC(
>     XcmsCCC ccc,
>diff --git a/src/xcms/HVCGcC.c b/src/xcms/HVCGcC.c
>index 35981d7..a89f8b9 100644
>--- a/src/xcms/HVCGcC.c
>+++ b/src/xcms/HVCGcC.c
>@@ -65,6 +65,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status
> XcmsTekHVCClipC (
>diff --git a/src/xcms/HVCGcV.c b/src/xcms/HVCGcV.c
>index b6761c8..463ca1b 100644
>--- a/src/xcms/HVCGcV.c
>+++ b/src/xcms/HVCGcV.c
>@@ -65,6 +65,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status
> XcmsTekHVCClipV (
>diff --git a/src/xcms/HVCGcVC.c b/src/xcms/HVCGcVC.c
>index 4171c72..3c16d3e 100644
>--- a/src/xcms/HVCGcVC.c
>+++ b/src/xcms/HVCGcVC.c
>@@ -73,6 +73,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status
> XcmsTekHVCClipVC (
>diff --git a/src/xcms/HVCMnV.c b/src/xcms/HVCMnV.c
>index fd33d2f..2a9b333 100644
>--- a/src/xcms/HVCMnV.c
>+++ b/src/xcms/HVCMnV.c
>@@ -70,6 +70,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsTekHVCQueryMinV (
>     XcmsCCC ccc,
>diff --git a/src/xcms/HVCMxC.c b/src/xcms/HVCMxC.c
>index 6e69237..55ba3f5 100644
>--- a/src/xcms/HVCMxC.c
>+++ b/src/xcms/HVCMxC.c
>@@ -73,6 +73,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsTekHVCQueryMaxC(
>     XcmsCCC ccc, 
>diff --git a/src/xcms/HVCMxV.c b/src/xcms/HVCMxV.c
>index 72d0ccb..eb68ee0 100644
>--- a/src/xcms/HVCMxV.c
>+++ b/src/xcms/HVCMxV.c
>@@ -73,6 +73,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsTekHVCQueryMaxV(
>     XcmsCCC ccc,
>diff --git a/src/xcms/HVCMxVC.c b/src/xcms/HVCMxVC.c
>index c3726f0..0b4e68a 100644
>--- a/src/xcms/HVCMxVC.c
>+++ b/src/xcms/HVCMxVC.c
>@@ -181,6 +181,7 @@ _XcmsTekHVCQueryMaxVCRGB(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsTekHVCQueryMaxVC (
>     XcmsCCC ccc,
>diff --git a/src/xcms/HVCMxVs.c b/src/xcms/HVCMxVs.c
>index 88376e5..6b5ec29 100644
>--- a/src/xcms/HVCMxVs.c
>+++ b/src/xcms/HVCMxVs.c
>@@ -66,6 +66,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsTekHVCQueryMaxVSamples(
>     XcmsCCC ccc,
>diff --git a/src/xcms/HVCWpAj.c b/src/xcms/HVCWpAj.c
>index f9e2c38..3c0a620 100644
>--- a/src/xcms/HVCWpAj.c
>+++ b/src/xcms/HVCWpAj.c
>@@ -66,6 +66,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsTekHVCWhiteShiftColors(
>     XcmsCCC ccc,
>diff --git a/src/xcms/IdOfPr.c b/src/xcms/IdOfPr.c
>index 47e4ec3..0b5ba89 100644
>--- a/src/xcms/IdOfPr.c
>+++ b/src/xcms/IdOfPr.c
>@@ -48,6 +48,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> XcmsColorFormat
> XcmsFormatOfPrefix(char *prefix)
> /*
>diff --git a/src/xcms/LRGB.c b/src/xcms/LRGB.c
>index dff6776..0a9f7af 100644
>--- a/src/xcms/LRGB.c
>+++ b/src/xcms/LRGB.c
>@@ -1467,6 +1467,7 @@ XcmsLRGB_RGBi_ParseString(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status 
> XcmsCIEXYZToRGBi(
>@@ -1589,6 +1590,7 @@ XcmsCIEXYZToRGBi(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status 
> XcmsRGBiToCIEXYZ(
>@@ -1642,6 +1644,7 @@ XcmsRGBiToCIEXYZ(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status 
> XcmsRGBiToRGB(
>@@ -1725,6 +1728,7 @@ XcmsRGBiToRGB(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status 
> XcmsRGBToRGBi(
>diff --git a/src/xcms/Lab.c b/src/xcms/Lab.c
>index ae83110..70a1752 100644
>--- a/src/xcms/Lab.c
>+++ b/src/xcms/Lab.c
>@@ -231,6 +231,7 @@ XcmsCIELab_ValidSpec(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIELabToCIEXYZ(
>     XcmsCCC ccc,
>@@ -334,6 +335,7 @@ XcmsCIELabToCIEXYZ(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIEXYZToCIELab(
>     XcmsCCC ccc,
>diff --git a/src/xcms/LabGcC.c b/src/xcms/LabGcC.c
>index 366f293..0a18d4b 100644
>--- a/src/xcms/LabGcC.c
>+++ b/src/xcms/LabGcC.c
>@@ -52,6 +52,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status
> XcmsCIELabClipab (
>diff --git a/src/xcms/LabGcL.c b/src/xcms/LabGcL.c
>index 9722c21..17d5e7a 100644
>--- a/src/xcms/LabGcL.c
>+++ b/src/xcms/LabGcL.c
>@@ -52,6 +52,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status
> XcmsCIELabClipL (
>diff --git a/src/xcms/LabGcLC.c b/src/xcms/LabGcLC.c
>index 47490cd..9e26f8c 100644
>--- a/src/xcms/LabGcLC.c
>+++ b/src/xcms/LabGcLC.c
>@@ -60,6 +60,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status
> XcmsCIELabClipLab (
>diff --git a/src/xcms/LabMnL.c b/src/xcms/LabMnL.c
>index 9b4cd3d..54b448b 100644
>--- a/src/xcms/LabMnL.c
>+++ b/src/xcms/LabMnL.c
>@@ -61,6 +61,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIELabQueryMinL(
>     XcmsCCC ccc,
>diff --git a/src/xcms/LabMxC.c b/src/xcms/LabMxC.c
>index acd83f2..a960a68 100644
>--- a/src/xcms/LabMxC.c
>+++ b/src/xcms/LabMxC.c
>@@ -64,6 +64,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIELabQueryMaxC(
>     XcmsCCC ccc,
>diff --git a/src/xcms/LabMxL.c b/src/xcms/LabMxL.c
>index fbc39ee..51ef12d 100644
>--- a/src/xcms/LabMxL.c
>+++ b/src/xcms/LabMxL.c
>@@ -61,6 +61,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIELabQueryMaxL(
>     XcmsCCC ccc,
>diff --git a/src/xcms/LabMxLC.c b/src/xcms/LabMxLC.c
>index c24dd4b..d45bf8d 100644
>--- a/src/xcms/LabMxLC.c
>+++ b/src/xcms/LabMxLC.c
>@@ -171,6 +171,7 @@ _XcmsCIELabQueryMaxLCRGB(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIELabQueryMaxLC (
>     XcmsCCC ccc,
>diff --git a/src/xcms/LabWpAj.c b/src/xcms/LabWpAj.c
>index 3098a60..f40ec8a 100644
>--- a/src/xcms/LabWpAj.c
>+++ b/src/xcms/LabWpAj.c
>@@ -58,6 +58,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIELabWhiteShiftColors(
>     XcmsCCC ccc,
>diff --git a/src/xcms/Luv.c b/src/xcms/Luv.c
>index 9fe80a0..d7c1249 100644
>--- a/src/xcms/Luv.c
>+++ b/src/xcms/Luv.c
>@@ -232,6 +232,7 @@ XcmsCIELuv_ValidSpec(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIELuvToCIEuvY(
>     XcmsCCC ccc,
>@@ -324,6 +325,7 @@ XcmsCIELuvToCIEuvY(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIEuvYToCIELuv(
>     XcmsCCC ccc,
>diff --git a/src/xcms/LuvGcC.c b/src/xcms/LuvGcC.c
>index c4fde28..acc65e1 100644
>--- a/src/xcms/LuvGcC.c
>+++ b/src/xcms/LuvGcC.c
>@@ -52,6 +52,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status
> XcmsCIELuvClipuv (
>diff --git a/src/xcms/LuvGcL.c b/src/xcms/LuvGcL.c
>index c7ccc75..19b2f29 100644
>--- a/src/xcms/LuvGcL.c
>+++ b/src/xcms/LuvGcL.c
>@@ -52,6 +52,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status
> XcmsCIELuvClipL (
>diff --git a/src/xcms/LuvGcLC.c b/src/xcms/LuvGcLC.c
>index f2eab37..db9ea6e 100644
>--- a/src/xcms/LuvGcLC.c
>+++ b/src/xcms/LuvGcLC.c
>@@ -60,6 +60,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status
> XcmsCIELuvClipLuv (
>diff --git a/src/xcms/LuvMnL.c b/src/xcms/LuvMnL.c
>index 2286d7e..cf1d936 100644
>--- a/src/xcms/LuvMnL.c
>+++ b/src/xcms/LuvMnL.c
>@@ -61,6 +61,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIELuvQueryMinL(
>     XcmsCCC ccc,
>diff --git a/src/xcms/LuvMxC.c b/src/xcms/LuvMxC.c
>index d228c39..0342b26 100644
>--- a/src/xcms/LuvMxC.c
>+++ b/src/xcms/LuvMxC.c
>@@ -64,6 +64,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIELuvQueryMaxC(
>     XcmsCCC ccc,
>diff --git a/src/xcms/LuvMxL.c b/src/xcms/LuvMxL.c
>index f24c414..c3e3d90 100644
>--- a/src/xcms/LuvMxL.c
>+++ b/src/xcms/LuvMxL.c
>@@ -61,6 +61,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIELuvQueryMaxL(
>     XcmsCCC ccc,
>diff --git a/src/xcms/LuvMxLC.c b/src/xcms/LuvMxLC.c
>index 941e459..6f5a65b 100644
>--- a/src/xcms/LuvMxLC.c
>+++ b/src/xcms/LuvMxLC.c
>@@ -171,6 +171,7 @@ _XcmsCIELuvQueryMaxLCRGB(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIELuvQueryMaxLC (
>     XcmsCCC ccc,
>diff --git a/src/xcms/LuvWpAj.c b/src/xcms/LuvWpAj.c
>index 86a60b4..22e0a87 100644
>--- a/src/xcms/LuvWpAj.c
>+++ b/src/xcms/LuvWpAj.c
>@@ -55,6 +55,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIELuvWhiteShiftColors(
>     XcmsCCC ccc,
>diff --git a/src/xcms/OfCCC.c b/src/xcms/OfCCC.c
>index 1c9e16b..52887ea 100644
>--- a/src/xcms/OfCCC.c
>+++ b/src/xcms/OfCCC.c
>@@ -55,6 +55,7 @@
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> Display *
> XcmsDisplayOfCCC(
>     XcmsCCC ccc)
>@@ -78,6 +79,7 @@ XcmsDisplayOfCCC(
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> Visual *
> XcmsVisualOfCCC(
>     XcmsCCC ccc)
>@@ -101,6 +103,7 @@ XcmsVisualOfCCC(
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> int
> XcmsScreenNumberOfCCC(
>     XcmsCCC ccc)
>@@ -124,6 +127,7 @@ XcmsScreenNumberOfCCC(
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> XcmsColor *
> XcmsScreenWhitePointOfCCC(
>     XcmsCCC ccc)
>@@ -147,6 +151,7 @@ XcmsScreenWhitePointOfCCC(
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> XcmsColor *
> XcmsClientWhitePointOfCCC(
>     XcmsCCC ccc)
>diff --git a/src/xcms/PrOfId.c b/src/xcms/PrOfId.c
>index 01d2c26..59c3623 100644
>--- a/src/xcms/PrOfId.c
>+++ b/src/xcms/PrOfId.c
>@@ -48,6 +48,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> char *
> XcmsPrefixOfFormat(
>     XcmsColorFormat	id)
>diff --git a/src/xcms/QBlack.c b/src/xcms/QBlack.c
>index cdeae03..8d2cded 100644
>--- a/src/xcms/QBlack.c
>+++ b/src/xcms/QBlack.c
>@@ -55,6 +55,7 @@
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> Status
> XcmsQueryBlack(
>     XcmsCCC ccc,
>diff --git a/src/xcms/QBlue.c b/src/xcms/QBlue.c
>index eae77dd..488b559 100644
>--- a/src/xcms/QBlue.c
>+++ b/src/xcms/QBlue.c
>@@ -55,6 +55,7 @@
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> Status
> XcmsQueryBlue(
>     XcmsCCC ccc,
>diff --git a/src/xcms/QGreen.c b/src/xcms/QGreen.c
>index deb24cc..95f7d18 100644
>--- a/src/xcms/QGreen.c
>+++ b/src/xcms/QGreen.c
>@@ -55,6 +55,7 @@
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> Status
> XcmsQueryGreen(
>     XcmsCCC ccc,
>diff --git a/src/xcms/QRed.c b/src/xcms/QRed.c
>index 51b6be4..bea2095 100644
>--- a/src/xcms/QRed.c
>+++ b/src/xcms/QRed.c
>@@ -55,6 +55,7 @@
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> Status
> XcmsQueryRed(
>     XcmsCCC ccc,
>diff --git a/src/xcms/QWhite.c b/src/xcms/QWhite.c
>index d23443d..121e76f 100644
>--- a/src/xcms/QWhite.c
>+++ b/src/xcms/QWhite.c
>@@ -55,6 +55,7 @@
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> Status
> XcmsQueryWhite(
>     XcmsCCC ccc,
>diff --git a/src/xcms/QuCol.c b/src/xcms/QuCol.c
>index 7944faa..4cde357 100644
>--- a/src/xcms/QuCol.c
>+++ b/src/xcms/QuCol.c
>@@ -54,6 +54,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsQueryColor(
>     Display *dpy,
>diff --git a/src/xcms/QuCols.c b/src/xcms/QuCols.c
>index 7a0816d..20884c7 100644
>--- a/src/xcms/QuCols.c
>+++ b/src/xcms/QuCols.c
>@@ -53,6 +53,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsQueryColors(
>     Display *dpy,
>diff --git a/src/xcms/SetCCC.c b/src/xcms/SetCCC.c
>index a7094b1..92ea3d7 100644
>--- a/src/xcms/SetCCC.c
>+++ b/src/xcms/SetCCC.c
>@@ -56,6 +56,7 @@
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> Status
> XcmsSetWhitePoint(
>     XcmsCCC ccc,
>@@ -89,6 +90,7 @@ XcmsSetWhitePoint(
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> XcmsCompressionProc
> XcmsSetCompressionProc(
>     XcmsCCC ccc,
>@@ -118,6 +120,7 @@ XcmsSetCompressionProc(
>  *	SYNOPSIS
>  */
> 
>+_X_EXPORT
> XcmsWhiteAdjustProc
> XcmsSetWhiteAdjustProc(
>     XcmsCCC ccc,
>diff --git a/src/xcms/StCol.c b/src/xcms/StCol.c
>index fef449e..8478202 100644
>--- a/src/xcms/StCol.c
>+++ b/src/xcms/StCol.c
>@@ -54,6 +54,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsStoreColor(
>     Display *dpy,
>diff --git a/src/xcms/StCols.c b/src/xcms/StCols.c
>index 163d621..5c9872f 100644
>--- a/src/xcms/StCols.c
>+++ b/src/xcms/StCols.c
>@@ -54,6 +54,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsStoreColors(
>     Display *dpy,
>diff --git a/src/xcms/cmsAllCol.c b/src/xcms/cmsAllCol.c
>index 145d117..dd35a14 100644
>--- a/src/xcms/cmsAllCol.c
>+++ b/src/xcms/cmsAllCol.c
>@@ -48,6 +48,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsAllocColor(
>     Display *dpy,
>diff --git a/src/xcms/cmsAllNCol.c b/src/xcms/cmsAllNCol.c
>index efee0f6..bfc3692 100644
>--- a/src/xcms/cmsAllNCol.c
>+++ b/src/xcms/cmsAllNCol.c
>@@ -50,6 +50,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsAllocNamedColor (
>     Display *dpy,
>diff --git a/src/xcms/cmsCmap.c b/src/xcms/cmsCmap.c
>index e213682..248f722 100644
>--- a/src/xcms/cmsCmap.c
>+++ b/src/xcms/cmsCmap.c
>@@ -411,6 +411,7 @@ _XcmsFreeClientCmaps(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> XcmsCCC 
> XcmsCCCOfColormap(
>     Display *dpy,
>@@ -480,6 +481,7 @@ XcmsCCCOfColormap(
>     return(NULL);
> }
> 
>+_X_EXPORT
> XcmsCCC XcmsSetCCCOfColormap(
>     Display *dpy,
>     Colormap cmap,
>diff --git a/src/xcms/cmsLkCol.c b/src/xcms/cmsLkCol.c
>index f19f21d..c59bf69 100644
>--- a/src/xcms/cmsLkCol.c
>+++ b/src/xcms/cmsLkCol.c
>@@ -50,6 +50,7 @@
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsLookupColor (
>     Display *dpy,
>diff --git a/src/xcms/uvY.c b/src/xcms/uvY.c
>index da9fd0f..b2be95b 100644
>--- a/src/xcms/uvY.c
>+++ b/src/xcms/uvY.c
>@@ -226,6 +226,7 @@ _XcmsCIEuvY_ValidSpec(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIEuvYToCIEXYZ(
>     XcmsCCC ccc,
>@@ -341,6 +342,7 @@ XcmsCIEuvYToCIEXYZ(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIEXYZToCIEuvY(
>     XcmsCCC ccc,
>diff --git a/src/xcms/xyY.c b/src/xcms/xyY.c
>index 2e56a08..bd9f456 100644
>--- a/src/xcms/xyY.c
>+++ b/src/xcms/xyY.c
>@@ -234,6 +234,7 @@ XcmsCIExyY_ValidSpec(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> Status
> XcmsCIExyYToCIEXYZ(
>     XcmsCCC ccc,
>@@ -340,6 +341,7 @@ XcmsCIExyYToCIEXYZ(
>  *
>  *	SYNOPSIS
>  */
>+_X_EXPORT
> /* ARGSUSED */
> Status
> XcmsCIEXYZToCIExyY(
>diff --git a/src/xkb/XKB.c b/src/xkb/XKB.c
>index ecc5ddf..5e6eabf 100644
>--- a/src/xkb/XKB.c
>+++ b/src/xkb/XKB.c
>@@ -39,6 +39,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
> XkbInternAtomFunc	_XkbInternAtomFunc= XInternAtom;
> XkbGetAtomNameFunc	_XkbGetAtomNameFunc= XGetAtomName;
> 
>+_X_EXPORT
> Bool 
> XkbQueryExtension(	Display *dpy,
> 			int *	opcodeReturn,
>@@ -62,6 +63,7 @@ XkbQueryExtension(	Display *dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool 
> XkbLibraryVersion(int *libMajorRtrn,int *libMinorRtrn)
> {
>@@ -82,6 +84,7 @@ int supported;
>     return supported;
> }
> 
>+_X_EXPORT
> Bool
> XkbSelectEvents(	Display *	dpy,
> 			unsigned int 	deviceSpec,
>@@ -132,6 +135,7 @@ XkbSelectEvents(	Display *	dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbSelectEventDetails(	Display *		dpy,
> 			unsigned 		deviceSpec,
>@@ -224,6 +228,7 @@ XkbSelectEventDetails(	Display *		dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbLockModifiers(	Display *	dpy,
> 			unsigned int 	deviceSpec,
>@@ -255,6 +260,7 @@ XkbLockModifiers(	Display *	dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbLatchModifiers(	Display *	dpy,
> 			unsigned int	deviceSpec,
>@@ -288,6 +294,7 @@ XkbLatchModifiers(	Display *	dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbLockGroup(Display *dpy,unsigned int deviceSpec,unsigned int group)
> {
>@@ -316,6 +323,7 @@ XkbLockGroup(Display *dpy,unsigned int deviceSpec,unsigned int group)
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbLatchGroup(Display *dpy,unsigned int deviceSpec,unsigned int group)
> {
>@@ -346,6 +354,7 @@ XkbLatchGroup(Display *dpy,unsigned int deviceSpec,unsigned int group)
>     return True;
> }
> 
>+_X_EXPORT
> unsigned
> XkbSetXlibControls(Display *dpy,unsigned affect,unsigned values)
> {
>@@ -359,6 +368,7 @@ XkbSetXlibControls(Display *dpy,unsigned affect,unsigned values)
>     return dpy->xkb_info->xlib_ctrls;
> }
> 
>+_X_EXPORT
> unsigned
> XkbGetXlibControls(Display *dpy)
> {
>@@ -369,6 +379,7 @@ XkbGetXlibControls(Display *dpy)
>     return dpy->xkb_info->xlib_ctrls;
> }
> 
>+_X_EXPORT
> unsigned int
> XkbXlibControlsImplemented(void)
> {
>@@ -379,6 +390,7 @@ XkbXlibControlsImplemented(void)
> #endif
> }
> 
>+_X_EXPORT
> Bool
> XkbSetDebuggingFlags(	Display *	dpy,
> 			unsigned int 	mask,
>@@ -428,6 +440,7 @@ XkbSetDebuggingFlags(	Display *	dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbComputeEffectiveMap(	XkbDescPtr 	xkb,
> 			XkbKeyTypePtr 	type,
>@@ -474,6 +487,7 @@ XkbKTMapEntryPtr	entry = NULL;
>     return True;
> }
> 
>+_X_EXPORT
> Status
> XkbGetState(Display *dpy,unsigned deviceSpec,XkbStatePtr rtrn)
> {
>@@ -514,6 +528,7 @@ XkbGetState(Display *dpy,unsigned deviceSpec,XkbStatePtr rtrn)
>     return Success;
> }
> 
>+_X_EXPORT
> Bool
> XkbSetDetectableAutoRepeat(Display *dpy,Bool detectable,Bool *supported)
> {
>@@ -547,6 +562,7 @@ XkbInfoPtr 			xkbi;
>     return ((rep.value&XkbPCF_DetectableAutoRepeatMask)!=0);
> }
> 
>+_X_EXPORT
> Bool
> XkbGetDetectableAutoRepeat(Display *dpy,Bool *supported)
> {
>@@ -578,6 +594,7 @@ XkbInfoPtr 			xkbi;
>     return ((rep.value&XkbPCF_DetectableAutoRepeatMask)!=0);
> }
> 
>+_X_EXPORT
> Bool
> XkbSetAutoResetControls(	Display *	dpy,
> 				unsigned 	changes,
>@@ -614,6 +631,7 @@ XkbInfoPtr 			xkbi;
>     return ((rep.value&XkbPCF_AutoResetControlsMask)!=0);
> }
> 
>+_X_EXPORT
> Bool
> XkbGetAutoResetControls(	Display *	dpy,
> 				unsigned *	auto_ctrls,
>@@ -649,6 +667,7 @@ XkbInfoPtr 			xkbi;
>     return ((rep.value&XkbPCF_AutoResetControlsMask)!=0);
> }
> 
>+_X_EXPORT
> Bool
> XkbSetPerClientControls(	Display *	dpy,
> 				unsigned 	change,
>@@ -683,6 +702,7 @@ unsigned			value_hold = *values;
>     return ((rep.value&value_hold)!=0);
> }
> 
>+_X_EXPORT
> Bool
> XkbGetPerClientControls(	Display *	dpy,
> 				unsigned *	ctrls)
>@@ -718,6 +738,7 @@ XkbInfoPtr 			xkbi;
>     return (True);
> }
> 
>+_X_EXPORT
> Display *
> XkbOpenDisplay(	char *	name,
> 		int *	ev_rtrn,
>@@ -762,6 +783,7 @@ XkbOpenDisplay(	char *	name,
>     return dpy;
> }
> 
>+_X_EXPORT
> void
> XkbSetAtomFuncs(XkbInternAtomFunc getAtom,XkbGetAtomNameFunc getName)
> {
>diff --git a/src/xkb/XKBAlloc.c b/src/xkb/XKBAlloc.c
>index 9430ac0..b3a4d1c 100644
>--- a/src/xkb/XKBAlloc.c
>+++ b/src/xkb/XKBAlloc.c
>@@ -60,6 +60,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
> /***===================================================================***/
> 
> /*ARGSUSED*/
>+_X_EXPORT
> Status
> XkbAllocCompatMap(XkbDescPtr xkb,unsigned which,unsigned nSI)
> {
>@@ -106,7 +107,7 @@ XkbSymInterpretRec *prev_interpret;
>     return Success;
> }
> 
>-
>+_X_EXPORT
> void
> XkbFreeCompatMap(XkbDescPtr xkb,unsigned which,Bool freeMap)
> {
>@@ -134,6 +135,7 @@ register XkbCompatMapPtr compat;
> 
> /***===================================================================***/
> 
>+_X_EXPORT
> Status
> XkbAllocNames(XkbDescPtr xkb,unsigned which,int nTotalRG,int nTotalAliases)
> {
>@@ -214,6 +216,7 @@ XkbNamesPtr	names;
>     return Success;
> }
> 
>+_X_EXPORT
> void
> XkbFreeNames(XkbDescPtr xkb,unsigned which,Bool freeMap)
> {
>@@ -263,6 +266,7 @@ XkbNamesPtr	names;
> /***===================================================================***/
> 
> /*ARGSUSED*/
>+_X_EXPORT
> Status
> XkbAllocControls(XkbDescPtr xkb,unsigned which)
> {
>@@ -278,6 +282,7 @@ XkbAllocControls(XkbDescPtr xkb,unsigned which)
> }
> 
> /*ARGSUSED*/
>+_X_EXPORT
> void
> XkbFreeControls(XkbDescPtr xkb,unsigned which,Bool freeMap)
> {
>@@ -303,6 +308,7 @@ XkbAllocIndicatorMaps(XkbDescPtr xkb)
>     return Success;
> }
> 
>+_X_EXPORT
> void
> XkbFreeIndicatorMaps(XkbDescPtr xkb)
> {
>@@ -315,6 +321,7 @@ XkbFreeIndicatorMaps(XkbDescPtr xkb)
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> XkbDescRec	*
> XkbAllocKeyboard(void)
> {
>@@ -326,6 +333,7 @@ XkbDescRec *xkb;
>     return xkb;
> }
> 
>+_X_EXPORT
> void
> XkbFreeKeyboard(XkbDescPtr xkb,unsigned which,Bool freeAll)
> {
>@@ -354,6 +362,7 @@ XkbFreeKeyboard(XkbDescPtr xkb,unsigned which,Bool freeAll)
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> XkbDeviceLedInfoPtr
> XkbAddDeviceLedInfo(XkbDeviceInfoPtr devi,unsigned ledClass,unsigned ledId)
> {
>@@ -392,6 +401,7 @@ register int		i;
>     return devli;
> }
> 
>+_X_EXPORT
> Status
> XkbResizeDeviceButtonActions(XkbDeviceInfoPtr devi,unsigned newTotal)
> {
>@@ -425,6 +435,7 @@ XkbResizeDeviceButtonActions(XkbDeviceInfoPtr devi,unsigned newTotal)
>     return Success;
> }
> 
>+_X_EXPORT
> /*ARGSUSED*/
> XkbDeviceInfoPtr
> XkbAllocDeviceInfo(unsigned deviceSpec,unsigned nButtons,unsigned szLeds)
>@@ -464,7 +475,7 @@ XkbDeviceInfoPtr	devi;
>     return devi;
> }
> 
>-
>+_X_EXPORT
> void 
> XkbFreeDeviceInfo(XkbDeviceInfoPtr devi,unsigned which,Bool freeDevI)
> {
>diff --git a/src/xkb/XKBBell.c b/src/xkb/XKBBell.c
>index 6ea3085..4e1331d 100644
>--- a/src/xkb/XKBBell.c
>+++ b/src/xkb/XKBBell.c
>@@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
> #include <X11/extensions/XKBproto.h>
> #include "XKBlibint.h"
> 
>-
>+_X_EXPORT
> Bool
> XkbDeviceBell(	Display *	dpy,
> 		Window 		window,
>@@ -73,6 +73,7 @@ XkbDeviceBell(	Display *	dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbForceDeviceBell(	Display *	dpy,
> 			int 		deviceID,
>@@ -107,6 +108,7 @@ XkbForceDeviceBell(	Display *	dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbDeviceBellEvent(	Display *	dpy,
> 			Window 		window,
>@@ -143,6 +145,7 @@ XkbDeviceBellEvent(	Display *	dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbBell(Display *dpy,Window window,int percent,Atom name)
> {
>@@ -155,6 +158,7 @@ XkbBell(Display *dpy,Window window,int percent,Atom name)
> 								percent,name);
> }
> 
>+_X_EXPORT
> Bool
> XkbForceBell(Display *dpy,int percent)
> {
>@@ -167,6 +171,7 @@ XkbForceBell(Display *dpy,int percent)
> 								percent);
> }
> 
>+_X_EXPORT
> Bool
> XkbBellEvent(Display *dpy,Window window,int percent,Atom name)
> {
>diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c
>index e190d00..559819c 100644
>--- a/src/xkb/XKBBind.c
>+++ b/src/xkb/XKBBind.c
>@@ -66,6 +66,7 @@ struct _XKeytrans {
> 	int mlen;		/* length of modifier list */
> };
> 
>+_X_EXPORT
> KeySym
> XkbKeycodeToKeysym(Display *dpy,
> #if NeedWidePrototypes
>@@ -189,6 +190,7 @@ register XkbDescPtr xkb;
>     return 0;
> }
> 
>+_X_EXPORT
> unsigned
> XkbKeysymToModifiers(Display *dpy,KeySym ks)
> {
>@@ -218,6 +220,7 @@ XkbKeysymToModifiers(Display *dpy,KeySym ks)
>     return mods;
> }
> 
>+_X_EXPORT
> KeySym
> XLookupKeysym(register XKeyEvent *event, int col)
> {
>@@ -249,6 +252,7 @@ XkbTranslateKey(	register Display *	dpy,
>     return XkbLookupKeySym(dpy,key,mods,mods_rtrn,keysym_rtrn);
> }
> 
>+_X_EXPORT
> Bool
> XkbLookupKeySym(	register Display *	dpy,
> 			KeyCode 		key,
>@@ -263,6 +267,7 @@ XkbLookupKeySym(	register Display *	dpy,
> 								keysym_rtrn);
> }
> 
>+_X_EXPORT
> Bool
> XkbTranslateKeyCode(	register XkbDescPtr	xkb,
> 			KeyCode 		key,
>@@ -342,6 +347,7 @@ XkbTranslateKeyCode(	register XkbDescPtr	xkb,
>     return (syms[col]!=NoSymbol);
> }
> 
>+_X_EXPORT
> Status
> XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
> {
>@@ -574,6 +580,7 @@ _XkbReloadDpy(Display *dpy)
>     return;
> }
> 
>+_X_EXPORT
> int
> XkbTranslateKeySym(	register Display *	dpy,
> 			register KeySym *	sym_rtrn,
>@@ -810,7 +817,7 @@ XLookupString (	register XKeyEvent *	event,
>     return XkbTranslateKeySym(dpy,keysym,new_mods,buffer,nbytes,NULL);
> }
> 
>-
>+_X_EXPORT
> int
> XkbLookupKeyBinding(	Display *		dpy,
> 			register KeySym 	sym,
>@@ -839,6 +846,7 @@ XkbLookupKeyBinding(	Display *		dpy,
>     return 0;
> }
> 
>+_X_EXPORT
> char
> XkbToControl( char ch )
> {
>diff --git a/src/xkb/XKBCompat.c b/src/xkb/XKBCompat.c
>index 5886e4d..597fe5e 100644
>--- a/src/xkb/XKBCompat.c
>+++ b/src/xkb/XKBCompat.c
>@@ -109,6 +109,7 @@ BAILOUT:
>     return BadLength;
> }
> 
>+_X_EXPORT
> Status
> XkbGetCompatMap(Display *dpy,unsigned which,XkbDescPtr xkb)
> {
>@@ -210,6 +211,7 @@ char *			buf;
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbSetCompatMap(Display *dpy,unsigned which,XkbDescPtr xkb,Bool updateActions)
> {
>diff --git a/src/xkb/XKBCtrls.c b/src/xkb/XKBCtrls.c
>index 0ea131a..f6aab9f 100644
>--- a/src/xkb/XKBCtrls.c
>+++ b/src/xkb/XKBCtrls.c
>@@ -51,6 +51,7 @@ xkbSetControlsReq *req;
>     return req;
> }
> 
>+_X_EXPORT
> Bool 
> XkbSetAutoRepeatRate(	Display *dpy,
> 			unsigned int deviceSpec, 
>@@ -72,6 +73,7 @@ XkbSetAutoRepeatRate(	Display *dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool 
> XkbGetAutoRepeatRate(	Display *	dpy,
> 			unsigned int 	deviceSpec,
>@@ -104,6 +106,7 @@ XkbGetAutoRepeatRate(	Display *	dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbSetServerInternalMods(	Display *	dpy,
> 				unsigned 	deviceSpec,
>@@ -129,6 +132,7 @@ XkbSetServerInternalMods(	Display *	dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbSetIgnoreLockMods(	Display *	dpy,
> 			unsigned int 	deviceSpec,
>@@ -154,6 +158,7 @@ XkbSetIgnoreLockMods(	Display *	dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbChangeEnabledControls(	Display *	dpy,
> 				unsigned	deviceSpec,
>@@ -175,6 +180,7 @@ XkbChangeEnabledControls(	Display *	dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Status 
> XkbGetControls(Display *dpy, unsigned long which, XkbDescPtr xkb)
> {
>@@ -271,6 +277,7 @@ XkbGetControls(Display *dpy, unsigned long which, XkbDescPtr xkb)
>     return Success;
> }
> 
>+_X_EXPORT
> Bool 
> XkbSetControls(Display *dpy, unsigned long which, XkbDescPtr xkb)
> {
>@@ -343,6 +350,7 @@ XkbSetControls(Display *dpy, unsigned long which, XkbDescPtr xkb)
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> void
> XkbNoteControlsChanges(	XkbControlsChangesPtr		old,
> 			XkbControlsNotifyEvent *	new,
>diff --git a/src/xkb/XKBExtDev.c b/src/xkb/XKBExtDev.c
>index a22a299..e7bd5a8 100644
>--- a/src/xkb/XKBExtDev.c
>+++ b/src/xkb/XKBExtDev.c
>@@ -40,6 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> extern void
> XkbNoteDeviceChanges(	XkbDeviceChangesPtr		old,
> 			XkbExtensionDeviceNotifyEvent *	new,
>@@ -217,6 +218,7 @@ BAILOUT:
>     return BadLength;
> }
> 
>+_X_EXPORT
> XkbDeviceInfoPtr
> XkbGetDeviceInfo(	Display *	dpy,
> 			unsigned 	which,
>@@ -266,6 +268,7 @@ XkbGetDeviceInfo(	Display *	dpy,
>     return devi;
> }
> 
>+_X_EXPORT
> Status
> XkbGetDeviceInfoChanges(	Display *		dpy,
> 				XkbDeviceInfoPtr 	devi,
>@@ -326,6 +329,7 @@ XkbGetDeviceInfoChanges(	Display *		dpy,
>     return status;
> }
> 
>+_X_EXPORT
> Status
> XkbGetDeviceButtonActions(	Display *		dpy,
> 				XkbDeviceInfoPtr	devi,
>@@ -367,6 +371,7 @@ XkbGetDeviceButtonActions(	Display *		dpy,
>     return status;
> }
> 
>+_X_EXPORT
> Status
> XkbGetDeviceLedInfo(	Display *		dpy,
> 			XkbDeviceInfoPtr	devi,
>@@ -656,6 +661,7 @@ char *start;
>     return wire-start;
> }
> 
>+_X_EXPORT
> Bool
> XkbSetDeviceInfo(	Display *		dpy,
> 			unsigned 		which,
>@@ -711,6 +717,7 @@ XkbSetDeviceInfo(	Display *		dpy,
>     return ok;
> }
> 
>+_X_EXPORT
> Bool
> XkbChangeDeviceInfo(	Display *		dpy,
> 			XkbDeviceInfoPtr	devi,
>@@ -759,6 +766,7 @@ XkbChangeDeviceInfo(	Display *		dpy,
>     return ok;
> }
> 
>+_X_EXPORT
> Bool 
> XkbSetDeviceLedInfo(	Display *		dpy,
> 			XkbDeviceInfoPtr	devi,
>@@ -769,6 +777,7 @@ XkbSetDeviceLedInfo(	Display *		dpy,
>     return False;
> }
> 
>+_X_EXPORT
> Bool 
> XkbSetDeviceButtonActions(	Display *		dpy,
> 				XkbDeviceInfoPtr 	devi,
>diff --git a/src/xkb/XKBGAlloc.c b/src/xkb/XKBGAlloc.c
>index fddb770..55a7529 100644
>--- a/src/xkb/XKBGAlloc.c
>+++ b/src/xkb/XKBGAlloc.c
>@@ -172,6 +172,7 @@ XkbPropertyPtr	prop= (XkbPropertyPtr)prop_in;
>     return;
> }
> 
>+_X_EXPORT
> void
> XkbFreeGeomProperties(	XkbGeometryPtr	geom,
> 			int		first,
>@@ -187,6 +188,7 @@ XkbFreeGeomProperties(	XkbGeometryPtr	geom,
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> void
> XkbFreeGeomKeyAliases(	XkbGeometryPtr	geom,
> 			int		first,
>@@ -212,6 +214,7 @@ XkbColorPtr	color= (XkbColorPtr)color_in;
>     return;
> }
> 
>+_X_EXPORT
> void
> XkbFreeGeomColors(XkbGeometryPtr geom,int first,int count,Bool freeAll)
> {
>@@ -224,6 +227,7 @@ XkbFreeGeomColors(XkbGeometryPtr geom,int first,int count,Bool freeAll)
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> void
> XkbFreeGeomPoints(XkbOutlinePtr outline,int first,int count,Bool freeAll)
> {
>@@ -246,6 +250,7 @@ XkbOutlinePtr	outline= (XkbOutlinePtr)outline_in;
>     return;
> }
> 
>+_X_EXPORT
> void
> XkbFreeGeomOutlines(XkbShapePtr	shape,int first,int count,Bool freeAll)
> {
>@@ -269,6 +274,7 @@ XkbShapePtr	shape= (XkbShapePtr)shape_in;
>     return;
> }
> 
>+_X_EXPORT
> void
> XkbFreeGeomShapes(XkbGeometryPtr geom,int first,int count,Bool freeAll)
> {
>@@ -281,6 +287,7 @@ XkbFreeGeomShapes(XkbGeometryPtr geom,int first,int count,Bool freeAll)
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> void 
> XkbFreeGeomOverlayKeys(XkbOverlayRowPtr row,int first,int count,Bool freeAll)
> {
>@@ -303,6 +310,7 @@ XkbOverlayRowPtr	row= (XkbOverlayRowPtr)row_in;
>     return;
> }
> 
>+_X_EXPORT
> void
> XkbFreeGeomOverlayRows(XkbOverlayPtr overlay,int first,int count,Bool freeAll)
> {
>@@ -325,6 +333,7 @@ XkbOverlayPtr	overlay= (XkbOverlayPtr)overlay_in;
>     return;
> }
> 
>+_X_EXPORT
> void
> XkbFreeGeomOverlays(XkbSectionPtr section,int first,int	count,Bool freeAll)
> {
>@@ -337,6 +346,7 @@ XkbFreeGeomOverlays(XkbSectionPtr section,int first,int	count,Bool freeAll)
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> void
> XkbFreeGeomKeys(XkbRowPtr row,int first,int count,Bool freeAll)
> {
>@@ -359,6 +369,7 @@ XkbRowPtr	row= (XkbRowPtr)row_in;
>     return;
> }
> 
>+_X_EXPORT
> void
> XkbFreeGeomRows(XkbSectionPtr section,int first,int count,Bool freeAll)
> {
>@@ -384,6 +395,7 @@ XkbSectionPtr	section= (XkbSectionPtr)section_in;
>     return;
> }
> 
>+_X_EXPORT
> void
> XkbFreeGeomSections(XkbGeometryPtr geom,int first,int count,Bool freeAll)
> {
>@@ -426,6 +438,7 @@ XkbDoodadPtr	doodad= (XkbDoodadPtr)doodad_in;
>     return;
> }
> 
>+_X_EXPORT
> void
> XkbFreeGeomDoodads(XkbDoodadPtr doodads,int nDoodads,Bool freeAll)
> {
>@@ -442,6 +455,7 @@ register XkbDoodadPtr	doodad;
>     return;
> }
> 
>+_X_EXPORT
> void
> XkbFreeGeometry(XkbGeometryPtr geom,unsigned which,Bool freeMap)
> {
>@@ -548,90 +562,105 @@ _XkbGeomAlloc(	XPointer *		old,
> 				&(r)->num_keys,&(r)->sz_keys,\
> 				(n),sizeof(XkbOverlayKeyRec))
>     
>+_X_EXPORT
> Status
> XkbAllocGeomProps(XkbGeometryPtr geom,int nProps)
> {
>     return _XkbAllocProps(geom,nProps);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomColors(XkbGeometryPtr geom,int nColors)
> {
>     return _XkbAllocColors(geom,nColors);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomKeyAliases(XkbGeometryPtr geom,int nKeyAliases)
> {
>     return _XkbAllocKeyAliases(geom,nKeyAliases);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomShapes(XkbGeometryPtr geom,int nShapes)
> {
>     return _XkbAllocShapes(geom,nShapes);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomSections(XkbGeometryPtr geom,int nSections)
> {
>     return _XkbAllocSections(geom,nSections);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomOverlays(XkbSectionPtr section,int nOverlays)
> {
>     return _XkbAllocOverlays(section,nOverlays);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomOverlayRows(XkbOverlayPtr overlay,int nRows)
> {
>     return _XkbAllocOverlayRows(overlay,nRows);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomOverlayKeys(XkbOverlayRowPtr row,int nKeys)
> {
>     return _XkbAllocOverlayKeys(row,nKeys);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomDoodads(XkbGeometryPtr geom,int nDoodads)
> {
>     return _XkbAllocDoodads(geom,nDoodads);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomSectionDoodads(XkbSectionPtr section,int nDoodads)
> {
>     return _XkbAllocDoodads(section,nDoodads);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomOutlines(XkbShapePtr shape,int nOL)
> {
>     return _XkbAllocOutlines(shape,nOL);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomRows(XkbSectionPtr section,int nRows)
> {
>     return _XkbAllocRows(section,nRows);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomPoints(XkbOutlinePtr ol,int nPts)
> {
>     return _XkbAllocPoints(ol,nPts);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeomKeys(XkbRowPtr row,int nKeys)
> {
>     return _XkbAllocKeys(row,nKeys);
> }
> 
>+_X_EXPORT
> Status
> XkbAllocGeometry(XkbDescPtr xkb,XkbGeometrySizesPtr sizes)
> {
>@@ -677,6 +706,7 @@ BAIL:
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> XkbPropertyPtr
> XkbAddGeomProperty(XkbGeometryPtr geom,char *name,char *value)
> {
>@@ -715,6 +745,7 @@ register XkbPropertyPtr prop;
>     return prop;
> }
> 
>+_X_EXPORT
> XkbKeyAliasPtr
> XkbAddGeomKeyAlias(XkbGeometryPtr geom,char *aliasStr,char *realStr)
> {
>@@ -742,6 +773,7 @@ register XkbKeyAliasPtr alias;
>     return alias;
> }
> 
>+_X_EXPORT
> XkbColorPtr
> XkbAddGeomColor(XkbGeometryPtr geom,char *spec,unsigned int pixel)
> {
>@@ -770,6 +802,7 @@ register XkbColorPtr color;
>     return color;
> }
> 
>+_X_EXPORT
> XkbOutlinePtr
> XkbAddGeomOutline(XkbShapePtr shape,int sz_points)
> {
>@@ -789,6 +822,7 @@ XkbOutlinePtr	outline;
>     return outline;
> }
> 
>+_X_EXPORT
> XkbShapePtr
> XkbAddGeomShape(XkbGeometryPtr geom,Atom name,int sz_outlines)
> {
>@@ -816,6 +850,7 @@ register int	i;
>     return shape;
> }
> 
>+_X_EXPORT
> XkbKeyPtr
> XkbAddGeomKey(XkbRowPtr row)
> {
>@@ -829,6 +864,7 @@ XkbKeyPtr	key;
>     return key;
> }
> 
>+_X_EXPORT
> XkbRowPtr
> XkbAddGeomRow(XkbSectionPtr section,int sz_keys)
> {
>@@ -847,6 +883,7 @@ XkbRowPtr	row;
>     return row;
> }
> 
>+_X_EXPORT
> XkbSectionPtr
> XkbAddGeomSection(	XkbGeometryPtr	geom,
> 			Atom		name,
>@@ -887,6 +924,7 @@ XkbSectionPtr	section;
>     return section;
> }
> 
>+_X_EXPORT
> XkbDoodadPtr
> XkbAddGeomDoodad(XkbGeometryPtr geom,XkbSectionPtr section,Atom name)
> {
>@@ -925,6 +963,7 @@ register int	i,nDoodads;
>     return doodad;
> }
> 
>+_X_EXPORT
> XkbOverlayKeyPtr
> XkbAddGeomOverlayKey(	XkbOverlayPtr		overlay,
> 			XkbOverlayRowPtr 	row,
>@@ -960,6 +999,7 @@ Bool		found;
>     return key;
> }
> 
>+_X_EXPORT
> XkbOverlayRowPtr
> XkbAddGeomOverlayRow(XkbOverlayPtr overlay,int row_under,int sz_keys)
> {
>@@ -992,6 +1032,7 @@ XkbOverlayRowPtr	row;
>     return row;
> }
> 
>+_X_EXPORT
> XkbOverlayPtr
> XkbAddGeomOverlay(XkbSectionPtr section,Atom name,int sz_rows)
> {
>diff --git a/src/xkb/XKBGeom.c b/src/xkb/XKBGeom.c
>index 6eca6d5..439f553 100644
>--- a/src/xkb/XKBGeom.c
>+++ b/src/xkb/XKBGeom.c
>@@ -60,6 +60,7 @@ _XkbCheckBounds(XkbBoundsPtr bounds,int	x,int y)
>     return;
> }
> 
>+_X_EXPORT
> Bool
> XkbComputeShapeBounds(XkbShapePtr shape)
> {
>@@ -82,6 +83,7 @@ XkbPointPtr	pt;
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbComputeShapeTop(XkbShapePtr shape,XkbBoundsPtr bounds)
> {
>@@ -107,6 +109,7 @@ XkbPointPtr	pt;
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbComputeRowBounds(XkbGeometryPtr geom,XkbSectionPtr section,XkbRowPtr row)
> {
>@@ -144,6 +147,7 @@ XkbBoundsPtr	bounds,sbounds;
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbComputeSectionBounds(XkbGeometryPtr geom,XkbSectionPtr section)
> {
>@@ -200,6 +204,7 @@ XkbBoundsPtr	bounds,rbounds=NULL;
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> char *
> XkbFindOverlayForKey(XkbGeometryPtr geom,XkbSectionPtr wanted,char *under)
> {
>@@ -638,6 +643,7 @@ XkbGeometryPtr	geom;
>     return Success;
> }
> 
>+_X_EXPORT
> Status
> XkbGetGeometry(Display *dpy,XkbDescPtr xkb)
> {
>@@ -666,6 +672,7 @@ Status			 status;
>     return status;
> }
> 
>+_X_EXPORT
> Status
> XkbGetNamedGeometry(Display *dpy,XkbDescPtr xkb,Atom name)
> {
>diff --git a/src/xkb/XKBGetByName.c b/src/xkb/XKBGetByName.c
>index 2c6ff08..e68751e 100644
>--- a/src/xkb/XKBGetByName.c
>+++ b/src/xkb/XKBGetByName.c
>@@ -38,6 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> XkbDescPtr
> XkbGetKeyboardByName(	Display *		dpy,
> 			unsigned		deviceSpec,
>@@ -211,6 +212,7 @@ BAILOUT:
>     return NULL;
> }
> 
>+_X_EXPORT
> XkbDescPtr
> XkbGetKeyboard(Display *dpy,unsigned which,unsigned deviceSpec)
> {
>diff --git a/src/xkb/XKBGetMap.c b/src/xkb/XKBGetMap.c
>index 59e9962..d3548e9 100644
>--- a/src/xkb/XKBGetMap.c
>+++ b/src/xkb/XKBGetMap.c
>@@ -526,6 +526,7 @@ xkbGetMapReply	rep;
>     return _XkbReadGetMapReply(dpy,&rep,xkb,NULL);
> }
> 
>+_X_EXPORT
> Status
> XkbGetUpdatedMap(Display *dpy,unsigned which,XkbDescPtr xkb)
> {
>@@ -549,6 +550,7 @@ XkbGetUpdatedMap(Display *dpy,unsigned which,XkbDescPtr xkb)
>     return Success;
> }
> 
>+_X_EXPORT
> XkbDescPtr
> XkbGetMap(Display *dpy,unsigned which,unsigned deviceSpec)
> {
>@@ -572,6 +574,7 @@ XkbDescPtr xkb;
>     return xkb;
> }
> 
>+_X_EXPORT
> Status
> XkbGetKeyTypes(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
> {
>@@ -596,6 +599,7 @@ XkbGetKeyTypes(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
>     return status;
> }
> 
>+_X_EXPORT
> Status
> XkbGetKeyActions(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
> {
>@@ -621,6 +625,7 @@ XkbGetKeyActions(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
>     return status;
> }
> 
>+_X_EXPORT
> Status
> XkbGetKeySyms(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
> {
>@@ -672,6 +677,7 @@ XkbGetKeyBehaviors(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
>     return status;
> }
> 
>+_X_EXPORT
> Status
> XkbGetVirtualMods(Display *dpy,unsigned which,XkbDescPtr xkb)
> {
>@@ -728,6 +734,7 @@ XkbGetKeyExplicitComponents(	Display *	dpy,
>     return status;
> }
> 
>+_X_EXPORT
> Status
> XkbGetKeyModifierMap(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
> {
>@@ -760,6 +767,7 @@ XkbGetKeyModifierMap(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
>     return status;
> }
> 
>+_X_EXPORT
> Status
> XkbGetKeyVirtualModMap(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
> {
>@@ -793,6 +801,7 @@ XkbGetKeyVirtualModMap(Display *dpy,unsigned first,unsigned num,XkbDescPtr xkb)
>     return status;
> }
> 
>+_X_EXPORT
> Status
> XkbGetMapChanges(Display *dpy,XkbDescPtr xkb,XkbMapChangesPtr changes)
> {
>diff --git a/src/xkb/XKBList.c b/src/xkb/XKBList.c
>index 2f4a534..1bfc41c 100644
>--- a/src/xkb/XKBList.c
>+++ b/src/xkb/XKBList.c
>@@ -94,6 +94,7 @@ BAILOUT:
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> XkbComponentListPtr
> XkbListComponents(	Display *		dpy,
> 			unsigned		deviceSpec,
>@@ -228,6 +229,7 @@ BAILOUT:
>     return NULL;
> }
> 
>+_X_EXPORT
> void
> XkbFreeComponentList(XkbComponentListPtr list)
> {
>diff --git a/src/xkb/XKBMAlloc.c b/src/xkb/XKBMAlloc.c
>index 08f29bb..3043575 100644
>--- a/src/xkb/XKBMAlloc.c
>+++ b/src/xkb/XKBMAlloc.c
>@@ -142,6 +142,7 @@ fprintf(stderr,"bad keycode (%d,%d) in XkbAllocClientMap\n",
>     return Success;
> }
> 
>+_X_EXPORT
> Status
> XkbAllocServerMap(XkbDescPtr xkb,unsigned which,unsigned nNewActions)
> {
>@@ -236,6 +237,7 @@ XkbServerMapPtr map;
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> Status
> XkbCopyKeyType(XkbKeyTypePtr from,XkbKeyTypePtr into)
> {
>@@ -277,6 +279,7 @@ XkbCopyKeyType(XkbKeyTypePtr from,XkbKeyTypePtr into)
>     return Success;
> }
> 
>+_X_EXPORT
> Status
> XkbCopyKeyTypes(XkbKeyTypePtr from,XkbKeyTypePtr into,int num_types)
> {
>@@ -291,6 +294,7 @@ register int i,rtrn;
>     return Success;
> }
> 
>+_X_EXPORT
> XkbKeyTypePtr
> XkbAddKeyType(	XkbDescPtr	xkb,
> 		Atom 		name,
>@@ -368,6 +372,7 @@ XkbClientMapPtr	map;
>     return type;
> }
> 
>+_X_EXPORT
> Status
> XkbResizeKeyType(	XkbDescPtr	xkb,
> 			int		type_ndx,
>@@ -566,6 +571,7 @@ KeyCode		matchingKeys[XkbMaxKeyCount],nMatchingKeys;
>     return Success;
> }
> 
>+_X_EXPORT
> KeySym *
> XkbResizeKeySyms(XkbDescPtr xkb,int key,int needed)
> {
>@@ -646,6 +652,7 @@ _ExtendRange(	unsigned int 	old_flags,
>     return old_flags;
> }
> 
>+_X_EXPORT
> Status
> XkbChangeKeycodeRange(	XkbDescPtr	xkb,
> 			int 		minKC,
>@@ -846,6 +853,7 @@ int	tmp;
>     return Success;
> }
> 
>+_X_EXPORT
> XkbAction *
> XkbResizeKeyActions(XkbDescPtr xkb,int key,int needed)
> {
>@@ -896,6 +904,7 @@ XkbAction *newActs;
>     return &xkb->server->acts[xkb->server->key_acts[key]];
> }
> 
>+_X_EXPORT
> void
> XkbFreeClientMap(XkbDescPtr xkb,unsigned what,Bool freeMap)
> {
>@@ -954,6 +963,7 @@ XkbClientMapPtr	map;
>     return;
> }
> 
>+_X_EXPORT
> void
> XkbFreeServerMap(XkbDescPtr xkb,unsigned what,Bool freeMap)
> {
>diff --git a/src/xkb/XKBMisc.c b/src/xkb/XKBMisc.c
>index 515b293..0217904 100644
>--- a/src/xkb/XKBMisc.c
>+++ b/src/xkb/XKBMisc.c
>@@ -107,6 +107,7 @@ static	XkbKeyTypeRec	canonicalTypes[XkbNumRequiredTypes] = {
> 	}
> };
> 
>+_X_EXPORT
> Status
> XkbInitCanonicalKeyTypes(XkbDescPtr xkb,unsigned which,int keypadVMod)
> {
>@@ -157,6 +158,7 @@ Status		rtrn;
> #define	CORE_SYM(i)	(i<map_width?core_syms[i]:NoSymbol)
> #define	XKB_OFFSET(g,l)	(((g)*groupsWidth)+(l))
> 
>+_X_EXPORT
> int
> XkbKeyTypesForCoreSymbols(	XkbDescPtr	xkb,
> 				int		map_width,
>@@ -422,6 +424,7 @@ unsigned	tmp;
> 
> #define	IBUF_SIZE	8
> 
>+_X_EXPORT
> Bool
> XkbApplyCompatMapToKey(XkbDescPtr xkb,KeyCode key,XkbChangesPtr changes)
> {
>@@ -574,6 +577,7 @@ unsigned		changed,tmp;
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbUpdateMapFromCore(	XkbDescPtr	xkb,
> 			KeyCode		first_key,
>@@ -656,6 +660,7 @@ KeySym *	syms;
>     return True;
> }
> 
>+_X_EXPORT
> Status
> XkbChangeTypesOfKey(	XkbDescPtr		 xkb,
> 			int		 	 key,
>@@ -780,6 +785,7 @@ int		width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> Bool
> XkbVirtualModsToReal(XkbDescPtr xkb,unsigned virtual_mask,unsigned *mask_rtrn)
> {
>@@ -804,6 +810,7 @@ register unsigned mask;
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> Bool
> XkbUpdateActionVirtualMods(XkbDescPtr xkb,XkbAction *act,unsigned changed)
> {
>@@ -830,6 +837,7 @@ unsigned int	tmp;
>     return False;
> }
> 
>+_X_EXPORT
> void
> XkbUpdateKeyTypeVirtualMods(	XkbDescPtr	xkb,
> 				XkbKeyTypePtr	type,
>@@ -878,6 +886,7 @@ unsigned int		mask;
>     return;
> }
> 
>+_X_EXPORT
> Bool
> XkbApplyVirtualModChanges(XkbDescPtr xkb,unsigned changed,XkbChangesPtr changes)
> {
>diff --git a/src/xkb/XKBNames.c b/src/xkb/XKBNames.c
>index a8eeb2a..397d5e3 100644
>--- a/src/xkb/XKBNames.c
>+++ b/src/xkb/XKBNames.c
>@@ -231,6 +231,7 @@ BAILOUT:
>     return BadLength;
> }
> 
>+_X_EXPORT
> Status
> XkbGetNames(Display *dpy,unsigned which,XkbDescPtr xkb)
> {
>@@ -313,6 +314,7 @@ register unsigned int i,bit;
>     return;
> }
> 
>+_X_EXPORT
> Bool
> XkbSetNames(	Display *	dpy,
> 		unsigned int 	which,
>@@ -539,6 +541,7 @@ XkbSetNames(	Display *	dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbChangeNames(Display *dpy,XkbDescPtr xkb,XkbNameChangesPtr changes)
> {
>@@ -795,6 +798,7 @@ XkbChangeNames(Display *dpy,XkbDescPtr xkb,XkbNameChangesPtr changes)
>     return True;
> }
> 
>+_X_EXPORT
> void
> XkbNoteNameChanges(	XkbNameChangesPtr	old,
> 			XkbNamesNotifyEvent *	new,
>diff --git a/src/xkb/XKBSetGeom.c b/src/xkb/XKBSetGeom.c
>index 8e4d8b1..5f0cfb8 100644
>--- a/src/xkb/XKBSetGeom.c
>+++ b/src/xkb/XKBSetGeom.c
>@@ -436,6 +436,7 @@ char *			wire,*tbuf;
> 
> /***====================================================================***/
> 
>+_X_EXPORT
> Status
> XkbSetGeometry(Display *dpy,unsigned deviceSpec,XkbGeometryPtr geom)
> {
>diff --git a/src/xkb/XKBSetMap.c b/src/xkb/XKBSetMap.c
>index 4a3b15c..3cc226a 100644
>--- a/src/xkb/XKBSetMap.c
>+++ b/src/xkb/XKBSetMap.c
>@@ -465,6 +465,7 @@ unsigned szMods;
>     return;
> }
> 
>+_X_EXPORT
> Bool
> XkbSetMap(Display *dpy,unsigned which,XkbDescPtr xkb)
> {
>@@ -535,6 +536,7 @@ XkbClientMapPtr		map;
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbChangeMap(Display *dpy,XkbDescPtr xkb,XkbMapChangesPtr changes)
> {
>diff --git a/src/xkb/XKBUse.c b/src/xkb/XKBUse.c
>index ad18bb6..80d2147 100644
>--- a/src/xkb/XKBUse.c
>+++ b/src/xkb/XKBUse.c
>@@ -39,6 +39,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
> 
> static Bool	_XkbIgnoreExtension = False;
> 
>+_X_EXPORT
> void
> XkbNoteMapChanges(XkbMapChangesPtr old,XkbMapNotifyEvent *new,unsigned wanted)
> {
>@@ -593,6 +594,7 @@ wire_to_event(Display *dpy,XEvent *re,xEvent *event)
>     return False;
> }
> 
>+_X_EXPORT
> Bool
> XkbIgnoreExtension(Bool ignore)
> {
>@@ -622,6 +624,7 @@ _XkbFreeInfo(Display *dpy)
>       }
> }
> 
>+_X_EXPORT
> Bool
> XkbUseExtension(Display *dpy,int *major_rtrn,int *minor_rtrn)
> {
>diff --git a/src/xkb/XKBleds.c b/src/xkb/XKBleds.c
>index 865342c..ef37547 100644
>--- a/src/xkb/XKBleds.c
>+++ b/src/xkb/XKBleds.c
>@@ -36,6 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
> #include <X11/extensions/XKBproto.h>
> #include "XKBlibint.h"
> 
>+_X_EXPORT
> Status
> XkbGetIndicatorState(Display *dpy,unsigned deviceSpec,unsigned *pStateRtrn)
> {
>@@ -111,6 +112,7 @@ XkbReadBufferRec	buf;
>     return Success;
> }
> 
>+_X_EXPORT
> Bool
> XkbGetIndicatorMap(Display *dpy,unsigned long which,XkbDescPtr xkb)
> {
>@@ -151,6 +153,7 @@ XkbGetIndicatorMap(Display *dpy,unsigned long which,XkbDescPtr xkb)
>     return status;
> }
> 
>+_X_EXPORT
> Bool
> XkbSetIndicatorMap(Display *dpy,unsigned long which,XkbDescPtr xkb)
> {
>@@ -196,6 +199,7 @@ XkbSetIndicatorMap(Display *dpy,unsigned long which,XkbDescPtr xkb)
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbGetNamedDeviceIndicator(	Display *		dpy,
> 				unsigned		device,
>@@ -251,6 +255,7 @@ XkbGetNamedDeviceIndicator(	Display *		dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbGetNamedIndicator(	Display *		dpy,
> 			Atom			name,
>@@ -265,6 +270,7 @@ XkbGetNamedIndicator(	Display *		dpy,
> 					  pMapRtrn,pRealRtrn);
> }
> 
>+_X_EXPORT
> Bool
> XkbSetNamedDeviceIndicator(	Display *		dpy,
> 				unsigned		device,
>@@ -322,6 +328,7 @@ XkbSetNamedDeviceIndicator(	Display *		dpy,
>     return True;
> }
> 
>+_X_EXPORT
> Bool
> XkbSetNamedIndicator(	Display *		dpy,
> 			Atom			name,
>diff --git a/src/xlibi18n/ICWrap.c b/src/xlibi18n/ICWrap.c
>index b51da6f..96f70d7 100644
>--- a/src/xlibi18n/ICWrap.c
>+++ b/src/xlibi18n/ICWrap.c
>@@ -150,6 +150,7 @@ _XIMVaToNestedList(va_list var, int max_count, XIMArg **args_return)
>     args->name = (char*)NULL;
> }
> 
>+_X_EXPORT
> /*ARGSUSED*/
> XVaNestedList
> XVaCreateNestedList(int dummy, ...)
>@@ -169,6 +170,7 @@ XVaCreateNestedList(int dummy, ...)
>     return (XVaNestedList)args;
> }
> 
>+_X_EXPORT
> char *
> XSetIMValues(XIM im, ...)
> {
>@@ -196,6 +198,7 @@ XSetIMValues(XIM im, ...)
>     return ret;
> }
> 
>+_X_EXPORT
> char *
> XGetIMValues(XIM im, ...)
> {
>@@ -228,6 +231,7 @@ XGetIMValues(XIM im, ...)
>  * and return a pointer to the input context.
>  */
> 
>+_X_EXPORT
> XIC
> XCreateIC(XIM im, ...)
> {
>@@ -262,6 +266,7 @@ XCreateIC(XIM im, ...)
> /*
>  * Free the input context.
>  */
>+_X_EXPORT
> void
> XDestroyIC(ic)
>     XIC ic;
>@@ -281,6 +286,7 @@ XDestroyIC(ic)
>     Xfree ((char *) ic);
> }
> 
>+_X_EXPORT
> char *
> XGetICValues(XIC ic, ...)
> { 
>@@ -311,6 +317,7 @@ XGetICValues(XIC ic, ...)
>     return ret;
> }
> 
>+_X_EXPORT
> char *
> XSetICValues(XIC ic, ...)
> {
>@@ -345,6 +352,7 @@ XSetICValues(XIC ic, ...)
>  * Require the input manager to focus the focus window attached to the ic
>  * argument.
>  */
>+_X_EXPORT
> void
> XSetICFocus(ic)
>     XIC ic;
>@@ -357,6 +365,7 @@ XSetICFocus(ic)
>  * Require the input manager to unfocus the focus window attached to the ic
>  * argument.
>  */
>+_X_EXPORT
> void
> XUnsetICFocus(ic)
>     XIC ic;
>@@ -368,6 +377,7 @@ XUnsetICFocus(ic)
> /*
>  * Return the XIM associated with the input context.
>  */
>+_X_EXPORT
> XIM
> XIMOfIC(ic)
>     XIC ic;
>@@ -375,6 +385,7 @@ XIMOfIC(ic)
>     return ic->core.im;
> }
> 
>+_X_EXPORT
> char *
> XmbResetIC(ic)
>     XIC ic;
>@@ -384,6 +395,7 @@ XmbResetIC(ic)
>     return (char *)NULL;
> }
> 
>+_X_EXPORT
> wchar_t *
> XwcResetIC(ic)
>     XIC ic;
>@@ -393,6 +405,7 @@ XwcResetIC(ic)
>     return (wchar_t *)NULL;
> }
> 
>+_X_EXPORT
> char *
> Xutf8ResetIC(ic)
>     XIC ic;
>@@ -406,6 +419,7 @@ Xutf8ResetIC(ic)
>     return (char *)NULL;
> }
> 
>+_X_EXPORT
> int
> XmbLookupString(ic, ev, buffer, nbytes, keysym, status)
>     XIC ic;
>@@ -421,6 +435,7 @@ XmbLookupString(ic, ev, buffer, nbytes, keysym, status)
>     return XLookupNone;
> }
> 
>+_X_EXPORT
> int
> XwcLookupString(ic, ev, buffer, nchars, keysym, status)
>     XIC ic;
>@@ -436,6 +451,7 @@ XwcLookupString(ic, ev, buffer, nchars, keysym, status)
>     return XLookupNone;
> }
> 
>+_X_EXPORT
> int
> Xutf8LookupString(ic, ev, buffer, nbytes, keysym, status)
>     XIC ic;
>diff --git a/src/xlibi18n/IMWrap.c b/src/xlibi18n/IMWrap.c
>index a90b406..fafd4f8 100644
>--- a/src/xlibi18n/IMWrap.c
>+++ b/src/xlibi18n/IMWrap.c
>@@ -121,6 +121,7 @@ _XCopyToArg(src, dst, size)
>  * a XIM object and return a pointer the newly created XIM back to the caller.
>  */
> 
>+_X_EXPORT
> XIM 
> XOpenIM( display, rdb, res_name, res_class )
>     Display	*display;
>@@ -138,6 +139,7 @@ XOpenIM( display, rdb, res_name, res_class )
> /*
>  * Close the connection to the input manager, and free the XIM structure
>  */
>+_X_EXPORT
> Status
> XCloseIM(im)
>     XIM im;
>@@ -157,6 +159,7 @@ XCloseIM(im)
> /*
>  * Return the Display associated with the input method.
>  */
>+_X_EXPORT
> Display *
> XDisplayOfIM(im)
>     XIM im;
>@@ -167,6 +170,7 @@ XDisplayOfIM(im)
> /*
>  * Return the Locale associated with the input method.
>  */
>+_X_EXPORT
> char *
> XLocaleOfIM(im)
>     XIM im;
>@@ -178,6 +182,7 @@ XLocaleOfIM(im)
>  * Register to a input method instantiation callback to prepare the
>  * on-demand input method instantiation.
>  */
>+_X_EXPORT
> Bool
> XRegisterIMInstantiateCallback(
>     Display	*display,
>@@ -199,6 +204,7 @@ XRegisterIMInstantiateCallback(
> /*
>  * Unregister to a input method instantiation callback.
>  */
>+_X_EXPORT
> Bool
> XUnregisterIMInstantiateCallback(
>     Display	*display,
>diff --git a/src/xlibi18n/lcStd.c b/src/xlibi18n/lcStd.c
>index e112dce..2c541c6 100644
>--- a/src/xlibi18n/lcStd.c
>+++ b/src/xlibi18n/lcStd.c
>@@ -197,7 +197,7 @@ _Xlcwcstombs(
>     return ret;
> }
> 
>-
>+_X_EXPORT
> int
> _Xmbtowc(
>     wchar_t *wstr,
>@@ -213,6 +213,7 @@ _Xmbtowc(
>     return _Xlcmbtowc((XLCd) NULL, wstr, str, len);
> }
> 
>+_X_EXPORT
> int
> _Xmblen(
> #ifdef ISC
>@@ -227,6 +228,7 @@ _Xmblen(
>     return _Xmbtowc((wchar_t *) NULL, str, len);
> }
> 
>+_X_EXPORT
> int
> _Xwctomb(
>     char *str,
>diff --git a/src/xlibi18n/lcWrap.c b/src/xlibi18n/lcWrap.c
>index ea26231..582a3c9 100644
>--- a/src/xlibi18n/lcWrap.c
>+++ b/src/xlibi18n/lcWrap.c
>@@ -73,6 +73,7 @@ from The Open Group.
> LockInfoPtr _Xi18n_lock;
> #endif
> 
>+_X_EXPORT
> char *
> XSetLocaleModifiers(
>     const char *modifiers)
>@@ -95,6 +96,7 @@ XSetLocaleModifiers(
>     return (char *)modifiers;
> }
> 
>+_X_EXPORT
> Bool
> XSupportsLocale()
> {
>@@ -376,6 +378,7 @@ _XrmInitParseInfo(
>     return (*lcd->methods->init_parse_info)(lcd, state);
> }
> 
>+_X_EXPORT
> int
> XmbTextPropertyToTextList(
>     Display *dpy,
>@@ -392,6 +395,7 @@ XmbTextPropertyToTextList(
> 						 count_ret);
> }
> 
>+_X_EXPORT
> int
> XwcTextPropertyToTextList(
>     Display *dpy,
>@@ -408,6 +412,7 @@ XwcTextPropertyToTextList(
> 						 count_ret);
> }
> 
>+_X_EXPORT
> int
> Xutf8TextPropertyToTextList(
>     Display *dpy,
>@@ -424,6 +429,7 @@ Xutf8TextPropertyToTextList(
> 						   list_ret, count_ret);
> }
> 
>+_X_EXPORT
> int
> XmbTextListToTextProperty(
>     Display *dpy,
>@@ -441,6 +447,7 @@ XmbTextListToTextProperty(
> 						 text_prop);
> }
> 
>+_X_EXPORT
> int
> XwcTextListToTextProperty(
>     Display *dpy,
>@@ -458,6 +465,7 @@ XwcTextListToTextProperty(
> 						 text_prop);
> }
> 
>+_X_EXPORT
> int
> Xutf8TextListToTextProperty(
>     Display *dpy,
>@@ -475,6 +483,7 @@ Xutf8TextListToTextProperty(
> 						   style, text_prop);
> }
> 
>+_X_EXPORT
> void
> XwcFreeStringList(
>     wchar_t **list)
>@@ -487,6 +496,7 @@ XwcFreeStringList(
>     (*lcd->methods->wc_free_string_list)(lcd, list);
> }
> 
>+_X_EXPORT
> const char *
> XDefaultString()
> {
>diff --git a/src/xlibi18n/mbWMProps.c b/src/xlibi18n/mbWMProps.c
>index a5f7732..357eb74 100644
>--- a/src/xlibi18n/mbWMProps.c
>+++ b/src/xlibi18n/mbWMProps.c
>@@ -36,6 +36,7 @@ from The Open Group.
> #include <X11/Xatom.h>
> #include <X11/Xlocale.h>
> 
>+_X_EXPORT
> void
> XmbSetWMProperties (
>     Display *dpy,
>diff --git a/src/xlibi18n/mbWrap.c b/src/xlibi18n/mbWrap.c
>index 827c10b..07cbdfe 100644
>--- a/src/xlibi18n/mbWrap.c
>+++ b/src/xlibi18n/mbWrap.c
>@@ -58,6 +58,7 @@ from The Open Group.
> #include "Xlibint.h"
> #include "Xlcint.h"
> 
>+_X_EXPORT
> void
> XmbDrawText(
>     Display            *dpy,
>@@ -91,6 +92,7 @@ XmbDrawText(
>     }
> }
> 
>+_X_EXPORT
> void
> XmbDrawString(
>     Display            *dpy,
>@@ -106,7 +108,7 @@ XmbDrawString(
> 						(char *)text, text_len);
> }
> 
>-
>+_X_EXPORT
> void
> XmbDrawImageString(
>     Display            *dpy,
>@@ -122,6 +124,7 @@ XmbDrawImageString(
> 						(char *)text, text_len);
> }
> 
>+_X_EXPORT
> int 
> XmbTextEscapement(
>     XFontSet        font_set,
>@@ -132,6 +135,7 @@ XmbTextEscapement(
> 						(char *)text, text_len);
> }
> 
>+_X_EXPORT
> int
> XmbTextExtents(
>     XFontSet        font_set,
>@@ -146,6 +150,7 @@ XmbTextExtents(
> 					     overall_logical_extents);
> }
> 
>+_X_EXPORT
> Status
> XmbTextPerCharExtents(
>     XFontSet        font_set,
>diff --git a/src/xlibi18n/utf8WMProps.c b/src/xlibi18n/utf8WMProps.c
>index e3a329a..273112d 100644
>--- a/src/xlibi18n/utf8WMProps.c
>+++ b/src/xlibi18n/utf8WMProps.c
>@@ -58,6 +58,7 @@ from The Open Group.
> #include <X11/Xatom.h>
> #include <X11/Xlocale.h>
> 
>+_X_EXPORT
> void
> Xutf8SetWMProperties (
>     Display *dpy,
>diff --git a/src/xlibi18n/utf8Wrap.c b/src/xlibi18n/utf8Wrap.c
>index bde3f04..fb60d30 100644
>--- a/src/xlibi18n/utf8Wrap.c
>+++ b/src/xlibi18n/utf8Wrap.c
>@@ -80,6 +80,7 @@ from The Open Group.
> #include "Xlibint.h"
> #include "Xlcint.h"
> 
>+_X_EXPORT
> void
> Xutf8DrawText(
>     Display            *dpy,
>@@ -113,6 +114,7 @@ Xutf8DrawText(
>     }
> }
> 
>+_X_EXPORT
> void
> Xutf8DrawString(
>     Display            *dpy,
>@@ -128,7 +130,7 @@ Xutf8DrawString(
> 						  (char *)text, text_len);
> }
> 
>-
>+_X_EXPORT
> void
> Xutf8DrawImageString(
>     Display            *dpy,
>@@ -144,6 +146,7 @@ Xutf8DrawImageString(
> 						  (char *)text, text_len);
> }
> 
>+_X_EXPORT
> int 
> Xutf8TextEscapement(
>     XFontSet        font_set,
>@@ -154,6 +157,7 @@ Xutf8TextEscapement(
> 						  (char *)text, text_len);
> }
> 
>+_X_EXPORT
> int
> Xutf8TextExtents(
>     XFontSet        font_set,
>@@ -168,6 +172,7 @@ Xutf8TextExtents(
> 					       overall_logical_extents);
> }
> 
>+_X_EXPORT
> Status
> Xutf8TextPerCharExtents(
>     XFontSet        font_set,
>diff --git a/src/xlibi18n/wcWrap.c b/src/xlibi18n/wcWrap.c
>index a0314da..3b9ada1 100644
>--- a/src/xlibi18n/wcWrap.c
>+++ b/src/xlibi18n/wcWrap.c
>@@ -59,6 +59,7 @@ from The Open Group.
> #include "Xlibint.h"
> #include "Xlcint.h"
> 
>+_X_EXPORT
> void
> XwcDrawText(
>     Display            *dpy,
>@@ -92,6 +93,7 @@ XwcDrawText(
>     }
> }
> 
>+_X_EXPORT
> void
> XwcDrawString(
>     Display            *dpy,
>@@ -107,6 +109,7 @@ XwcDrawString(
> 						text, text_len);
> }
> 
>+_X_EXPORT
> void
> XwcDrawImageString(
>     Display            *dpy,
>@@ -122,6 +125,7 @@ XwcDrawImageString(
> 						text, text_len);
> }
> 
>+_X_EXPORT
> int 
> XwcTextEscapement(
>     XFontSet            font_set,
>@@ -131,6 +135,7 @@ XwcTextEscapement(
>     return (*font_set->methods->wc_escapement) (font_set, text, text_len);
> }
> 
>+_X_EXPORT
> int
> XwcTextExtents(
>     XFontSet            font_set,
>@@ -144,6 +149,7 @@ XwcTextExtents(
> 					     overall_logical_extents);
> }
> 
>+_X_EXPORT
> Status
> XwcTextPerCharExtents(
>     XFontSet            font_set,

Actions: View | Splinter Review

Attachments on bug 2607: 1969 | 1970 | 1971 | 1972 | 1973 | 2014 | 2167 | 9856 | 9857

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.