diff --git a/src/comio/comio.h b/src/comio/comio.h
index 478c2593d2622666021a694641b3819c253cbe9b..7a26c67c5dd075b5258be2235c429e453432ca62 100644
--- a/src/comio/comio.h
+++ b/src/comio/comio.h
@@ -44,7 +44,7 @@
 
 #ifdef _WIN32
 	#ifdef __BORLANDC__
-		#define COMIOCALL __stdcall
+		#define COMIOCALL
 	#else
 		#define COMIOCALL
 	#endif
diff --git a/src/conio/ciolib.h b/src/conio/ciolib.h
index 93c195cb2ad634ed5137a61abe65363717109d66..c04120de0b34f334898581ad6865b9a8f3d74269 100644
--- a/src/conio/ciolib.h
+++ b/src/conio/ciolib.h
@@ -43,7 +43,7 @@
 
 #ifdef _WIN32
         #ifdef __BORLANDC__
-                #define CIOLIBCALL __stdcall
+                #define CIOLIBCALL
         #else
                 #define CIOLIBCALL
         #endif
diff --git a/src/encode/base64.h b/src/encode/base64.h
index dd8462bf2fa2c57731200dcd7f077bc7cfe1bc33..f27937b4dd433486f7ac2d25b7275e0181c24079 100644
--- a/src/encode/base64.h
+++ b/src/encode/base64.h
@@ -43,7 +43,7 @@
 		#define B64EXPORT	__declspec(dllexport)
 	#endif
 	#if defined(__BORLANDC__)
-		#define B64CALL __stdcall
+		#define B64CALL
 	#else
 		#define B64CALL
 	#endif
diff --git a/src/encode/lzh.h b/src/encode/lzh.h
index 78c3ade362d2494388f35cdc0259fb4b33af2ffe..8ac421d6ab4e732b32031dd4e164ae32638d42a5 100644
--- a/src/encode/lzh.h
+++ b/src/encode/lzh.h
@@ -40,7 +40,7 @@
 
 #ifdef _WIN32
 	#ifdef __BORLANDC__
-		#define LZHCALL __stdcall
+		#define LZHCALL
 	#else
 		#define LZHCALL
 	#endif
diff --git a/src/hash/crc32.h b/src/hash/crc32.h
index f4f1b4cada8af910a77a630f75133b9fe493fd48..32c21f6dd8eb8c22d16217d9c39375ca863389f4 100644
--- a/src/hash/crc32.h
+++ b/src/hash/crc32.h
@@ -48,7 +48,7 @@
 		#define CRCEXPORT	__declspec(dllexport)
 	#endif
 	#if defined(__BORLANDC__)
-		#define CRCCALL __stdcall
+		#define CRCCALL
 	#else
 		#define CRCCALL
 	#endif
diff --git a/src/hash/md5.h b/src/hash/md5.h
index fec203ce3b500032547f8e384a072401f34c3660..187de1a04cd3c091d921553977911abb990c9d9a 100644
--- a/src/hash/md5.h
+++ b/src/hash/md5.h
@@ -55,7 +55,7 @@ typedef struct
 		#define MD5EXPORT	__declspec(dllexport)
 	#endif
 	#if defined(__BORLANDC__)
-		#define MD5CALL __stdcall
+		#define MD5CALL
 	#else
 		#define MD5CALL
 	#endif
diff --git a/src/sbbs3/ctrl/makelibs.bat b/src/sbbs3/ctrl/makelibs.bat
index 5bdeebd166fbd8744797920834e9c3fbe632151e..492ffacbe23c2e721ca32356ee263729bbb00e23 100755
--- a/src/sbbs3/ctrl/makelibs.bat
+++ b/src/sbbs3/ctrl/makelibs.bat
@@ -8,8 +8,8 @@ if '%1'=='' goto implib
 set dllsrc=%1
 :implib
 echo Creating import libraries from %dllsrc%
-implib sbbs.lib 	%dllsrc%\sbbs.dll
-implib mailsrvr.lib 	%dllsrc%\mailsrvr.dll
-implib ftpsrvr.lib 	%dllsrc%\ftpsrvr.dll
-implib websrvr.lib 	%dllsrc%\websrvr.dll
-implib services.lib	%dllsrc%\services.dll
\ No newline at end of file
+implib -a sbbs.lib 	%dllsrc%\sbbs.dll
+implib -a mailsrvr.lib 	%dllsrc%\mailsrvr.dll
+implib -a ftpsrvr.lib 	%dllsrc%\ftpsrvr.dll
+implib -a websrvr.lib 	%dllsrc%\websrvr.dll
+implib -a services.lib	%dllsrc%\services.dll
\ No newline at end of file
diff --git a/src/sbbs3/dat_rec.h b/src/sbbs3/dat_rec.h
index 819644a5bde3f73cd66a329d2792a0a416204c34..69c8667cadfd38afea3ea78b16fa1393aecb168e 100644
--- a/src/sbbs3/dat_rec.h
+++ b/src/sbbs3/dat_rec.h
@@ -56,7 +56,7 @@
 			#define DLLEXPORT __declspec(dllimport)
 		#endif
 		#ifdef __BORLANDC__
