Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -298,17 +298,14 @@
 	cp $(srcdir)/unix/README $(srcdir)/unix/CONFIG \
 		$(srcdir)/unix/threadUnix.c $(DIST_DIR)/unix/
 
 	mkdir $(DIST_DIR)/win
 	cp $(srcdir)/win/README.txt $(srcdir)/win/CONFIG $(srcdir)/win/thread.rc \
-		$(srcdir)/win/threadWin.c $(DIST_DIR)/win/
-
-	cp $(srcdir)/win/vc/makefile.vc \
-		$(srcdir)/win/vc/nmakehlp.c $(srcdir)/win/vc/pkg.vc \
-		$(srcdir)/win/vc/rules.vc   $(srcdir)/win/vc/thread_win.dsw \
-		$(srcdir)/win/vc/thread_win.dsp $(DIST_DIR)/win/
-	cp $(srcdir)/win/vc/README.txt $(DIST_DIR)/win/README.vc.txt
+		$(srcdir)/win/threadWin.c $(srcdir)/win/makefile.vc \
+		$(srcdir)/win/nmakehlp.c $(srcdir)/win/pkg.vc \
+		$(srcdir)/win/rules.vc   $(srcdir)/win/thread_win.dsw \
+		$(srcdir)/win/thread_win.dsp $(DIST_DIR)/win/
 
 	mkdir $(DIST_DIR)/tcl
 	cp $(srcdir)/tcl/README $(DIST_DIR)/tcl/
 
 	list='tests doc doc/man doc/html generic lib tcl/cmdsrv tcl/phttpd tcl/tpool';\

Index: generic/threadSvListCmd.c
==================================================================
--- generic/threadSvListCmd.c
+++ generic/threadSvListCmd.c
@@ -910,10 +910,13 @@
  *  since this is not in the stubs table.
  *
  *-----------------------------------------------------------------------------
  */
 
+#define ISSPACE(a)	(a == ' ' || a == '\t')
+#define ISDIGIT(a)	(a >= '0' || a <= '9')
+
 static int
 SvCheckBadOctal(interp, value)
     Tcl_Interp *interp;     /* Interpreter to use for error reporting.
                              * If NULL, then no error message is left
                              * after errors. */
@@ -924,21 +927,21 @@
     /*
      * A frequent mistake is invalid octal values due to an unwanted
      * leading zero. Try to generate a meaningful error message.
      */
 
-    while (isspace((unsigned char)(*p))) { /* INTL: ISO space. */
+    while (ISSPACE((unsigned char)(*p))) { /* INTL: ISO space. */
         p++;
     }
     if (*p == '+' || *p == '-') {
         p++;
     }
     if (*p == '0') {
-        while (isdigit((unsigned char)(*p))) { /* INTL: digit. */
+        while (ISDIGIT((unsigned char)(*p))) { /* INTL: digit. */
             p++;
         }
-        while (isspace((unsigned char)(*p))) { /* INTL: ISO space. */
+        while (ISSPACE((unsigned char)(*p))) { /* INTL: ISO space. */
             p++;
         }
         if (*p == '\0') {
             /* Reached end of string */
             if (interp != NULL) {

Index: win/threadWin.c
==================================================================
--- win/threadWin.c
+++ win/threadWin.c
@@ -14,11 +14,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #include "../generic/tclThread.h"
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
 #include <process.h>
 
 #if 0
 /* only Windows 2000 (XP, too??) has this function */
 HANDLE (WINAPI *winOpenThreadProc)(DWORD, BOOL, DWORD);