Bug 469083: WinCE NSPRPUB PR Tests Do Not Run On WinCE/WinMobile6, r=wtc

165 files changed, 5 insertions, 183 deletions

diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in
index 95c32f48..126b2d0f 100644
--- a/pr/tests/Makefile.in
+++ b/pr/tests/Makefile.in
@@ -249,15 +249,14 @@ endif
 
 ifeq ($(OS_ARCH),WINCE)
 ifdef NS_USE_GCC
-  EXTRA_LIBS += -lwsock32
+  EXTRA_LIBS += -lws2 -lcoredll
 else
+  INCLUDES += -FInst_wince.h
   EXTRA_LIBS += ws2.lib coredll.lib
   LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO -PDB:$(@:.dll=.pdb)
-  # NOTE: Need this to have a proper WinCE entry into main(argc, argv)
-#  EXE_EXTRA_LDOPTS = -SUBSYSTEM:CONSOLE -ENTRY:mainCRTStartup
   EXE_EXTRA_LDOPTS = -SUBSYSTEM:CONSOLE
   ifdef PROFILE
-    LDOPTS += -PROFILE -MAP                                                                  
+    LDOPTS += -PROFILE -MAP
   endif # profile
 endif # NS_USE_GCC
 
diff --git a/pr/tests/accept.c b/pr/tests/accept.c
index e988b6ab..4fada1aa 100644
--- a/pr/tests/accept.c
+++ b/pr/tests/accept.c
@@ -63,7 +63,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #include "plgetopt.h"
 #include "plerror.h"
diff --git a/pr/tests/acceptread.c b/pr/tests/acceptread.c
index 19f7e1db..023d4a4e 100644
--- a/pr/tests/acceptread.c
+++ b/pr/tests/acceptread.c
@@ -45,7 +45,6 @@
 #include <plerror.h>
 
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define DEFAULT_PORT 12273
 #define GET "GET / HTTP/1.0\n\n"
diff --git a/pr/tests/acceptreademu.c b/pr/tests/acceptreademu.c
index 40362b51..c66cfa9d 100644
--- a/pr/tests/acceptreademu.c
+++ b/pr/tests/acceptreademu.c
@@ -51,7 +51,6 @@
 #include <plerror.h>
 
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define DEFAULT_PORT 12273
 #define GET "GET / HTTP/1.0\n\n"
