diff --git a/src/sbbs3/logon.cpp b/src/sbbs3/logon.cpp
index b996959cdbb65e9f7695c9e5f5e81fd2ead97405..7af906816f077e6617698121f8572c68b58e0273 100644
--- a/src/sbbs3/logon.cpp
+++ b/src/sbbs3/logon.cpp
@@ -37,7 +37,6 @@
 
 #include "sbbs.h"
 #include "cmdshell.h"
-#include <nspr.h>
 
 extern "C" void client_on(SOCKET sock, client_t* client, BOOL update);
 
@@ -243,10 +242,10 @@ bool sbbs_t::logon()
 			bprintf(text[TimeToChangePw],cfg.sys_pwdays);
 
 			c=0;
-			while(c < PR_MAX(RAND_PASS_LEN, cfg.min_pwlen)) { 				/* Create random password */
+			while(c < MAX(RAND_PASS_LEN, cfg.min_pwlen)) { 				/* Create random password */
 				str[c]=sbbs_random(43)+'0';
 				if(IS_ALPHANUMERIC(str[c]))
-					c++; 
+					c++;
 			}
 			str[c]=0;
 			bprintf(text[YourPasswordIs],str);
diff --git a/src/sbbs3/newuser.cpp b/src/sbbs3/newuser.cpp
index ef42e1d93c12d18302da6bfe4e6042025e8e4cfe..e2022d377683723ef58b883d4e922cca60f2cea9 100644
--- a/src/sbbs3/newuser.cpp
+++ b/src/sbbs3/newuser.cpp
@@ -38,7 +38,6 @@
 #include "sbbs.h"
 #include "petdefs.h"
 #include "cmdshell.h"
-#include <nspr.h>
 
 /****************************************************************************/
 /* This function is invoked when a user enters "NEW" at the NN: prompt		*/
@@ -382,7 +381,7 @@ BOOL sbbs_t::newuser()
 	}
 	else {
 		c=0;
-		while(c < PR_MAX(RAND_PASS_LEN, cfg.min_pwlen)) { 				/* Create random password */
+		while(c < MAX(RAND_PASS_LEN, cfg.min_pwlen)) { 				/* Create random password */
 			useron.pass[c]=sbbs_random(43)+'0';
 			if(IS_ALPHANUMERIC(useron.pass[c]))
 				c++; 
diff --git a/src/sbbs3/sbbsdefs.h b/src/sbbs3/sbbsdefs.h
index f57703edcb87f555bd0f84b2b4b4bbb2e972383a..bfae99e7f7058786174b10b521bc196bb8584534 100644
--- a/src/sbbs3/sbbsdefs.h
+++ b/src/sbbs3/sbbsdefs.h
@@ -83,6 +83,13 @@ typedef struct js_callback {
 
 #define JSVAL_NULL_OR_VOID(val)		(JSVAL_IS_NULL(val) || JSVAL_IS_VOID(val))
 
+#ifndef MAX
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
 /************/
 /* Maximums */
 /************/