Export symbols defined in the sdk.

  This is the biggest "visibility" patch. Instead of doing a "export"
symbol on demand, export everything in the sdk, so that if some module
fails due to an unresolved symbol, it is because it is using a symbol
not in the sdk.

  Most exported symbols shouldn't really be made visible, neither
advertised in the sdk, as they are only used by a single shared object.

  Symbols in the sdk (or referenced in sdk macros), but not defined
anywhere include:
XkbBuildCoreState()
XkbInitialMap
XkbXIUnsupported
XkbCheckActionVMods()
XkbSendCompatNotify()
XkbDDXFakePointerButton()
XkbDDXApplyConfig()
_XkbStrCaseCmp()
_XkbErrMessages[]
_XkbErrCode
_XkbErrLocation
_XkbErrData
XkbAccessXDetailText()
XkbNKNDetailMaskText()
XkbLookupGroupAndLevel()
XkbInitAtoms()
XkbGetOrderedDrawables()
XkbFreeOrderedDrawables()
XkbConvertXkbComponents()
XkbWriteXKBSemantics()
XkbWriteXKBLayout()
XkbWriteXKBKeymap()
XkbWriteXKBFile()
XkbWriteCFile()
XkbWriteXKMFile()
XkbWriteToServer()
XkbMergeFile()
XkmFindTOCEntry()
XkmReadFileSection()
XkmReadFileSectionName()
InitExtInput()
xf86CheckButton()
xf86SwitchCoreDevice()
RamDacSetGamma()
RamDacRestoreDACValues()
xf86Bpp
xf86ConfigPix24
xf86MouseCflags[]
xf86SupportedMouseTypes[]
xf86NumMouseTypes
xf86ChangeBusIndex()
xf86EntityEnter()
xf86EntityLeave()
xf86WrapperInit()
xf86RingBell()
xf86findOptionBoolean()
xf86debugListOptions()
LoadSubModuleLocal()
LoaderSymbolLocal()
getInt10Rec()
xf86CurrentScreen
xf86ReallocatePciResources()
xf86NewSerialNumber()
xf86RandRSetInitialMode()
fbCompositeSolidMask_nx1xn
fbCompositeSolidMask_nx8888x0565C
fbCompositeSolidMask_nx8888x8888C
fbCompositeSolidMask_nx8x0565
fbCompositeSolidMask_nx8x0888
fbCompositeSolidMask_nx8x8888
fbCompositeSrc_0565x0565
fbCompositeSrc_8888x0565
fbCompositeSrc_8888x0888
fbCompositeSrc_8888x8888
fbCompositeSrcAdd_1000x1000
fbCompositeSrcAdd_8000x8000
fbCompositeSrcAdd_8888x8888
fbGeneration
fbIn
fbOver
fbOver24
fbOverlayGeneration
fbRasterizeEdges
fbRestoreAreas
fbSaveAreas
composeFunctions
VBEBuildVbeModeList()
VBECalcVbeModeIndex()
TIramdac3030CalculateMNPForClock()
shadowBufPtr
shadowFindBuf()
miRRGetScreenInfo()
RRSetScreenConfig()
RRModePruneUnused()
PixmanImageFromPicture()
extern int miPointerGetMotionEvents()
miClipPicture()
miRasterizeTriangle()
fbPush1toN()
fbInitializeBackingStore()
ddxBeforeReset()
SetupSprite()
InitSprite()
DGADeliverEvent()

  SPECIAL CASES
o defined as _X_INTERNAL
	xf86NewInputDevice()
o defined as static
	fbGCPrivateKey
	fbOverlayScreenPrivateKey
	fbScreenPrivateKey
	fbWinPrivateKey
o defined in libXfont.so, but declared in xorg/dixfont.h
	GetGlyphs()
	QueryGlyphExtents()
	QueryTextExtents()
	ParseGlyphCachingMode()
	InitGlyphCaching()
	SetGlyphCachingMode()

29 files changed, 162 insertions, 162 deletions

diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index 790aede92..2a50c15df 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -41,7 +41,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /***===================================================================***/
 
 /*ARGSUSED*/
-Status
+_X_EXPORT Status
 XkbAllocCompatMap(XkbDescPtr xkb,unsigned which,unsigned nSI)
 {
 XkbCompatMapPtr	compat;
@@ -88,7 +88,7 @@ XkbSymInterpretRec *prev_interpret;
 }
 
 
