diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c
index 45e00bfce300e478900edcdc4d9b7dfe83f5868d..7a455c02b69a4ffbe43a11b847cf23b9af55169d 100644
--- a/src/sbbs3/ftpsrvr.c
+++ b/src/sbbs3/ftpsrvr.c
@@ -2920,15 +2920,7 @@ char* ftp_ver(void)
 	static char ver[256];
 	char compiler[32];
 
-#if defined(__BORLANDC__)
-	sprintf(compiler,"BCC %X.%02X"
-		,__BORLANDC__>>8
-		,__BORLANDC__&0xff);
-#elif defined(_MSC_VER)
-	sprintf(compiler,"MSC %u", _MSC_VER);
-#else
-	strcpy(compiler,"UNKNOWN COMPILER");
-#endif
+	COMPILER_DESC(compiler);
 
 	sprintf(ver,"Synchronet FTP Server v%s%s  "
 		"Compiled %s %s with %s"
@@ -2986,15 +2978,7 @@ void ftp_server(void* arg)
 #endif
 		);
 
-#if defined(__BORLANDC__)
-	sprintf(compiler,"BCC %X.%02X"
-		,__BORLANDC__>>8
-		,__BORLANDC__&0xff);
-#elif defined(_MSC_VER)
-	sprintf(compiler,"MSC %u", _MSC_VER);
-#else
-	strcpy(compiler,"UNKNOWN COMPILER");
-#endif
+	COMPILER_DESC(compiler);
 
 	lprintf("Compiled %s %s with %s", __DATE__, __TIME__, compiler);
 
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index adaf7713f57d68ba889f3c01daaa2bdab40177b7..312fa684f21c98c452af6f7d41c2d41abbdc9006 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -1327,7 +1327,7 @@ static void smtp_thread(void* arg)
 						truncsp(rcpt_name);
 						truncsp(rcpt_addr);
 
-						snprintf(hdrfield,sizeof(hdrfield),
+						_snprintf(hdrfield,sizeof(hdrfield),
 							"Received: from %s (%s [%s])\r\n"
 							"          by %s [%s] (Synchronet Mail Server %s) with %s\r\n"
 							"          for %s; %s"
@@ -2247,15 +2247,7 @@ char* mail_ver(void)
 	static char ver[256];
 	char compiler[32];
 
-#if defined(__BORLANDC__)
-	sprintf(compiler,"BCC %X.%02X"
-		,__BORLANDC__>>8
-		,__BORLANDC__&0xff);
-#elif defined(_MSC_VER)
-	sprintf(compiler,"MSC %u", _MSC_VER);
-#else
-	strcpy(compiler,"UNKNOWN COMPILER");
-#endif
+	COMPILER_DESC(compiler);
 
 	sprintf(ver,"Synchronet Mail Server v%s%s  SMBLIB v%s  "
 		"Compiled %s %s with %s"
@@ -2321,15 +2313,7 @@ void mail_server(void* arg)
 #endif
 		);
 
-#if defined(__BORLANDC__)
-	sprintf(compiler,"BCC %X.%02X"
-		,__BORLANDC__>>8
-		,__BORLANDC__&0xff);
-#elif defined(_MSC_VER)
-	sprintf(compiler,"MSC %u", _MSC_VER);
-#else
-	strcpy(compiler,"UNKNOWN COMPILER");
-#endif
+	COMPILER_DESC(compiler);
 
 	lprintf("Compiled %s %s with %s", __DATE__, __TIME__, compiler);
 
diff --git a/src/sbbs3/ver.cpp b/src/sbbs3/ver.cpp
index 9558466c175961d50349078f5032a79a3d916e37..2731b1ffb8a6f612a27e37b8eedec7b39bdc4d63 100644
--- a/src/sbbs3/ver.cpp
+++ b/src/sbbs3/ver.cpp
@@ -53,21 +53,7 @@ void sbbs_t::ver()
 	center(str);
 	CRLF;
 
-#if defined(__BORLANDC__)
-	sprintf(compiler,"BCC %X.%02X"
-		,__BORLANDC__>>8
-		,__BORLANDC__&0xff);
-#elif defined(_MSC_VER)
-	sprintf(compiler,"MSC %u", _MSC_VER);
-#elif defined(__GNUC__) && defined(__GLIBC__)
-	sprintf(compiler,"GCC %u.%02u (GLIBC %u.%u)"
-		,__GNUC__
-		,__GNUC_MINOR__
-		,__GLIBC__
-		,__GLIBC_MINOR__);
-#else
-	strcpy(compiler,"UNKNOWN COMPILER");
-#endif
+	COMPILER_DESC(compiler);
 
 	sprintf(str,"Revision %c%s %s %.5s  "
 		"SMBLIB %s  %s"