diff --git a/extensions/inspector/base/src/inCSSValueSearch.cpp b/extensions/inspector/base/src/inCSSValueSearch.cpp
index 9c0fd4b7d9b2..927db04187f0 100644
--- a/extensions/inspector/base/src/inCSSValueSearch.cpp
+++ b/extensions/inspector/base/src/inCSSValueSearch.cpp
@@ -331,7 +331,7 @@ nsresult
 inCSSValueSearch::EqualizeURL(nsAutoString* aURL)
 {
   if (mNormalizeChromeURLs) {
-    if (aURL->Find("chrome://", false, 0, 1) >= 0) {
+    if (aURL->Find("chrome://", PR_FALSE, 0, 1) >= 0) {
       PRUint32 len = aURL->Length();
       char* result = new char[len-8];
       char* buffer = aURL->ToNewCString();
diff --git a/extensions/inspector/base/src/inFileSearch.cpp b/extensions/inspector/base/src/inFileSearch.cpp
index 16080fe2714a..3a30dc8d94cb 100644
--- a/extensions/inspector/base/src/inFileSearch.cpp
+++ b/extensions/inspector/base/src/inFileSearch.cpp
@@ -461,7 +461,7 @@ inFileSearch::GetNextSubDirectory(nsIFile** aDir)
   nsCOMPtr<nsISimpleEnumerator> nextDirs;
   PRUint32 count;
 
-  while (true) {
+  while (PR_TRUE) {
     mDirStack->Count(&count);
     // the stack is empty, so our search must be complete
     if (count == 0) return PR_FALSE;
@@ -504,7 +504,7 @@ inFileSearch::GetNextDirectory(nsISimpleEnumerator* aEnum)
   PRBool isDir;
   PRBool hasMoreElements;
 
-  while (true) {
+  while (PR_TRUE) {
     aEnum->HasMoreElements(&hasMoreElements);
     if (!hasMoreElements) 
       break;
@@ -549,7 +549,7 @@ PRBool
 inFileSearch::MatchPattern(PRUnichar* aPattern, PRUnichar* aString)
 {
   PRInt32 index = 0;
-  PRBool matching = true;
+  PRBool matching = PR_TRUE;
   char wildcard = '*';
   
   PRUnichar* patternPtr = aPattern;
@@ -562,7 +562,7 @@ inFileSearch::MatchPattern(PRUnichar* aPattern, PRUnichar* aString)
       matching = *patternPtr == *stringPtr;
       ++stringPtr;
     }
-    if (!matching) return false;
+    if (!matching) return PR_FALSE;
     ++patternPtr;
     ++index;
   }
@@ -579,9 +579,9 @@ inFileSearch::AdvanceWildcard(PRUnichar** aString, PRUnichar* aNextChar)
     if (*stringPtr == *aNextChar) {
       // we have found the next char after the wildcard, so return with success
       *aString = stringPtr;
-      return true;
+      return PR_TRUE;
     } else if (*stringPtr == 0)
-      return false;
+      return PR_FALSE;
     ++stringPtr;
   }
 }
@@ -600,7 +600,7 @@ inFileSearch::MakePathRelative(nsAutoString* aPath)
   nsAutoString searchPath;
   searchPath.AssignWithConversion(temp);
 
-  PRInt32 found = aPath->Find(searchPath, false, 0, 1);
+  PRInt32 found = aPath->Find(searchPath, PR_FALSE, 0, 1);
   if (found == 0) {
     PRUint32 len = searchPath.Length();
     aPath->Mid(result, len+1, aPath->Length()-len);
diff --git a/extensions/inspector/base/src/inSearchOrphanImages.cpp b/extensions/inspector/base/src/inSearchOrphanImages.cpp
index 9cf2b19e82b1..2b24096925a3 100644
--- a/extensions/inspector/base/src/inSearchOrphanImages.cpp
+++ b/extensions/inspector/base/src/inSearchOrphanImages.cpp
@@ -252,7 +252,7 @@ inSearchOrphanImages::CacheAllDirectories()
   mDirectories = do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID);
   
   nsCOMPtr<nsILocalFile> file;
-  NS_NewLocalFile(mSearchPath.ToNewCString(), false, getter_AddRefs(file));
+  NS_NewLocalFile(mSearchPath.ToNewCString(), PR_FALSE, getter_AddRefs(file));
   
   CacheDirectory(file);
   
@@ -357,7 +357,7 @@ nsresult
 inSearchOrphanImages::BuildRemoteURLHash()
 {
   // XXX dunno if I have to addref here and release the old one.. Scripting habits be damned!
-  mFileHash = new nsHashtable(3000, true);
+  mFileHash = new nsHashtable(3000, PR_TRUE);
 
   nsCOMPtr<nsIDocument> doc = do_QueryInterface(mDocument);
   if (doc) {
@@ -437,7 +437,7 @@ nsresult
 inSearchOrphanImages::EqualizeRemoteURL(nsAutoString* aURL)
 {
   if (mIsSkin) {
-    if (aURL->Find("chrome://", false, 0, 1) >= 0) {
+    if (aURL->Find("chrome://", PR_FALSE, 0, 1) >= 0) {
       PRUint32 len = aURL->Length();
       char* result = new char[len-8];
       char* buffer = aURL->ToNewCString();
@@ -470,7 +470,7 @@ nsAutoString
 inSearchOrphanImages::EqualizeLocalURL(nsAutoString* aURL)
 {
   nsAutoString result;
-  PRInt32 found = aURL->Find(mSearchPath, false, 0, 1);
+  PRInt32 found = aURL->Find(mSearchPath, PR_FALSE, 0, 1);
   if (found == 0) {
     PRUint32 len = mSearchPath.Length();
     aURL->Mid(result, len, aURL->Length()-len);
@@ -538,7 +538,7 @@ inSearchOrphanImages::InitDataSource()
   nsCOMPtr<nsIRDFResource> res;
   mRDF->GetAnonymousResource(getter_AddRefs(res));
 
-  mDataSource->Assert(kINS_SearchRoot, kINS_results, res, true);
+  mDataSource->Assert(kINS_SearchRoot, kINS_results, res, PR_TRUE);
   
   mRDFCU->MakeSeq(mDataSource, res, getter_AddRefs(mResultSeq));
 
@@ -559,7 +559,7 @@ inSearchOrphanImages::CreateResourceFromFile(nsIFile* aFile, nsIRDFResource** aR
   nsCOMPtr<nsIRDFLiteral> literal;
   mRDF->GetLiteral(theURL.ToNewUnicode(), getter_AddRefs(literal));
 
-  mDataSource->Assert(res, kINS_url, literal, true);
+  mDataSource->Assert(res, kINS_url, literal, PR_TRUE);
 
   mResultSeq->AppendElement(res);
 
diff --git a/extensions/inspector/base/src/nsDOMDataSource.cpp b/extensions/inspector/base/src/nsDOMDataSource.cpp
index d30309afa386..6817780ae1d0 100644
--- a/extensions/inspector/base/src/nsDOMDataSource.cpp
+++ b/extensions/inspector/base/src/nsDOMDataSource.cpp
@@ -864,7 +864,7 @@ nsDOMDataSource::CreateDOMNodeTarget(nsIDOMNode *aNode, nsIRDFResource *aPropert
     GetFieldNameFromRes(aProperty, &fieldName);
     
     // maybe it's an attribute reference?
-    if (!fieldName.Find("@", false, 0, 1)) {
+    if (!fieldName.Find("@", PR_FALSE, 0, 1)) {
       // first make sure we're looking at an element node...
       nsCOMPtr<nsIDOMElement> el = do_QueryInterface(aNode);
       if (el) {
@@ -890,7 +890,7 @@ nsDOMDataSource::GetFieldNameFromRes(nsIRDFResource* aProperty, nsAutoString* aR
   aProperty->GetValue(&resval);
   nsAutoString val;
   val.AssignWithConversion(resval);
-  PRInt32 offset = val.Find(INS_NAMESPACE_URI, false, 0, 1);
+  PRInt32 offset = val.Find(INS_NAMESPACE_URI, PR_FALSE, 0, 1);
   if (!offset) {
     PRInt32 len = strlen(INS_NAMESPACE_URI);
     val.Right(*aResult, val.Length() - len);