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()

15 files changed, 101 insertions, 101 deletions

diff --git a/os/WaitFor.c b/os/WaitFor.c
index d6dd99553..eb163b668 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -142,7 +142,7 @@ static OsTimerPtr timers = NULL;
  *     pClientsReady is an array to store ready client->index values into.
  *****************/
 
-int
+_X_EXPORT int
 WaitForSomething(int *pClientsReady)
 {
     int i;
@@ -475,7 +475,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
     return timer;
 }
 
-Bool
+_X_EXPORT Bool
 TimerForce(OsTimerPtr timer)
 {
     OsTimerPtr *prev;
@@ -518,7 +518,7 @@ TimerFree(OsTimerPtr timer)
     xfree(timer);
 }
 
-void
+_X_EXPORT void
 TimerCheck(void)
 {
     CARD32 now = GetTimeInMillis();
@@ -527,7 +527,7 @@ TimerCheck(void)
 	DoTimer(timers, now, &timers);
 }
 
-void
+_X_EXPORT void
 TimerInit(void)
 {
     OsTimerPtr timer;
@@ -626,7 +626,7 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,pointer arg)
 
 static OsTimerPtr ScreenSaverTimer = NULL;
 
-void
+_X_EXPORT void
 FreeScreenSaverTimer(void)
 {
     if (ScreenSaverTimer) {
@@ -635,7 +635,7 @@ FreeScreenSaverTimer(void)
     }
 }
 
