diff --git a/mozilla/directory/xpcom/base/src/nsLDAPMessage.cpp b/mozilla/directory/xpcom/base/src/nsLDAPMessage.cpp
index 42cc5aa0b6c..5e725d5f987 100644
--- a/mozilla/directory/xpcom/base/src/nsLDAPMessage.cpp
+++ b/mozilla/directory/xpcom/base/src/nsLDAPMessage.cpp
@@ -31,7 +31,6 @@
  * GPL.
  */
 
-#include <stdio.h>
 #include "nsLDAPMessage.h"
 
 #ifdef DEBUG
@@ -77,14 +76,14 @@ nsLDAPMessage::~nsLDAPMessage(void)
 	    break;
 	case LDAP_SUCCESS:
 	    // timed out (dunno why LDAP_SUCCESS is used to indicate this) 
-	    fprintf(stderr, 
+	    PR_fprintf(PR_STDERR,
 		"nsLDAPMessage::~nsLDAPMessage: ldap_msgfree() timed out.\n");
 	    break;
 	default:
 	    // other failure
 	    // XXX - might errno conceivably be useful here?
-	    fprintf(stderr,"nsLDAPMessage::~nsLDAPMessage: ldap_msgfree: %s\n",
-		    ldap_err2string(rc));
+	    PR_fprintf(PR_STDERR,"nsLDAPMessage::~nsLDAPMessage: "
+		       "ldap_msgfree: %s\n", ldap_err2string(rc));
 	    break;
 	}
     }
@@ -160,9 +159,10 @@ nsLDAPMessage::GetErrorString(void)
   rc = ldap_parse_result(mConnectionHandle, mMsgHandle, &errcode, &matcheddn,
 			 &errmsg, &referrals, &serverctrls, 0);
   if (rc != LDAP_SUCCESS) {
-    fprintf(stderr, "nsLDAPMessage::ErrorToString: ldap_parse_result: %s\n",
-	    ldap_err2string(rc));
-    exit(-1);
+      PR_fprintf(PR_STDERR, 
+		 "nsLDAPMessage::ErrorToString: ldap_parse_result: %s\n",
+		 ldap_err2string(rc));
+      // XXX need real err handling here
   }
 
   if (matcheddn) ldap_memfree(matcheddn);
diff --git a/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp b/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp
index f501cde83bc..54700dba2e2 100644
--- a/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp
+++ b/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp
@@ -247,7 +247,7 @@ nsLDAPOperation::UrlSearch(const char *aURL, // the search URL
 				   aAttrsOnly);
     if (this->mMsgId == -1) {
 	// XXX
-	abort();
+	PR_Abort();
 #ifdef DEBUG
     char *s;