diff --git a/mozilla/caps/src/Makefile.in b/mozilla/caps/src/Makefile.in
index 91fa753e592..21a2d77ae34 100644
--- a/mozilla/caps/src/Makefile.in
+++ b/mozilla/caps/src/Makefile.in
@@ -51,7 +51,8 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		$(ZLIB_LIBS)	\
-		-lxp	\
+		-lxpcom		\
+		-lmozjs		\
 		$(NSPR_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/caps/src/nsCodebasePrincipal.cpp b/mozilla/caps/src/nsCodebasePrincipal.cpp
index f7deba4247d..1ec2db97849 100644
--- a/mozilla/caps/src/nsCodebasePrincipal.cpp
+++ b/mozilla/caps/src/nsCodebasePrincipal.cpp
@@ -19,7 +19,6 @@
 #include "nsCodebasePrincipal.h"
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
-#include "xp.h"
 #include "nsIURL.h"
 
 static NS_DEFINE_IID(kICodebasePrincipalIID, NS_ICODEBASEPRINCIPAL_IID);
diff --git a/mozilla/caps/src/nsJSPrincipals.cpp b/mozilla/caps/src/nsJSPrincipals.cpp
index 0827aa164bd..ab0f4ab6ebf 100644
--- a/mozilla/caps/src/nsJSPrincipals.cpp
+++ b/mozilla/caps/src/nsJSPrincipals.cpp
@@ -17,7 +17,6 @@
  */
 #include "nsCodebasePrincipal.h"
 #include "nsJSPrincipals.h"
-#include "xp.h"
 #include "plstr.h"
 
 PR_STATIC_CALLBACK(void *) 
diff --git a/mozilla/caps/src/nsPrivilege.cpp b/mozilla/caps/src/nsPrivilege.cpp
index 31ee6dae84f..5a29c633e7e 100755
--- a/mozilla/caps/src/nsPrivilege.cpp
+++ b/mozilla/caps/src/nsPrivilege.cpp
@@ -17,7 +17,8 @@
  */
 /*describes the state and duration of privileges*/
 #include "nsPrivilege.h"
-#include "xp.h"
+#include "prlog.h"
+#include "plstr.h"
 
 static NS_DEFINE_IID(kIPrivilegeIID, NS_IPRIVILEGE_IID);
 
@@ -125,7 +126,7 @@ nsPrivilege::ToString(char * * result)
 			privStr = "blank";
 			break;
 		default:
-			PR_ASSERT(FALSE);
+			PR_ASSERT(PR_FALSE);
 			privStr = "error";
 			break;
 	}
@@ -144,13 +145,13 @@ nsPrivilege::ToString(char * * result)
 			privStr = "blank";
 			break;
 		default:
-			PR_ASSERT(FALSE);
+			PR_ASSERT(PR_FALSE);
 			privStr = "error";
 			break;
 	}
 	itsString = new char[strlen(privStr) + strlen(durStr) + 1];
-	XP_STRCPY(itsString, privStr);
-	XP_STRCAT(itsString, durStr);
+	PL_strcpy(itsString, privStr);
+	PL_strcat(itsString, durStr);
 	result = & itsString;
 	return NS_OK;
 }
diff --git a/mozilla/caps/src/nsPrivilegeManager.cpp b/mozilla/caps/src/nsPrivilegeManager.cpp
index 191e07ec504..a45bdfe35ec 100755
--- a/mozilla/caps/src/nsPrivilegeManager.cpp
+++ b/mozilla/caps/src/nsPrivilegeManager.cpp
@@ -49,7 +49,6 @@ static JSec_Principal RDF_CreatePrincipal(nsPrincipal *prin);
 #endif /* ENABLE_RDF */
 
 PR_BEGIN_EXTERN_C
-#include "xp.h"
 #include "prefapi.h"
 
 PRBool
