diff -r a2c8fc23c90e -r 1a7853a4257e src/server/util/plist.h
--- a/src/server/util/plist.h	Wed Feb 22 23:20:39 2012 +0100
+++ b/src/server/util/plist.h	Thu Feb 23 13:10:04 2012 +0100
@@ -47,7 +47,7 @@
  */
 
 #include "pool.h"
-#include "mps/nspr.h"
+//include "mps/nspr.h"
 #include "../public/nsapi.h"
 #include "plist_pvt.h"
 
@@ -58,7 +58,9 @@
 #ifdef INTNSACL
 
 /* Functions in plist.c */
-NSPR_BEGIN_EXTERN_C
+#ifdef	__cplusplus
+extern "C" {
+#endif
 
 NSAPI_PUBLIC extern int PListAssignValue(PList_t plist, const char *pname,
                             const void *pvalue, PList_t ptype);
@@ -87,7 +89,9 @@
 NSAPI_PUBLIC extern int PListDefKey(PList_t plist, pb_key *key, const char *pname, const int flags);
 NSAPI_PUBLIC extern int PListInitKey(PList_t plist, pb_key *key, const void *pvalue, PList_t ptype);
 
-NSPR_END_EXTERN_C
+#ifdef	__cplusplus
+}
+#endif
 
 #endif /* INTNSACL */