diff --git a/src/sbbs3/data_ovl.cpp b/src/sbbs3/data_ovl.cpp
index bc36e0bd0b662618fc390b902dc2d04dbfd12e04..0da5d5d0bd5084106865993bee441b650c2fae7b 100644
--- a/src/sbbs3/data_ovl.cpp
+++ b/src/sbbs3/data_ovl.cpp
@@ -106,10 +106,12 @@ void sbbs_t::putmsgptrs()
 extern "C" BOOL DLLCALL putmsgptrs(scfg_t* cfg, uint usernumber, subscan_t* subscan)
 {
 	char	str[256];
-	ushort	idx,scancfg;
+	ushort	idx;
+	uint16_t scancfg;
 	uint	i,j;
 	int 	file;
-	ulong	l=0L,length;
+	ulong	length;
+	uint32_t	l=0L;
 
 	if(!usernumber)
 		return(FALSE);
diff --git a/src/smblib/smbadd.c b/src/smblib/smbadd.c
index ab148199907c8dfd9272d4466c87f63641834d4d..7ff691d57fcb63627ff19b28bf69c40a7d0840e3 100644
--- a/src/smblib/smbadd.c
+++ b/src/smblib/smbadd.c
@@ -44,7 +44,7 @@
 /****************************************************************************/
 /****************************************************************************/
 int SMBCALL smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, long dupechk_hashes
-					   ,ushort xlat, const uchar* body, const uchar* tail)
+					   ,uint16_t xlat, const uchar* body, const uchar* tail)
 {
 	uchar*		lzhbuf=NULL;
 	long		lzhlen;