diff --git a/modules/libfont/src/fb.cpp b/modules/libfont/src/fb.cpp
index 804e8deac523..0b3b1bfaecc2 100644
--- a/modules/libfont/src/fb.cpp
+++ b/modules/libfont/src/fb.cpp
@@ -47,11 +47,7 @@
 #include "Mnfdoer.h"
 
 #include "net.h"		// libnet
-#ifndef NSPR20
-#include "prfile.h"		// for reading directories
-#else
 #include "prio.h"		// for reading directories
-#endif /* NSPR20 */
 
 FontBrokerObject::
 FontBrokerObject() : fpPeers(NULL), fpPeersFromCatalog(NULL)
@@ -533,11 +529,7 @@ int FontBrokerObject::scanDisplayersFromDir(const char *directoryName)
 		{
 			*nameptr++ = '/';  
 		}
-#ifndef NSPR20
-		while ((dp = PR_ReadDir(dir, PR_SKIP_DOT | PR_SKIP_DOT_DOT)) != NULL)
-#else
 		while ((dp = PR_ReadDir(dir, PR_SKIP_BOTH)) != NULL)
-#endif
 		{
 			strcpy(nameptr, PR_DirName(dp));
 			if (wf_isFileDirectory(filename))
diff --git a/modules/libfont/src/wfDlm.cpp b/modules/libfont/src/wfDlm.cpp
index bef5cd380740..da039ba38981 100644
--- a/modules/libfont/src/wfDlm.cpp
+++ b/modules/libfont/src/wfDlm.cpp
@@ -27,13 +27,11 @@
 #include "wfDlm.h"
 #include "libfont.h"
 
-#ifdef NSPR20
 #ifdef XP_MAC
 #include "probslet.h"
 #else
 #include "obsolete/probslet.h"
 #endif
-#endif
 
 wfDlm::wfDlm(const char *fname, const char *str)
 : m_state(0), m_filename(NULL), m_lib(NULL), m_dlmInterface(NULL)
@@ -248,11 +246,7 @@ FARPROC wfDlm::findSymbol(const char *symbol)
 		return (NULL);
 	}
 
-#ifndef NSPR20
-	return PR_FindSymbol(symbol, m_lib);
-#else
 	return (FARPROC)PR_FindSymbol(m_lib, symbol);
-#endif /* NSPR20 */
 }
 
 int wfDlm::unload(int force)
diff --git a/modules/libfont/src/wfMisc.cpp b/modules/libfont/src/wfMisc.cpp
index 7cd5a70eaf1c..b7d076bda9d1 100644
--- a/modules/libfont/src/wfMisc.cpp
+++ b/modules/libfont/src/wfMisc.cpp
@@ -28,13 +28,11 @@
 #include "wfMisc.h"
 #include "Mnffmi.h"
 
-#ifdef NSPR20
 #ifdef XP_MAC
 #include "probslet.h"
 #else
 #include "obsolete/probslet.h"
 #endif
-#endif
 
 
 // The logic we are using to merge these is brute force.