@@ -144,31 +143,31 @@ nsPrivilegeManager::FindPrivilege(char * privStr)
 {
 	PRInt16 privState; 
 	PRInt16 privDuration;
-	if (XP_STRCMP(privStr, "allowed in scope") == 0) {
+	if (PL_strcmp(privStr, "allowed in scope") == 0) {
 		privState = nsIPrivilege::PrivilegeState_Allowed;
 		privDuration = nsIPrivilege::PrivilegeDuration_Scope;
-	} else if (XP_STRCMP(privStr, "allowed in session") == 0) {
+	} else if (PL_strcmp(privStr, "allowed in session") == 0) {
 		privState = nsIPrivilege::PrivilegeState_Allowed;
 		privDuration = nsIPrivilege::PrivilegeDuration_Session;
-	} else if (XP_STRCMP(privStr, "allowed forever") == 0) {
+	} else if (PL_strcmp(privStr, "allowed forever") == 0) {
 		privState = nsIPrivilege::PrivilegeState_Allowed;
 		privDuration = nsIPrivilege::PrivilegeDuration_Forever;
-	} else if (XP_STRCMP(privStr, "forbidden forever") == 0) {
+	} else if (PL_strcmp(privStr, "forbidden forever") == 0) {
 		privState = nsIPrivilege::PrivilegeState_Forbidden;
 		privDuration = nsIPrivilege::PrivilegeDuration_Forever;
-	} else if (XP_STRCMP(privStr, "forbidden in session") == 0) {
+	} else if (PL_strcmp(privStr, "forbidden in session") == 0) {
 		privState = nsIPrivilege::PrivilegeState_Forbidden;
 		privDuration = nsIPrivilege::PrivilegeDuration_Session;
-	} else if (XP_STRCMP(privStr, "forbidden in scope") == 0) {
+	} else if (PL_strcmp(privStr, "forbidden in scope") == 0) {
 		privState = nsIPrivilege::PrivilegeState_Forbidden;
 		privDuration = nsIPrivilege::PrivilegeDuration_Scope;
-	} else if (XP_STRCMP(privStr, "blank forever") == 0) {
+	} else if (PL_strcmp(privStr, "blank forever") == 0) {
 		privState = nsIPrivilege::PrivilegeState_Blank;
 		privDuration = nsIPrivilege::PrivilegeDuration_Forever;
-	} else if (XP_STRCMP(privStr, "blank in session") == 0) {
+	} else if (PL_strcmp(privStr, "blank in session") == 0) {
 		privState = nsIPrivilege::PrivilegeState_Blank;
 		privDuration = nsIPrivilege::PrivilegeDuration_Session;
-	} else if (XP_STRCMP(privStr, "blank in scope") == 0) {
+	} else if (PL_strcmp(privStr, "blank in scope") == 0) {
 		privState = nsIPrivilege::PrivilegeState_Blank;
 		privDuration = nsIPrivilege::PrivilegeDuration_Scope;
 	} else {
diff --git a/mozilla/caps/src/nsTarget.cpp b/mozilla/caps/src/nsTarget.cpp
index 7484944f990..a913109e073 100755
--- a/mozilla/caps/src/nsTarget.cpp
+++ b/mozilla/caps/src/nsTarget.cpp
@@ -22,8 +22,7 @@
 #include "nsPrincipalManager.h"
 #include "nsUserTarget.h"
 #include "nsUserDialogHelper.h"
-#include "xp.h"
-#include "xpgetstr.h"
+#include "prmem.h"
 #include "plhash.h"
 
 /* XXXXXXXX Begin oF HACK */
@@ -363,11 +362,11 @@ java_netscape_security_getTargetDetails(const char * charSetName, char * targetN
 		char * targetRisk, * targetDescription;
 		primTarget->GetDescription(& targetDescription);
 		primTarget->GetRisk(& targetRisk);
-		XP_STRCAT(desc, "<option>");
-		XP_STRCAT(desc, targetDescription);
-		XP_STRCAT(desc, " (");
-		XP_STRCAT(desc, targetRisk);
-		XP_STRCAT(desc, ")");
+		PL_strcat(desc, "<option>");
+		PL_strcat(desc, targetDescription);
+		PL_strcat(desc, " (");
+		PL_strcat(desc, targetRisk);
+		PL_strcat(desc, ")");
 	}
 	* details = desc;
 	// Should we consider caching the details desc?
@@ -677,7 +676,7 @@ nsTarget::nsTarget(char *name, nsIPrincipal * prin, PRInt32 risk, char * riskCol
 	/* init method makes a copy of all its arguments. Thus we need
 	 * to free the URL, which was allocated by JavaSecUI_getHelpURL.
 	 */
-	XP_FREE(url);
+	PR_Free(url);
 }
 
 nsTarget::~nsTarget(void)
@@ -959,10 +958,10 @@ nsTarget::ToString(char * * result)
 	char * prinStr = "<none>";
 	if (itsPrincipal != NULL)  itsPrincipal->ToString(& prinStr);
 	itsString = new char [strlen(TARGET_STR) + strlen(itsName) + strlen(PRIN_STR) + strlen(prinStr) + 1];
-	XP_STRCPY(itsString, TARGET_STR); 
-	XP_STRCAT(itsString, itsName); 
-	XP_STRCAT(itsString, PRIN_STR); 
-	XP_STRCAT(itsString, prinStr); 
+	PL_strcpy(itsString, TARGET_STR); 
+	PL_strcat(itsString, itsName); 
+	PL_strcat(itsString, PRIN_STR); 
+	PL_strcat(itsString, prinStr); 
 	result = & itsString;
 	return NS_OK;
 }
@@ -984,23 +983,23 @@ nsTarget::Init(char * name, nsIPrincipal * prin, nsTargetArray * targetArray,
 	PR_ASSERT(name != NULL);
 	PR_ASSERT(prin != NULL);
 	itsName = new char[strlen(name) + 1];
-	XP_STRCPY(itsName, name);
+	PL_strcpy(itsName, name);
 	itsPrincipal = prin;
 	itsRegistered = PR_FALSE;
 	itsRisk = risk;
 	if (riskColor) {
 		itsRiskColorStr = new char[strlen(riskColor) + 1];
-		XP_STRCPY(itsRiskColorStr, riskColor);
-	} else itsRiskColorStr = XP_STRDUP(JavaSecUI_getString(CAPS_TARGET_RISK_COLOR_HIGH));
+		PL_strcpy(itsRiskColorStr, riskColor);
+	} else itsRiskColorStr = PL_strdup(JavaSecUI_getString(CAPS_TARGET_RISK_COLOR_HIGH));
 	if (description == NULL) description = name;
 	itsDescriptionStr = new char[strlen(description) + 1];
-	XP_STRCPY(itsDescriptionStr, description);
+	PL_strcpy(itsDescriptionStr, description);
 	if (detailDescription == NULL) detailDescription = itsDescriptionStr;
 	itsDetailDescriptionStr = new char[strlen(detailDescription) + 1];
-	XP_STRCPY(itsDetailDescriptionStr, detailDescription);
+	PL_strcpy(itsDetailDescriptionStr, detailDescription);
 	if (url != NULL) {
 		itsURLStr = new char[strlen(url) + 1];
-		XP_STRCPY(itsURLStr, url);
+		PL_strcpy(itsURLStr, url);
 	} else itsURLStr = NULL;
 	itsTargetArray = NULL;
 	itsString = NULL;
diff --git a/mozilla/caps/src/nsUserDialogHelper.cpp b/mozilla/caps/src/nsUserDialogHelper.cpp
index e0ed1d81786..30ef263bbdf 100644
--- a/mozilla/caps/src/nsUserDialogHelper.cpp
+++ b/mozilla/caps/src/nsUserDialogHelper.cpp
@@ -26,8 +26,7 @@
  *
  */
 #include "nsUserDialogHelper.h"
-#include "xp.h"
-#include "xpgetstr.h"
+#include "prmem.h"
 #include "prprf.h"
 #include "nsTarget.h"
 
@@ -88,9 +87,9 @@ char * JavaSecUI_getHelpURL(int id)
   PR_ASSERT(tag != NULL);
   PR_ASSERT(java_sec_help_url != NULL);
 
-  char *helpURL = (char *)XP_ALLOC(strlen(java_sec_help_url) + strlen(tag) + 1);
-  XP_STRCPY(helpURL, java_sec_help_url);
-  XP_STRCAT(helpURL, tag);
+  char *helpURL = (char *)PR_Malloc(strlen(java_sec_help_url) + strlen(tag) + 1);
+  PL_strcpy(helpURL, java_sec_help_url);
+  PL_strcat(helpURL, tag);
   return helpURL;
 }
 
diff --git a/mozilla/caps/src/nsUserTarget.cpp b/mozilla/caps/src/nsUserTarget.cpp
index cb52cb65d86..bad36c9d9d1 100755
--- a/mozilla/caps/src/nsUserTarget.cpp
+++ b/mozilla/caps/src/nsUserTarget.cpp
@@ -16,7 +16,6 @@
  * Reserved.
  */
 
-#include "xp.h"
 #include "nsUserTarget.h"
 #include "prtypes.h"