-			#define DLLCALL __stdcall
+			#define DLLCALL
 		#else
 			#define DLLCALL
 		#endif
diff --git a/src/sbbs3/ftpsrvr.h b/src/sbbs3/ftpsrvr.h
index 1851302dc394edb522160b3e2444dc54d50125b3..b66b41e63d7f83e3f3e126b29d6bdcaffebfc6eb 100644
--- a/src/sbbs3/ftpsrvr.h
+++ b/src/sbbs3/ftpsrvr.h
@@ -169,7 +169,7 @@ static ini_bitdesc_t ftp_options[] = {
 		#define DLLEXPORT __declspec(dllimport)
 	#endif
 	#ifdef __BORLANDC__
-		#define DLLCALL __stdcall
+		#define DLLCALL
 	#else
 		#define DLLCALL
 	#endif
diff --git a/src/sbbs3/js_rtpool.c b/src/sbbs3/js_rtpool.c
index 42f4aefefa0e196ee0dbb4ed306c1d51c17f4acf..fa60f75fe3ed8e51ad679d66c76d770639de43e4 100644
--- a/src/sbbs3/js_rtpool.c
+++ b/src/sbbs3/js_rtpool.c
@@ -6,19 +6,6 @@
 #include <genwrap.h>		/* SLEEP() */
 #include <link_list.h>
 
-#ifdef DLLCALL
-#undef DLLCALL
-#endif
-#ifdef _WIN32
-	#ifdef __BORLANDC__
-		#define DLLCALL __stdcall
-	#else
-		#define DLLCALL
-	#endif
-#else	/* !_WIN32 */
-	#define DLLCALL
-#endif
-
 static pthread_mutex_t		jsrt_mutex;
 static int			initialized=0;
 static link_list_t	rt_list;
diff --git a/src/sbbs3/js_rtpool.h b/src/sbbs3/js_rtpool.h
index 22a48a6b6f61184431e03fe76a9c75eab63b2e3c..5bf7148ec621f63dc4f64d87094421407a8a2711 100644
--- a/src/sbbs3/js_rtpool.h
+++ b/src/sbbs3/js_rtpool.h
@@ -24,7 +24,7 @@
 		#define DLLEXPORT	__declspec(dllimport)
 	#endif
 	#ifdef __BORLANDC__
-		#define DLLCALL __stdcall
+		#define DLLCALL
 	#else
 		#define DLLCALL
 	#endif
diff --git a/src/sbbs3/mailsrvr.h b/src/sbbs3/mailsrvr.h
index a39976536a3a5349a76c72af3b983a0e72430c56..2b284aa04efcb7ac7e3ad40d37ac22584067bfba 100644
--- a/src/sbbs3/mailsrvr.h
+++ b/src/sbbs3/mailsrvr.h
@@ -235,7 +235,7 @@ static ini_bitdesc_t mail_options[] = {
 		#define DLLEXPORT __declspec(dllimport)
 	#endif
 	#ifdef __BORLANDC__
-		#define DLLCALL __stdcall
+		#define DLLCALL
 	#else
 		#define DLLCALL
 	#endif
diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h
index 85b97191a22ed38c0977ec15a052fa071eb3751c..bdccfbf1f25c47ec0ed01b6d1c0aa2441a60b329 100644
--- a/src/sbbs3/sbbs.h
+++ b/src/sbbs3/sbbs.h
@@ -1033,7 +1033,7 @@ public:
 			#define DLLEXPORT	__declspec(dllimport)
 		#endif
 		#ifdef __BORLANDC__
-			#define DLLCALL __stdcall
+			#define DLLCALL
 		#else
 			#define DLLCALL
 		#endif
diff --git a/src/sbbs3/services.h b/src/sbbs3/services.h
index 07bc702f067d12fe917764dfb472e41d8b5b82fc..0329911ac10071f6fc2c3c0e0f6a8319b7c8de90 100644
--- a/src/sbbs3/services.h
+++ b/src/sbbs3/services.h
@@ -144,7 +144,7 @@ extern "C" {
 		#define DLLEXPORT __declspec(dllimport)
 	#endif
 	#ifdef __BORLANDC__
-		#define DLLCALL __stdcall
+		#define DLLCALL
 	#else
 		#define DLLCALL
 	#endif
diff --git a/src/sbbs3/ssl.h b/src/sbbs3/ssl.h
index fc47c5d92c90bb46ba28199c75d1c41231e6dd7e..f4d3596ae558a5c4144ed594c9142f9d1b4969ac 100644
--- a/src/sbbs3/ssl.h
+++ b/src/sbbs3/ssl.h
@@ -19,7 +19,7 @@
 		#define DLLEXPORT	__declspec(dllimport)
 	#endif
 	#ifdef __BORLANDC__
-		#define DLLCALL __stdcall
+		#define DLLCALL
 	#else
 		#define DLLCALL
 	#endif
diff --git a/src/sbbs3/startup.h b/src/sbbs3/startup.h
index 0ac4822ec70a20722826483646a1bd86c6cd3b0b..fc8ada93d7983ec9fa13d5634297d32beaa99089 100644
--- a/src/sbbs3/startup.h
+++ b/src/sbbs3/startup.h
@@ -243,7 +243,7 @@ extern "C" {
 		#define DLLEXPORT __declspec(dllimport)
 	#endif
 	#ifdef __BORLANDC__
-		#define DLLCALL __stdcall
+		#define DLLCALL
 	#else
 		#define DLLCALL
 	#endif
diff --git a/src/sbbs3/telnet.h b/src/sbbs3/telnet.h
index b6ebd49c373530b87f244e65ccc49f5b98432ead..e12993891da410cbfaa4b727b95fc006d1c359a1 100644
--- a/src/sbbs3/telnet.h
+++ b/src/sbbs3/telnet.h
@@ -157,7 +157,7 @@ enum {
 		#define DLLEXPORT
 	#endif
 	#ifdef __BORLANDC__
-		#define DLLCALL __stdcall
+		#define DLLCALL
 	#else
 		#define DLLCALL
 	#endif
diff --git a/src/sbbs3/userdat.h b/src/sbbs3/userdat.h
index b3ae55a1dcc33a042a7fad432b3ef466bee7f09f..9307c4f5fa36cdfe0c07a636660c164ac7e8825b 100644
--- a/src/sbbs3/userdat.h
+++ b/src/sbbs3/userdat.h
@@ -58,7 +58,7 @@
 			#define DLLEXPORT __declspec(dllimport)
 		#endif
 		#ifdef __BORLANDC__
-			#define DLLCALL __stdcall
+			#define DLLCALL
 		#else
 			#define DLLCALL
 		#endif
diff --git a/src/sbbs3/websrvr.h b/src/sbbs3/websrvr.h
index 70f9a04109174bb0a28e3c6492e9b44c9b54b998..a7af55623ca1e386ee479120dd783ddebadaf389 100644
--- a/src/sbbs3/websrvr.h
+++ b/src/sbbs3/websrvr.h
@@ -173,7 +173,7 @@ static ini_bitdesc_t web_options[] = {
 		#define DLLEXPORT __declspec(dllimport)
 	#endif
 	#ifdef __BORLANDC__
-		#define DLLCALL __stdcall
+		#define DLLCALL
 	#else
 		#define DLLCALL
 	#endif
diff --git a/src/smblib/smblib.h b/src/smblib/smblib.h
index eb58628b09011d07068c99d49ef7700bc0a45e80..9e5a8f23b45da6c8980f72bd8ef1746979c7685c 100644
--- a/src/smblib/smblib.h
+++ b/src/smblib/smblib.h
@@ -45,7 +45,7 @@
 
 #ifdef _WIN32
 	#ifdef __BORLANDC__
-		#define SMBCALL __stdcall
+		#define SMBCALL
 	#else
 		#define SMBCALL
 	#endif
diff --git a/src/uifc/uifc.h b/src/uifc/uifc.h
index a32092baeabdb0816ea4c4246a18fda55b5c8537..053847e9d5562b4e591aaf064db3589c60a0d81c 100644
--- a/src/uifc/uifc.h
+++ b/src/uifc/uifc.h
@@ -53,7 +53,7 @@
 
 #ifdef _WIN32
         #ifdef __BORLANDC__
-                #define UIFCCALL __stdcall
+                #define UIFCCALL
         #else
                 #define UIFCCALL
         #endif
diff --git a/src/xpdev/wrapdll.h b/src/xpdev/wrapdll.h
index 7edb4bcd4c0cbefd9fa1891066d6719b4b3ae52d..137b7f39e24454c76a13e3912b6fe429f02ec571 100644
--- a/src/xpdev/wrapdll.h
+++ b/src/xpdev/wrapdll.h
@@ -49,7 +49,7 @@
 		#define DLLEXPORT	__declspec(dllexport)
 	#endif
 	#if defined(__BORLANDC__)
-		#define DLLCALL __stdcall
+		#define DLLCALL
 	#else
 		#define DLLCALL
 	#endif