diff --git a/mozilla/xpinstall/src/ScheduledTasks.cpp b/mozilla/xpinstall/src/ScheduledTasks.cpp
index 204f420a952..43b7f177687 100644
--- a/mozilla/xpinstall/src/ScheduledTasks.cpp
+++ b/mozilla/xpinstall/src/ScheduledTasks.cpp
@@ -40,11 +40,11 @@ BOOL WIN32_IsMoveFileExBroken()
     /* the NT option MOVEFILE_DELAY_UNTIL_REBOOT is broken on 
      * Windows NT 3.51 Service Pack 4 and NT 4.0 before Service Pack 2
      */
-    BOOL broken = FALSE;
+    BOOL broken = PR_FALSE;
     OSVERSIONINFO osinfo;
 
     // they *all* appear broken--better to have one way that works.
-    return TRUE;
+    return PR_TRUE;
 
     osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
     if (GetVersionEx(&osinfo) && osinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
@@ -53,7 +53,7 @@ BOOL WIN32_IsMoveFileExBroken()
         {
             if ( 0 == stricmp(osinfo.szCSDVersion,"Service Pack 4"))
             {
-                broken = TRUE;
+                broken = PR_TRUE;
             }
         }
         else if ( osinfo.dwMajorVersion == 4 )
@@ -61,7 +61,7 @@ BOOL WIN32_IsMoveFileExBroken()
             if (osinfo.szCSDVersion[0] == '\0' || 
                 (0 == stricmp(osinfo.szCSDVersion,"Service Pack 1")))
             {
-                broken = TRUE;
+                broken = PR_TRUE;
             }
         }
     }
@@ -105,7 +105,7 @@ PRInt32 DoWindowsReplaceExistingFileStuff(const char* currentName, const char* f
                     tmpname[len-1] = '~';
                     tmpname[len] = '\0';
                     if ( stat(tmpname, &statbuf) != 0 )
-                        nameFound = TRUE;
+                        nameFound = PR_TRUE;
                     else
                         len++;
             }
diff --git a/mozilla/xpinstall/src/nsInstallFile.cpp b/mozilla/xpinstall/src/nsInstallFile.cpp
index 3434b9492e6..c1daea7c399 100644
--- a/mozilla/xpinstall/src/nsInstallFile.cpp
+++ b/mozilla/xpinstall/src/nsInstallFile.cpp
@@ -406,7 +406,7 @@ nsInstallFile::RegisterInVersionRegistry()
 PRBool
 nsInstallFile::CanUninstall()
 {
-    return TRUE;
+    return PR_TRUE;
 }
 
 /* RegisterPackageNode
@@ -416,5 +416,5 @@ nsInstallFile::CanUninstall()
 PRBool
 nsInstallFile::RegisterPackageNode()
 {
-    return TRUE;
+    return PR_TRUE;
 }