diff --git a/os/Xtrans.c b/os/Xtrans.c
index 2063793dfc..0433d08a4c 100644
--- a/os/Xtrans.c
+++ b/os/Xtrans.c
@@ -881,7 +881,7 @@ complete_network_count (void)
 
 static int
 receive_listening_fds(const char* port, XtransConnInfo* temp_ciptrs,
-                      int* count_ret)
+                      uint32_t* count_ret)
 
 {
 #ifdef HAVE_SYSTEMD_DAEMON
@@ -958,7 +958,7 @@ extern int xquartz_launchd_fd;
 #endif
 
 int _XSERVTransMakeAllCOTSServerListeners (const char *port, int *partial,
-                                   int *count_ret, XtransConnInfo **ciptrs_ret)
+                                   uint32_t *count_ret, XtransConnInfo **ciptrs_ret)
 {
     char		buffer[256]; /* ??? What size ?? */
     XtransConnInfo	ciptr, temp_ciptrs[NUMTRANS] = { NULL };
diff --git a/os/Xtrans.h b/os/Xtrans.h
index fa40550e47..fb7ceaadd6 100644
--- a/os/Xtrans.h
+++ b/os/Xtrans.h
@@ -50,6 +50,8 @@ from The Open Group.
 #ifndef _XTRANS_H_
 #define _XTRANS_H_
 
+#include <stdint.h>
+
 #include <X11/Xfuncproto.h>
 #include <X11/Xos.h>
 #include <X11/Xmd.h>
@@ -289,7 +291,7 @@ int _XSERVTransGetConnectionNumber (
 int _XSERVTransMakeAllCOTSServerListeners (
     const char *,	/* port */
     int *,		/* partial */
-    int *,		/* count_ret */
+    uint32_t *,		/* count_ret */
     XtransConnInfo **	/* ciptrs_ret */
 );
 
diff --git a/os/connection.c b/os/connection.c
index 916bf11acc..1829d66d05 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -144,7 +144,7 @@ set_poll_clients(void);
 
 static XtransConnInfo *ListenTransConns = NULL;
 static int *ListenTransFds = NULL;
-static int ListenTransCount;
+static uint32_t ListenTransCount = 0;
 
 static void ErrorConnMax(XtransConnInfo /* trans_conn */ );