diff --git a/mozilla/modules/calendar/src/libcal/ical/jparser.cpp b/mozilla/modules/calendar/src/libcal/ical/jparser.cpp
index faf2173af39..06a8175917e 100644
--- a/mozilla/modules/calendar/src/libcal/ical/jparser.cpp
+++ b/mozilla/modules/calendar/src/libcal/ical/jparser.cpp
@@ -130,11 +130,7 @@ void JulianParser::ParseCalendars(ICalReader * reader,
 #if TESTING_ITIPRIG
                 if (FALSE) TRACE("\t--jParser: yielding\r\n");
 #endif
-#ifdef NSPR20
                 PR_Sleep(PR_INTERVAL_NO_WAIT);
-#else
-                PR_Yield();
-#endif
                 //break;
             }
 
@@ -183,11 +179,7 @@ void jparser_ParseCalendarsZero(void * jp, void * nPtr)
 #if TESTING_ITIPRIG
     TRACE("\t--killing parseThread\r\n");
 #endif
-#ifdef NSPR20
     PR_ProcessExit(0);
-#else
-    PR_Exit();
-#endif
 }
 
 //---------------------------------------------------------------------
diff --git a/mozilla/modules/calendar/src/libcal/util/julnstr.cpp b/mozilla/modules/calendar/src/libcal/util/julnstr.cpp
index d7d485f867d..d9ccad12e5d 100644
--- a/mozilla/modules/calendar/src/libcal/util/julnstr.cpp
+++ b/mozilla/modules/calendar/src/libcal/util/julnstr.cpp
@@ -28,9 +28,7 @@
 #endif
 
 #include "nspr.h"
-#ifdef NSPR20
 #include "plstr.h"
-#endif
 
 #if 0
 /* Breaks SINIX5.4 build */
diff --git a/mozilla/modules/calendar/src/libcal/util/julnstr.h b/mozilla/modules/calendar/src/libcal/util/julnstr.h
index 8d770b3f225..3932ad70a21 100644
--- a/mozilla/modules/calendar/src/libcal/util/julnstr.h
+++ b/mozilla/modules/calendar/src/libcal/util/julnstr.h
@@ -54,9 +54,7 @@
 #include <ctype.h>
 #include <nspr.h>
 
-#ifdef NSPR20
 #include "plstr.h"
-#endif
 
 #include "julnstr.h"