diff --git a/hw/xwin/windisplay.c b/hw/xwin/windisplay.c
index 637ab0283..6ad8f6651 100644
--- a/hw/xwin/windisplay.c
+++ b/hw/xwin/windisplay.c
@@ -36,7 +36,6 @@
 #include "winmsg.h"
 
 #define XSERV_t
-#define TRANS_SERVER
 #include "os/Xtrans.h"
 
 /*
diff --git a/os/Xtrans.c b/os/Xtrans.c
index 888a559df..b7e0eb442 100644
--- a/os/Xtrans.c
+++ b/os/Xtrans.c
@@ -443,9 +443,7 @@ TRANS(Open) (int type, const char *address)
 #endif /* TRANS_CLIENT */
 	break;
     case XTRANS_OPEN_COTS_SERVER:
-#ifdef TRANS_SERVER
 	ciptr = thistrans->OpenCOTSServer(thistrans, protocol, host, port);
-#endif /* TRANS_SERVER */
 	break;
     default:
 	prmsg (1,"Open: Unknown Open type %d\n", type);
@@ -564,9 +562,6 @@ TRANS(OpenCOTSClient) (const char *address)
 
 #endif /* TRANS_CLIENT */
 
-
-#ifdef TRANS_SERVER
-
 XtransConnInfo
 TRANS(OpenCOTSServer) (const char *address)
 
@@ -575,9 +570,6 @@ TRANS(OpenCOTSServer) (const char *address)
     return TRANS(Open) (XTRANS_OPEN_COTS_SERVER, address);
 }
 
-#endif /* TRANS_SERVER */
-
-
 #ifdef TRANS_REOPEN
 
 XtransConnInfo
@@ -696,18 +688,14 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
     return ret;
 }
 
-#ifdef TRANS_SERVER
-
 int
 TRANS(CreateListener) (XtransConnInfo ciptr, const char *port, unsigned int flags)
-
 {
     return ciptr->transptr->CreateListener (ciptr, port, flags);
 }
 
 int
 TRANS(Received) (const char * protocol)