diff --git a/pr/tests/addrstr.c b/pr/tests/addrstr.c
index c6633b96..532d75f6 100644
--- a/pr/tests/addrstr.c
+++ b/pr/tests/addrstr.c
@@ -40,7 +40,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 const char *testaddrs[] = {
     "::", "::",
diff --git a/pr/tests/affinity.c b/pr/tests/affinity.c
index f24d8e80..46f159bf 100644
--- a/pr/tests/affinity.c
+++ b/pr/tests/affinity.c
@@ -42,7 +42,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifndef XP_BEOS
 
diff --git a/pr/tests/alarm.c b/pr/tests/alarm.c
index 04a44716..7af2ed4c 100644
--- a/pr/tests/alarm.c
+++ b/pr/tests/alarm.c
@@ -73,7 +73,6 @@
 #include "plgetopt.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #if defined(XP_UNIX)
 #include <sys/time.h>
diff --git a/pr/tests/anonfm.c b/pr/tests/anonfm.c
index bb3da4c5..2aa24159 100644
--- a/pr/tests/anonfm.c
+++ b/pr/tests/anonfm.c
@@ -66,7 +66,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 /*
 ** Test harness infrastructure
diff --git a/pr/tests/append.c b/pr/tests/append.c
index cc07ba54..6a037b5f 100644
--- a/pr/tests/append.c
+++ b/pr/tests/append.c
@@ -54,7 +54,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 PRIntn  debug = 0;
 PRIntn  verbose = 0;
diff --git a/pr/tests/atomic.c b/pr/tests/atomic.c
index a3676bf3..f7e3fe3f 100644
--- a/pr/tests/atomic.c
+++ b/pr/tests/atomic.c
@@ -38,7 +38,6 @@
 #include "prio.h"
 #include "prprf.h"
 #include "pratom.h"
-#include "nst_wince.h"
 
 /*
  * TODO: create a macro to generate the six lines of code that are repeated
diff --git a/pr/tests/attach.c b/pr/tests/attach.c
index cb9a5fc2..2eaefdca 100644
--- a/pr/tests/attach.c
+++ b/pr/tests/attach.c
@@ -87,7 +87,6 @@
 #elif defined(XP_BEOS)
 #include <kernel/OS.h>
 #endif
-#include "nst_wince.h"
 
 #define DEFAULT_COUNT 1000
 PRIntn failed_already=0;
diff --git a/pr/tests/bigfile.c b/pr/tests/bigfile.c
index 1a6416c2..bff889bd 100644
--- a/pr/tests/bigfile.c
+++ b/pr/tests/bigfile.c
@@ -44,7 +44,6 @@
 
 #include "plerror.h"
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 #define DEFAULT_COUNT 10
 #define DEFAULT_FILESIZE 1
diff --git a/pr/tests/bigfile2.c b/pr/tests/bigfile2.c
index 9b6d4f33..2b538e27 100644
--- a/pr/tests/bigfile2.c
+++ b/pr/tests/bigfile2.c
@@ -43,7 +43,6 @@
 #ifdef _WIN32
 #include <windows.h>
 #endif
-#include "nst_wince.h"
 
 #define TEST_FILE_NAME "bigfile2.txt"
 #ifdef WINCE
diff --git a/pr/tests/bigfile3.c b/pr/tests/bigfile3.c
index bd4ecd7f..be04d5e8 100644
--- a/pr/tests/bigfile3.c
+++ b/pr/tests/bigfile3.c
@@ -43,7 +43,6 @@
 #ifdef _WIN32
 #include <windows.h>
 #endif
-#include "nst_wince.h"
 
 #define TEST_FILE_NAME "bigfile3.txt"
 #ifdef WINCE
diff --git a/pr/tests/bug1test.c b/pr/tests/bug1test.c
index 655a8928..6c4c4d84 100644
--- a/pr/tests/bug1test.c
+++ b/pr/tests/bug1test.c
@@ -46,7 +46,6 @@ before leaving the critical section in _PR_CondWait in hwmon.c).
 #include "prinit.h"
 #include "prmon.h"
 #include "prlog.h"
-#include "nst_wince.h"
 
 typedef struct Arg_s
 {
diff --git a/pr/tests/cleanup.c b/pr/tests/cleanup.c
index 0c493cb6..38f9b94c 100644
--- a/pr/tests/cleanup.c
+++ b/pr/tests/cleanup.c
@@ -44,7 +44,6 @@
 #include "plgetopt.h"
 
 #include <stdlib.h>
-#include "nst_wince.h"
 
 static void PR_CALLBACK Thread(void *sleep)
 {
diff --git a/pr/tests/cltsrv.c b/pr/tests/cltsrv.c
index aad0c6bf..da5a4b83 100644
--- a/pr/tests/cltsrv.c
+++ b/pr/tests/cltsrv.c
@@ -82,7 +82,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "nst_wince.h"
 
 #if defined(XP_UNIX)
 #include <math.h>
diff --git a/pr/tests/concur.c b/pr/tests/concur.c
index 812f7457..1f22d014 100644
--- a/pr/tests/concur.c
+++ b/pr/tests/concur.c
@@ -57,7 +57,6 @@
 #endif
 
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define DEFAULT_RANGE 10
 #define DEFAULT_LOOPS 100
diff --git a/pr/tests/cvar.c b/pr/tests/cvar.c
index a8f63f01..c3a84c5d 100644
--- a/pr/tests/cvar.c
+++ b/pr/tests/cvar.c
@@ -65,7 +65,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/cvar2.c b/pr/tests/cvar2.c
index dcc67baa..604510ca 100644
--- a/pr/tests/cvar2.c
+++ b/pr/tests/cvar2.c
@@ -60,7 +60,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 int _debug_on = 0;
 #define DPRINTF(arg) if (_debug_on) printf arg
diff --git a/pr/tests/dbmalloc.c b/pr/tests/dbmalloc.c
index 0fb84bfb..ed500b7c 100644
--- a/pr/tests/dbmalloc.c
+++ b/pr/tests/dbmalloc.c
@@ -53,7 +53,6 @@
 #include <time.h>
 #include <string.h>
 #include "nspr.h"
-#include "nst_wince.h"
 
 void
 usage
diff --git a/pr/tests/dbmalloc1.c b/pr/tests/dbmalloc1.c
index a13b35a2..f12a27c6 100644
--- a/pr/tests/dbmalloc1.c
+++ b/pr/tests/dbmalloc1.c
@@ -60,7 +60,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "nspr.h"
-#include "nst_wince.h"
 
 PRIntn failed_already=0;
 PRIntn debug_mode;
diff --git a/pr/tests/dceemu.c b/pr/tests/dceemu.c
index c713a9be..5e09a20c 100644
--- a/pr/tests/dceemu.c
+++ b/pr/tests/dceemu.c
@@ -60,7 +60,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #if defined(_PR_DCETHREADS)
 
diff --git a/pr/tests/depend.c b/pr/tests/depend.c
index b83bfc07..e3fb691e 100644
--- a/pr/tests/depend.c
+++ b/pr/tests/depend.c
@@ -59,7 +59,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 static void PrintVersion(
     const char *msg, const PRVersion* info, PRIntn tab)
diff --git a/pr/tests/dlltest.c b/pr/tests/dlltest.c
index 40f4f9d8..f8a5f53b 100644
--- a/pr/tests/dlltest.c
+++ b/pr/tests/dlltest.c
@@ -64,7 +64,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 typedef PRIntn (PR_CALLBACK *GetFcnType)(void);
 typedef void (PR_CALLBACK *SetFcnType)(PRIntn);
diff --git a/pr/tests/dtoa.c b/pr/tests/dtoa.c
index 5b26d863..a85e6437 100644
--- a/pr/tests/dtoa.c
+++ b/pr/tests/dtoa.c
@@ -52,7 +52,6 @@
 #include <locale.h>
 #include "prprf.h"
 #include "prdtoa.h"
-#include "nst_wince.h"
 
 static int failed_already = 0;
 
diff --git a/pr/tests/env.c b/pr/tests/env.c
index ccbc20cc..ac1c4419 100644
--- a/pr/tests/env.c
+++ b/pr/tests/env.c
@@ -46,7 +46,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 PRIntn  debug = 0;
 PRIntn  verbose = 0;
diff --git a/pr/tests/errcodes.c b/pr/tests/errcodes.c
index 044756c1..9e9c573a 100644
--- a/pr/tests/errcodes.c
+++ b/pr/tests/errcodes.c
@@ -46,7 +46,6 @@
 #include "plgetopt.h"
 
 #include <stdio.h>
-#include "nst_wince.h"
 
 static int _debug_on = 0;
 
diff --git a/pr/tests/errset.c b/pr/tests/errset.c
index c0145dd0..0e690c04 100644
--- a/pr/tests/errset.c
+++ b/pr/tests/errset.c
@@ -53,7 +53,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "nst_wince.h"
 
 static int _debug_on = 0;
 
diff --git a/pr/tests/exit.c b/pr/tests/exit.c
index d378c0c9..8ecf50a4 100644
--- a/pr/tests/exit.c
+++ b/pr/tests/exit.c
@@ -45,7 +45,6 @@
 #include "plgetopt.h"
 
 #include <stdlib.h>
-#include "nst_wince.h"
 
 static PRInt32 dally = 0;
 static PRFileDesc *err = NULL;
diff --git a/pr/tests/fdcach.c b/pr/tests/fdcach.c
index 5a9dce3c..33382fa8 100644
--- a/pr/tests/fdcach.c
+++ b/pr/tests/fdcach.c
@@ -46,7 +46,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 /*
  * Define ORDER_PRESERVED if the implementation of PR_SetFDCacheSize
diff --git a/pr/tests/fileio.c b/pr/tests/fileio.c
index 4d7c3dde..0b154047 100644
--- a/pr/tests/fileio.c
+++ b/pr/tests/fileio.c
@@ -65,7 +65,6 @@
 #include "prlog.h"
 
 #include <stdio.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prsem.h"
diff --git a/pr/tests/foreign.c b/pr/tests/foreign.c
index a26e4bbf..869000c3 100644
--- a/pr/tests/foreign.c
+++ b/pr/tests/foreign.c
@@ -64,7 +64,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 static enum {
     thread_nspr, thread_pthread, thread_sproc, thread_win32
diff --git a/pr/tests/forktest.c b/pr/tests/forktest.c
index 4b222d84..f0187983 100644
--- a/pr/tests/forktest.c
+++ b/pr/tests/forktest.c
@@ -62,7 +62,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 PRIntn failed_already=0;
 
diff --git a/pr/tests/formattm.c b/pr/tests/formattm.c
index 42a5c711..0ab630ba 100644
--- a/pr/tests/formattm.c
+++ b/pr/tests/formattm.c
@@ -40,7 +40,6 @@
 #include "prtime.h"
 
 #include <stdio.h>
-#include "nst_wince.h"
 
 int main(int argc, char **argv)
 {
diff --git a/pr/tests/freeif.c b/pr/tests/freeif.c
index 4a5c861d..4bf29940 100644
--- a/pr/tests/freeif.c
+++ b/pr/tests/freeif.c
@@ -44,7 +44,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 static void Noop(void) { }
 
diff --git a/pr/tests/fsync.c b/pr/tests/fsync.c
index eda5b1fc..149a5b54 100644
--- a/pr/tests/fsync.c
+++ b/pr/tests/fsync.c
@@ -42,7 +42,6 @@
 
 #include "plerror.h"
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 static PRFileDesc *err = NULL;
 
diff --git a/pr/tests/getai.c b/pr/tests/getai.c
index adc352ff..eaa41d41 100644
--- a/pr/tests/getai.c
+++ b/pr/tests/getai.c
@@ -39,7 +39,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 int main(int argc, char **argv)
 {
diff --git a/pr/tests/gethost.c b/pr/tests/gethost.c
index 37aa6888..3af41a3f 100644
--- a/pr/tests/gethost.c
+++ b/pr/tests/gethost.c
@@ -49,7 +49,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define DEFAULT_HOST_NAME "mcom.com"
 
diff --git a/pr/tests/getproto.c b/pr/tests/getproto.c
index 4e8374c8..fe847a0b 100644
--- a/pr/tests/getproto.c
+++ b/pr/tests/getproto.c
@@ -51,7 +51,6 @@
 #include "prprf.h"
 #include "prnetdb.h"
 #include "prerror.h"
-#include "nst_wince.h"
 
 int main(int argc, char **argv)
 {
diff --git a/pr/tests/i2l.c b/pr/tests/i2l.c
index 69e996f1..a2e4a545 100644
--- a/pr/tests/i2l.c
+++ b/pr/tests/i2l.c
@@ -44,7 +44,6 @@
 
 #include "plerror.h"
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 typedef union Overlay_i
 {
diff --git a/pr/tests/initclk.c b/pr/tests/initclk.c
index a5ee34b1..24e80f82 100644
--- a/pr/tests/initclk.c
+++ b/pr/tests/initclk.c
@@ -50,7 +50,6 @@
 #include "prlog.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 /* The timeouts, in milliseconds */
 #define SHORT_TIMEOUT 1000
diff --git a/pr/tests/inrval.c b/pr/tests/inrval.c
index 7f7120c9..aa06845c 100644
--- a/pr/tests/inrval.c
+++ b/pr/tests/inrval.c
@@ -72,7 +72,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 static PRIntn debug_mode;
 static PRFileDesc *output;
diff --git a/pr/tests/instrumt.c b/pr/tests/instrumt.c
index 617785ed..3b57ea9d 100644
--- a/pr/tests/instrumt.c
+++ b/pr/tests/instrumt.c
@@ -78,7 +78,6 @@
 #include <prtrace.h> 
 #include <prcountr.h> 
 #include <prolock.h> 
-#include "nst_wince.h"
 
 #define COUNT_LIMIT  (10 * ( 1024))
 
diff --git a/pr/tests/intrio.c b/pr/tests/intrio.c
index 68548220..ad678b3b 100644
--- a/pr/tests/intrio.c
+++ b/pr/tests/intrio.c
@@ -45,7 +45,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/intrupt.c b/pr/tests/intrupt.c
index 7ca3871d..1385bddd 100644
--- a/pr/tests/intrupt.c
+++ b/pr/tests/intrupt.c
@@ -54,7 +54,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/io_timeout.c b/pr/tests/io_timeout.c
index 997ba07f..2a680aa5 100644
--- a/pr/tests/io_timeout.c
+++ b/pr/tests/io_timeout.c
@@ -56,7 +56,6 @@
 
 #include <stdio.h>
 #include "nspr.h"
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/io_timeoutk.c b/pr/tests/io_timeoutk.c
index 141d890c..26e3beeb 100644
--- a/pr/tests/io_timeoutk.c
+++ b/pr/tests/io_timeoutk.c
@@ -56,7 +56,6 @@
 
 #include <stdio.h>
 #include "nspr.h"
-#include "nst_wince.h"
 
 #define NUM_THREADS 1
 #define BASE_PORT   8000
diff --git a/pr/tests/io_timeoutu.c b/pr/tests/io_timeoutu.c
index 021181c6..c17a93f7 100644
--- a/pr/tests/io_timeoutu.c
+++ b/pr/tests/io_timeoutu.c
@@ -57,7 +57,6 @@
 
 #include <stdio.h>
 #include "nspr.h"
-#include "nst_wince.h"
 
 #define NUM_THREADS 1
 #define BASE_PORT   8000
diff --git a/pr/tests/ioconthr.c b/pr/tests/ioconthr.c
index bd6faaf1..2e39522d 100644
--- a/pr/tests/ioconthr.c
+++ b/pr/tests/ioconthr.c
@@ -42,7 +42,6 @@
 
 #include "nspr.h"
 #include <stdio.h>
-#include "nst_wince.h"
 
 int num_threads = 10;  /* must be an even number */
 PRThreadScope thread_scope = PR_GLOBAL_THREAD;
diff --git a/pr/tests/ipv6.c b/pr/tests/ipv6.c
index 5155fb97..571716fb 100644
--- a/pr/tests/ipv6.c
+++ b/pr/tests/ipv6.c
@@ -49,7 +49,6 @@
 #include "obsolete/probslet.h"
 
 #include <string.h>
-#include "nst_wince.h"
 
 #define DNS_BUFFER 100
 #define ADDR_BUFFER 100
diff --git a/pr/tests/join.c b/pr/tests/join.c
index 3b045392..670df7ef 100644
--- a/pr/tests/join.c
+++ b/pr/tests/join.c
@@ -63,7 +63,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/joinkk.c b/pr/tests/joinkk.c
index 5f4a8b2b..77f2176f 100644
--- a/pr/tests/joinkk.c
+++ b/pr/tests/joinkk.c
@@ -64,7 +64,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/joinku.c b/pr/tests/joinku.c
index b63d6cdb..c639ce1a 100644
--- a/pr/tests/joinku.c
+++ b/pr/tests/joinku.c
@@ -64,7 +64,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/joinuk.c b/pr/tests/joinuk.c
index 3801db06..07425932 100644
--- a/pr/tests/joinuk.c
+++ b/pr/tests/joinuk.c
@@ -64,7 +64,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/joinuu.c b/pr/tests/joinuu.c
index e803e6f2..71f17a83 100644
--- a/pr/tests/joinuu.c
+++ b/pr/tests/joinuu.c
@@ -64,7 +64,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/layer.c b/pr/tests/layer.c
index 25a6ba6b..e0e09b50 100644
--- a/pr/tests/layer.c
+++ b/pr/tests/layer.c
@@ -47,7 +47,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 /*
 ** Testing layering of I/O
diff --git a/pr/tests/lazyinit.c b/pr/tests/lazyinit.c
index bab48efe..1b206929 100644
--- a/pr/tests/lazyinit.c
+++ b/pr/tests/lazyinit.c
@@ -61,7 +61,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 static void PR_CALLBACK lazyEntry(void *arg)
 {
diff --git a/pr/tests/libfilename.c b/pr/tests/libfilename.c
index 8dcf6da9..d454f5f5 100644
--- a/pr/tests/libfilename.c
+++ b/pr/tests/libfilename.c
@@ -48,7 +48,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 PRBool debug_mode = PR_FALSE;
 
diff --git a/pr/tests/lltest.c b/pr/tests/lltest.c
index e808fbc3..4679a2ce 100644
--- a/pr/tests/lltest.c
+++ b/pr/tests/lltest.c
@@ -69,7 +69,6 @@
 
 #include "nspr.h"
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 /* --- Local Definitions --- */
 #define ReportProgress(m) if (verboseMode) PR_fprintf(output, (m));
diff --git a/pr/tests/lock.c b/pr/tests/lock.c
index ae31749c..e0e23d01 100644
--- a/pr/tests/lock.c
+++ b/pr/tests/lock.c
@@ -82,7 +82,6 @@
 #include "plstr.h"
 
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #if defined(XP_UNIX)
 #include <string.h>
diff --git a/pr/tests/lockfile.c b/pr/tests/lockfile.c
index 2c0749f9..27f8821e 100644
--- a/pr/tests/lockfile.c
+++ b/pr/tests/lockfile.c
@@ -75,7 +75,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/logger.c b/pr/tests/logger.c
index 58cb89e5..d17f2f97 100644
--- a/pr/tests/logger.c
+++ b/pr/tests/logger.c
@@ -48,7 +48,6 @@
 #include "prinrval.h"
 
 #include <stdio.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 extern void SetupMacPrintfLog(char *logFile);
diff --git a/pr/tests/makedir.c b/pr/tests/makedir.c
index 7fb07d47..5bb3dfdb 100644
--- a/pr/tests/makedir.c
+++ b/pr/tests/makedir.c
@@ -44,7 +44,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 int main(int argc, char **argv)
 {
diff --git a/pr/tests/many_cv.c b/pr/tests/many_cv.c
index 7f35fe3a..d3002ecf 100644
--- a/pr/tests/many_cv.c
+++ b/pr/tests/many_cv.c
@@ -48,7 +48,6 @@
 #include "plgetopt.h"
 
 #include <stdlib.h>
-#include "nst_wince.h"
 
 static PRInt32 RandomNum(void)
 {
diff --git a/pr/tests/mbcs.c b/pr/tests/mbcs.c
index 9ccd076e..bb2cf789 100644
--- a/pr/tests/mbcs.c
+++ b/pr/tests/mbcs.c
@@ -71,7 +71,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 /*
 ** Test harness infrastructure
diff --git a/pr/tests/multiacc.c b/pr/tests/multiacc.c
index 3aa7f2ab..ccae270b 100644
--- a/pr/tests/multiacc.c
+++ b/pr/tests/multiacc.c
@@ -48,7 +48,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #define NUM_SERVER_THREADS 10
 
diff --git a/pr/tests/multiwait.c b/pr/tests/multiwait.c
index e0acb774..8454eb42 100644
--- a/pr/tests/multiwait.c
+++ b/pr/tests/multiwait.c
@@ -53,7 +53,6 @@
 #include "plgetopt.h"
 
 #include <string.h>
-#include "nst_wince.h"
 
 typedef struct Shared
 {
diff --git a/pr/tests/nameshm1.c b/pr/tests/nameshm1.c
index e4f936cc..bbd6d386 100644
--- a/pr/tests/nameshm1.c
+++ b/pr/tests/nameshm1.c
@@ -103,7 +103,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <private/primpl.h>
-#include "nst_wince.h"
 
 #define SEM_NAME1 "/tmp/nameshmSEM1"
 #define SEM_NAME2 "/tmp/nameshmSEM2"
diff --git a/pr/tests/nbconn.c b/pr/tests/nbconn.c
index 22ce59dc..099150a5 100644
--- a/pr/tests/nbconn.c
+++ b/pr/tests/nbconn.c
@@ -60,7 +60,6 @@
 #include "plgetopt.h"
 #include <stdio.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #define printf PR_LogPrint
diff --git a/pr/tests/nblayer.c b/pr/tests/nblayer.c
index 380be9b9..19df5cf6 100644
--- a/pr/tests/nblayer.c
+++ b/pr/tests/nblayer.c
@@ -49,7 +49,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 /*
 ** Testing layering of I/O
diff --git a/pr/tests/nonblock.c b/pr/tests/nonblock.c
index 629ecee8..39d4c7eb 100644
--- a/pr/tests/nonblock.c
+++ b/pr/tests/nonblock.c
@@ -51,7 +51,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define NUMBER_ROUNDS 5
 
diff --git a/pr/tests/nst_wince.h b/pr/tests/nst_wince.h
index f28ac8a9..c3ed2f8a 100644
--- a/pr/tests/nst_wince.h
+++ b/pr/tests/nst_wince.h
@@ -42,11 +42,10 @@
 
 /***********
  * NOTE: This file is loaded once in each test - and defines two
- * functions for each test's eventual executable: WinMain() and
+ * functions for each test's eventual executable: DllMain() and
  * nspr_test_runme() -- both exported functions.
  *
- * WinMain() is required to massage a main() entry-point EXE into
- * a WinMain() entry-point DLL.
+ * DLLs require a DllMain() entry-point.
  *
  * nspr_test_runme() is required so that the WinCE/WinMobile
  * controlling test program can run each DLL's tests in a standard way.
diff --git a/pr/tests/ntioto.c b/pr/tests/ntioto.c
index b16b96d3..4fb175aa 100644
--- a/pr/tests/ntioto.c
+++ b/pr/tests/ntioto.c
@@ -76,7 +76,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 /*
 ** Test harness infrastructure
diff --git a/pr/tests/ntoh.c b/pr/tests/ntoh.c
index 7f1d3ab9..d6eb0951 100644
--- a/pr/tests/ntoh.c
+++ b/pr/tests/ntoh.c
@@ -45,7 +45,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 /* Byte sequence in network byte order */
 static unsigned char bytes_n[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
diff --git a/pr/tests/obsints.c b/pr/tests/obsints.c
index 69348797..bbe60f85 100644
--- a/pr/tests/obsints.c
+++ b/pr/tests/obsints.c
@@ -44,7 +44,6 @@
  */
 
 #include <stdio.h>
-#include "nst_wince.h"
 
 #ifdef NO_NSPR_10_SUPPORT
 
diff --git a/pr/tests/op_2long.c b/pr/tests/op_2long.c
index 548f15a0..27f64d79 100644
--- a/pr/tests/op_2long.c
+++ b/pr/tests/op_2long.c
@@ -56,7 +56,6 @@
 #include <stdio.h>
 #include "plerror.h"
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/op_excl.c b/pr/tests/op_excl.c
index 628a3a59..30407684 100644
--- a/pr/tests/op_excl.c
+++ b/pr/tests/op_excl.c
@@ -49,7 +49,6 @@
 #include <nspr.h> 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 /*
 ** Test harness infrastructure
diff --git a/pr/tests/op_filnf.c b/pr/tests/op_filnf.c
index 8ad43a04..5f676250 100644
--- a/pr/tests/op_filnf.c
+++ b/pr/tests/op_filnf.c
@@ -56,7 +56,6 @@
 #include "prerror.h"
 #include <stdio.h>
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/op_filok.c b/pr/tests/op_filok.c
index ac6ee9f5..acb86a7e 100644
--- a/pr/tests/op_filok.c
+++ b/pr/tests/op_filok.c
@@ -54,7 +54,6 @@
 #include "prio.h"
 #include "prerror.h"
 #include <stdio.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/op_noacc.c b/pr/tests/op_noacc.c
index 32fd15a1..ab1254de 100644
--- a/pr/tests/op_noacc.c
+++ b/pr/tests/op_noacc.c
@@ -55,7 +55,6 @@
 #include "prerror.h"
 #include <stdio.h>
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/op_nofil.c b/pr/tests/op_nofil.c
index 7912a687..20bc11e1 100644
--- a/pr/tests/op_nofil.c
+++ b/pr/tests/op_nofil.c
@@ -55,7 +55,6 @@
 #include "prerror.h"
 #include <stdio.h>
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/openfile.c b/pr/tests/openfile.c
index 84593c7c..8d64a1ac 100644
--- a/pr/tests/openfile.c
+++ b/pr/tests/openfile.c
@@ -46,7 +46,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define TEMPLATE_FILE_NAME "template.txt"
 
diff --git a/pr/tests/parent.c b/pr/tests/parent.c
index 2b8e30b7..91bf5ee8 100644
--- a/pr/tests/parent.c
+++ b/pr/tests/parent.c
@@ -45,7 +45,6 @@
 #include "prinit.h"
 #include "prproces.h"
 #include "prinrval.h"
-#include "nst_wince.h"
 
 typedef struct Child
 {
diff --git a/pr/tests/peek.c b/pr/tests/peek.c
index 97738ce1..22fcfec6 100644
--- a/pr/tests/peek.c
+++ b/pr/tests/peek.c
@@ -46,7 +46,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #define BUFFER_SIZE 1024
 
diff --git a/pr/tests/perf.c b/pr/tests/perf.c
index 79cd2e78..dda69682 100644
--- a/pr/tests/perf.c
+++ b/pr/tests/perf.c
@@ -41,7 +41,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 int _debug_on = 0;
 #define DPRINTF(arg) if (_debug_on) printf arg
diff --git a/pr/tests/pipeping.c b/pr/tests/pipeping.c
index c6331ddb..494cca64 100644
--- a/pr/tests/pipeping.c
+++ b/pr/tests/pipeping.c
@@ -57,7 +57,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_OS2
 static char *child_argv[] = { "pipepong.exe", NULL };
diff --git a/pr/tests/pipeping2.c b/pr/tests/pipeping2.c
index a6cc249b..012b327a 100644
--- a/pr/tests/pipeping2.c
+++ b/pr/tests/pipeping2.c
@@ -56,7 +56,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define NUM_ITERATIONS 10
 
diff --git a/pr/tests/pipepong.c b/pr/tests/pipepong.c
index 4850b5a1..19a7523b 100644
--- a/pr/tests/pipepong.c
+++ b/pr/tests/pipepong.c
@@ -54,7 +54,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define NUM_ITERATIONS 10
 
diff --git a/pr/tests/pipepong2.c b/pr/tests/pipepong2.c
index a745e836..aad1265b 100644
--- a/pr/tests/pipepong2.c
+++ b/pr/tests/pipepong2.c
@@ -55,7 +55,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define NUM_ITERATIONS 10
 
diff --git a/pr/tests/pipeself.c b/pr/tests/pipeself.c
index 97db6559..fb9bbe20 100644
--- a/pr/tests/pipeself.c
+++ b/pr/tests/pipeself.c
@@ -53,7 +53,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #define NUM_ITERATIONS 10
 
diff --git a/pr/tests/poll_er.c b/pr/tests/poll_er.c
index dddb76fc..b68c7986 100755
--- a/pr/tests/poll_er.c
+++ b/pr/tests/poll_er.c
@@ -72,7 +72,6 @@ int main()
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 PRIntn failed_already=0;
 PRIntn debug_mode;
diff --git a/pr/tests/poll_nm.c b/pr/tests/poll_nm.c
index 30601ae7..05304beb 100644
--- a/pr/tests/poll_nm.c
+++ b/pr/tests/poll_nm.c
@@ -78,7 +78,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 PRIntn failed_already=0;
 PRIntn debug_mode;
diff --git a/pr/tests/poll_to.c b/pr/tests/poll_to.c
index e8190346..c9197ed9 100644
--- a/pr/tests/poll_to.c
+++ b/pr/tests/poll_to.c
@@ -73,7 +73,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 PRIntn failed_already=0;
 PRIntn debug_mode;
diff --git a/pr/tests/pollable.c b/pr/tests/pollable.c
index df8e2c79..20da55a3 100644
--- a/pr/tests/pollable.c
+++ b/pr/tests/pollable.c
@@ -53,7 +53,6 @@
 #include "plgetopt.h"
 
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define DEFAULT_THREADS 10
 #define DEFAULT_LOOPS 100
diff --git a/pr/tests/prftest.c b/pr/tests/prftest.c
index 2f04cd1e..f89b27d4 100644
--- a/pr/tests/prftest.c
+++ b/pr/tests/prftest.c
@@ -46,7 +46,6 @@
 #include "prprf.h"
 
 #include <string.h>
-#include "nst_wince.h"
 
 #define BUF_SIZE 128
 
diff --git a/pr/tests/prftest1.c b/pr/tests/prftest1.c
index a179e4f4..1e59bf1f 100644
--- a/pr/tests/prftest1.c
+++ b/pr/tests/prftest1.c
@@ -60,7 +60,6 @@
 #include "prprf.h"
 
 #include <string.h>
-#include "nst_wince.h"
 
 #define BUF_SIZE 128
 
diff --git a/pr/tests/prftest2.c b/pr/tests/prftest2.c
index c87f9544..256266a5 100644
--- a/pr/tests/prftest2.c
+++ b/pr/tests/prftest2.c
@@ -61,7 +61,6 @@
 #include "prprf.h"
 
 #include <string.h>
-#include "nst_wince.h"
 
 #define BUF_SIZE 128
 
diff --git a/pr/tests/primblok.c b/pr/tests/primblok.c
index 7b19a317..865ff119 100644
--- a/pr/tests/primblok.c
+++ b/pr/tests/primblok.c
@@ -45,7 +45,6 @@
 #if !defined(WINNT)
 
 #include <stdio.h>
-#include "nst_wince.h"
 
 int main(int argc, char **argv)
 {
@@ -61,7 +60,6 @@ int main(int argc, char **argv)
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #define TEST_FILE_NAME "primblok.dat"
 
diff --git a/pr/tests/priotest.c b/pr/tests/priotest.c
index e80f3bb7..bff791c0 100644
--- a/pr/tests/priotest.c
+++ b/pr/tests/priotest.c
@@ -60,7 +60,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define DEFAULT_DURATION 5
 
diff --git a/pr/tests/provider.c b/pr/tests/provider.c
index d99e0863..4a1f2c7b 100644
--- a/pr/tests/provider.c
+++ b/pr/tests/provider.c
@@ -81,7 +81,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 
 #if defined(XP_UNIX)
diff --git a/pr/tests/prpoll.c b/pr/tests/prpoll.c
index 1c870a81..706ec192 100644
--- a/pr/tests/prpoll.c
+++ b/pr/tests/prpoll.c
@@ -62,8 +62,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "nst_wince.h"
-
 #ifdef WINCE
 
 int main(int argc, char **argv)
diff --git a/pr/tests/prpollml.c b/pr/tests/prpollml.c
index be70f7c3..d20f1967 100644
--- a/pr/tests/prpollml.c
+++ b/pr/tests/prpollml.c
@@ -46,7 +46,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #define POLL_DESC_COUNT 256  /* This should be greater than the
                               * STACK_POLL_DESC_COUNT macro in
diff --git a/pr/tests/prselect.c b/pr/tests/prselect.c
index 5dfea81b..ff6ebdc6 100644
--- a/pr/tests/prselect.c
+++ b/pr/tests/prselect.c
@@ -68,7 +68,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 /***********************************************************************
 ** PRIVATE FUNCTION:    Test_Result
diff --git a/pr/tests/randseed.c b/pr/tests/randseed.c
index 1ff169c0..2cda2dca 100644
--- a/pr/tests/randseed.c
+++ b/pr/tests/randseed.c
@@ -52,7 +52,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 /*
 ** Test harness infrastructure
diff --git a/pr/tests/ranfile.c b/pr/tests/ranfile.c
index 9f2f6148..8fbc5854 100644
--- a/pr/tests/ranfile.c
+++ b/pr/tests/ranfile.c
@@ -69,7 +69,6 @@
 
 #include <string.h>
 #include <stdio.h>
-#include "nst_wince.h"
 
 static PRIntn debug_mode = 0;
 static PRIntn failed_already=0;
diff --git a/pr/tests/rmdir.c b/pr/tests/rmdir.c
index a3d9d7d5..87f9dc32 100644
--- a/pr/tests/rmdir.c
+++ b/pr/tests/rmdir.c
@@ -51,7 +51,6 @@
 #include <prerror.h>
 #include <prlog.h>
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 #define DIRNAME "xxxBug80884/"
 #define FILENAME "file80883"
diff --git a/pr/tests/rwlocktest.c b/pr/tests/rwlocktest.c
index 2beccd7f..c31eeb33 100644
--- a/pr/tests/rwlocktest.c
+++ b/pr/tests/rwlocktest.c
@@ -53,7 +53,6 @@
 #include "nspr.h"
 #include "plgetopt.h"
 #include "prrwlock.h"
-#include "nst_wince.h"
 
 static int _debug_on;
 static void rwtest(void *args);
diff --git a/pr/tests/sel_spd.c b/pr/tests/sel_spd.c
index dc22e184..9ba09eb0 100644
--- a/pr/tests/sel_spd.c
+++ b/pr/tests/sel_spd.c
@@ -47,7 +47,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/selct_er.c b/pr/tests/selct_er.c
index 3977f645..e658813f 100755
--- a/pr/tests/selct_er.c
+++ b/pr/tests/selct_er.c
@@ -74,7 +74,6 @@ int main()
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 
 PRIntn failed_already=0;
diff --git a/pr/tests/selct_nm.c b/pr/tests/selct_nm.c
index 238930de..56a80a76 100644
--- a/pr/tests/selct_nm.c
+++ b/pr/tests/selct_nm.c
@@ -74,7 +74,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 PRIntn failed_already=0;
 PRIntn debug_mode;
diff --git a/pr/tests/selct_to.c b/pr/tests/selct_to.c
index 3a8b1dd7..b5600fa9 100644
--- a/pr/tests/selct_to.c
+++ b/pr/tests/selct_to.c
@@ -75,7 +75,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 PRIntn failed_already=0;
 PRIntn debug_mode;
diff --git a/pr/tests/select2.c b/pr/tests/select2.c
index 4fc436d3..775a1e1c 100644
--- a/pr/tests/select2.c
+++ b/pr/tests/select2.c
@@ -60,7 +60,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 #if defined(OS2)
 #include <sys/time.h>
 #endif
diff --git a/pr/tests/selintr.c b/pr/tests/selintr.c
index 97eb132c..5e87236d 100644
--- a/pr/tests/selintr.c
+++ b/pr/tests/selintr.c
@@ -58,7 +58,6 @@ int main()
 #else /* XP_UNIX */
 
 #include "nspr.h"
-#include "nst_wince.h"
 
 #include <sys/time.h>
 #include <stdio.h>
diff --git a/pr/tests/sem.c b/pr/tests/sem.c
index c0a1fdb6..09c9f3cd 100644
--- a/pr/tests/sem.c
+++ b/pr/tests/sem.c
@@ -63,7 +63,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 PRIntn failed_already=0;
 PRIntn debug_mode;
diff --git a/pr/tests/sema.c b/pr/tests/sema.c
index 03db50b8..3dff8a00 100644
--- a/pr/tests/sema.c
+++ b/pr/tests/sema.c
@@ -39,7 +39,6 @@
 #include "plgetopt.h"
 
 #include <stdio.h>
-#include "nst_wince.h"
 
 #define SEM_NAME1 "/tmp/foo.sem"
 #define SEM_NAME2 "/tmp/bar.sem"
diff --git a/pr/tests/semaerr.c b/pr/tests/semaerr.c
index 01a9ca42..8feb8d81 100644
--- a/pr/tests/semaerr.c
+++ b/pr/tests/semaerr.c
@@ -39,7 +39,6 @@
 #include "plgetopt.h"
 
 #include <stdio.h>
-#include "nst_wince.h"
 
 #define NO_SUCH_SEM_NAME "/tmp/nosuchsem.sem"
 #define SEM_NAME1 "/tmp/foo.sem"
diff --git a/pr/tests/semaerr1.c b/pr/tests/semaerr1.c
index 334c1522..eeccdc43 100644
--- a/pr/tests/semaerr1.c
+++ b/pr/tests/semaerr1.c
@@ -39,7 +39,6 @@
 #include "plgetopt.h"
 
 #include <stdio.h>
-#include "nst_wince.h"
 
 #define SEM_NAME1 "/tmp/foo.sem"
 #define SEM_NAME2 "/tmp/bar.sem"
diff --git a/pr/tests/semaping.c b/pr/tests/semaping.c
index 3e545fba..7b145fc5 100644
--- a/pr/tests/semaping.c
+++ b/pr/tests/semaping.c
@@ -39,7 +39,6 @@
 #include "plgetopt.h"
 
 #include <stdio.h>
-#include "nst_wince.h"
 
 #define SHM_NAME "/tmp/counter"
 #define SEM_NAME1 "/tmp/foo.sem"
diff --git a/pr/tests/semapong.c b/pr/tests/semapong.c
index ec2760aa..d3733290 100644
--- a/pr/tests/semapong.c
+++ b/pr/tests/semapong.c
@@ -39,7 +39,6 @@
 #include "plgetopt.h"
 
 #include <stdio.h>
-#include "nst_wince.h"
 
 #define SHM_NAME "/tmp/counter"
 #define SEM_NAME1 "/tmp/foo.sem"
diff --git a/pr/tests/sendzlf.c b/pr/tests/sendzlf.c
index acf0fad5..3d473659 100644
--- a/pr/tests/sendzlf.c
+++ b/pr/tests/sendzlf.c
@@ -53,7 +53,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 static void ClientThread(void *arg)
 {
diff --git a/pr/tests/server_test.c b/pr/tests/server_test.c
index e8318677..70a32c12 100644
--- a/pr/tests/server_test.c
+++ b/pr/tests/server_test.c
@@ -62,7 +62,6 @@
 #include "pprthred.h"
 
 #include <string.h>
-#include "nst_wince.h"
 
 #define PORT 15004
 #define THREAD_STACKSIZE 0
diff --git a/pr/tests/servr_kk.c b/pr/tests/servr_kk.c
index 1cb580a9..9fbb9b00 100644
--- a/pr/tests/servr_kk.c
+++ b/pr/tests/servr_kk.c
@@ -64,7 +64,6 @@
 #include "pprthred.h"
 
 #include <string.h>
-#include "nst_wince.h"
 
 #define PORT 15004
 #define THREAD_STACKSIZE 0
diff --git a/pr/tests/servr_ku.c b/pr/tests/servr_ku.c
index e7539e0e..a25b9a9c 100644
--- a/pr/tests/servr_ku.c
+++ b/pr/tests/servr_ku.c
@@ -64,7 +64,6 @@
 #include "pprthred.h"
 
 #include <string.h>
-#include "nst_wince.h"
 
 #define PORT 15004
 #define THREAD_STACKSIZE 0
diff --git a/pr/tests/servr_uk.c b/pr/tests/servr_uk.c
index eaca9439..57eaafcd 100644
--- a/pr/tests/servr_uk.c
+++ b/pr/tests/servr_uk.c
@@ -64,7 +64,6 @@
 #include "pprthred.h"
 
 #include <string.h>
-#include "nst_wince.h"
 
 #define PORT 15004
 #define THREAD_STACKSIZE 0
diff --git a/pr/tests/servr_uu.c b/pr/tests/servr_uu.c
index 89d4e296..e5cd2aad 100644
--- a/pr/tests/servr_uu.c
+++ b/pr/tests/servr_uu.c
@@ -64,7 +64,6 @@
 #include "pprthred.h"
 
 #include <string.h>
-#include "nst_wince.h"
 
 #define PORT 15004
 #define THREAD_STACKSIZE 0
diff --git a/pr/tests/short_thread.c b/pr/tests/short_thread.c
index 25c84a43..42a52d7c 100644
--- a/pr/tests/short_thread.c
+++ b/pr/tests/short_thread.c
@@ -38,7 +38,6 @@
 #include <stdio.h>
 #include "nspr.h"
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 /*
  * Create a thread that exits right away; useful for testing race conditions in thread
diff --git a/pr/tests/sigpipe.c b/pr/tests/sigpipe.c
index 4279d1fd..af3bea83 100644
--- a/pr/tests/sigpipe.c
+++ b/pr/tests/sigpipe.c
@@ -66,7 +66,6 @@ int main(void)
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
-#include "nst_wince.h"
 
 static void Test(void *arg)
 {
diff --git a/pr/tests/sleep.c b/pr/tests/sleep.c
index edde60cb..3459fa6a 100644
--- a/pr/tests/sleep.c
+++ b/pr/tests/sleep.c
@@ -36,7 +36,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nspr.h"
-#include "nst_wince.h"
 
 #if defined(XP_UNIX) || defined(XP_OS2)
 
diff --git a/pr/tests/socket.c b/pr/tests/socket.c
index cdbdcecd..97d41347 100644
--- a/pr/tests/socket.c
+++ b/pr/tests/socket.c
@@ -84,10 +84,6 @@ extern void SetupMacPrintfLog(char *logFile);
 
 #define DPRINTF(arg) if (_debug_on) printf arg
 
-
-#include "nst_wince.h"
-
-
 #ifdef XP_PC
 char *TEST_DIR = "prdir";
 char *SMALL_FILE_NAME = "prsmallf";
diff --git a/pr/tests/sockopt.c b/pr/tests/sockopt.c
index 916cf1ed..5ef30f04 100644
--- a/pr/tests/sockopt.c
+++ b/pr/tests/sockopt.c
@@ -47,8 +47,6 @@
 
 #include "plerror.h"
 
-#include "nst_wince.h"
-
 static PRFileDesc *err = NULL;
 static PRBool failed = PR_FALSE;
 
diff --git a/pr/tests/sockping.c b/pr/tests/sockping.c
index fee62250..998ffadf 100644
--- a/pr/tests/sockping.c
+++ b/pr/tests/sockping.c
@@ -56,7 +56,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define NUM_ITERATIONS 10
 
diff --git a/pr/tests/sockpong.c b/pr/tests/sockpong.c
index a5cdc520..5c25ab80 100644
--- a/pr/tests/sockpong.c
+++ b/pr/tests/sockpong.c
@@ -55,7 +55,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define NUM_ITERATIONS 10
 
diff --git a/pr/tests/sprintf.c b/pr/tests/sprintf.c
index 10a34f82..7fe2ac19 100644
--- a/pr/tests/sprintf.c
+++ b/pr/tests/sprintf.c
@@ -55,7 +55,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define countof(a) (sizeof(a)/sizeof(a[0]))
 
diff --git a/pr/tests/sproc_ch.c b/pr/tests/sproc_ch.c
index 8d66d62d..20b35ac4 100644
--- a/pr/tests/sproc_ch.c
+++ b/pr/tests/sproc_ch.c
@@ -50,7 +50,6 @@
 
 #include "prinit.h"
 #include <stdio.h>
-#include "nst_wince.h"
 
 #if !defined(IRIX)
 
diff --git a/pr/tests/sproc_p.c b/pr/tests/sproc_p.c
index 7c92608d..7cae380e 100644
--- a/pr/tests/sproc_p.c
+++ b/pr/tests/sproc_p.c
@@ -48,7 +48,6 @@
 
 #include "prinit.h"
 #include <stdio.h>
-#include "nst_wince.h"
 
 #if !defined(IRIX)
 
diff --git a/pr/tests/stack.c b/pr/tests/stack.c
index 6a05c330..b88c9e5d 100644
--- a/pr/tests/stack.c
+++ b/pr/tests/stack.c
@@ -50,7 +50,6 @@
  
 #include "nspr.h"
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 typedef struct _DataRecord {
 	PRInt32	data;
diff --git a/pr/tests/stat.c b/pr/tests/stat.c
index 0d2720c0..b8609143 100644
--- a/pr/tests/stat.c
+++ b/pr/tests/stat.c
@@ -47,7 +47,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_OS2
 #include <io.h>
diff --git a/pr/tests/stdio.c b/pr/tests/stdio.c
index 73fb8381..d0d84e4e 100644
--- a/pr/tests/stdio.c
+++ b/pr/tests/stdio.c
@@ -52,7 +52,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "nst_wince.h"
 
 static PRIntn PR_CALLBACK stdio(PRIntn argc, char **argv)
 {
diff --git a/pr/tests/str2addr.c b/pr/tests/str2addr.c
index 2e26bc50..b1d4cf4a 100644
--- a/pr/tests/str2addr.c
+++ b/pr/tests/str2addr.c
@@ -44,7 +44,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 /* Address string to convert */
 #define DEFAULT_IPV4_ADDR_STR "207.200.73.41"
diff --git a/pr/tests/strod.c b/pr/tests/strod.c
index dda1d615..b2409c1f 100644
--- a/pr/tests/strod.c
+++ b/pr/tests/strod.c
@@ -42,7 +42,6 @@
 #include "plgetopt.h"
 
 #include <stdlib.h>
-#include "nst_wince.h"
 
 static void Help(void)
 {
diff --git a/pr/tests/suspend.c b/pr/tests/suspend.c
index de743c39..d3cbc7f1 100644
--- a/pr/tests/suspend.c
+++ b/pr/tests/suspend.c
@@ -63,8 +63,6 @@ int main()
 extern void SetupMacPrintfLog(char *logFile);
 #endif
 
-#include "nst_wince.h"
-
 PRMonitor *mon;
 PRInt32 count;
 PRInt32 alive;
diff --git a/pr/tests/switch.c b/pr/tests/switch.c
index 886a9a09..79981272 100644
--- a/pr/tests/switch.c
+++ b/pr/tests/switch.c
@@ -60,7 +60,6 @@
 #endif
 
 #include <stdlib.h>
-#include "nst_wince.h"
 
 #define INNER_LOOPS 100
 #define DEFAULT_LOOPS 100
diff --git a/pr/tests/system.c b/pr/tests/system.c
index 19effe4d..94a69078 100644
--- a/pr/tests/system.c
+++ b/pr/tests/system.c
@@ -41,7 +41,6 @@
 #include "prsystem.h"
 
 #include "plerror.h"
-#include "nst_wince.h"
 
 static char *tag[] =
 {
diff --git a/pr/tests/testbit.c b/pr/tests/testbit.c
index 1a063369..bfb16e29 100644
--- a/pr/tests/testbit.c
+++ b/pr/tests/testbit.c
@@ -42,7 +42,6 @@
 */
 
 #include "nspr.h"
-#include "nst_wince.h"
 
 #define ErrorReport(x) { printf((x)); failed = 1; }
 
diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c
index cf86e0e3..9e68c8c0 100644
--- a/pr/tests/testfile.c
+++ b/pr/tests/testfile.c
@@ -56,8 +56,6 @@
 #include <errno.h>
 #endif /* XP_OS2 */
 
-#include "nst_wince.h"
-
 static int _debug_on = 0;
 
 #ifdef XP_MAC
diff --git a/pr/tests/threads.c b/pr/tests/threads.c
index eba0bcdf..e1d188d4 100644
--- a/pr/tests/threads.c
+++ b/pr/tests/threads.c
@@ -42,7 +42,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/thrpool_client.c b/pr/tests/thrpool_client.c
index 10e2ebc3..2acf24fd 100644
--- a/pr/tests/thrpool_client.c
+++ b/pr/tests/thrpool_client.c
@@ -61,8 +61,6 @@
 #include <process.h>
 #endif
 
-#include "nst_wince.h"
-
 static int _debug_on = 0;
 static int server_port = -1;
 static char *program_name = NULL;
diff --git a/pr/tests/thrpool_server.c b/pr/tests/thrpool_server.c
index 88726b11..e647186a 100644
--- a/pr/tests/thrpool_server.c
+++ b/pr/tests/thrpool_server.c
@@ -68,8 +68,6 @@
 #include <process.h>
 #endif
 
-#include "nst_wince.h"
-
 static int _debug_on = 0;
 static char *program_name = NULL;
 static void serve_client_write(void *arg);
diff --git a/pr/tests/thruput.c b/pr/tests/thruput.c
index 6aa9ed28..6c9c123d 100644
--- a/pr/tests/thruput.c
+++ b/pr/tests/thruput.c
@@ -54,14 +54,10 @@
 #include "prnetdb.h"
 #include "prprf.h"
 #include "prthread.h"
-
 #include "pprio.h"
-
 #include "plerror.h"
 #include "plgetopt.h"
 
-#include "nst_wince.h"
-
 #define ADDR_BUFFER 100
 #define PORT_NUMBER 51877
 #define SAMPLING_INTERVAL 10
diff --git a/pr/tests/time.c b/pr/tests/time.c
index 89928d5c..3321678a 100644
--- a/pr/tests/time.c
+++ b/pr/tests/time.c
@@ -59,7 +59,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
-#include "nst_wince.h"
 
 #define DEFAULT_COUNT 100000
 PRInt32 count;
diff --git a/pr/tests/timemac.c b/pr/tests/timemac.c
index b8ff47cb..c58c24bd 100644
--- a/pr/tests/timemac.c
+++ b/pr/tests/timemac.c
@@ -42,7 +42,6 @@
 #include <stdio.h>
 #include "prinit.h"
 #include "prtime.h"
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/timetest.c b/pr/tests/timetest.c
index 5828d752..c57c15e6 100644
--- a/pr/tests/timetest.c
+++ b/pr/tests/timetest.c
@@ -52,7 +52,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/tmoacc.c b/pr/tests/tmoacc.c
index 5a2f3f7e..fa974a13 100644
--- a/pr/tests/tmoacc.c
+++ b/pr/tests/tmoacc.c
@@ -42,7 +42,6 @@
 
 #include "plerror.h"
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/tmocon.c b/pr/tests/tmocon.c
index 9cd677a5..b762e451 100644
--- a/pr/tests/tmocon.c
+++ b/pr/tests/tmocon.c
@@ -64,7 +64,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 /* for getcwd */
 #if defined(XP_UNIX) || defined (XP_OS2) || defined(XP_BEOS)
diff --git a/pr/tests/tpd.c b/pr/tests/tpd.c
index c24982bc..6db204ce 100644
--- a/pr/tests/tpd.c
+++ b/pr/tests/tpd.c
@@ -54,7 +54,6 @@
 #endif
 
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 static PRUintn key[128];
 static PRIntn debug = 0;
diff --git a/pr/tests/udpsrv.c b/pr/tests/udpsrv.c
index e288103b..b9b615a2 100644
--- a/pr/tests/udpsrv.c
+++ b/pr/tests/udpsrv.c
@@ -82,7 +82,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "nst_wince.h"
 
 #ifdef XP_PC
 #define mode_t int
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index edf496f2..01f31226 100644
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -50,7 +50,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "nst_wince.h"
 
 /*
  * This release (4.8) is backward compatible with the
diff --git a/pr/tests/version.c b/pr/tests/version.c
index ba1516c4..297a5840 100644
--- a/pr/tests/version.c
+++ b/pr/tests/version.c
@@ -42,7 +42,6 @@
 
 #include "plerror.h"
 #include "plgetopt.h"
-#include "nst_wince.h"
 
 PR_IMPORT(const PRVersionDescription *) libVersionPoint(void);
 
diff --git a/pr/tests/writev.c b/pr/tests/writev.c
index dd9fc0c9..603526c9 100644
--- a/pr/tests/writev.c
+++ b/pr/tests/writev.c
@@ -41,7 +41,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/xnotify.c b/pr/tests/xnotify.c
index d064d2f6..725d9aeb 100644
--- a/pr/tests/xnotify.c
+++ b/pr/tests/xnotify.c
@@ -49,7 +49,6 @@
 #include "prinit.h"
 #include "prinrval.h"
 #include "prthread.h"
-#include "nst_wince.h"
 
 static PRLock *ml = NULL;
 static PRIntervalTime base;
diff --git a/pr/tests/y2k.c b/pr/tests/y2k.c
index 7565096d..80fc10a5 100644
--- a/pr/tests/y2k.c
+++ b/pr/tests/y2k.c
@@ -55,7 +55,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nst_wince.h"
 
 #ifdef XP_MAC
 #include "prlog.h"
diff --git a/pr/tests/y2ktmo.c b/pr/tests/y2ktmo.c
index 06626587..c3993dd3 100644
--- a/pr/tests/y2ktmo.c
+++ b/pr/tests/y2ktmo.c
@@ -75,7 +75,6 @@
 #include <sys/types.h>
 #include <sys/timeb.h>  /* for _ftime */
 #endif
-#include "nst_wince.h"
 
 #define DEFAULT_LEAD_TIME_SECS 5
 #define DEFAULT_TOLERANCE_MSECS 500
diff --git a/pr/tests/yield.c b/pr/tests/yield.c
index 74d8f1bd..b798a092 100644
--- a/pr/tests/yield.c
+++ b/pr/tests/yield.c
@@ -45,7 +45,6 @@
 #include "primpl.h"
 #include <os2.h>
 #endif
-#include "nst_wince.h"
 
 #define THREADS 10
 
diff --git a/pr/tests/zerolen.c b/pr/tests/zerolen.c
index 1fa76c39..a39cc022 100644
--- a/pr/tests/zerolen.c
+++ b/pr/tests/zerolen.c
@@ -55,7 +55,6 @@
 #ifndef XP_UNIX
 
 #include <stdio.h>
-#include "nst_wince.h"
 
 int main(int argc, char **argv)
 {