diff --git a/src/sbbs3/ftpsrvr.h b/src/sbbs3/ftpsrvr.h
index 19a4935e49bbb1b055232489586fe580a7141fe3..fef53bbd09423dce56c5851bda850386a4b4484a 100644
--- a/src/sbbs3/ftpsrvr.h
+++ b/src/sbbs3/ftpsrvr.h
@@ -27,20 +27,20 @@
 typedef struct {
 
 	STARTUP_COMMON_ELEMENTS
-	WORD	port;
-	WORD	max_clients;
+	uint16_t	port;
+	uint16_t	max_clients;
 #define FTP_DEFAULT_MAX_CLIENTS		10
-	WORD	max_inactivity;
+	uint16_t	max_inactivity;
 #define FTP_DEFAULT_MAX_INACTIVITY	300
-	WORD	qwk_timeout;
+	uint16_t	qwk_timeout;
 #define FTP_DEFAULT_QWK_TIMEOUT		600
 	struct in_addr outgoing4;
 	struct in6_addr	outgoing6;
     str_list_t	interfaces;
 	struct in_addr pasv_ip_addr;
 	struct in6_addr	pasv_ip6_addr;
-	WORD	pasv_port_low;
-	WORD	pasv_port_high;
+	uint16_t	pasv_port_low;
+	uint16_t	pasv_port_high;
 	int64_t	min_fsize;			/* Minimum file size accepted for upload */
 	int64_t	max_fsize;			/* Maximum file size accepted for upload (0=unlimited) */
 	uint	max_concurrent_connections;
diff --git a/src/sbbs3/mailsrvr.h b/src/sbbs3/mailsrvr.h
index b32c9f13d4f795087fb58bd25dd35d0641d00666..f0b95413f64ce8d9fe977c3cfdaceea84ab77e48 100644
--- a/src/sbbs3/mailsrvr.h
+++ b/src/sbbs3/mailsrvr.h
@@ -28,33 +28,33 @@
 typedef struct {
 
 	STARTUP_COMMON_ELEMENTS
-	WORD	smtp_port;
-	WORD	pop3_port;
-	WORD	pop3s_port;
-	WORD	submission_port;
-	WORD	submissions_port;
-	WORD	max_clients;
+	uint16_t	smtp_port;
+	uint16_t	pop3_port;
+	uint16_t	pop3s_port;
+	uint16_t	submission_port;
+	uint16_t	submissions_port;
+	uint16_t	max_clients;
 #define MAIL_DEFAULT_MAX_CLIENTS			10
-	WORD	max_inactivity;
+	uint16_t	max_inactivity;
 #define MAIL_DEFAULT_MAX_INACTIVITY			120
-	WORD	max_delivery_attempts;
+	uint16_t	max_delivery_attempts;
 #define MAIL_DEFAULT_MAX_DELIVERY_ATTEMPTS	50
-	WORD	rescan_frequency;	/* In seconds */
+	uint16_t	rescan_frequency;	/* In seconds */
 #define MAIL_DEFAULT_RESCAN_FREQUENCY		3600
-	WORD	relay_port;
-	WORD	lines_per_yield;	/* 0=none */
+	uint16_t	relay_port;
+	uint16_t	lines_per_yield;	/* 0=none */
 #define MAIL_DEFAULT_LINES_PER_YIELD		10
-	WORD	max_recipients;
+	uint16_t	max_recipients;
 #define MAIL_DEFAULT_MAX_RECIPIENTS			100
 	struct in_addr outgoing4;
 	struct in6_addr	outgoing6;
-    str_list_t   interfaces;
-    str_list_t   pop3_interfaces;
-    DWORD	max_msg_size;		/* Max msg size in bytes (0=unlimited) */
+    str_list_t	interfaces;
+    str_list_t	pop3_interfaces;
+	uint32_t	max_msg_size;		/* Max msg size in bytes (0=unlimited) */
 #define MAIL_DEFAULT_MAX_MSG_SIZE			(20*1024*1024)	/* 20MB */
-	DWORD	max_msgs_waiting;	/* Max msgs in user's inbox (0=unlimited) */
+	uint32_t	max_msgs_waiting;	/* Max msgs in user's inbox (0=unlimited) */
 #define MAIL_DEFAULT_MAX_MSGS_WAITING		100
-	DWORD	connect_timeout;	/* in seconds, for non-blocking connect (0=blocking socket) */
+	uint32_t	connect_timeout;	/* in seconds, for non-blocking connect (0=blocking socket) */
 #define MAIL_DEFAULT_CONNECT_TIMEOUT		30		/* seconds */
 
 	/* Strings */
diff --git a/src/sbbs3/startup.h b/src/sbbs3/startup.h
index 64ba54e2f2de60ff9ee15846d8b74f9505650a08..e4ac56eae371209507a3ba0484a0a23d5c1dce04 100644
--- a/src/sbbs3/startup.h
+++ b/src/sbbs3/startup.h
@@ -66,8 +66,8 @@ typedef struct {
 	char	ctrl_dir[INI_MAX_VALUE_LEN];
 	char	temp_dir[INI_MAX_VALUE_LEN];
 	char	host_name[INI_MAX_VALUE_LEN];
-	ushort	sem_chk_freq;
-	struct in_addr		outgoing4;
+	uint16_t sem_chk_freq;
+	struct in_addr	outgoing4;
 	struct in6_addr	outgoing6;
 	str_list_t		interfaces;
 	int		log_level;
@@ -119,16 +119,16 @@ struct startup {
 typedef struct {
 
 	STARTUP_COMMON_ELEMENTS
-    WORD	first_node;
-    WORD	last_node;
-	WORD	telnet_port;
-	WORD	rlogin_port;
-	WORD	pet40_port;			// 40-column PETSCII terminal server
-	WORD	pet80_port;			// 80-column PETSCII terminal server
-	WORD	ssh_port;
-	WORD	ssh_connect_timeout;
-	WORD	outbuf_highwater_mark;	/* output block size control */
-	WORD	outbuf_drain_timeout;
+	uint16_t	first_node;
+	uint16_t	last_node;
+	uint16_t	telnet_port;
+	uint16_t	rlogin_port;
+	uint16_t	pet40_port;			// 40-column PETSCII terminal server
+	uint16_t	pet80_port;			// 80-column PETSCII terminal server
+	uint16_t	ssh_port;
+	uint16_t	ssh_connect_timeout;
+	uint16_t	outbuf_highwater_mark;	/* output block size control */
+	uint16_t	outbuf_drain_timeout;
 	struct in_addr outgoing4;
 	struct in6_addr	outgoing6;
     str_list_t	telnet_interfaces;