-
 {
    Xtransport *trans;
    int i = 0, ret = 0;
@@ -735,7 +723,6 @@ TRANS(Received) (const char * protocol)
 
 int
 TRANS(NoListen) (const char * protocol)
-
 {
    Xtransport *trans;
    int i = 0, ret = 0;
@@ -802,7 +789,6 @@ TRANS(IsListening) (const char * protocol)
 
 int
 TRANS(ResetListener) (XtransConnInfo ciptr)
-
 {
     if (ciptr->transptr->ResetListener)
 	return ciptr->transptr->ResetListener (ciptr);
@@ -810,10 +796,8 @@ TRANS(ResetListener) (XtransConnInfo ciptr)
 	return TRANS_RESET_NOOP;
 }
 
-
 XtransConnInfo
 TRANS(Accept) (XtransConnInfo ciptr, int *status)
-
 {
     XtransConnInfo	newciptr;
 
@@ -827,9 +811,6 @@ TRANS(Accept) (XtransConnInfo ciptr, int *status)
     return newciptr;
 }
 
-#endif /* TRANS_SERVER */
-
-
 #ifdef TRANS_CLIENT
 
 int
@@ -996,18 +977,13 @@ TRANS(GetConnectionNumber) (XtransConnInfo ciptr)
     return ciptr->fd;
 }
 
-
 /*
  * These functions are really utility functions, but they require knowledge
  * of the internal data structures, so they have to be part of the Transport
  * Independent API.
  */
-
-#ifdef TRANS_SERVER
-
 static int
 complete_network_count (void)
-
 {
     int count = 0;
     int found_local = 0;
@@ -1245,10 +1221,6 @@ TRANS(MakeAllCOTSServerListeners) (const char *port, int *partial,
     return 0;
 }
 
-#endif /* TRANS_SERVER */
-
-
-
 /*
  * These routines are not part of the X Transport Interface, but they
  * may be used by it.
diff --git a/os/Xtrans.h b/os/Xtrans.h
index 3b7296dcb..9ebe16744 100644
--- a/os/Xtrans.h
+++ b/os/Xtrans.h
@@ -205,14 +205,10 @@ XtransConnInfo TRANS(OpenCOTSClient)(
 
 #endif /* TRANS_CLIENT */
 
-#ifdef TRANS_SERVER
-
 XtransConnInfo TRANS(OpenCOTSServer)(
     const char *	/* address */
 );
 
-#endif /* TRANS_SERVER */
-
 #ifdef TRANS_REOPEN
 
 XtransConnInfo TRANS(ReopenCOTSServer)(
@@ -237,8 +233,6 @@ int TRANS(SetOption)(
     int			/* arg */
 );
 
-#ifdef TRANS_SERVER
-
 int TRANS(CreateListener)(
     XtransConnInfo,	/* ciptr */
     const char *,	/* port */
@@ -270,8 +264,6 @@ XtransConnInfo TRANS(Accept)(
     int *		/* status */
 );
 
-#endif /* TRANS_SERVER */
-
 #ifdef TRANS_CLIENT
 
 int TRANS(Connect)(
@@ -341,8 +333,6 @@ int TRANS(GetConnectionNumber)(
     XtransConnInfo	/* ciptr */
 );
 
-#ifdef TRANS_SERVER
-
 int TRANS(MakeAllCOTSServerListeners)(
     const char *,	/* port */
     int *,		/* partial */
@@ -350,9 +340,6 @@ int TRANS(MakeAllCOTSServerListeners)(
     XtransConnInfo **	/* ciptrs_ret */
 );
 
-#endif /* TRANS_SERVER */
-
-
 /*
  * Function Prototypes for Utility Functions.
  */
diff --git a/os/Xtransint.h b/os/Xtransint.h
index baf1f728b..6927b741f 100644
--- a/os/Xtransint.h
+++ b/os/Xtransint.h
@@ -146,7 +146,6 @@ typedef struct _Xtransport {
 
 #endif /* TRANS_CLIENT */
 
-#ifdef TRANS_SERVER
     const char **	nolisten;
     XtransConnInfo (*OpenCOTSServer)(
 	struct _Xtransport *,	/* transport */
@@ -155,8 +154,6 @@ typedef struct _Xtransport {
 	const char *		/* port */
     );
 
-#endif /* TRANS_SERVER */
-
 #ifdef TRANS_REOPEN
 
     XtransConnInfo (*ReopenCOTSServer)(
@@ -174,7 +171,6 @@ typedef struct _Xtransport {
 	int			/* arg */
     );
 
-#ifdef TRANS_SERVER
 /* Flags */
 # define ADDR_IN_USE_ALLOWED	1
 
@@ -193,8 +189,6 @@ typedef struct _Xtransport {
         int *			/* status */
     );
 
-#endif /* TRANS_SERVER */
-
 #ifdef TRANS_CLIENT
 
     int	(*Connect)(
@@ -332,12 +326,10 @@ static int TRANS(WriteV)(
 
 #endif /* WIN32 */
 
-#ifdef TRANS_SERVER
 static int trans_mkdir (
     const char *,	/* path */
     int			/* mode */
 );
-#endif
 
 #ifdef __clang__
 #pragma clang diagnostic pop
diff --git a/os/Xtranslcl.c b/os/Xtranslcl.c
index b981ba441..063612fce 100644
--- a/os/Xtranslcl.c
+++ b/os/Xtranslcl.c
@@ -297,10 +297,6 @@ TRANS(NAMEDOpenClient)(XtransConnInfo ciptr, const char *port)
 
 #endif /* TRANS_CLIENT */
 
-
-#ifdef TRANS_SERVER
-
-
 #ifdef NAMEDNODENAME
 static int
 TRANS(NAMEDOpenPipe)(const char *server_path)
@@ -484,8 +480,6 @@ TRANS(NAMEDAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
     return str.fd;
 }
 
-#endif /* TRANS_SERVER */
-
 #endif /* LOCAL_TRANS_NAMED */
 
 
@@ -562,14 +556,10 @@ typedef struct _LOCALtrans2dev {
 
 #endif /* TRANS_CLIENT */
 
-#ifdef TRANS_SERVER
-
     int	(*devcotsopenserver)(
 	XtransConnInfo, const char * /*port*/
 );
 
-#endif /* TRANS_SERVER */
-
 #ifdef TRANS_CLIENT
 
     int	(*devcltsopenclient)(
@@ -578,14 +568,10 @@ typedef struct _LOCALtrans2dev {
 
 #endif /* TRANS_CLIENT */
 
-#ifdef TRANS_SERVER
-
     int	(*devcltsopenserver)(
 	XtransConnInfo, const char * /*port*/
 );
 
-#endif /* TRANS_SERVER */
-
 #ifdef TRANS_REOPEN
 
     int	(*devcotsreopenserver)(
@@ -602,8 +588,6 @@ typedef struct _LOCALtrans2dev {
 
 #endif /* TRANS_REOPEN */
 
-#ifdef TRANS_SERVER
-
     int (*devreset)(
 	XtransConnInfo /* ciptr */
 );
@@ -612,8 +596,6 @@ typedef struct _LOCALtrans2dev {
 	XtransConnInfo, XtransConnInfo, int *
 );
 
-#endif /* TRANS_SERVER */
-
 } LOCALtrans2dev;
 
 static LOCALtrans2dev LOCALtrans2devtab[] = {
@@ -621,46 +603,34 @@ static LOCALtrans2dev LOCALtrans2devtab[] = {
 #ifdef TRANS_CLIENT
      TRANS(NAMEDOpenClient),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
      TRANS(NAMEDOpenServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_CLIENT
      TRANS(OpenFail),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
      TRANS(OpenFail),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
      TRANS(NAMEDReopenServer),
      TRANS(ReopenFail),
 #endif
-#ifdef TRANS_SERVER
      TRANS(NAMEDResetListener),
      TRANS(NAMEDAccept)
-#endif /* TRANS_SERVER */
 },
 
 {"local",
 #ifdef TRANS_CLIENT
      TRANS(NAMEDOpenClient),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
      TRANS(NAMEDOpenServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_CLIENT
      TRANS(OpenFail),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
      TRANS(OpenFail),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
      TRANS(NAMEDReopenServer),
      TRANS(ReopenFail),
 #endif
-#ifdef TRANS_SERVER
      TRANS(NAMEDResetListener),
      TRANS(NAMEDAccept)
-#endif /* TRANS_SERVER */
 },
 
 #ifdef LOCAL_TRANS_NAMED
@@ -668,46 +638,34 @@ static LOCALtrans2dev LOCALtrans2devtab[] = {
 #ifdef TRANS_CLIENT
      TRANS(NAMEDOpenClient),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
      TRANS(NAMEDOpenServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_CLIENT
      TRANS(OpenFail),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
      TRANS(OpenFail),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
      TRANS(NAMEDReopenServer),
      TRANS(ReopenFail),
 #endif
-#ifdef TRANS_SERVER
      TRANS(NAMEDResetListener),
      TRANS(NAMEDAccept)
-#endif /* TRANS_SERVER */
 },
 
 {"pipe",
 #ifdef TRANS_CLIENT
      TRANS(NAMEDOpenClient),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
      TRANS(NAMEDOpenServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_CLIENT
      TRANS(OpenFail),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
      TRANS(OpenFail),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
      TRANS(NAMEDReopenServer),
      TRANS(ReopenFail),
 #endif
-#ifdef TRANS_SERVER
      TRANS(NAMEDResetListener),
      TRANS(NAMEDAccept)
-#endif /* TRANS_SERVER */
 },
 #endif /* LOCAL_TRANS_NAMED */
 
@@ -919,9 +877,6 @@ TRANS(LocalOpenClient)(int type, const char *protocol,
 
 #endif /* TRANS_CLIENT */
 
-
-#ifdef TRANS_SERVER
-
 static XtransConnInfo
 TRANS(LocalOpenServer)(int type, const char *protocol,
                        const char *host _X_UNUSED, const char *port)
@@ -976,9 +931,6 @@ TRANS(LocalOpenServer)(int type, const char *protocol,
     return NULL;
 }
 
-#endif /* TRANS_SERVER */
-
-
 #ifdef TRANS_REOPEN
 
 static XtransConnInfo
@@ -1042,9 +994,6 @@ TRANS(LocalOpenCOTSClient)(Xtransport *thistrans _X_UNUSED, const char *protocol
 
 #endif /* TRANS_CLIENT */
 
-
-#ifdef TRANS_SERVER
-
 static XtransConnInfo
 TRANS(LocalOpenCOTSServer)(Xtransport *thistrans, const char *protocol,
 			   const char *host, const char *port)
@@ -1090,8 +1039,6 @@ TRANS(LocalOpenCOTSServer)(Xtransport *thistrans, const char *protocol,
     return TRANS(LocalOpenServer)(XTRANS_OPEN_COTS_SERVER, protocol, host, port);
 }
 
-#endif /* TRANS_SERVER */
-
 #ifdef TRANS_REOPEN
 
 static XtransConnInfo
@@ -1131,9 +1078,6 @@ TRANS(LocalSetOption)(XtransConnInfo ciptr, int option, int arg)
     return -1;
 }
 
-
-#ifdef TRANS_SERVER
-
 static int
 TRANS(LocalCreateListener)(XtransConnInfo ciptr, const char *port,
                            unsigned int flags _X_UNUSED)
@@ -1195,9 +1139,6 @@ TRANS(LocalAccept)(XtransConnInfo ciptr, int *status)
     return newciptr;
 }
 
-#endif /* TRANS_SERVER */
-
-
 #ifdef TRANS_CLIENT
 
 static int
@@ -1316,13 +1257,10 @@ TRANS(LocalCloseForCloning)(XtransConnInfo ciptr)
  * The TransName is in lowercase, so it will never match during a normal
  * call to SelectTransport() in Xtrans.c.
  */
-
-#ifdef TRANS_SERVER
 static const char * local_aliases[] = {
 				  "named",
 				  "pipe", /* compatibility with Solaris Xlib */
 				  NULL };
-#endif
 
 static Xtransport	TRANS(LocalFuncs) = {
 	/* Local Interface */
@@ -1331,19 +1269,15 @@ static Xtransport	TRANS(LocalFuncs) = {
 #ifdef TRANS_CLIENT
 	TRANS(LocalOpenCOTSClient),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
 	local_aliases,
 	TRANS(LocalOpenCOTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(LocalReopenCOTSServer),
 #endif
 	TRANS(LocalSetOption),
-#ifdef TRANS_SERVER
 	TRANS(LocalCreateListener),
 	TRANS(LocalResetListener),
 	TRANS(LocalAccept),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_CLIENT
 	TRANS(LocalConnect),
 #endif /* TRANS_CLIENT */
@@ -1371,19 +1305,15 @@ static Xtransport	TRANS(NAMEDFuncs) = {
 #ifdef TRANS_CLIENT
 	TRANS(LocalOpenCOTSClient),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
 	NULL,
 	TRANS(LocalOpenCOTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(LocalReopenCOTSServer),
 #endif
 	TRANS(LocalSetOption),
-#ifdef TRANS_SERVER
 	TRANS(LocalCreateListener),
 	TRANS(LocalResetListener),
 	TRANS(LocalAccept),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_CLIENT
 	TRANS(LocalConnect),
 #endif /* TRANS_CLIENT */
@@ -1408,19 +1338,15 @@ static Xtransport	TRANS(PIPEFuncs) = {
 #ifdef TRANS_CLIENT
 	TRANS(LocalOpenCOTSClient),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
 	NULL,
 	TRANS(LocalOpenCOTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(LocalReopenCOTSServer),
 #endif
 	TRANS(LocalSetOption),
-#ifdef TRANS_SERVER
 	TRANS(LocalCreateListener),
 	TRANS(LocalResetListener),
 	TRANS(LocalAccept),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_CLIENT
 	TRANS(LocalConnect),
 #endif /* TRANS_CLIENT */
diff --git a/os/Xtranssock.c b/os/Xtranssock.c
index ec735dee8..92c796d6a 100644
--- a/os/Xtranssock.c
+++ b/os/Xtranssock.c
@@ -211,9 +211,7 @@ static Sockettrans2dev Sockettrans2devtab[] = {
 static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
 #endif
 
-#if (defined(TCPCONN) && \
-     (defined(TRANS_SERVER) || defined(X11_t) || !defined(HAVE_GETADDRINFO))) \
-    || defined(TRANS_REOPEN)
+#if (defined(TCPCONN) || defined(TRANS_REOPEN))
 static int
 is_numeric (const char *str)
 {
@@ -592,9 +590,6 @@ TRANS(SocketOpenCOTSClient) (Xtransport *thistrans, const char *protocol,
 
 #endif /* TRANS_CLIENT */
 
-
-#ifdef TRANS_SERVER
-
 static XtransConnInfo
 TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, const char *protocol,
 			     const char *host, const char *port)
@@ -664,9 +659,6 @@ TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, const char *protocol,
     return ciptr;
 }
 
-#endif /* TRANS_SERVER */
-
-
 #ifdef TRANS_REOPEN
 
 static XtransConnInfo
@@ -743,8 +735,6 @@ set_sun_path(const char *port, const char *upath, char *path, int abstract)
 }
 #endif
 
-#ifdef TRANS_SERVER
-
 static int
 TRANS(SocketCreateListener) (XtransConnInfo ciptr,
 			     struct sockaddr *sockname,
@@ -1285,9 +1275,6 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status)
 
 #endif /* UNIXCONN */
 
-#endif /* TRANS_SERVER */
-
-
 #ifdef TRANS_CLIENT
 
 #ifdef TCPCONN
@@ -2349,7 +2336,6 @@ TRANS(SocketUNIXCloseForCloning) (XtransConnInfo ciptr)
 
 
 #ifdef TCPCONN
-# ifdef TRANS_SERVER
 static const char* tcp_nolisten[] = {
 	"inet",
 #ifdef IPv6
@@ -2357,7 +2343,6 @@ static const char* tcp_nolisten[] = {
 #endif
 	NULL
 };
-# endif
 
 static Xtransport	TRANS(SocketTCPFuncs) = {
 	/* Socket Interface */
@@ -2366,19 +2351,15 @@ static Xtransport	TRANS(SocketTCPFuncs) = {
 #ifdef TRANS_CLIENT
 	TRANS(SocketOpenCOTSClient),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
 	tcp_nolisten,
 	TRANS(SocketOpenCOTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(SocketReopenCOTSServer),
 #endif
 	TRANS(SocketSetOption),
-#ifdef TRANS_SERVER
 	TRANS(SocketINETCreateListener),
 	NULL,		       			/* ResetListener */
 	TRANS(SocketINETAccept),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_CLIENT
 	TRANS(SocketINETConnect),
 #endif /* TRANS_CLIENT */
@@ -2403,19 +2384,15 @@ static Xtransport	TRANS(SocketINETFuncs) = {
 #ifdef TRANS_CLIENT
 	TRANS(SocketOpenCOTSClient),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
 	NULL,
 	TRANS(SocketOpenCOTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(SocketReopenCOTSServer),
 #endif
 	TRANS(SocketSetOption),
-#ifdef TRANS_SERVER
 	TRANS(SocketINETCreateListener),
 	NULL,		       			/* ResetListener */
 	TRANS(SocketINETAccept),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_CLIENT
 	TRANS(SocketINETConnect),
 #endif /* TRANS_CLIENT */
@@ -2441,19 +2418,15 @@ static Xtransport     TRANS(SocketINET6Funcs) = {
 #ifdef TRANS_CLIENT
 	TRANS(SocketOpenCOTSClient),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
 	NULL,
 	TRANS(SocketOpenCOTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(SocketReopenCOTSServer),
 #endif
 	TRANS(SocketSetOption),
-#ifdef TRANS_SERVER
 	TRANS(SocketINETCreateListener),
 	NULL,					/* ResetListener */
 	TRANS(SocketINETAccept),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_CLIENT
 	TRANS(SocketINETConnect),
 #endif /* TRANS_CLIENT */
@@ -2486,19 +2459,15 @@ static Xtransport	TRANS(SocketLocalFuncs) = {
 #ifdef TRANS_CLIENT
 	TRANS(SocketOpenCOTSClient),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
 	NULL,
 	TRANS(SocketOpenCOTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(SocketReopenCOTSServer),
 #endif
 	TRANS(SocketSetOption),
-#ifdef TRANS_SERVER
 	TRANS(SocketUNIXCreateListener),
 	TRANS(SocketUNIXResetListener),
 	TRANS(SocketUNIXAccept),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_CLIENT
 	TRANS(SocketUNIXConnect),
 #endif /* TRANS_CLIENT */
@@ -2516,11 +2485,9 @@ static Xtransport	TRANS(SocketLocalFuncs) = {
 	TRANS(SocketUNIXCloseForCloning),
 	};
 #endif /* !LOCALCONN */
-# ifdef TRANS_SERVER
 #  if !defined(LOCALCONN)
 static const char* unix_nolisten[] = { "local" , NULL };
 #  endif
-# endif
 
 static Xtransport	TRANS(SocketUNIXFuncs) = {
 	/* Socket Interface */
@@ -2533,23 +2500,19 @@ static Xtransport	TRANS(SocketUNIXFuncs) = {
 #ifdef TRANS_CLIENT
 	TRANS(SocketOpenCOTSClient),
 #endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
 #if !defined(LOCALCONN)
 	unix_nolisten,
 #else
 	NULL,
 #endif
 	TRANS(SocketOpenCOTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(SocketReopenCOTSServer),
 #endif
 	TRANS(SocketSetOption),
-#ifdef TRANS_SERVER
 	TRANS(SocketUNIXCreateListener),
 	TRANS(SocketUNIXResetListener),
 	TRANS(SocketUNIXAccept),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_CLIENT
 	TRANS(SocketUNIXConnect),
 #endif /* TRANS_CLIENT */
diff --git a/os/Xtransutil.c b/os/Xtransutil.c
index 5cb937521..8690e67e5 100644
--- a/os/Xtransutil.c
+++ b/os/Xtransutil.c
@@ -240,7 +240,6 @@ TRANS(WSAStartup) (void)
 }
 #endif
 
-#ifdef TRANS_SERVER
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
@@ -427,5 +426,3 @@ trans_mkdir(const char *path, int mode)
     /* In all other cases, fail */
     return -1;
 }
-
-#endif /* TRANS_SERVER */
diff --git a/os/access.c b/os/access.c
index ce74eafbc..c7b7a03c8 100644
--- a/os/access.c
+++ b/os/access.c
@@ -85,7 +85,6 @@ SOFTWARE.
 #include <stdio.h>
 #include <stdlib.h>
 #define XSERV_t
-#define TRANS_SERVER
 #define TRANS_REOPEN
 #include "os/Xtrans.h"
 #include <X11/Xauth.h>
diff --git a/os/connection.c b/os/connection.c
index cee77fa9f..153d727d0 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -68,7 +68,6 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #define XSERV_t
-#define TRANS_SERVER
 #define TRANS_REOPEN
 #include "os/Xtrans.h"
 #include "os/Xtransint.h"
diff --git a/os/io.c b/os/io.c
index 10a666c0c..c90f78f3d 100644
--- a/os/io.c
+++ b/os/io.c
@@ -62,7 +62,6 @@ SOFTWARE.
 #endif
 #include <stdio.h>
 #define XSERV_t
-#define TRANS_SERVER
 #define TRANS_REOPEN
 #include "os/Xtrans.h"
 #include <X11/Xmd.h>
diff --git a/os/utils.c b/os/utils.c
index 198e3e0cc..4b0c88b28 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -63,7 +63,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include <X11/X.h>
 #define XSERV_t
-#define TRANS_SERVER
 #define TRANS_REOPEN
 #include "os/Xtrans.h"
 
diff --git a/os/xdmauth.c b/os/xdmauth.c
index 8f30ef946..42d7956d3 100644
--- a/os/xdmauth.c
+++ b/os/xdmauth.c
@@ -38,7 +38,6 @@ from The Open Group.
 #include <stdio.h>
 #include <X11/X.h>
 #define XSERV_t
-#define TRANS_SERVER
 #define TRANS_REOPEN
 
 #include "os/auth.h"
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 3168d8608..66efa9470 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -18,7 +18,6 @@
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #define XSERV_t
-#define TRANS_SERVER
 #define TRANS_REOPEN
 #include "os/Xtrans.h"
 #endif
@@ -49,7 +48,6 @@
 #include "dixstruct.h"
 
 #define XSERV_t
-#define TRANS_SERVER
 #define TRANS_REOPEN
 #include "os/Xtrans.h"
 
diff --git a/os/xstrans.c b/os/xstrans.c
index bd60a18be..aea79114b 100644
--- a/os/xstrans.c
+++ b/os/xstrans.c
@@ -3,6 +3,5 @@
 #include <X11/Xfuncproto.h>
 
 #define TRANS_REOPEN
-#define TRANS_SERVER
 #define XSERV_t
 #include "os/transport.c"