diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c
index 807c1bcee3954bfbc2bc61063b30c17ae7598292..16013587aaa62d9952a5b4b39322cf41281f4a50 100644
--- a/src/sbbs3/ftpsrvr.c
+++ b/src/sbbs3/ftpsrvr.c
@@ -1779,7 +1779,7 @@ static void filexfer(SOCKADDR_IN* addr, SOCKET ctrl_sock, SOCKET pasv_sock, SOCK
 					,char* desc)
 {
 	int			result;
-	int			addr_len;
+	socklen_t	addr_len;
 	SOCKADDR_IN	server_addr;
 	BOOL		reuseaddr;
 	xfer_t*		xfer;
@@ -2178,7 +2178,7 @@ static void ctrl_thread(void* arg)
 	char		html_index_ext[MAX_PATH+1];
 	WORD		port;
 	ulong		ip_addr;
-	int			addr_len;
+	socklen_t	addr_len;
 	DWORD		h1,h2,h3,h4;
 	u_short		p1,p2;	/* For PORT command */
 	int			i;
@@ -4276,7 +4276,7 @@ void DLLCALL ftp_server(void* arg)
 	char			compiler[32];
 	SOCKADDR_IN		server_addr;
 	SOCKADDR_IN		client_addr;
-	int				client_addr_len;
+	socklen_t		client_addr_len;
 	SOCKET			client_socket;
 	int				i;
 	int				result;
diff --git a/src/sbbs3/js_socket.c b/src/sbbs3/js_socket.c
index fad6435aff16cf66c6c7b4539c43c4dda3aec730..ed85643f3ca8edddd6b52fae7a16750a21d918d8 100644
--- a/src/sbbs3/js_socket.c
+++ b/src/sbbs3/js_socket.c
@@ -444,7 +444,7 @@ js_getsockopt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
 {
 	int			lvl;
 	int			opt;
-	int			len;
+	socklen_t	len;
 	int			val;
 	private_t*	p;
 
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 4be009df417f8cb73a7e856595c93eea50367a68..9e47057d7fc16a399cdabcef556efc5ef5105b12 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -1146,7 +1146,7 @@ static void smtp_thread(void* arg)
 	char*		msgbuf;
 	char		dest_host[128];
 	ushort		dest_port;
-	int			addr_len;
+	socklen_t	addr_len;
 	ushort		xlat;
 	ushort		nettype;
 	uint		usernum;
@@ -2690,7 +2690,7 @@ void DLLCALL mail_server(void* arg)
 	char			compiler[32];
 	SOCKADDR_IN		server_addr;
 	SOCKADDR_IN		client_addr;
-	int				client_addr_len;
+	socklen_t		client_addr_len;
 	SOCKET			client_socket;
 	int				i;
 	int				result;
diff --git a/src/sbbs3/services.c b/src/sbbs3/services.c
index 6a96d0c98301c886002fb59b16c1b45b18d61916..942cd50f59e3afc0ba4918b2f3ea9f810a402d30 100644
--- a/src/sbbs3/services.c
+++ b/src/sbbs3/services.c
@@ -966,7 +966,7 @@ void DLLCALL services_thread(void* arg)
 	char			cmd[128];
 	SOCKADDR_IN		addr;
 	SOCKADDR_IN		client_addr;
-	int				client_addr_len;
+	socklen_t		client_addr_len;
 	SOCKET			socket;
 	SOCKET			client_socket;
 	int				i;