-void
+_X_EXPORT void
 XkbFreeCompatMap(XkbDescPtr xkb,unsigned which,Bool freeMap)
 {
 register XkbCompatMapPtr compat;
@@ -115,7 +115,7 @@ register XkbCompatMapPtr compat;
 
 /***===================================================================***/
 
-Status
+_X_EXPORT Status
 XkbAllocNames(XkbDescPtr xkb,unsigned which,int nTotalRG,int nTotalAliases)
 {
 XkbNamesPtr	names;
@@ -195,7 +195,7 @@ XkbNamesPtr	names;
     return Success;
 }
 
-void
+_X_EXPORT void
 XkbFreeNames(XkbDescPtr xkb,unsigned which,Bool freeMap)
 {
 XkbNamesPtr	names;
@@ -244,7 +244,7 @@ XkbNamesPtr	names;
 /***===================================================================***/
 
 /*ARGSUSED*/
-Status
+_X_EXPORT Status
 XkbAllocControls(XkbDescPtr xkb,unsigned which)
 {
     if (xkb==NULL)
@@ -271,7 +271,7 @@ XkbFreeControls(XkbDescPtr xkb,unsigned which,Bool freeMap)
 
 /***===================================================================***/
 
-Status 
+_X_EXPORT Status 
 XkbAllocIndicatorMaps(XkbDescPtr xkb)
 {
     if (xkb==NULL)
@@ -296,7 +296,7 @@ XkbFreeIndicatorMaps(XkbDescPtr xkb)
 
 /***====================================================================***/
 
-XkbDescRec	*
+_X_EXPORT XkbDescRec	*
 XkbAllocKeyboard(void)
 {
 XkbDescRec *xkb;
@@ -307,7 +307,7 @@ XkbDescRec *xkb;
     return xkb;
 }
 
-void
+_X_EXPORT void
 XkbFreeKeyboard(XkbDescPtr xkb,unsigned which,Bool freeAll)
 {
     if (xkb==NULL)
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index 178b5b89a..daefe4736 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -43,7 +43,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /***====================================================================***/
 
-Status
+_X_EXPORT Status
 XkbAllocClientMap(XkbDescPtr xkb,unsigned which,unsigned nTotalTypes)
 {
 register int	i;
@@ -124,7 +124,7 @@ XkbClientMapPtr map;
     return Success;
 }
 
-Status
+_X_EXPORT Status
 XkbAllocServerMap(XkbDescPtr xkb,unsigned which,unsigned nNewActions)
 {
 register int	i;
@@ -259,7 +259,7 @@ XkbCopyKeyType(XkbKeyTypePtr from,XkbKeyTypePtr into)
     return Success;
 }
 
-Status
+_X_EXPORT Status
 XkbCopyKeyTypes(XkbKeyTypePtr from,XkbKeyTypePtr into,int num_types)
 {
 register int i,rtrn;
@@ -273,7 +273,7 @@ register int i,rtrn;
     return Success;
 }
 
-Status
+_X_EXPORT Status
 XkbResizeKeyType(	XkbDescPtr	xkb,
 			int		type_ndx,
 			int		map_count,
@@ -471,7 +471,7 @@ KeyCode		matchingKeys[XkbMaxKeyCount],nMatchingKeys;
     return Success;
 }
 
-KeySym *
+_X_EXPORT KeySym *
 XkbResizeKeySyms(XkbDescPtr xkb,int key,int needed)
 {
 register int i,nSyms,nKeySyms;
@@ -551,7 +551,7 @@ _ExtendRange(	unsigned int 	old_flags,
     return old_flags;
 }
 
-Status
+_X_EXPORT Status
 XkbChangeKeycodeRange(	XkbDescPtr	xkb,
 			int 		minKC,
 			int 		maxKC,
@@ -751,7 +751,7 @@ int	tmp;
     return Success;
 }
 
-XkbAction *
+_X_EXPORT XkbAction *
 XkbResizeKeyActions(XkbDescPtr xkb,int key,int needed)
 {
 register int i,nActs;
@@ -801,7 +801,7 @@ XkbAction *newActs;
     return &xkb->server->acts[xkb->server->key_acts[key]];
 }
 
-void
+_X_EXPORT void
 XkbFreeClientMap(XkbDescPtr xkb,unsigned what,Bool freeMap)
 {
 XkbClientMapPtr	map;
@@ -859,7 +859,7 @@ XkbClientMapPtr	map;
     return;
 }
 
-void
+_X_EXPORT void
 XkbFreeServerMap(XkbDescPtr xkb,unsigned what,Bool freeMap)
 {
 XkbServerMapPtr	map;
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index a9d8b17c0..45db35177 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -46,7 +46,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	CORE_SYM(i)	(i<map_width?core_syms[i]:NoSymbol)
 #define	XKB_OFFSET(g,l)	(((g)*groupsWidth)+(l))
 
-int
+_X_EXPORT int
 XkbKeyTypesForCoreSymbols(	XkbDescPtr	xkb,
 				int		map_width,
 				KeySym *	core_syms,
@@ -318,7 +318,7 @@ unsigned	tmp;
 
 #define	IBUF_SIZE	8
 
-Bool
+_X_EXPORT Bool
 XkbApplyCompatMapToKey(XkbDescPtr xkb,KeyCode key,XkbChangesPtr changes)
 {
 KeySym *		syms;
@@ -467,7 +467,7 @@ unsigned		changed,tmp;
     return True;
 }
 
-Status
+_X_EXPORT Status
 XkbChangeTypesOfKey(	XkbDescPtr		 xkb,
 			int		 	 key,
 			int			 nGroups,
@@ -591,7 +591,7 @@ int		width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
 
 /***====================================================================***/
 
-Bool
+_X_EXPORT Bool
 XkbVirtualModsToReal(XkbDescPtr xkb,unsigned virtual_mask,unsigned *mask_rtrn)
 {
 register int i,bit;
@@ -689,7 +689,7 @@ unsigned int		mask;
     return;
 }
 
-Bool
+_X_EXPORT Bool
 XkbApplyVirtualModChanges(XkbDescPtr xkb,unsigned changed,XkbChangesPtr changes)
 {
 register int	i;
diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c
index 74d868c0e..1851e626e 100644
--- a/xkb/ddxBeep.c
+++ b/xkb/ddxBeep.c
@@ -314,7 +314,7 @@ Atom		name;
     return next;
 }
 
-int
+_X_EXPORT int
 XkbDDXAccessXBeep(DeviceIntPtr dev,unsigned what,unsigned which)
 {
 XkbSrvInfoRec	*xkbInfo= dev->key->xkbInfo;
diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c
index 34ea0bd3f..86a4affeb 100644
--- a/xkb/ddxCtrls.c
+++ b/xkb/ddxCtrls.c
@@ -39,7 +39,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <xkbsrv.h>
 #include <X11/extensions/XI.h>
 
-void
+_X_EXPORT void
 XkbDDXKeybdCtrlProc(DeviceIntPtr dev,KeybdCtrl *ctrl)
 {
 int realRepeat;
@@ -54,7 +54,7 @@ int realRepeat;
 }
 
 
-int
+_X_EXPORT int
 XkbDDXUsesSoftRepeat(DeviceIntPtr pXDev)
 {
 #ifndef XKB_ALWAYS_USES_SOFT_REPEAT
@@ -80,7 +80,7 @@ XkbDDXUsesSoftRepeat(DeviceIntPtr pXDev)
 #endif
 }
 
-void
+_X_EXPORT void
 XkbDDXChangeControls(DeviceIntPtr dev,XkbControlsPtr old,XkbControlsPtr new)
 {
 unsigned	changed, i;
diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c
index b68a28b2a..66a4cc479 100644
--- a/xkb/ddxDevBtn.c
+++ b/xkb/ddxDevBtn.c
@@ -42,7 +42,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 extern	int	DeviceValuator;
 
-void
+_X_EXPORT void
 XkbDDXFakeDeviceButton(DeviceIntPtr dev,Bool press,int button)
 {
 int *			devVal;
diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c
index 3f010f9ce..191ada8c6 100644
--- a/xkb/ddxFakeMtn.c
+++ b/xkb/ddxFakeMtn.c
@@ -47,7 +47,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "mipointer.h"
 #include "mipointrst.h"
 
-void
+_X_EXPORT void
 XkbDDXFakePointerMotion(unsigned flags,int x,int y)
 {
 int 		   oldX,oldY;
diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c
index 4c78a621b..ae22b6539 100644
--- a/xkb/ddxInit.c
+++ b/xkb/ddxInit.c
@@ -39,7 +39,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <xkbsrv.h>
 #include <X11/extensions/XI.h>
 
-int
+_X_EXPORT int
 XkbDDXInitDevice(DeviceIntPtr dev)
 {
     return 1;
diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c
index 51d78f56d..59e1488a8 100644
--- a/xkb/ddxKeyClick.c
+++ b/xkb/ddxKeyClick.c
@@ -39,7 +39,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <xkbsrv.h>
 #include <X11/extensions/XI.h>
 
-void
+_X_EXPORT void
 XkbDDXKeyClick(DeviceIntPtr pXDev,int keycode,int synthetic)
 {
     return;
diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c
index 3b5fd5353..6c441181e 100644
--- a/xkb/ddxKillSrv.c
+++ b/xkb/ddxKillSrv.c
@@ -38,7 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "windowstr.h"
 #include <xkbsrv.h>
 
-int
+_X_EXPORT int
 XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act)
 {
     if (dev != inputInfo.keyboard)
diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c
index b4c8086f5..941e66ccb 100644
--- a/xkb/ddxLEDs.c
+++ b/xkb/ddxLEDs.c
@@ -47,7 +47,7 @@ XkbDDXUpdateIndicators(DeviceIntPtr dev,CARD32 new)
     return;
 }
 
-void
+_X_EXPORT void
 XkbDDXUpdateDeviceIndicators(	DeviceIntPtr		dev,
 				XkbSrvLedInfoPtr 	sli,
 				CARD32 			new)
diff --git a/xkb/ddxList.c b/xkb/ddxList.c
index ae3a7f7e0..d551d820d 100644
--- a/xkb/ddxList.c
+++ b/xkb/ddxList.c
@@ -276,7 +276,7 @@ char	tmpname[PATH_MAX];
 /***====================================================================***/
 
 /* ARGSUSED */
-Status
+_X_EXPORT Status
 XkbDDXList(DeviceIntPtr	dev,XkbSrvListInfoPtr list,ClientPtr client)
 {
 Status	status;
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 4d5dfb685..6b6575d90 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -329,7 +329,7 @@ FILE *	file;
     return file;
 }
 
-unsigned
+_X_EXPORT unsigned
 XkbDDXLoadKeymapByNames(	DeviceIntPtr		keybd,
 				XkbComponentNamesPtr	names,
 				unsigned		want,
@@ -379,7 +379,7 @@ unsigned	missing;
     return (need|want)&(~missing);
 }
 
-Bool
+_X_EXPORT Bool
 XkbDDXNamesFromRules(	DeviceIntPtr		keybd,
 			char *			rules_name,
 			XkbRF_VarDefsPtr	defs,
diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c
index f67e20c27..807f350d0 100644
--- a/xkb/ddxPrivate.c
+++ b/xkb/ddxPrivate.c
@@ -8,7 +8,7 @@
 #include "windowstr.h"
 #include <xkbsrv.h>
 
-int
+_X_EXPORT int
 XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act)
 {
     return 0;
diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c
index 55c82a865..eff2f4b50 100644
--- a/xkb/ddxVT.c
+++ b/xkb/ddxVT.c
@@ -38,7 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "windowstr.h"
 #include <xkbsrv.h>
 
-int
+_X_EXPORT int
 XkbDDXSwitchScreen(DeviceIntPtr dev,KeyCode key,XkbAction *act)
 {
     return 1;
diff --git a/xkb/maprules.c b/xkb/maprules.c
index b25d92901..f6e60a76d 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -833,7 +833,7 @@ int	len, ndx;
 
 /***====================================================================***/
 
-Bool
+_X_EXPORT Bool
 XkbRF_GetComponents(	XkbRF_RulesPtr		rules,
 			XkbRF_VarDefsPtr	defs,
 			XkbComponentNamesPtr	names)
@@ -868,7 +868,7 @@ XkbRF_GetComponents(	XkbRF_RulesPtr		rules,
 		names->compat && names->geometry ) || names->keymap;
 }
 
-XkbRF_RulePtr
+_X_EXPORT XkbRF_RulePtr
 XkbRF_AddRule(XkbRF_RulesPtr	rules)
 {
     if (rules->sz_rules<1) {
@@ -890,7 +890,7 @@ XkbRF_AddRule(XkbRF_RulesPtr	rules)
     return &rules->rules[rules->num_rules++];
 }
 
-XkbRF_GroupPtr
+_X_EXPORT XkbRF_GroupPtr
 XkbRF_AddGroup(XkbRF_RulesPtr	rules)
 {
     if (rules->sz_groups<1) {
@@ -912,7 +912,7 @@ XkbRF_AddGroup(XkbRF_RulesPtr	rules)
     return &rules->groups[rules->num_groups++];
 }
 
-Bool
+_X_EXPORT Bool
 XkbRF_LoadRules(FILE *file, XkbRF_RulesPtr rules)
 {
 InputLine	line;
@@ -945,7 +945,7 @@ XkbRF_GroupRec  tgroup,*group;
     return True;
 }
 
-Bool
+_X_EXPORT Bool
 XkbRF_LoadRulesByName(char *base,char *locale,XkbRF_RulesPtr rules)
 {
 FILE *		file;
@@ -986,7 +986,7 @@ Bool		ok;
 #define HEAD_OPTION	4
 #define	HEAD_EXTRA	5
 
-XkbRF_VarDescPtr
+_X_EXPORT XkbRF_VarDescPtr
 XkbRF_AddVarDesc(XkbRF_DescribeVarsPtr	vars)
 {
     if (vars->sz_desc<1) {
@@ -1008,7 +1008,7 @@ XkbRF_AddVarDesc(XkbRF_DescribeVarsPtr	vars)
     return &vars->desc[vars->num_desc++];
 }
 
-XkbRF_VarDescPtr
+_X_EXPORT XkbRF_VarDescPtr
 XkbRF_AddVarDescCopy(XkbRF_DescribeVarsPtr vars,XkbRF_VarDescPtr from)
 {
 XkbRF_VarDescPtr	nd;
@@ -1020,7 +1020,7 @@ XkbRF_VarDescPtr	nd;
     return nd;
 }
 
-XkbRF_DescribeVarsPtr 
+_X_EXPORT XkbRF_DescribeVarsPtr 
 XkbRF_AddVarToDescribe(XkbRF_RulesPtr rules,char *name)
 {
     if (rules->sz_extra<1) {
@@ -1048,7 +1048,7 @@ XkbRF_AddVarToDescribe(XkbRF_RulesPtr rules,char *name)
     return &rules->extra[rules->num_extra++];
 }
 
-Bool
+_X_EXPORT Bool
 XkbRF_LoadDescriptions(FILE *file,XkbRF_RulesPtr rules)
 {
 InputLine		line;
@@ -1144,7 +1144,7 @@ int			len,headingtype,extra_ndx = 0;
     return True;
 }
 
-Bool
+_X_EXPORT Bool
 XkbRF_LoadDescriptionsByName(char *base,char *locale,XkbRF_RulesPtr rules)
 {
 FILE *		file;
@@ -1179,7 +1179,7 @@ Bool		ok;
 
 /***====================================================================***/
 
-XkbRF_RulesPtr
+_X_EXPORT XkbRF_RulesPtr
 XkbRF_Load(char *base,char *locale,Bool wantDesc,Bool wantRules)
 {
 XkbRF_RulesPtr	rules;
@@ -1199,7 +1199,7 @@ XkbRF_RulesPtr	rules;
     return rules;
 }
 
-XkbRF_RulesPtr
+_X_EXPORT XkbRF_RulesPtr
 XkbRF_Create(int szRules,int szExtra) 
 {
 XkbRF_RulesPtr rules;
@@ -1247,7 +1247,7 @@ register int i;
     return;
 }
 
-void
+_X_EXPORT void
 XkbRF_Free(XkbRF_RulesPtr rules,Bool freeRules)
 {
 int		i;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 7c1edea1a..90ce011e9 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -43,11 +43,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <X11/extensions/XI.h>
 
-	int	XkbEventBase;
+_X_EXPORT int	XkbEventBase;
 static	int	XkbErrorBase;
-	int	XkbReqCode;
-	int	XkbKeyboardErrorCode;
-CARD32	xkbDebugFlags = 0;
+_X_EXPORT int	XkbReqCode;
+_X_EXPORT int	XkbKeyboardErrorCode;
+_X_EXPORT CARD32 xkbDebugFlags = 0;
 static CARD32	xkbDebugCtrls = 0;
 
 static RESTYPE	RT_XKBCLIENT;
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 2baa70d7a..ccdc033e6 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -42,7 +42,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 _X_EXPORT int	XkbDfltRepeatDelay=	660;
 _X_EXPORT int	XkbDfltRepeatInterval=	40;
-pointer	XkbLastRepeatEvent=	NULL;
+_X_EXPORT pointer XkbLastRepeatEvent=	NULL;
 
 #define	DFLT_TIMEOUT_CTRLS (XkbAX_KRGMask|XkbStickyKeysMask|XkbMouseKeysMask)
 #define	DFLT_TIMEOUT_OPTS  (XkbAX_IndicatorFBMask)
@@ -55,7 +55,7 @@ static unsigned int XkbDfltAccessXTimeoutOptionsValues= 0;
 unsigned int	XkbDfltAccessXFeedback= XkbAccessXFeedbackMask;
 unsigned short	XkbDfltAccessXOptions=  XkbAX_AllOptionsMask & ~(XkbAX_IndicatorFBMask|XkbAX_SKReleaseFBMask|XkbAX_SKRejectFBMask);
 
-void
+_X_EXPORT void
 AccessXComputeCurveFactor(XkbSrvInfoPtr xkbi,XkbControlsPtr ctrls)
 {
     xkbi->mouseKeysCurve= 1.0+(((double)ctrls->mk_curve)*0.001);
@@ -64,7 +64,7 @@ AccessXComputeCurveFactor(XkbSrvInfoPtr xkbi,XkbControlsPtr ctrls)
     return;
 }
 
-void
+_X_EXPORT void
 AccessXInit(DeviceIntPtr keybd)
 {
 XkbSrvInfoPtr	xkbi = keybd->key->xkbInfo;
@@ -317,7 +317,7 @@ KeyCode		key;
     return xkbi->desc->ctrls->repeat_interval;
 }
 
-void
+_X_EXPORT void
 AccessXCancelRepeatKey(XkbSrvInfoPtr xkbi,KeyCode key)
 {
     if (xkbi->repeatKey==key)
@@ -442,7 +442,7 @@ XkbSrvLedInfoPtr	sli;
 /* Returns FALSE if the event needs further processing.			*/
 /*									*/
 /************************************************************************/
-Bool
+_X_EXPORT Bool
 AccessXFilterPressEvent(	register xEvent *	xE, 
 				register DeviceIntPtr	keybd, 
 				int			count)
@@ -572,7 +572,7 @@ KeySym *	sym = XkbKeySymsPtr(xkbi->desc,key);
 /* Returns FALSE if the event needs further processing.			*/
 /*									*/
 /************************************************************************/
-Bool
+_X_EXPORT Bool
 AccessXFilterReleaseEvent(	register xEvent *	xE, 
 				register DeviceIntPtr	keybd, 
 				int			count)
@@ -682,7 +682,7 @@ Bool		ignoreKeyEvent = FALSE;
 /************************************************************************/
 extern int xkbDevicePrivateIndex;
 extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer);
-void
+_X_EXPORT void
 ProcessPointerEvent(	register xEvent  *	xE, 
 			register DeviceIntPtr	mouse, 
 			int		        count)
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 94420cf68..a2606297a 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -43,9 +43,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define EXTENSION_EVENT_BASE 64
 
 static int xkbDevicePrivateKeyIndex;
-DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex;
+_X_EXPORT DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex;
 
-void
+_X_EXPORT void
 xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc,
                    pointer data)
 {
@@ -61,7 +61,7 @@ xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc,
 }
 
 
-void
+_X_EXPORT void
 XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc)
 {
     xkbDeviceInfoPtr xkbPrivPtr;
@@ -1130,7 +1130,7 @@ register int	i,send;
     return send;
 }
 
-void
+_X_EXPORT void
 XkbHandleActions(DeviceIntPtr dev,DeviceIntPtr kbd,xEvent *xE,int count)
 {
 int		key,bit,i;
@@ -1315,7 +1315,7 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
     return;
 }
 
-int
+_X_EXPORT int
 XkbLatchModifiers(DeviceIntPtr pXDev,CARD8 mask,CARD8 latches)
 {
 XkbSrvInfoPtr	xkbi;
@@ -1342,7 +1342,7 @@ unsigned	clear;
     return BadValue;
 }
 
-int
+_X_EXPORT int
 XkbLatchGroup(DeviceIntPtr pXDev,int group)
 {
 XkbSrvInfoPtr	xkbi;
@@ -1364,7 +1364,7 @@ XkbAction	act;
 
 /***====================================================================***/
 
-void
+_X_EXPORT void
 XkbClearAllLatchesAndLocks(	DeviceIntPtr		dev,
 				XkbSrvInfoPtr		xkbi,
 				Bool			genEv,
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 151849c70..fe44ee99a 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -43,7 +43,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /***====================================================================***/
 
-void
+_X_EXPORT void
 XkbSendNewKeyboardNotify(DeviceIntPtr kbd,xkbNewKeyboardNotify *pNKN)
 {		
 register int	i;
@@ -100,7 +100,7 @@ CARD16		changed;
 
 /***====================================================================***/
 
-void
+_X_EXPORT void
 XkbSendStateNotify(DeviceIntPtr kbd,xkbStateNotify *pSN)
 {
 XkbSrvInfoPtr	xkbi;
@@ -161,7 +161,7 @@ register CARD16	changed,bState;
 
 /***====================================================================***/
 
-void
+_X_EXPORT void
 XkbSendMapNotify(DeviceIntPtr kbd,xkbMapNotify *pMN)
 {
 int 		i;
@@ -203,7 +203,7 @@ CARD16		changed;
     return;
 }
 
-int
+_X_EXPORT int
 XkbComputeControlsNotify(	DeviceIntPtr	 	kbd,
 				XkbControlsPtr		old,
 				XkbControlsPtr		new,
@@ -282,7 +282,7 @@ CARD32 		changedControls;
     return 1;
 }
 
-void
+_X_EXPORT void
 XkbSendControlsNotify(DeviceIntPtr kbd,xkbControlsNotify *pCN)
 {
 int			initialized;
@@ -382,7 +382,7 @@ CARD32		state,changed;
 }
 
 
-void
+_X_EXPORT void
 XkbHandleBell(	BOOL		 force,
 		BOOL		 eventOnly,
 		DeviceIntPtr	 kbd,
@@ -467,7 +467,7 @@ XID		winID = 0;
     return;
 }
 
-void
+_X_EXPORT void
 XkbSendAccessXNotify(DeviceIntPtr kbd,xkbAccessXNotify *pEv)
 {
 int		initialized;
@@ -512,7 +512,7 @@ CARD16		sk_delay,db_delay;
     return;
 }
 
-void
+_X_EXPORT void
 XkbSendNamesNotify(DeviceIntPtr kbd,xkbNamesNotify *pEv)
 {
 int		initialized;
@@ -561,7 +561,7 @@ CARD32		changedIndicators;
     return;
 }
 
-void
+_X_EXPORT void
 XkbSendCompatMapNotify(DeviceIntPtr kbd,xkbCompatMapNotify *pEv)
 {
 int		initialized;
@@ -609,7 +609,7 @@ CARD16		firstSI = 0, nSI = 0, nTotalSI = 0;
     return;
 }
 
-void
+_X_EXPORT void
 XkbSendActionMessage(DeviceIntPtr kbd,xkbActionMessage *pEv)
 {
 int		 initialized;
@@ -652,7 +652,7 @@ Time 		 time = 0;
     return;
 }
 
-void
+_X_EXPORT void
 XkbSendExtensionDeviceNotify(	DeviceIntPtr 			dev,
 				ClientPtr			client,
 				xkbExtensionDeviceNotify *	pEv)
@@ -716,7 +716,7 @@ CARD16		 reason, supported = 0;
     return;
 }
 
-void
+_X_EXPORT void
 XkbSendNotification(	DeviceIntPtr		kbd,
 			XkbChangesPtr		pChanges,
 			XkbEventCausePtr	cause)
@@ -945,7 +945,7 @@ XkbSrvInfoPtr	xkbi;
 
 /***====================================================================***/
 
-XkbInterestPtr	
+_X_EXPORT XkbInterestPtr	
 XkbFindClientResource(DevicePtr inDev,ClientPtr client)
 {
 DeviceIntPtr	dev = (DeviceIntPtr)inDev;
@@ -963,7 +963,7 @@ XkbInterestPtr	interest;
     return NULL;
 }
 
-XkbInterestPtr	
+_X_EXPORT XkbInterestPtr	
 XkbAddClientResource(DevicePtr inDev,ClientPtr client,XID id)
 {
 DeviceIntPtr	dev = (DeviceIntPtr)inDev;
@@ -997,7 +997,7 @@ XkbInterestPtr	interest;
     return NULL;
 }
 
-int
+_X_EXPORT int
 XkbRemoveResourceClient(DevicePtr inDev,XID id) 
 {
 XkbSrvInfoPtr	xkbi;
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 0b93e87d9..35da3e9ac 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -114,8 +114,8 @@ typedef struct	_SrvXkmInfo {
 #define	XKB_DFLT_RULES_PROP	True
 #endif
 
-char	*		XkbBaseDirectory=	XKB_BASE_DIRECTORY;
-char	*		XkbBinDirectory=	XKB_BIN_DIRECTORY;
+_X_EXPORT char	*	XkbBaseDirectory=	XKB_BASE_DIRECTORY;
+_X_EXPORT char	*	XkbBinDirectory=	XKB_BIN_DIRECTORY;
 static int	 	XkbWantAccessX=		0;	
 
 static Bool		rulesDefined=		False;
@@ -271,7 +271,7 @@ XkbSetRulesDflts(char *rulesFile,char *model,char *layout,
     return;
 }
 
-void
+_X_EXPORT void
 XkbDeleteRulesDflts()
 {
     _XkbFree(XkbRulesFile);
@@ -474,7 +474,7 @@ XkbControlsPtr	ctrls;
     return Success;
 }
 
-void
+_X_EXPORT void
 XkbInitDevice(DeviceIntPtr pXDev)
 {
 int			i;
@@ -724,7 +724,7 @@ XkbDescPtr              xkb;
 	 * This function also computes the autorepeat accelerators for the
 	 * default indicator feedback.
 	 */
-int
+_X_EXPORT int
 XkbFinishDeviceInit(DeviceIntPtr pXDev)
 {
 XkbSrvInfoPtr		xkbi;
@@ -767,7 +767,7 @@ XkbSrvLedInfoPtr	sli;
 	 * fixed-size structures for the device.   Don't free anything that
 	 * is part of this larger block.
 	 */
-void
+_X_EXPORT void
 XkbFreeInfo(XkbSrvInfoPtr xkbi)
 {
     if (xkbi->radioGroups) {
@@ -817,7 +817,7 @@ extern unsigned int	XkbDfltAccessXTimeoutMask;
 extern unsigned int	XkbDfltAccessXFeedback;
 extern unsigned char	XkbDfltAccessXOptions;
 
-int
+_X_EXPORT int
 XkbProcessArguments(int argc,char *argv[],int i)
 {
     if (strcmp(argv[i],"-kb")==0) {
@@ -903,7 +903,7 @@ XkbProcessArguments(int argc,char *argv[],int i)
     return 0;
 }
 
-void
+_X_EXPORT void
 XkbUseMsg(void)
 {
     ErrorF("-kb                    disable the X Keyboard Extension\n");
diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index edc389f04..bd6b53765 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -53,7 +53,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 	 * any extension devices might be affected in check_devs_rtrn.
 	 */
 
-unsigned
+_X_EXPORT unsigned
 XkbIndicatorsToUpdate(	DeviceIntPtr	dev,
 			unsigned long 	state_changes,
 			Bool		enable_changes)
@@ -352,7 +352,7 @@ XkbSrvLedInfoPtr	sli;
 	 * ChangeKeyboardMapping request.
 	 */
 
-void
+_X_EXPORT void
 XkbSetIndicators(	DeviceIntPtr		dev,
 			CARD32			affect,
 			CARD32			values,
@@ -408,7 +408,7 @@ unsigned 			side_affected;
 	 * the state of any extension device indicators as necessary.
 	 */
 
-void
+_X_EXPORT void
 XkbUpdateIndicators(	DeviceIntPtr		dev,
 			register CARD32		update,
 			Bool			check_edevs,
@@ -439,7 +439,7 @@ XkbSrvLedInfoPtr	sli;
 	 * be affected by a particular change in keyboard state or controls.
 	 */
 
-void
+_X_EXPORT void
 XkbCheckIndicatorMaps(DeviceIntPtr dev,XkbSrvLedInfoPtr sli,unsigned which)
 {
 register unsigned	i,bit;
@@ -512,7 +512,7 @@ XkbDescPtr		xkb;
 	 * If 'needed_parts' is non-zero, this function makes sure that any
 	 * of the parts speicified therein are allocated.
 	 */
-XkbSrvLedInfoPtr
+_X_EXPORT XkbSrvLedInfoPtr
 XkbAllocSrvLedInfo(	DeviceIntPtr		dev,
 			KbdFeedbackPtr		kf,
 			LedFeedbackPtr		lf,
@@ -602,7 +602,7 @@ Bool			checkNames;
     return sli;
 }
 
-void
+_X_EXPORT void
 XkbFreeSrvLedInfo(XkbSrvLedInfoPtr sli)
 {
     if ((sli->flags&XkbSLI_IsDefault)==0) {
@@ -623,7 +623,7 @@ XkbFreeSrvLedInfo(XkbSrvLedInfoPtr sli)
  * thus the new copy behaves like the original one and can be freed with
  * XkbFreeSrvLedInfo.
  */
-XkbSrvLedInfoPtr
+_X_EXPORT XkbSrvLedInfoPtr
 XkbCopySrvLedInfo(	DeviceIntPtr		from,
 			XkbSrvLedInfoPtr	src,
 			KbdFeedbackPtr		kf,
@@ -668,7 +668,7 @@ finish:
 	 *
 	 */
 
-XkbSrvLedInfoPtr 
+_X_EXPORT XkbSrvLedInfoPtr 
 XkbFindSrvLedInfo(	DeviceIntPtr		dev,
 			unsigned		class,
 			unsigned		id,
@@ -724,7 +724,7 @@ XkbSrvLedInfoPtr	sli;
 
 /***====================================================================***/
 
-void
+_X_EXPORT void
 XkbFlushLedEvents(	DeviceIntPtr			dev,
 			DeviceIntPtr			kbd,
 			XkbSrvLedInfoPtr		sli,
@@ -757,7 +757,7 @@ XkbFlushLedEvents(	DeviceIntPtr			dev,
 
 /***====================================================================***/
 
-void
+_X_EXPORT void
 XkbApplyLedNameChanges(	DeviceIntPtr 			dev,
 			XkbSrvLedInfoPtr		sli,
 			unsigned			changed_names,
@@ -834,7 +834,7 @@ xkbExtensionDeviceNotify	my_ed;
 	 * request) for the change, as reported in some XKB events.
 	 */
 
-void
+_X_EXPORT void
 XkbApplyLedMapChanges(	DeviceIntPtr 			dev,
 			XkbSrvLedInfoPtr		sli,
 			unsigned			changed_maps,
@@ -890,7 +890,7 @@ xkbExtensionDeviceNotify	my_ed;
 
 /***====================================================================***/
 
-void
+_X_EXPORT void
 XkbApplyLedStateChanges(DeviceIntPtr 			dev,
 			XkbSrvLedInfoPtr		sli,
 			unsigned			changed_leds,
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index a3f715c7d..264636092 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -42,7 +42,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /***====================================================================***/
 
-void
+_X_EXPORT void
 XkbProcessKeyboardEvent(xEvent *xE,DeviceIntPtr keybd,int count)
 {
 KeyClassPtr	keyc = keybd->key;
@@ -187,7 +187,7 @@ int             xiEvent;
     return;
 }
 
-void
+_X_EXPORT void
 ProcessKeyboardEvent(xEvent *xE,DeviceIntPtr keybd,int count)
 {
 
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index 1a513b35c..0ad64a924 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -531,7 +531,7 @@ register int	n;
     return ProcXkbSetDebuggingFlags(client);
 }
 
-int
+_X_EXPORT int
 SProcXkbDispatch (ClientPtr client)
 {
     REQUEST(xReq);
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index aafc1ab0a..3f3d8a01c 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -69,11 +69,11 @@ DEALINGS IN THE SOFTWARE.
 #include "xkbgeom.h"
 #include "xkb.h"
 
-int	XkbDisableLockActions = 0;
+_X_EXPORT int	XkbDisableLockActions = 0;
 
 /***====================================================================***/
 
-int
+_X_EXPORT int
 _XkbLookupAnyDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
 		    Mask access_mode, int *xkb_err)
 {
@@ -91,7 +91,7 @@ _XkbLookupAnyDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
     return rc;
 }
 
-int
+_X_EXPORT int
 _XkbLookupKeyboard(DeviceIntPtr *pDev, int id, ClientPtr client,
 		   Mask access_mode, int *xkb_err)
 {
@@ -114,7 +114,7 @@ _XkbLookupKeyboard(DeviceIntPtr *pDev, int id, ClientPtr client,
     return Success;
 }
 
-int
+_X_EXPORT int
 _XkbLookupBellDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
 		     Mask access_mode, int *xkb_err)
 {
@@ -134,7 +134,7 @@ _XkbLookupBellDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
     return Success;
 }
 
-int
+_X_EXPORT int
 _XkbLookupLedDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
 		    Mask access_mode, int *xkb_err)
 {
@@ -157,7 +157,7 @@ _XkbLookupLedDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
     return Success;
 }
 
-int
+_X_EXPORT int
 _XkbLookupButtonDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
 		       Mask access_mode, int *xkb_err)
 {
@@ -177,7 +177,7 @@ _XkbLookupButtonDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
     return Success;
 }
 
-void
+_X_EXPORT void
 XkbSetActionKeyMods(XkbDescPtr xkb,XkbAction *act,unsigned mods)
 {
 register unsigned	tmp;
@@ -199,7 +199,7 @@ register unsigned	tmp;
     return;
 }
 
-unsigned
+_X_EXPORT unsigned
 XkbMaskForVMask(XkbDescPtr xkb,unsigned vmask)
 {
 register int i,bit;
@@ -214,7 +214,7 @@ register unsigned mask;
 
 /***====================================================================***/
 
-void
+_X_EXPORT void
 XkbUpdateKeyTypesFromCore(	DeviceIntPtr	pXDev,
 				KeyCode	 	first,
 				CARD8	 	num,
@@ -268,7 +268,7 @@ XkbMapChangesPtr	mc;
     return;
 }
 
-void
+_X_EXPORT void
 XkbUpdateDescActions(	XkbDescPtr		xkb,
 			KeyCode		 	first,
 			CARD8		 	num,
@@ -327,7 +327,7 @@ register unsigned	key;
     return;
 }
 
-void
+_X_EXPORT void
 XkbUpdateActions(	DeviceIntPtr	 	pXDev,
 			KeyCode		 	first,
 			CARD8		 	num,
@@ -358,7 +358,7 @@ CARD8 *			repeat;
     return;
 }
 
-void
+_X_EXPORT void
 XkbUpdateCoreDescription(DeviceIntPtr keybd,Bool resize)
 {
 register int		key,tmp;
@@ -574,7 +574,7 @@ CARD8			keysPerMod[XkbNumModifiers];
     return;
 }
 
-void
+_X_EXPORT void
 XkbSetRepeatKeys(DeviceIntPtr pXDev,int key,int onoff)
 {
     if (pXDev && pXDev->key && pXDev->key->xkbInfo) {
@@ -598,7 +598,7 @@ XkbSetRepeatKeys(DeviceIntPtr pXDev,int key,int onoff)
     return;
 }
 
-void
+_X_EXPORT void
 XkbApplyMappingChange(	DeviceIntPtr	kbd,
 			CARD8		 request,
 			KeyCode		 firstKey,
@@ -640,7 +640,7 @@ unsigned	 	check;
     return;
 }
 
-void
+_X_EXPORT void
 XkbDisableComputedAutoRepeats(DeviceIntPtr dev,unsigned key)
 {
 XkbSrvInfoPtr	xkbi = dev->key->xkbInfo;
@@ -655,7 +655,7 @@ xkbMapNotify	mn;
     return;
 }
 
-unsigned
+_X_EXPORT unsigned
 XkbStateChangedFlags(XkbStatePtr old,XkbStatePtr new)
 {
 int		changed;
@@ -700,7 +700,7 @@ XkbCompatMapPtr	map;
     return;
 }
 
-unsigned
+_X_EXPORT unsigned
 XkbAdjustGroup(int group,XkbControlsPtr ctrls)
 {
 unsigned	act;
@@ -741,7 +741,7 @@ unsigned	act;
     return group;
 }
 
-void
+_X_EXPORT void
 XkbComputeDerivedState(XkbSrvInfoPtr xkbi)
 {
 XkbStatePtr	state= &xkbi->state;
@@ -773,7 +773,7 @@ unsigned char	grp;
 
 /***====================================================================***/
 
-void
+_X_EXPORT void
 XkbCheckSecondaryEffects(	XkbSrvInfoPtr		xkbi,
 				unsigned		which,
 				XkbChangesPtr 		changes,
@@ -793,7 +793,7 @@ XkbCheckSecondaryEffects(	XkbSrvInfoPtr		xkbi,
 
 /***====================================================================***/
 
-Bool
+_X_EXPORT Bool
 XkbEnableDisableControls(	XkbSrvInfoPtr		xkbi,
 				unsigned long		change,
 				unsigned long		newValues,
@@ -842,7 +842,7 @@ XkbSrvLedInfoPtr	sli;
 
 #define	MAX_TOC	16
 
-XkbGeometryPtr 
+_X_EXPORT XkbGeometryPtr
 XkbLookupNamedGeometry(DeviceIntPtr dev,Atom name,Bool *shouldFree)
 {
 XkbSrvInfoPtr	xkbi=	dev->key->xkbInfo;
@@ -860,7 +860,7 @@ XkbDescPtr	xkb=	xkbi->desc;
     return NULL;
 }
 
-void
+_X_EXPORT void
 XkbConvertCase(register KeySym sym, KeySym *lower, KeySym *upper)
 {
     *lower = sym;
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index ae752e945..50b175a34 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -48,7 +48,7 @@
 #include "xkbgeom.h"
 #include "xkb.h"
 
-unsigned
+_X_EXPORT unsigned
 _XkbKSCheckCase(KeySym ks)
 {
 unsigned	set,rtrn;
@@ -157,7 +157,7 @@ _AddIncl(	FILE *		file,
     return;
 }
 
-Bool
+_X_EXPORT Bool
 XkbWriteXKBKeymapForNames(	FILE *			file,
 				XkbComponentNamesPtr	names,
 				XkbDescPtr		xkb,
@@ -354,7 +354,7 @@ unsigned	wantNames,wantConfig,wantDflts;
 
 /***====================================================================***/
 
-int
+_X_EXPORT int
 XkbFindKeycodeByName(XkbDescPtr xkb,char *name,Bool use_aliases)
 {
 register int	i;
@@ -387,7 +387,7 @@ register int	i;
 }
 
 
-unsigned
+_X_EXPORT unsigned
 XkbConvertGetByNameComponents(Bool toXkm,unsigned orig)
 {
 unsigned	rtrn;
@@ -423,7 +423,7 @@ static unsigned char componentSpecLegal[] = {
 	0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0xff
 };
 
-void
+_X_EXPORT void
 XkbEnsureSafeMapName(char *name)
 {
    if (name==NULL)
@@ -440,7 +440,7 @@ XkbEnsureSafeMapName(char *name)
 
 #define	UNMATCHABLE(c)	(((c)=='(')||((c)==')')||((c)=='/'))
 
-Bool
+_X_EXPORT Bool
 XkbNameMatchesPattern(char *name,char *ptrn)
 {
     while (ptrn[0]!='\0') {
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index 229cc9258..d5e841691 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -98,7 +98,7 @@ WriteXKBAction(FILE *file,XkbDescPtr xkb,XkbAnyAction *action)
 
 /***====================================================================***/
 
-Bool
+_X_EXPORT Bool
 XkbWriteXKBKeycodes(	FILE *			file,
 			XkbDescPtr		xkb,
 			Bool			topLevel,
@@ -158,7 +158,7 @@ char *			alternate;
     return True;
 }
 
-Bool
+_X_EXPORT Bool
 XkbWriteXKBKeyTypes(	FILE *			file,
 			XkbDescPtr              xkb,
 			Bool			topLevel,
@@ -265,7 +265,7 @@ WriteXKBIndicatorMap(	FILE *			file,
     return True;
 }
 
-Bool
+_X_EXPORT Bool
 XkbWriteXKBCompatMap(	FILE *			file,
 			XkbDescPtr              xkb,
 			Bool			topLevel,
@@ -340,7 +340,7 @@ XkbSymInterpretPtr	interp;
     return True;
 }
 
-Bool
+_X_EXPORT Bool
 XkbWriteXKBSymbols(	FILE *			file,
 			XkbDescPtr              xkb,
 			Bool			topLevel,
@@ -791,7 +791,7 @@ int		dfltKeyColor = 0;
     return True;
 }
 
-Bool
+_X_EXPORT Bool
 XkbWriteXKBGeometry(	FILE *			file,
 			XkbDescPtr              xkb,
 			Bool			topLevel,
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index d08c91589..18c42ba51 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -68,7 +68,7 @@ char *rtrn;
 
 /***====================================================================***/
 
-char *
+_X_EXPORT char *
 XkbAtomText(Atom atm,unsigned format)
 {
 char	*rtrn,*tmp;
@@ -100,7 +100,7 @@ char	*rtrn,*tmp;
 
 /***====================================================================***/
 
-char *
+_X_EXPORT char *
 XkbVModIndexText(XkbDescPtr xkb,unsigned ndx,unsigned format)
 {
 register int len;
@@ -134,7 +134,7 @@ char  numBuf[20];
     return rtrn;
 }
 
-char *
+_X_EXPORT char *
 XkbVModMaskText(        XkbDescPtr	xkb,
 			unsigned	modMask,
 			unsigned	mask,
@@ -216,7 +216,7 @@ static char *modNames[XkbNumModifiers] = {
     "Shift", "Lock", "Control", "Mod1", "Mod2", "Mod3", "Mod4", "Mod5"
 };
 
-char *
+_X_EXPORT char *
 XkbModIndexText(unsigned ndx,unsigned format)
 {
 char *	rtrn;
@@ -241,7 +241,7 @@ char	buf[100];
     return rtrn;
 }
 
-char *
+_X_EXPORT char *
 XkbModMaskText(unsigned mask,unsigned format)
 {
 register int i,bit;
@@ -281,7 +281,7 @@ char buf[64],*rtrn;
 /***====================================================================***/
 
 /*ARGSUSED*/
-char *
+_X_EXPORT char *
 XkbConfigText(unsigned config,unsigned format)
 {
 static char *buf;
@@ -328,7 +328,7 @@ static char *buf;
 
 /***====================================================================***/
 
-char *
+_X_EXPORT char *
 XkbKeysymText(KeySym sym,unsigned format)
 {
 static char buf[32],*rtrn;
@@ -339,7 +339,7 @@ static char buf[32],*rtrn;
     return rtrn;
 }
 
-char *
+_X_EXPORT char *
 XkbKeyNameText(char *name,unsigned format)
 {
 char *buf;
@@ -368,7 +368,7 @@ static char *siMatchText[5] = {
 	"NoneOf", "AnyOfOrNone", "AnyOf", "AllOf", "Exactly"
 };
 
-char *
+_X_EXPORT char *
 XkbSIMatchText(unsigned type,unsigned format)
 {
 static char buf[40];
@@ -402,7 +402,7 @@ static char *imWhichNames[]= {
 	"compat"
 };
 
-char *
+_X_EXPORT char *
 XkbIMWhichStateMaskText(unsigned use_which,unsigned format)
 {
 int		len;
@@ -461,7 +461,7 @@ static char *ctrlNames[] = {
 	"ignoreGroupLock"
 };
 
-char *
+_X_EXPORT char *
 XkbControlsMaskText(unsigned ctrls,unsigned format)
 {
 int		len;
@@ -508,7 +508,7 @@ char *		buf;
 
 /***====================================================================***/
 
-char *
+_X_EXPORT char *
 XkbStringText(char *str,unsigned format)
 {
 char *	buf;
@@ -568,7 +568,7 @@ Bool	ok;
 
 /***====================================================================***/
 
-char *
+_X_EXPORT char *
 XkbGeomFPText(int val,unsigned format)
 {
 int	whole,frac;
@@ -588,7 +588,7 @@ char *	buf;
     return buf;
 }
 
-char *
+_X_EXPORT char *
 XkbDoodadTypeText(unsigned type,unsigned format)
 {
 char *	buf;
@@ -628,7 +628,7 @@ static char *actionTypeNames[XkbSA_NumActions]= {
     "DeviceBtn",    "LockDeviceBtn"
 };
 
-char *
+_X_EXPORT char *
 XkbActionTypeText(unsigned type,unsigned format)
 {
 static char buf[32];
@@ -1125,7 +1125,7 @@ static actionCopy	copyActionArgs[XkbSA_NumActions] = {
 
 #define	ACTION_SZ	256
 
-char *
+_X_EXPORT char *
 XkbActionText(XkbDescPtr xkb,XkbAction *action,unsigned format)
 {
 char	buf[ACTION_SZ],*tmp;
@@ -1153,7 +1153,7 @@ int	sz;
     return tmp;
 }
 
-char *
+_X_EXPORT char *
 XkbBehaviorText(XkbDescPtr xkb,XkbBehavior *behavior,unsigned format)
 {
 char	buf[256],*tmp;
@@ -1210,7 +1210,7 @@ char	buf[256],*tmp;
 
 /***====================================================================***/
 
-char *
+_X_EXPORT char *
 XkbIndentText(unsigned size)
 {
 static char buf[32];
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index b14a5beda..f9b4025da 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -43,7 +43,7 @@
 #include "xkbsrv.h"
 #include "xkbgeom.h"
 
-Atom
+_X_EXPORT Atom
 XkbInternAtom(char *str,Bool only_if_exists)
 {
     if (str==NULL)
@@ -51,7 +51,7 @@ XkbInternAtom(char *str,Bool only_if_exists)
     return MakeAtom(str,strlen(str),!only_if_exists);
 }
 
-char *
+_X_EXPORT char *
 _XkbDupString(char *str)
 {
 char *new;
@@ -1026,7 +1026,7 @@ XkbGeometrySizesRec	sizes;
     return nRead;
 }
 
-Bool
+_X_EXPORT Bool
 XkmProbe(FILE *file)
 {
 unsigned hdr,tmp;
@@ -1043,7 +1043,7 @@ int	 nRead=0;
     return 1;
 }
 
-static Bool
+_X_EXPORT static Bool
 XkmReadTOC(FILE *file,xkmFileInfo* file_info,int max_toc,xkmSectionInfo *toc)
 {
 unsigned hdr,tmp;
@@ -1077,7 +1077,7 @@ unsigned i,size_toc;
 /***====================================================================***/
 
 #define	MAX_TOC	16
-unsigned
+_X_EXPORT unsigned
 XkmReadFile(FILE *file,unsigned need,unsigned want,XkbDescPtr *xkb)
 {
 register unsigned	i;