diff -r a2c8fc23c90e -r 1a7853a4257e src/server/daemon/netsite.h
--- a/src/server/daemon/netsite.h	Wed Feb 22 23:20:39 2012 +0100
+++ b/src/server/daemon/netsite.h	Thu Feb 23 13:10:04 2012 +0100
@@ -42,8 +42,7 @@
  * Standard defs for NetSite servers.
  */
 
-#include <mps/nspr.h>
-
+//include <mps/nspr.h>
 #ifndef BASE_SYSTEMS_H
 #include "../util/systems.h"
 #endif /* !BASE_SYSTEMS_H */
@@ -58,7 +57,9 @@
 #include "../public/nsapi.h"
 #endif /* PUBLIC_NETSITE_H */
 
-NSPR_BEGIN_EXTERN_C
+#ifdef	__cplusplus
+extern "C" {
+#endif
 
 /*
  * Only the mainline needs to set the malloc key.
@@ -142,7 +143,9 @@
 
 /* --- End public functions --- */
 
-NSPR_END_EXTERN_C
+#ifdef	__cplusplus
+}
+#endif
 
 #ifdef INTNSAPI