-void
+_X_EXPORT void
 SetScreenSaverTimer(void)
 {
     CARD32 timeout = 0;
diff --git a/os/access.c b/os/access.c
index 50fc5f9f2..670ec368e 100644
--- a/os/access.c
+++ b/os/access.c
@@ -179,7 +179,7 @@ SOFTWARE.
 #endif
 #endif
 
-Bool defeatAccessControl = FALSE;
+_X_EXPORT Bool defeatAccessControl = FALSE;
 
 #define acmp(a1, a2, len) memcmp((char *)(a1), (char *)(a2), len)
 #define acopy(a1, a2, len) memmove((char *)(a2), (char *)(a1), len)
@@ -240,7 +240,7 @@ static void siTypesInitialize(void);
  * local host to the access list
  */
 
-void
+_X_EXPORT void
 EnableLocalHost (void)
 {
     if (!UsingXdmcp)
@@ -253,7 +253,7 @@ EnableLocalHost (void)
 /*
  * called when authorization is enabled to keep us secure
  */
-void
+_X_EXPORT void
 DisableLocalHost (void)
 {
     HOST *self;
@@ -271,7 +271,7 @@ DisableLocalHost (void)
  * adds local hosts manually when needed
  */
 
-void
+_X_EXPORT void
 AccessUsingXdmcp (void)
 {
     UsingXdmcp = TRUE;
@@ -321,7 +321,7 @@ ifioctl (int fd, int cmd, char *arg)
  */
 
 #if !defined(SIOCGIFCONF) 
-void
+_X_EXPORT void
 DefineSelf (int fd)
 {
 #if !defined(TCPCONN) && !defined(STREAMSCONN) && !defined(UNIXCONN) && !defined(MNX_TCPCONN)
@@ -847,7 +847,7 @@ DefineSelf (int fd)
 #endif /* hpux && !HAS_IFREQ */
 
 #ifdef XDMCP
-void
+_X_EXPORT void
 AugmentSelf(pointer from, int len)
 {
     int family;
@@ -873,7 +873,7 @@ AugmentSelf(pointer from, int len)
 }
 #endif
 
-void
+_X_EXPORT void
 AddLocalHosts (void)
 {
     HOST    *self;
@@ -887,7 +887,7 @@ AddLocalHosts (void)
 }
 
 /* Reset access control list to initial hosts */
-void
+_X_EXPORT void
 ResetHosts (char *display)
 {
     register HOST	*host;
@@ -1132,7 +1132,7 @@ _X_EXPORT Bool LocalClient(ClientPtr client)
  * 
  * Used by XShm to test access rights to shared memory segments
  */
-int
+_X_EXPORT int
 LocalClientCred(ClientPtr client, int *pUid, int *pGid)
 {
     LocalClientCredRec *lcc;
@@ -1161,7 +1161,7 @@ LocalClientCred(ClientPtr client, int *pUid, int *pGid)
  * Used by localuser & localgroup ServerInterpreted access control forms below
  * Used by AuthAudit to log who local connections came from
  */
-int
+_X_EXPORT int
 GetLocalClientCreds(ClientPtr client, LocalClientCredRec **lccp)
 {
 #if defined(HAS_GETPEEREID) || defined(HAS_GETPEERUCRED) || defined(SO_PEERCRED)
@@ -1260,7 +1260,7 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredRec **lccp)
 #endif
 }
 
-void
+_X_EXPORT void
 FreeLocalClientCreds(LocalClientCredRec *lcc)
 {
     if (lcc != NULL) {
@@ -1290,7 +1290,7 @@ AuthorizedClient(ClientPtr client)
 /* Add a host to the access control list.  This is the external interface
  * called from the dispatcher */
 
-int
+_X_EXPORT int
 AddHost (ClientPtr	client,
 	 int            family,
 	 unsigned       length,        /* of bytes in pAddr */
@@ -1335,7 +1335,7 @@ AddHost (ClientPtr	client,
     return BadAlloc;
 }
 
-Bool
+_X_EXPORT Bool
 ForEachHostInFamily (int	    family,
 		     Bool    (*func)(
 			 unsigned char * /* addr */,
@@ -1387,7 +1387,7 @@ NewHost (int		family,
 
 /* Remove a host from the access control list */
 
-int
+_X_EXPORT int
 RemoveHost (
     ClientPtr		client,
     int                 family,
@@ -1441,7 +1441,7 @@ RemoveHost (
 }
 
 /* Get all hosts in the access control list */
-int
+_X_EXPORT int
 GetHosts (
     pointer		*data,
     int			*pnHosts,
@@ -1540,7 +1540,7 @@ CheckAddr (
 /* Check if a host is not in the access control list. 
  * Returns 1 if host is invalid, 0 if we've found it. */
 
-int
+_X_EXPORT int
 InvalidHost (
     register struct sockaddr	*saddr,
     int				len,
@@ -1651,7 +1651,7 @@ ConvertAddr (
     }
 }
 
-int
+_X_EXPORT int
 ChangeAccessControl(
     ClientPtr client,
     int fEnabled)
@@ -1664,7 +1664,7 @@ ChangeAccessControl(
 }
 
 /* returns FALSE if xhost + in effect, else TRUE */
-int
+_X_EXPORT int
 GetAccessControl(void)
 {
     return AccessEnabled;
diff --git a/os/auth.c b/os/auth.c
index a852e1c3b..4a67b37be 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -100,7 +100,7 @@ static char *authorization_file = (char *)NULL;
 
 static Bool ShouldLoadAuth = TRUE;
 
-void
+_X_EXPORT void
 InitAuthorization (char *file_name)
 {
     authorization_file = file_name;
@@ -145,7 +145,7 @@ LoadAuthorization (void)
  * XdmcpInit calls this function to discover all authorization
  * schemes supported by the display
  */
-void
+_X_EXPORT void
 RegisterAuthorizations (void)
 {
     int	    i;
@@ -156,7 +156,7 @@ RegisterAuthorizations (void)
 }
 #endif
 
-XID
+_X_EXPORT XID
 CheckAuthorization (
     unsigned int name_length,
     char	*name,
@@ -221,7 +221,7 @@ CheckAuthorization (
     return (XID) ~0L;
 }
 
-void
+_X_EXPORT void
 ResetAuthorization (void)
 {
     int	i;
@@ -232,7 +232,7 @@ ResetAuthorization (void)
     ShouldLoadAuth = TRUE;
 }
 
-int
+_X_EXPORT int
 AuthorizationFromID (
 	XID 		id,
 	unsigned short	*name_lenp,
@@ -253,7 +253,7 @@ AuthorizationFromID (
     return 0;
 }
 
-int
+_X_EXPORT int
 RemoveAuthorization (
 	unsigned short	name_length,
 	char		*name,
@@ -273,7 +273,7 @@ RemoveAuthorization (
     return 0;
 }
 
-int
+_X_EXPORT int
 AddAuthorization (unsigned name_length, char *name, unsigned data_length, char *data)
 {
     int	i;
@@ -291,7 +291,7 @@ AddAuthorization (unsigned name_length, char *name, unsigned data_length, char *
 
 #ifdef XCSECURITY
 
-XID
+_X_EXPORT XID
 GenerateAuthorization(
 	unsigned name_length,
 	char	*name,
diff --git a/os/backtrace.c b/os/backtrace.c
index b52dcded8..e51b93043 100644
--- a/os/backtrace.c
+++ b/os/backtrace.c
@@ -30,7 +30,7 @@
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>
 
-void xorg_backtrace(void)
+_X_EXPORT void xorg_backtrace(void)
 {
     void *array[32]; /* deeper nesting than this means something's wrong */
     size_t size, i;
@@ -168,7 +168,7 @@ static int xorg_backtrace_pstack(void) {
 
 # if defined(HAVE_PSTACK) || defined(HAVE_WALKCONTEXT)
 
-void xorg_backtrace(void) {
+_X_EXPORT void xorg_backtrace(void) {
 
     ErrorF("\nBacktrace:\n");
 
@@ -195,7 +195,7 @@ void xorg_backtrace(void) {
 # else
 
 /* Default fallback if we can't find any way to get a backtrace */
-void xorg_backtrace(void) { return; }
+_X_EXPORT void xorg_backtrace(void) { return; }
 
 # endif
 #endif
diff --git a/os/connection.c b/os/connection.c
index ddb2d6c2a..9153d1564 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -141,12 +141,12 @@ fd_set LastSelectMask;		/* mask returned from last select call */
 fd_set ClientsWithInput;	/* clients with FULL requests in buffer */
 fd_set ClientsWriteBlocked;	/* clients who cannot receive output */
 fd_set OutputPending;		/* clients with reply/event data ready to go */
-int MaxClients = 0;
+_X_EXPORT int MaxClients = 0;
 Bool NewOutputPending;		/* not yet attempted to write some new output */
 Bool AnyClientsWriteBlocked;	/* true if some client blocked on write */
 
 static Bool RunFromSmartParent;	/* send SIGUSR1 to parent process */
-Bool PartialNetwork;		/* continue even if unable to bind all addrs */
+_X_EXPORT Bool PartialNetwork;	/* continue even if unable to bind all addrs */
 static Pid_t ParentProcess;
 
 static Bool debug_conns = FALSE;
@@ -273,7 +273,7 @@ lookup_trans_conn (int fd)
 
 /* Set MaxClients and lastfdesc, and allocate ConnectionTranslation */
 
-void
+_X_EXPORT void
 InitConnectionLimits(void)
 {
     lastfdesc = -1;
@@ -358,7 +358,7 @@ InitParentProcess(void)
 #endif
 }
 
-void
+_X_EXPORT void
 NotifyParentProcess(void)
 {
 #if !defined(WIN32)
@@ -375,7 +375,7 @@ NotifyParentProcess(void)
  *    At initialization, create the sockets to listen on for new clients.
  *****************/
 
-void
+_X_EXPORT void
 CreateWellKnownSockets(void)
 {
     int		i;
@@ -442,7 +442,7 @@ CreateWellKnownSockets(void)
 #endif
 }
 
-void
+_X_EXPORT void
 ResetWellKnownSockets (void)
 {
     int i;
@@ -493,7 +493,7 @@ ResetWellKnownSockets (void)
 #endif
 }
 
-void
+_X_EXPORT void
 CloseWellKnownConnections(void)
 {
     int i;
@@ -618,7 +618,7 @@ AuthAudit (ClientPtr client, Bool letin,
 #endif	
 }
 
-XID
+_X_EXPORT XID
 AuthorizationIDOfClient(ClientPtr client)
 {
     if (client->osPrivate)
@@ -647,7 +647,7 @@ AuthorizationIDOfClient(ClientPtr client)
  *
  *****************************************************************/
 
-char * 
+_X_EXPORT char * 
 ClientAuthorized(ClientPtr client, 
     unsigned int proto_n, char *auth_proto, 
     unsigned int string_n, char *auth_string)
@@ -798,7 +798,7 @@ AllocNewConnection (XtransConnInfo trans_conn, int fd, CARD32 conn_time)
  *****************/
 
 /*ARGSUSED*/
-Bool
+_X_EXPORT Bool
 EstablishNewConnections(ClientPtr clientUnused, pointer closure)
 {
     fd_set  readyconnections;     /* set of listeners that are ready */
@@ -980,7 +980,7 @@ CloseDownFileDescriptor(OsCommPtr oc)
  *    to check each and every socket individually.
  *****************/
 
-void
+_X_EXPORT void
 CheckConnections(void)
 {
 #ifndef WIN32
@@ -1040,7 +1040,7 @@ CheckConnections(void)
  *    Delete client from AllClients and free resources 
  *****************/
 
-void
+_X_EXPORT void
 CloseDownConnection(ClientPtr client)
 {
     OsCommPtr oc = (OsCommPtr)client->osPrivate;
@@ -1098,7 +1098,7 @@ RemoveEnabledDevice(int fd)
  *    This routine is "undone" by ListenToAllClients()
  *****************/
 
-int
+_X_EXPORT int
 OnlyListenToOneClient(ClientPtr client)
 {
     OsCommPtr oc = (OsCommPtr)client->osPrivate;
@@ -1135,7 +1135,7 @@ OnlyListenToOneClient(ClientPtr client)
  *    Undoes OnlyListentToOneClient()
  ****************/
 
-void
+_X_EXPORT void
 ListenToAllClients(void)
 {
     if (GrabInProgress)
@@ -1213,7 +1213,7 @@ AttendClient (ClientPtr client)
 
 /* make client impervious to grabs; assume only executing client calls this */
 
-void
+_X_EXPORT void
 MakeClientGrabImpervious(ClientPtr client)
 {
     OsCommPtr oc = (OsCommPtr)client->osPrivate;
@@ -1232,7 +1232,7 @@ MakeClientGrabImpervious(ClientPtr client)
 
 /* make client pervious to grabs; assume only executing client calls this */
 
-void
+_X_EXPORT void
 MakeClientGrabPervious(ClientPtr client)
 {
     OsCommPtr oc = (OsCommPtr)client->osPrivate;
diff --git a/os/io.c b/os/io.c
index f07993e5a..e902ee520 100644
--- a/os/io.c
+++ b/os/io.c
@@ -191,7 +191,7 @@ YieldControlDeath(void)
     timesThisConnection = 0;
 }
 
-int
+_X_EXPORT int
 ReadRequestFromClient(ClientPtr client)
 {
     OsCommPtr oc = (OsCommPtr)client->osPrivate;
@@ -465,7 +465,7 @@ ReadRequestFromClient(ClientPtr client)
  *
  **********************/
 
-Bool
+_X_EXPORT Bool
 InsertFakeRequest(ClientPtr client, char *data, int count)
 {
     OsCommPtr oc = (OsCommPtr)client->osPrivate;
@@ -599,7 +599,7 @@ static const int padlength[4] = {0, 3, 2, 1};
  *
  **********************/
 
-void
+_X_EXPORT void
 FlushAllOutput(void)
 {
     register int index, base;
@@ -672,7 +672,7 @@ FlushAllOutput(void)
 #endif /* WIN32 */
 }
 
-void
+_X_EXPORT void
 FlushIfCriticalOutputPending(void)
 {
     if (CriticalOutputPending)
@@ -1087,7 +1087,7 @@ FreeOsBuffers(OsCommPtr oc)
     }
 }
 
-void
+_X_EXPORT void
 ResetOsBuffers(void)
 {
     ConnectionInputPtr oci;
diff --git a/os/log.c b/os/log.c
index 97b98f0ec..d65932449 100644
--- a/os/log.c
+++ b/os/log.c
@@ -100,7 +100,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 
 
 #ifdef DDXOSVERRORF
-void (*OsVendorVErrorFProc)(const char *, va_list args) = NULL;
+_X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args) = NULL;
 #endif
 
 static FILE *logFile = NULL;
@@ -155,7 +155,7 @@ static Bool needBuffer = TRUE;
  * string.
  */
 
-const char *
+_X_EXPORT const char *
 LogInit(const char *fname, const char *backup)
 {
     char *logFileName = NULL;
@@ -217,7 +217,7 @@ LogInit(const char *fname, const char *backup)
     return logFileName;
 }
 
-void
+_X_EXPORT void
 LogClose(void)
 {
     if (logFile) {
@@ -226,7 +226,7 @@ LogClose(void)
     }
 }
 
-Bool
+_X_EXPORT Bool
 LogSetParameter(LogParameter param, int value)
 {
     switch (param) {
@@ -420,7 +420,7 @@ static int nrepeat = 0;
 static int oldlen = -1;
 static OsTimerPtr auditTimer = NULL;
 
-void 
+_X_EXPORT void 
 FreeAuditTimer(void)
 {
     if (auditTimer != NULL) {
@@ -451,7 +451,7 @@ AuditPrefix(void)
     return tmpBuf;
 }
 
-void
+_X_EXPORT void
 AuditF(const char * f, ...)
 {
     va_list args;
@@ -482,7 +482,7 @@ AuditFlush(OsTimerPtr timer, CARD32 now, pointer arg)
     }
 }
 
-void
+_X_EXPORT void
 VAuditF(const char *f, va_list args)
 {
     char *prefix;
@@ -577,7 +577,7 @@ Error(char *str)
 	LogWrite(-1, strerror(saveErrno));
 }
 
-void
+_X_EXPORT void
 LogPrintMarkers(void)
 {
     /* Show what the message marker symbols mean. */
diff --git a/os/oscolor.c b/os/oscolor.c
index 7f6b93880..a066129a6 100644
--- a/os/oscolor.c
+++ b/os/oscolor.c
@@ -1571,7 +1571,7 @@ static const BuiltinColor BuiltinColors[] = {
 
 #define NUM_BUILTIN_COLORS  (sizeof (BuiltinColors) / sizeof (BuiltinColors[0]))
 
-Bool
+_X_EXPORT Bool
 OsLookupColor(int		screen,
 	      char		*name,
 	      unsigned int	len,
diff --git a/os/osinit.c b/os/osinit.c
index 74e2457f2..92bd90bcf 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -79,16 +79,16 @@ SOFTWARE.
 
 extern char *display;
 #ifdef RLIMIT_DATA
-int limitDataSpace = -1;
+_X_EXPORT int limitDataSpace = -1;
 #endif
 #ifdef RLIMIT_STACK
-int limitStackSpace = -1;
+_X_EXPORT int limitStackSpace = -1;
 #endif
 #ifdef RLIMIT_NOFILE
-int limitNoFile = -1;
+_X_EXPORT int limitNoFile = -1;
 #endif
 
-void
+_X_EXPORT void
 OsInit(void)
 {
     static Bool been_here = FALSE;
@@ -202,7 +202,7 @@ OsInit(void)
 	    SmartScheduleDisable = TRUE;
 }
 
-void
+_X_EXPORT void
 OsCleanup(Bool terminating)
 {
     if (terminating)
diff --git a/os/strcasecmp.c b/os/strcasecmp.c
index ca1051dc1..268fa1e50 100644
--- a/os/strcasecmp.c
+++ b/os/strcasecmp.c
@@ -35,7 +35,7 @@
 #include "dix.h"
 
 #ifdef NEED_STRCASECMP
-int
+_X_EXPORT int
 xstrcasecmp(const char *str1, const char *str2)
 {
     const u_char *us1 = (const u_char *)str1, *us2 = (const u_char *)str2;
@@ -51,7 +51,7 @@ xstrcasecmp(const char *str1, const char *str2)
 #endif
 
 #ifdef NEED_STRNCASECMP
-int
+_X_EXPORT int
 xstrncasecmp(const char *s1, const char *s2, size_t n)
 {
     if (n != 0) {
diff --git a/os/strcasestr.c b/os/strcasestr.c
index b3d45495c..cbc84f124 100644
--- a/os/strcasestr.c
+++ b/os/strcasestr.c
@@ -42,7 +42,7 @@
  * Find the first occurrence of find in s, ignore case.
  */
 #ifdef NEED_STRCASESTR
-char *
+_X_EXPORT char *
 xstrcasestr(const char *s, const char *find)
 {
         char c, sc;
diff --git a/os/strlcat.c b/os/strlcat.c
index 91ceabb1c..b753a7a28 100644
--- a/os/strlcat.c
+++ b/os/strlcat.c
@@ -30,7 +30,7 @@
  * Returns strlen(src) + MIN(siz, strlen(initial dst)).
  * If retval >= siz, truncation occurred.
  */
-size_t
+_X_EXPORT size_t
 strlcat(char *dst, const char *src, size_t siz)
 {
 	register char *d = dst;
diff --git a/os/strlcpy.c b/os/strlcpy.c
index aa9d042e0..341d0284d 100644
--- a/os/strlcpy.c
+++ b/os/strlcpy.c
@@ -27,7 +27,7 @@
  * will be copied.  Always NUL terminates (unless siz == 0).
  * Returns strlen(src); if retval >= siz, truncation occurred.
  */
-size_t
+_X_EXPORT size_t
 strlcpy(char *dst, const char *src, size_t siz)
 {
 	register char *d = dst;
diff --git a/os/utils.c b/os/utils.c
index 39a40e481..54fb1209c 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -198,13 +198,13 @@ _X_EXPORT Bool noGEExtension = FALSE;
 
 #include <errno.h>
 
-Bool CoreDump;
+_X_EXPORT Bool CoreDump;
 
 #ifdef PANORAMIX
-Bool PanoramiXExtensionDisabledHack = FALSE;
+_X_EXPORT Bool PanoramiXExtensionDisabledHack = FALSE;
 #endif
 
-int auditTrailLevel = 1;
+_X_EXPORT int auditTrailLevel = 1;
 
 #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
 #define HAS_SAVED_IDS_AND_SETEUID
@@ -212,7 +212,7 @@ int auditTrailLevel = 1;
 
 static char *dev_tty_from_init = NULL;	/* since we need to parse it anyway */
 
-OsSigHandlerPtr
+_X_EXPORT OsSigHandlerPtr
 OsSignal(sig, handler)
     int sig;
     OsSigHandlerPtr handler;
@@ -261,7 +261,7 @@ static Bool nolock = FALSE;
  *      contained inside is valid.  If so, then die.  Otherwise, create
  *      the lock file containing the PID.
  */
-void
+_X_EXPORT void
 LockServer(void)
 {
   char tmp[PATH_MAX], pid_str[12];
@@ -387,7 +387,7 @@ LockServer(void)
  * UnlockServer --
  *      Remove the server lock file.
  */
-void
+_X_EXPORT void
 UnlockServer(void)
 {
   if (nolock) return;
@@ -401,7 +401,7 @@ UnlockServer(void)
 /* Force connections to close on SIGHUP from init */
 
 /*ARGSUSED*/
-SIGVAL
+_X_EXPORT SIGVAL
 AutoResetServer (int sig)
 {
     int olderrno = errno;
@@ -471,7 +471,7 @@ AdjustWaitForDelay (pointer waitTime, unsigned long newdelay)
     }
 }
 
-void UseMsg(void)
+_X_EXPORT void UseMsg(void)
 {
     ErrorF("use: X [:<display>] [option]\n");
     ErrorF("-a #                   mouse acceleration (pixels)\n");
@@ -577,7 +577,7 @@ VerifyDisplayName(const char *d)
  * and allows ddx to handle additional fields.  It is not allowed to modify
  * argc or any of the strings pointed to by argv.
  */
-void
+_X_EXPORT void
 ProcessCommandLine(int argc, char *argv[])
 {
     int i, skip;
@@ -1167,7 +1167,7 @@ Xfree(pointer ptr)
 #endif /* !INTERNAL_MALLOC */
 
 
-char *
+_X_EXPORT char *
 Xstrdup(const char *s)
 {
     char *sd;
@@ -1205,7 +1205,7 @@ XNFstrdup(const char *s)
 #define SMART_SCHEDULE_TIMER		ITIMER_REAL
 #endif
 
-void
+_X_EXPORT void
 SmartScheduleStopTimer (void)
 {
 #ifdef SMART_SCHEDULE_POSSIBLE
@@ -1221,7 +1221,7 @@ SmartScheduleStopTimer (void)
 #endif
 }
 
-void
+_X_EXPORT void
 SmartScheduleStartTimer (void)
 {
 #ifdef SMART_SCHEDULE_POSSIBLE
@@ -1245,7 +1245,7 @@ SmartScheduleTimer (int sig)
 }
 #endif
 
-Bool
+_X_EXPORT Bool
 SmartScheduleInit (void)
 {
 #ifdef SMART_SCHEDULE_POSSIBLE
@@ -1276,7 +1276,7 @@ static sigset_t	PreviousSignalMask;
 static int	BlockedSignalCount;
 #endif
 
-void
+_X_EXPORT void
 OsBlockSignals (void)
 {
 #ifdef SIG_BLOCK
@@ -1314,7 +1314,7 @@ OsBlockSignals (void)
 #endif
 }
 
-void
+_X_EXPORT void
 OsReleaseSignals (void)
 {
 #ifdef SIG_BLOCK
@@ -1336,7 +1336,7 @@ OsReleaseSignals (void)
  * as well.  As it is now, xkbcomp messages don't end up in the log file.
  */
 
-int
+_X_EXPORT int
 System(char *command)
 {
     int pid, p;
@@ -1395,7 +1395,7 @@ static struct pid {
 
 OsSigHandlerPtr old_alarm = NULL; /* XXX horrible awful hack */
 
-pointer
+_X_EXPORT pointer
 Popen(char *command, char *type)
 {
     struct pid *cur;
@@ -1480,7 +1480,7 @@ Popen(char *command, char *type)
 }
 
 /* fopen that drops privileges */
-pointer
+_X_EXPORT pointer
 Fopen(char *file, char *type)
 {
     FILE *iop;
@@ -1573,7 +1573,7 @@ Fopen(char *file, char *type)
 #endif /* HAS_SAVED_IDS_AND_SETEUID */
 }
 
-int
+_X_EXPORT int
 Pclose(pointer iop)
 {
     struct pid *cur, *last;
@@ -1613,7 +1613,7 @@ Pclose(pointer iop)
     return pid == -1 ? -1 : pstat;
 }
 
-int 
+_X_EXPORT int 
 Fclose(pointer iop)
 {
 #ifdef HAS_SAVED_IDS_AND_SETEUID
@@ -1701,7 +1701,7 @@ enum BadCode {
 #endif
 
 void
-CheckUserParameters(int argc, char **argv, char **envp)
+_X_EXPORT CheckUserParameters(int argc, char **argv, char **envp)
 {
     enum BadCode bad = NotBad;
     int i = 0, j;
@@ -1838,7 +1838,7 @@ CheckUserParameters(int argc, char **argv, char **envp)
 #include <pwd.h>
 #endif /* USE_PAM */
 
-void
+_X_EXPORT void
 CheckUserAuthorization(void)
 {
 #ifdef USE_PAM
diff --git a/os/xprintf.c b/os/xprintf.c
index 07eaa1f58..4be4e7adc 100644
--- a/os/xprintf.c
+++ b/os/xprintf.c
@@ -43,7 +43,7 @@
 # endif
 #endif
     
-char *
+_X_EXPORT char *
 Xvprintf(const char *format, va_list va)
 {
     char *ret;
@@ -63,7 +63,7 @@ Xvprintf(const char *format, va_list va)
     return ret;
 }
 
-char *Xprintf(const char *format, ...)
+_X_EXPORT char *Xprintf(const char *format, ...)
 {
     char *ret;
     va_list va;
@@ -73,7 +73,7 @@ char *Xprintf(const char *format, ...)
     return ret;
 }
 
-char *
+_X_EXPORT char *
 XNFvprintf(const char *format, va_list va)
 {
     char *ret;
@@ -93,7 +93,7 @@ XNFvprintf(const char *format, va_list va)
     return ret;
 }
 
-char *XNFprintf(const char *format, ...)
+_X_EXPORT char *XNFprintf(const char *format, ...)
 {
     char *ret;
     va_list va;