diff --git a/src/.gitattributes b/src/.gitattributes
new file mode 100644
index 0000000000..b8c4277350
--- /dev/null
+++ b/src/.gitattributes
@@ -0,0 +1,26 @@
+# These files need to be CRLF for MSVC and Windows users to be happy.
+# If you clone the git reposity under Windows, then it will normally
+# convert all LFs to CRLF, anyway. But these file need to be CRLF
+# when cloned to a Unix filesystem to assemble a Racket distribution.
+*.vcproj -crlf
+*.sln -crlf
+*.manifest -crlf
+*.rc -crlf
+*.bat -crlf
+src/worksp/README -crlf
+src/racket/gc/BCC_MAKEFILE -crlf
+src/racket/gc/digimars.mak -crlf
+src/worksp/README -crlf
+src/worksp/extradlls/README.TXT -crlf
+src/worksp/gracket/gracket.manifest
+src/worksp/mzcom/mzcom.def
+src/worksp/mzcom/mzcom.rgs
+src/worksp/mzcom/mzcomps.def
+src/worksp/mzcom/mzobj.rgs
+
+# These files seem to be generated. Maybe they shouldn't be
+# in the repository; in any case, they are generated with 
+# CRLF, so let's keep them that way.
+src/worksp/mzcom/mzcom.h -crlf
+src/worksp/racket/resource.h -crlf
+src/worksp/starters/resource.h -crlf
diff --git a/src/worksp/gc2/make.rkt b/src/worksp/gc2/make.rkt
index cc05b6d8d0..216586cc34 100644
--- a/src/worksp/gc2/make.rkt
+++ b/src/worksp/gc2/make.rkt
@@ -1,505 +1,503 @@
-
-#lang scheme/base
-
-(use-compiled-file-paths null)
-
-(require mzlib/restart
-	 mzlib/process)
-
-(define (system- s)
-  (fprintf (current-error-port) "~a~n" s)
-  (system s))
-
-(define accounting-gc? #t)
-(define backtrace-gc? #f)
-(define opt-flags "/O2 /Oy-")
-(define re:only #f)
-
-(unless (find-executable-path "cl.exe" #f)
-  (error (string-append
-	  "Cannot find executable \"cl.exe\".\n"
-	  "You may need to find and run \"vsvars32.bat\".")))
-
-(unless (directory-exists? "xsrc")
-  (make-directory "xsrc"))
-
-(define srcs
-  '("salloc"
-    "bignum"
-    "bool"
-    "builtin"
-    "char"
-    "complex"
-    "dynext"
-    "env"
-    "error"
-    "eval"
-    "file"
-    "future"
-    "fun"
-    "hash"
-    "jit"
-    "list"
-    "module"
-    "mzrt"
-    "network"
-    "numarith"
-    "number"
-    "numcomp"
-    "numstr"
-    "places"
-    "port"
-    "portfun"
-    "print"
-    "rational"
-    "read"
-    "regexp"
-    "sema"
-    "setjmpup"
-    "string"
-    "struct"
-    "symbol"
-    "syntax"
-    "stxobj"
-    "thread"
-    "type"
-    "vector"))
-
-(define common-cpp-defs " /D _CRT_SECURE_NO_DEPRECATE /D _USE_DECLSPECS_FOR_SAL=0 /D _USE_ATTRIBUTES_FOR_SAL=0 ")
-
-(define (check-timestamp t2 dep)
-  (when (t2 . > . (current-seconds))
-    (fprintf (current-error-port)
-	     "WARNING: timestamp is in the future: ~e\n" 
-	     dep)))
-
-(define (try src deps dest objdest includes use-precomp extra-compile-flags expand-extra-flags msvc-pch indirect?)
-  (when (or (not re:only) (regexp-match re:only dest))
-    (unless (and (file-exists? dest)
-		 (let ([t (file-or-directory-modify-seconds dest)])
-		   (andmap
-		    (lambda (dep)
-		      (let ([dep (cond
-				  [(bytes? dep) (bytes->path dep)]
-				  [else dep])])
-			(let ([t2 (file-or-directory-modify-seconds dep)])
-			  (check-timestamp t2 dep)
-			  (> t t2))))
-		    (append deps
-			    (if use-precomp (list use-precomp) null)
-			    (let ([deps (path-replace-suffix dest #".sdep")])
-			      (if (file-exists? deps)
-				  (with-input-from-file deps read)
-				  null))))))
-      (unless (parameterize
-	       ([use-compiled-file-paths (list "compiled")])
-	       (restart-mzscheme #() (lambda (x) x)
-				 (list->vector 
-				  (append
-				   (list "-u"
-					 "../../racket/gc2/xform.rkt"
-					 "--setup"
-					 ".")
-				   (if objdest
-				       (if use-precomp
-					   (list "--precompiled" use-precomp)
-					   null)
-				       (list "--precompile"))
-				   (if indirect?
-				       '("--indirect")
-				       null)
-				   (list
-				    "--depends"
-				    "--cpp"
-				    (format "cl.exe /MT /E ~a ~a ~a" 
-					    common-cpp-defs
-					    expand-extra-flags 
-					    includes)
-				    "-o"
-				    dest
-				    src)))
-				 void))
-        (when (file-exists? dest)
-	  (delete-file dest))
-	(error "error xforming")))
-    (when objdest
-      (c-compile dest objdest null (string-append
-				    extra-compile-flags
-				    common-cpp-defs
-				    (if msvc-pch
-					(format " /Fp~a" msvc-pch)
-					""))))))
-
-(define (c-compile c o deps flags)
-  (unless (and (file-exists? o)
-	       (let ([t (file-or-directory-modify-seconds o)])
-		 (and (>= t (file-or-directory-modify-seconds c))
-		      (andmap
-		       (lambda (f)
-			 (let ([t2 (file-or-directory-modify-seconds f)])
-			   (check-timestamp t2 f)
-			   (>= t t2)))
-		       deps))))
-    (unless (system- (format "cl.exe ~a /MT /Zi ~a /c ~a /Fdxsrc/ /Fo~a" flags opt-flags c o))
-      (error "failed compile"))))
-
-(define common-deps (list "../../racket/gc2/xform.rkt"
-			  "../../racket/gc2/xform-mod.rkt"))
-
-(define (find-obj f d) (format "../~a/release/~a.obj" d f))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define mz-inc "/I ../../racket/include /I .. ")
-
-(try "precomp.c" (list* "../../racket/src/schvers.h"
-			common-deps)
-     "xsrc/precomp.h" #f 
-     (string-append mz-inc "/I ../../racket/src")
-     #f "" "" #f #f)
-
-(for-each
- (lambda (x)
-   (try (format "../../racket/src/~a.c" x)
-	(list* (format "../../racket/src/~a.c" x)
-	       common-deps)
-	(format "xsrc/~a.c" x)
-	(format "xsrc/~a.obj" x)
-	mz-inc
-	"xsrc/precomp.h"
-	""
-	(string-append "/D LIBMZ_EXPORTS "
-		       (if accounting-gc?
-			   "/D NEWGC_BTC_ACCOUNT "
-			   "")
-		       (if backtrace-gc?
-			   "/D MZ_GC_BACKTRACE "
-			   ""))
-	"mz.pch"
-	#f))
- srcs)
-
-(try "../../racket/main.c"
-     (list* "../../racket/main.c"
-	    common-deps)
-     "xsrc/main.c"
-     "xsrc/main.obj"
-     mz-inc
-     #f
-     ""
-     ""
-     #f
-     #t)
-
-(try "../../foreign/foreign.c"
-     (list* "../../foreign/foreign.c"
-	    common-deps)
-     "xsrc/foreign.c"
-     "xsrc/foreign.obj"
-     (string-append
-      mz-inc
-      "/I../../foreign/libffi_msvc "
-      "/I../../racket/src ")
-     #f
-     ""
-     ""
-     #f
-     #f)
-
-(c-compile "../../racket/gc2/gc2.c" "xsrc/gc2.obj"
-           (append
-	    (list "../mzconfig.h")
-	    (map (lambda (f) (build-path "../../racket/" f))
-		 '("include/scheme.h"
-		   "include/schthread.h"
-		   "src/schpriv.h"
-		   "src/stypes.h"))
-	    (map (lambda (f) (build-path "../../racket/gc2/" f))
-		 '("gc2.c"
-		   "newgc.c"
-		   "vm_win.c"
-		   "sighand.c"
-		   "msgprint.c"
-		   "gc2.h"
-		   "gc2_obj.h")))
-	   (string-append
-	    "/D GC2_AS_EXPORT "
-	    "/D NEWGC_BTC_ACCOUNT "
-	    (if backtrace-gc?
-		"/D MZ_GC_BACKTRACE "
-		"")
-	    mz-inc))
-(c-compile "../../racket/src/mzsj86.c" "xsrc/mzsj86.obj" '() mz-inc)
-
-(define dll "../../../lib/libracket3mxxxxxxx.dll")
-(define exe "../../../Racket.exe")
-
-(define libs "kernel32.lib user32.lib ws2_32.lib shell32.lib advapi32.lib")
-
-(define (link-dll objs delayloads sys-libs dll link-options exe?)
-  (let ([ms (if (file-exists? dll)
-		(file-or-directory-modify-seconds dll)
-		0)])
-    (when (ormap
-	   (lambda (f)
-	     (> (file-or-directory-modify-seconds f)
-		ms))
-	   objs)
-      (unless (system- (format "cl.exe ~a /MT /Zi /Fe~a unicows.lib ~a ~a /link ~a~a~a"
-			       (if exe? "" "/LD /DLL")
-			       dll
-			       (let loop ([objs (append objs sys-libs)])
-				 (if (null? objs)
-				     ""
-				     (string-append
-				      (car objs)
-				      " "
-				      (loop (cdr objs)))))
-			       libs
-			       (let loop ([delayloads delayloads])
-				 (if (null? delayloads)
-				     ""
-				     (string-append
-				      " /DELAYLOAD:"
-				      (car delayloads)
-				      " "
-				      (loop (cdr delayloads)))))
-			       link-options
-			       (let ([s (regexp-match "^(.*)/([a-z0-9]*)[.]dll$" dll)])
-				 (if s
-				     (format " /IMPLIB:~a/msvc/~a.lib"
-					     (cadr s) (caddr s))
-				     ""))))
-	(error 'winmake "~a link failed" (if exe? "EXE" "DLL"))))))
-
-(c-compile "../racket/uniplt.c"
-	   "xsrc/uniplt.obj"
-	   null
-	   " -Dwx_msw")
-
-(let ([objs (list*
-	     "../libracket/Release/uniplt.obj"
-	     "xsrc/gc2.obj"
-	     "xsrc/mzsj86.obj"
-	     "xsrc/foreign.obj"
-	     (find-obj "gmp" "libracket")
-	     (find-obj "ffi" "libracket")
-	     (find-obj "win32" "libracket")
-	     (find-obj "prep_cif" "libracket")
-	     (find-obj "types" "libracket")
-	     (map
-	      (lambda (n)
-		(format "xsrc/~a.obj" n))
-	      srcs))])
-  (link-dll objs null null dll "" #f))
-
-(define (check-rc res rc)
-  (unless (and (file-exists? res)
-	       (>= (file-or-directory-modify-seconds res)
-		   (file-or-directory-modify-seconds rc)))
-	  (system- (string-append 
-		    "rc /l 0x409  /I ../../wxwindow/include/msw /I ../../wxwindow/contrib/fafa "
-		    (format "/fo~a ~a" res rc)))))
-
-(check-rc "racket.res" "../racket/racket.rc")
-
-(let ([objs (list
-	     "racket.res"
-	     "xsrc/main.obj"
-	     "xsrc/uniplt.obj"
-	     "../../../lib/msvc/libracket3mxxxxxxx.lib")])
-  (link-dll objs 
-	    '("libracket3mxxxxxxx.dll")
-	    '("delayimp.lib")
-	    exe "" #t))
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define wx-inc (string-append "/I ../../racket/include "
-			      "/I .. "
-			      "/I ../../racket/gc2 "
-			      "/I ../../wxwindow/include/msw "
-			      "/I ../../wxwindow/include/base "
-			      "/I ../../gracket/wxme "
-			      "/I ../../wxwindow/contrib/wxxpm/libxpm.34b/lib "
-			      "/I ../../wxWindow/contrib/fafa "
-			      "/I ../../wxcommon/jpeg /I ../jpeg /I ../../wxcommon/zlib "))
-(try "wxprecomp.cxx" (list* "../../racket/src/schvers.h" common-deps)
-     "xsrc/wxprecomp.h" #f wx-inc #f "" "-DGC2_AS_IMPORT" #f #f)
-
-(define (wx-try base proj x use-precomp? suffix indirect?)
-  (let ([cxx-file (format "../../~a/~a.~a" base x suffix)])
-    (try cxx-file
-	 (list* cxx-file
-		common-deps)
-	 (format "xsrc/~a.~a" x suffix)
-	 (format "xsrc/~a.obj" x)
-	 wx-inc
-	 (and use-precomp? "xsrc/wxprecomp.h")
-	 "-DGC2_JUST_MACROS /FI../../../racket/gc2/gc2.h"
-	 (string-append "-DGC2_AS_IMPORT"
-			(if backtrace-gc?
-			    " /D MZ_GC_BACKTRACE"
-			    ""))
-	 "wx.pch"
-	 indirect?)))
-
-(define wxwin-base-srcs
-  '("wb_canvs"
-    "wb_cmdlg"
-    "wb_data"
-    "wb_dc"
-    "wb_dialg"
-    "wb_frame"
-    "wb_gdi"
-    "wb_hash"
-    "wb_item"
-    "wb_list"
-    "wb_main"
-    "wb_obj"
-    "wb_panel"
-    "wb_print"
-    "wb_ps"
-    "wb_stdev"
-    "wb_sysev"
-    "wb_timer"
-    "wb_types"
-    "wb_utils"
-    "wb_win"))
-
-(for-each (lambda (x)
-	    (wx-try "wxwindow/src/base" "wxwin" x #t "cxx" #f))
-	  wxwin-base-srcs)
-
-(define wxwin-msw-srcs
-  '("wx_buttn"
-    "wx_canvs"
-    "wx_check"
-    "wx_choic"
-    "wx_clipb"
-    "wx_cmdlg"
-    "wx_dc"
-    "wx_dialg"
-    "wx_frame"
-    "wx_gauge"
-    "wx_gbox"
-    "wx_gdi"
-    "wx_graph_glue"
-    "wx_item"
-    "wx_lbox"
-    "wx_main"
-    "wx_menu"
-    "wx_messg"
-    "wx_panel"
-    "wx_pdf"
-    "wx_rbox"
-    "wx_slidr"
-    "wx_tabc"
-    "wx_timer"
-    "wx_utils"
-    "wx_win"
-    "wximgfil"))
-
-(for-each (lambda (x)
-	    (wx-try "wxwindow/src/msw" "wxwin" x #t "cxx" #f))
-	  wxwin-msw-srcs)
-
-(define wxs-srcs
-  '("wxs_bmap"
-    "wxs_butn"
-    "wxs_chce"
-    "wxs_ckbx"
-    "wxs_cnvs"
-    "wxs_dc"
-    "wxs_evnt"
-    "wxs_fram"
-    "wxs_gage"
-    "wxs_gdi"
-    "wxs_glob"
-    "wxs_item"
-    "wxs_lbox"
-    "wxs_menu"
-    "wxs_misc"
-    "wxs_obj"
-    "wxs_panl"
-    "wxs_rado"
-    "wxs_slid"
-    "wxs_tabc"
-    "wxs_win"
-    "wxscheme"))
-
-(for-each (lambda (x)
-	    (wx-try "gracket/wxs" "wxs" x #t "cxx" #f))
-	  wxs-srcs)
-
-(define gracket-srcs
-  '("gracket"
-    "gracketmsw"))
-
-(for-each (lambda (x)
-	    (wx-try "gracket" "libgracket" x #t "cxx" #f))
-	  gracket-srcs)
-
-(wx-try "wxcommon" "wxme" "wxJPEG" #t "cxx" #f)
-(wx-try "racket/utils" "wxme" "xcglue" #f "c" #f)
-(c-compile "../../wxcommon/wxGC.cxx"
-	   "xsrc/wxGC.obj"
-	   null
-	   (string-append wx-inc " -DMZ_PRECISE_GC -DGC2_AS_IMPORT -Dwx_msw"))
-
-(let ([objs (append (list
-		     "xsrc/uniplt.obj"
-		     "xsrc/wxGC.obj"
-		     "xsrc/wxJPEG.obj"
-		     "xsrc/xcglue.obj")
-		    (map
-		     (lambda (n)
-		       (format "xsrc/~a.obj" n))
-		     (append wxwin-base-srcs
-			     wxwin-msw-srcs
-			     wxs-srcs
-			     gracket-srcs)))]
-      [libs (list
-	     "../../../lib/msvc/libracket3mxxxxxxx.lib"
-	     "../wxutils/Release/wxutils.lib"
-	     "../jpeg/Release/jpeg.lib"
-	     "../png/Release/png.lib"
-	     "../zlib/Release/zlib.lib")]
-      [win-libs (list
-		 "comctl32.lib" "glu32.lib" "opengl32.lib"
-		 "gdi32.lib" "comdlg32.lib" "advapi32.lib" 
-		 "shell32.lib" "ole32.lib" "oleaut32.lib"
-		 "winmm.lib")])
-  (link-dll (append objs libs) null win-libs "../../../lib/libgracket3mxxxxxxx.dll" "" #f))
-
-(wx-try "gracket" "gracket" "grmain" #f "cxx" #t)
-
-(check-rc "gracket.res" "../gracket/gracket.rc")
-
-(let ([objs (list
-	     "gracket.res"
-	     "xsrc/grmain.obj"
-	     "xsrc/uniplt.obj"
-	     "../../../lib/msvc/libracket3mxxxxxxx.lib"
-	     "../../../lib/msvc/libgracket3mxxxxxxx.lib")])
-  (link-dll objs 
-	    '("libracket3mxxxxxxx.dll" 
-	      "libgracket3mxxxxxxx.dll")
-	    '("advapi32.lib" 
-	      "delayimp.lib") 
-	    "../../../GRacket.exe" " /subsystem:windows" #t))
-
-(system- "cl.exe /MT /O2 /DMZ_PRECISE_GC /I../../racket/include /I.. /c ../../racket/dynsrc/mzdyn.c /Fomzdyn3m.obj")
-(system- "lib.exe -def:../../racket/dynsrc/mzdyn.def -out:mzdyn3m.lib")
-
-(define (copy-file/diff src dest)
-  (unless (and (file-exists? dest)
-	       (string=? (with-input-from-file src (lambda () (read-string (file-size src))))
-			 (with-input-from-file dest (lambda () (read-string (file-size dest))))))
-    (printf "Updating ~a~n" dest)
-    (when (file-exists? dest) (delete-file dest))
-    (copy-file src dest)))
-
-(copy-file/diff "mzdyn3m.exp" "../../../lib/msvc/mzdyn3m.exp")
-(copy-file/diff "mzdyn3m.obj" "../../../lib/msvc/mzdyn3m.obj")
-
+#lang scheme/base
+
+(use-compiled-file-paths null)
+
+(require mzlib/restart
+	 mzlib/process)
+
+(define (system- s)
+  (fprintf (current-error-port) "~a~n" s)
+  (system s))
+
+(define accounting-gc? #t)
+(define backtrace-gc? #f)
+(define opt-flags "/O2 /Oy-")
+(define re:only #f)
+
+(unless (find-executable-path "cl.exe" #f)
+  (error (string-append
+	  "Cannot find executable \"cl.exe\".\n"
+	  "You may need to find and run \"vsvars32.bat\".")))
+
+(unless (directory-exists? "xsrc")
+  (make-directory "xsrc"))
+
+(define srcs
+  '("salloc"
+    "bignum"
+    "bool"
+    "builtin"
+    "char"
+    "complex"
+    "dynext"
+    "env"
+    "error"
+    "eval"
+    "file"
+    "future"
+    "fun"
+    "hash"
+    "jit"
+    "list"
+    "module"
+    "mzrt"
+    "network"
+    "numarith"
+    "number"
+    "numcomp"
+    "numstr"
+    "places"
+    "port"
+    "portfun"
+    "print"
+    "rational"
+    "read"
+    "regexp"
+    "sema"
+    "setjmpup"
+    "string"
+    "struct"
+    "symbol"
+    "syntax"
+    "stxobj"
+    "thread"
+    "type"
+    "vector"))
+
+(define common-cpp-defs " /D _CRT_SECURE_NO_DEPRECATE /D _USE_DECLSPECS_FOR_SAL=0 /D _USE_ATTRIBUTES_FOR_SAL=0 ")
+
+(define (check-timestamp t2 dep)
+  (when (t2 . > . (current-seconds))
+    (fprintf (current-error-port)
+	     "WARNING: timestamp is in the future: ~e\n" 
+	     dep)))
+
+(define (try src deps dest objdest includes use-precomp extra-compile-flags expand-extra-flags msvc-pch indirect?)
+  (when (or (not re:only) (regexp-match re:only dest))
+    (unless (and (file-exists? dest)
+		 (let ([t (file-or-directory-modify-seconds dest)])
+		   (andmap
+		    (lambda (dep)
+		      (let ([dep (cond
+				  [(bytes? dep) (bytes->path dep)]
+				  [else dep])])
+			(let ([t2 (file-or-directory-modify-seconds dep)])
+			  (check-timestamp t2 dep)
+			  (> t t2))))
+		    (append deps
+			    (if use-precomp (list use-precomp) null)
+			    (let ([deps (path-replace-suffix dest #".sdep")])
+			      (if (file-exists? deps)
+				  (with-input-from-file deps read)
+				  null))))))
+      (unless (parameterize
+	       ([use-compiled-file-paths (list "compiled")])
+	       (restart-mzscheme #() (lambda (x) x)
+				 (list->vector 
+				  (append
+				   (list "-u"
+					 "../../racket/gc2/xform.rkt"
+					 "--setup"
+					 ".")
+				   (if objdest
+				       (if use-precomp
+					   (list "--precompiled" use-precomp)
+					   null)
+				       (list "--precompile"))
+				   (if indirect?
+				       '("--indirect")
+				       null)
+				   (list
+				    "--depends"
+				    "--cpp"
+				    (format "cl.exe /MT /E ~a ~a ~a" 
+					    common-cpp-defs
+					    expand-extra-flags 
+					    includes)
+				    "-o"
+				    dest
+				    src)))
+				 void))
+        (when (file-exists? dest)
+	  (delete-file dest))
+	(error "error xforming")))
+    (when objdest
+      (c-compile dest objdest null (string-append
+				    extra-compile-flags
+				    common-cpp-defs
+				    (if msvc-pch
+					(format " /Fp~a" msvc-pch)
+					""))))))
+
+(define (c-compile c o deps flags)
+  (unless (and (file-exists? o)
+	       (let ([t (file-or-directory-modify-seconds o)])
+		 (and (>= t (file-or-directory-modify-seconds c))
+		      (andmap
+		       (lambda (f)
+			 (let ([t2 (file-or-directory-modify-seconds f)])
+			   (check-timestamp t2 f)
+			   (>= t t2)))
+		       deps))))
+    (unless (system- (format "cl.exe ~a /MT /Zi ~a /c ~a /Fdxsrc/ /Fo~a" flags opt-flags c o))
+      (error "failed compile"))))
+
+(define common-deps (list "../../racket/gc2/xform.rkt"
+			  "../../racket/gc2/xform-mod.rkt"))
+
+(define (find-obj f d) (format "../~a/release/~a.obj" d f))
+
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define mz-inc "/I ../../racket/include /I .. ")
+
+(try "precomp.c" (list* "../../racket/src/schvers.h"
+			common-deps)
+     "xsrc/precomp.h" #f 
+     (string-append mz-inc "/I ../../racket/src")
+     #f "" "" #f #f)
+
+(for-each
+ (lambda (x)
+   (try (format "../../racket/src/~a.c" x)
+	(list* (format "../../racket/src/~a.c" x)
+	       common-deps)
+	(format "xsrc/~a.c" x)
+	(format "xsrc/~a.obj" x)
+	mz-inc
+	"xsrc/precomp.h"
+	""
+	(string-append "/D LIBMZ_EXPORTS "
+		       (if accounting-gc?
+			   "/D NEWGC_BTC_ACCOUNT "
+			   "")
+		       (if backtrace-gc?
+			   "/D MZ_GC_BACKTRACE "
+			   ""))
+	"mz.pch"
+	#f))
+ srcs)
+
+(try "../../racket/main.c"
+     (list* "../../racket/main.c"
+	    common-deps)
+     "xsrc/main.c"
+     "xsrc/main.obj"
+     mz-inc
+     #f
+     ""
+     ""
+     #f
+     #t)
+
+(try "../../foreign/foreign.c"
+     (list* "../../foreign/foreign.c"
+	    common-deps)
+     "xsrc/foreign.c"
+     "xsrc/foreign.obj"
+     (string-append
+      mz-inc
+      "/I../../foreign/libffi_msvc "
+      "/I../../racket/src ")
+     #f
+     ""
+     ""
+     #f
+     #f)
+
+(c-compile "../../racket/gc2/gc2.c" "xsrc/gc2.obj"
+           (append
+	    (list "../mzconfig.h")
+	    (map (lambda (f) (build-path "../../racket/" f))
+		 '("include/scheme.h"
+		   "include/schthread.h"
+		   "src/schpriv.h"
+		   "src/stypes.h"))
+	    (map (lambda (f) (build-path "../../racket/gc2/" f))
+		 '("gc2.c"
+		   "newgc.c"
+		   "vm_win.c"
+		   "sighand.c"
+		   "msgprint.c"
+		   "gc2.h"
+		   "gc2_obj.h")))
+	   (string-append
+	    "/D GC2_AS_EXPORT "
+	    "/D NEWGC_BTC_ACCOUNT "
+	    (if backtrace-gc?
+		"/D MZ_GC_BACKTRACE "
+		"")
+	    mz-inc))
+(c-compile "../../racket/src/mzsj86.c" "xsrc/mzsj86.obj" '() mz-inc)
+
+(define dll "../../../lib/libracket3mxxxxxxx.dll")
+(define exe "../../../Racket.exe")
+
+(define libs "kernel32.lib user32.lib ws2_32.lib shell32.lib advapi32.lib")
+
+(define (link-dll objs delayloads sys-libs dll link-options exe?)
+  (let ([ms (if (file-exists? dll)
+		(file-or-directory-modify-seconds dll)
+		0)])
+    (when (ormap
+	   (lambda (f)
+	     (> (file-or-directory-modify-seconds f)
+		ms))
+	   objs)
+      (unless (system- (format "cl.exe ~a /MT /Zi /Fe~a unicows.lib ~a ~a /link ~a~a~a"
+			       (if exe? "" "/LD /DLL")
+			       dll
+			       (let loop ([objs (append objs sys-libs)])
+				 (if (null? objs)
+				     ""
+				     (string-append
+				      (car objs)
+				      " "
+				      (loop (cdr objs)))))
+			       libs
+			       (let loop ([delayloads delayloads])
+				 (if (null? delayloads)
+				     ""
+				     (string-append
+				      " /DELAYLOAD:"
+				      (car delayloads)
+				      " "
+				      (loop (cdr delayloads)))))
+			       link-options
+			       (let ([s (regexp-match "^(.*)/([a-z0-9]*)[.]dll$" dll)])
+				 (if s
+				     (format " /IMPLIB:~a/msvc/~a.lib"
+					     (cadr s) (caddr s))
+				     ""))))
+	(error 'winmake "~a link failed" (if exe? "EXE" "DLL"))))))
+
+(c-compile "../racket/uniplt.c"
+	   "xsrc/uniplt.obj"
+	   null
+	   " -Dwx_msw")
+
+(let ([objs (list*
+	     "../libracket/Release/uniplt.obj"
+	     "xsrc/gc2.obj"
+	     "xsrc/mzsj86.obj"
+	     "xsrc/foreign.obj"
+	     (find-obj "gmp" "libracket")
+	     (find-obj "ffi" "libracket")
+	     (find-obj "win32" "libracket")
+	     (find-obj "prep_cif" "libracket")
+	     (find-obj "types" "libracket")
+	     (map
+	      (lambda (n)
+		(format "xsrc/~a.obj" n))
+	      srcs))])
+  (link-dll objs null null dll "" #f))
+
+(define (check-rc res rc)
+  (unless (and (file-exists? res)
+	       (>= (file-or-directory-modify-seconds res)
+		   (file-or-directory-modify-seconds rc)))
+	  (system- (string-append 
+		    "rc /l 0x409  /I ../../wxwindow/include/msw /I ../../wxwindow/contrib/fafa "
+		    (format "/fo~a ~a" res rc)))))
+
+(check-rc "racket.res" "../racket/racket.rc")
+
+(let ([objs (list
+	     "racket.res"
+	     "xsrc/main.obj"
+	     "xsrc/uniplt.obj"
+	     "../../../lib/msvc/libracket3mxxxxxxx.lib")])
+  (link-dll objs 
+	    '("libracket3mxxxxxxx.dll")
+	    '("delayimp.lib")
+	    exe "" #t))
+
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define wx-inc (string-append "/I ../../racket/include "
+			      "/I .. "
+			      "/I ../../racket/gc2 "
+			      "/I ../../wxwindow/include/msw "
+			      "/I ../../wxwindow/include/base "
+			      "/I ../../gracket/wxme "
+			      "/I ../../wxwindow/contrib/wxxpm/libxpm.34b/lib "
+			      "/I ../../wxWindow/contrib/fafa "
+			      "/I ../../wxcommon/jpeg /I ../jpeg /I ../../wxcommon/zlib "))
+(try "wxprecomp.cxx" (list* "../../racket/src/schvers.h" common-deps)
+     "xsrc/wxprecomp.h" #f wx-inc #f "" "-DGC2_AS_IMPORT" #f #f)
+
+(define (wx-try base proj x use-precomp? suffix indirect?)
+  (let ([cxx-file (format "../../~a/~a.~a" base x suffix)])
+    (try cxx-file
+	 (list* cxx-file
+		common-deps)
+	 (format "xsrc/~a.~a" x suffix)
+	 (format "xsrc/~a.obj" x)
+	 wx-inc
+	 (and use-precomp? "xsrc/wxprecomp.h")
+	 "-DGC2_JUST_MACROS /FI../../../racket/gc2/gc2.h"
+	 (string-append "-DGC2_AS_IMPORT"
+			(if backtrace-gc?
+			    " /D MZ_GC_BACKTRACE"
+			    ""))
+	 "wx.pch"
+	 indirect?)))
+
+(define wxwin-base-srcs
+  '("wb_canvs"
+    "wb_cmdlg"
+    "wb_data"
+    "wb_dc"
+    "wb_dialg"
+    "wb_frame"
+    "wb_gdi"
+    "wb_hash"
+    "wb_item"
+    "wb_list"
+    "wb_main"
+    "wb_obj"
+    "wb_panel"
+    "wb_print"
+    "wb_ps"
+    "wb_stdev"
+    "wb_sysev"
+    "wb_timer"
+    "wb_types"
+    "wb_utils"
+    "wb_win"))
+
+(for-each (lambda (x)
+	    (wx-try "wxwindow/src/base" "wxwin" x #t "cxx" #f))
+	  wxwin-base-srcs)
+
+(define wxwin-msw-srcs
+  '("wx_buttn"
+    "wx_canvs"
+    "wx_check"
+    "wx_choic"
+    "wx_clipb"
+    "wx_cmdlg"
+    "wx_dc"
+    "wx_dialg"
+    "wx_frame"
+    "wx_gauge"
+    "wx_gbox"
+    "wx_gdi"
+    "wx_graph_glue"
+    "wx_item"
+    "wx_lbox"
+    "wx_main"
+    "wx_menu"
+    "wx_messg"
+    "wx_panel"
+    "wx_pdf"
+    "wx_rbox"
+    "wx_slidr"
+    "wx_tabc"
+    "wx_timer"
+    "wx_utils"
+    "wx_win"
+    "wximgfil"))
+
+(for-each (lambda (x)
+	    (wx-try "wxwindow/src/msw" "wxwin" x #t "cxx" #f))
+	  wxwin-msw-srcs)
+
+(define wxs-srcs
+  '("wxs_bmap"
+    "wxs_butn"
+    "wxs_chce"
+    "wxs_ckbx"
+    "wxs_cnvs"
+    "wxs_dc"
+    "wxs_evnt"
+    "wxs_fram"
+    "wxs_gage"
+    "wxs_gdi"
+    "wxs_glob"
+    "wxs_item"
+    "wxs_lbox"
+    "wxs_menu"
+    "wxs_misc"
+    "wxs_obj"
+    "wxs_panl"
+    "wxs_rado"
+    "wxs_slid"
+    "wxs_tabc"
+    "wxs_win"
+    "wxscheme"))
+
+(for-each (lambda (x)
+	    (wx-try "gracket/wxs" "wxs" x #t "cxx" #f))
+	  wxs-srcs)
+
+(define gracket-srcs
+  '("gracket"
+    "gracketmsw"))
+
+(for-each (lambda (x)
+	    (wx-try "gracket" "libgracket" x #t "cxx" #f))
+	  gracket-srcs)
+
+(wx-try "wxcommon" "wxme" "wxJPEG" #t "cxx" #f)
+(wx-try "racket/utils" "wxme" "xcglue" #f "c" #f)
+(c-compile "../../wxcommon/wxGC.cxx"
+	   "xsrc/wxGC.obj"
+	   null
+	   (string-append wx-inc " -DMZ_PRECISE_GC -DGC2_AS_IMPORT -Dwx_msw"))
+
+(let ([objs (append (list
+		     "xsrc/uniplt.obj"
+		     "xsrc/wxGC.obj"
+		     "xsrc/wxJPEG.obj"
+		     "xsrc/xcglue.obj")
+		    (map
+		     (lambda (n)
+		       (format "xsrc/~a.obj" n))
+		     (append wxwin-base-srcs
+			     wxwin-msw-srcs
+			     wxs-srcs
+			     gracket-srcs)))]
+      [libs (list
+	     "../../../lib/msvc/libracket3mxxxxxxx.lib"
+	     "../wxutils/Release/wxutils.lib"
+	     "../jpeg/Release/jpeg.lib"
+	     "../png/Release/png.lib"
+	     "../zlib/Release/zlib.lib")]
+      [win-libs (list
+		 "comctl32.lib" "glu32.lib" "opengl32.lib"
+		 "gdi32.lib" "comdlg32.lib" "advapi32.lib" 
+		 "shell32.lib" "ole32.lib" "oleaut32.lib"
+		 "winmm.lib")])
+  (link-dll (append objs libs) null win-libs "../../../lib/libgracket3mxxxxxxx.dll" "" #f))
+
+(wx-try "gracket" "gracket" "grmain" #f "cxx" #t)
+
+(check-rc "gracket.res" "../gracket/gracket.rc")
+
+(let ([objs (list
+	     "gracket.res"
+	     "xsrc/grmain.obj"
+	     "xsrc/uniplt.obj"
+	     "../../../lib/msvc/libracket3mxxxxxxx.lib"
+	     "../../../lib/msvc/libgracket3mxxxxxxx.lib")])
+  (link-dll objs 
+	    '("libracket3mxxxxxxx.dll" 
+	      "libgracket3mxxxxxxx.dll")
+	    '("advapi32.lib" 
+	      "delayimp.lib") 
+	    "../../../GRacket.exe" " /subsystem:windows" #t))
+
+(system- "cl.exe /MT /O2 /DMZ_PRECISE_GC /I../../racket/include /I.. /c ../../racket/dynsrc/mzdyn.c /Fomzdyn3m.obj")
+(system- "lib.exe -def:../../racket/dynsrc/mzdyn.def -out:mzdyn3m.lib")
+
+(define (copy-file/diff src dest)
+  (unless (and (file-exists? dest)
+	       (string=? (with-input-from-file src (lambda () (read-string (file-size src))))
+			 (with-input-from-file dest (lambda () (read-string (file-size dest))))))
+    (printf "Updating ~a~n" dest)
+    (when (file-exists? dest) (delete-file dest))
+    (copy-file src dest)))
+
+(copy-file/diff "mzdyn3m.exp" "../../../lib/msvc/mzdyn3m.exp")
+(copy-file/diff "mzdyn3m.obj" "../../../lib/msvc/mzdyn3m.obj")
diff --git a/src/worksp/gc2/precomp.c b/src/worksp/gc2/precomp.c
index a2414de2f3..57add7f281 100644
--- a/src/worksp/gc2/precomp.c
+++ b/src/worksp/gc2/precomp.c
@@ -1 +1 @@
-#include "schpriv.h"
+#include "schpriv.h"
diff --git a/src/worksp/gc2/wxprecomp.cxx b/src/worksp/gc2/wxprecomp.cxx
index dcc76e1d4e..308f105344 100644
--- a/src/worksp/gc2/wxprecomp.cxx
+++ b/src/worksp/gc2/wxprecomp.cxx
@@ -1 +1 @@
-#include "wx.h"
+#include "wx.h"
diff --git a/src/worksp/jpeg/jconfig.h b/src/worksp/jpeg/jconfig.h
index 5da29c7dfc..23af5627aa 100644
--- a/src/worksp/jpeg/jconfig.h
+++ b/src/worksp/jpeg/jconfig.h
@@ -1,2 +1 @@
-
-#include "jconfig.vc"
+#include "jconfig.vc"
diff --git a/src/worksp/mzcom/MzCOMCP.h b/src/worksp/mzcom/MzCOMCP.h
index 4e287234dd..042f472f9b 100644
--- a/src/worksp/mzcom/MzCOMCP.h
+++ b/src/worksp/mzcom/MzCOMCP.h
@@ -1,32 +1,32 @@
-#ifndef _MZCOMCP_H_
-#define _MZCOMCP_H_
-
-template <class T>
-class CProxy_IMzObjEvents : public IConnectionPointImpl<T, &DIID__IMzObjEvents, CComDynamicUnkArray>
-{
-	//Warning this class may be recreated by the wizard.
-public:
-	VOID Fire_SchemeError(BSTR description)
-	{
-		T* pT = static_cast<T*>(this);
-		int nConnectionIndex;
-		CComVariant* pvars = new CComVariant[1];
-		int nConnections = m_vec.GetSize();
-		
-		for (nConnectionIndex = 0; nConnectionIndex < nConnections; nConnectionIndex++)
-		{
-			pT->Lock();
-			CComPtr<IUnknown> sp = m_vec.GetAt(nConnectionIndex);
-			pT->Unlock();
-			IDispatch* pDispatch = reinterpret_cast<IDispatch*>(sp.p);
-			if (pDispatch != NULL)
-			{
-				pvars[0] = description;
-				DISPPARAMS disp = { pvars, NULL, 1, 0 };
-				pDispatch->Invoke(0x1, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &disp, NULL, NULL, NULL);
-			}
-		}
-		delete[] pvars;
-	}
-};
-#endif
\ No newline at end of file
+#ifndef _MZCOMCP_H_
+#define _MZCOMCP_H_
+
+template <class T>
+class CProxy_IMzObjEvents : public IConnectionPointImpl<T, &DIID__IMzObjEvents, CComDynamicUnkArray>
+{
+	//Warning this class may be recreated by the wizard.
+public:
+	VOID Fire_SchemeError(BSTR description)
+	{
+		T* pT = static_cast<T*>(this);
+		int nConnectionIndex;
+		CComVariant* pvars = new CComVariant[1];
+		int nConnections = m_vec.GetSize();
+		
+		for (nConnectionIndex = 0; nConnectionIndex < nConnections; nConnectionIndex++)
+		{
+			pT->Lock();
+			CComPtr<IUnknown> sp = m_vec.GetAt(nConnectionIndex);
+			pT->Unlock();
+			IDispatch* pDispatch = reinterpret_cast<IDispatch*>(sp.p);
+			if (pDispatch != NULL)
+			{
+				pvars[0] = description;
+				DISPPARAMS disp = { pvars, NULL, 1, 0 };
+				pDispatch->Invoke(0x1, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &disp, NULL, NULL, NULL);
+			}
+		}
+		delete[] pvars;
+	}
+};
+#endif
diff --git a/src/worksp/mzcom/mzcom.dsp b/src/worksp/mzcom/mzcom.dsp
deleted file mode 100644
index 661a4230db..0000000000
--- a/src/worksp/mzcom/mzcom.dsp
+++ /dev/null
@@ -1,180 +0,0 @@
-# Microsoft Developer Studio Project File - Name="MzCOM" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=MzCOM - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "MzCOM.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "MzCOM.mak" CFG="MzCOM - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "MzCOM - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "MzCOM - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "MzCOM - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\..\..\include" /I "..\..\mzcom" /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i ".\..\mzcom" /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libcmtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib libmzschxxxxxxx.lib libmzgcxxxxxxx.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcmt.lib" /out:"../../../collects/mzcom/mzcom.exe" /pdbtype:sept /libpath:"..\libmzsch\Debug" /libpath:"..\libmzgc\Debug"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "MzCOM - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "MzCOM___Win32_Release"
-# PROP BASE Intermediate_Dir "MzCOM___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /O1 /I "../../mzscheme/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /O1 /I "..\..\mzcom" /I "." /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "..\..\mzcom" /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib libmzschxxxxxxx.lib libmzgcxxxxxxx.lib /nologo /subsystem:windows /machine:I386 /out:"../../../collects/mzcom/mzcom.exe" /libpath:"..\libmzsch\Release" /libpath:"..\libmzgc\Release"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "MzCOM - Win32 Debug"
-# Name "MzCOM - Win32 Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\mzcom\mzcom.cxx
-
-!IF  "$(CFG)" == "MzCOM - Win32 Debug"
-
-# ADD CPP /I "../../mzscheme/include ../worksp/mzcom"
-
-!ELSEIF  "$(CFG)" == "MzCOM - Win32 Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mzcom\mzcom.idl
-
-!IF  "$(CFG)" == "MzCOM - Win32 Debug"
-
-# ADD MTL /tlb "./mzcom.tlb"
-# SUBTRACT MTL /Oicf
-
-!ELSEIF  "$(CFG)" == "MzCOM - Win32 Release"
-
-# PROP Intermediate_Dir "Release"
-# ADD MTL /tlb "./mzcom.tlb"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mzcom\mzobj.cxx
-
-!IF  "$(CFG)" == "MzCOM - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "MzCOM - Win32 Release"
-
-# PROP Intermediate_Dir "Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mzcom\stdafx.h
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\mzcom.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MzCOMCP.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mzcom\mzobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\mzcom\resource.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\mzcom.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\mzcom.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\MzCOM.rgs
-# End Source File
-# Begin Source File
-
-SOURCE=.\MzObj.rgs
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/src/worksp/mzcom/mzcom.dsw b/src/worksp/mzcom/mzcom.dsw
deleted file mode 100644
index d6430c9ef7..0000000000
--- a/src/worksp/mzcom/mzcom.dsw
+++ /dev/null
@@ -1,59 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "MzCOM"=.\MzCOM.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libmzgc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libmzsch
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libmzgc"=..\libmzgc\libmzgc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libmzsch"=..\libmzsch\libmzsch.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/src/worksp/mzcom/mzcom.mak b/src/worksp/mzcom/mzcom.mak
deleted file mode 100644
index c88d01c32e..0000000000
--- a/src/worksp/mzcom/mzcom.mak
+++ /dev/null
@@ -1,292 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on MzCOM.dsp
-!IF "$(CFG)" == ""
-CFG=MzCOM - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to MzCOM - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "MzCOM - Win32 Debug" && "$(CFG)" != "MzCOM - Win32 Release"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "MzCOM.mak" CFG="MzCOM - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "MzCOM - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "MzCOM - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "MzCOM - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-
-ALL : "..\..\..\collects\mzcom\mzcom.exe" ".\mzcom.tlb" ".\Debug\regsvr32.trg"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\mzcom.obj"
-	-@erase "$(INTDIR)\mzcom.res"
-	-@erase "$(INTDIR)\mzobj.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(OUTDIR)\mzcom.pdb"
-	-@erase "..\..\..\collects\mzcom\mzcom.exe"
-	-@erase "..\..\..\collects\mzcom\mzcom.ilk"
-	-@erase ".\mzcom.tlb"
-	-@erase ".\Debug\regsvr32.trg"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MTd /W3 /Gm /ZI /Od /I "..\..\..\collects\mzscheme\include" /I "..\..\mzcom" /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /Fp"$(INTDIR)\MzCOM.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mzcom.res" /i ".\..\mzcom" /d "_DEBUG" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\MzCOM.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=libcmtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib mzsrc.lib gc.lib /nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\mzcom.pdb" /debug /machine:I386 /nodefaultlib:"libcmt.lib" /out:"../../../collects/mzcom/mzcom.exe" /pdbtype:sept /libpath:"..\mzsrc\Debug" /libpath:"..\gc\Debug" 
-LINK32_OBJS= \
-	"$(INTDIR)\mzcom.obj" \
-	"$(INTDIR)\mzobj.obj" \
-	"$(INTDIR)\mzcom.res"
-
-"..\..\..\collects\mzcom\mzcom.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-OutDir=.\Debug
-TargetPath=\plt\collects\mzcom\mzcom.exe
-InputPath=\plt\collects\mzcom\mzcom.exe
-SOURCE="$(InputPath)"
-
-"$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	"$(TargetPath)" /RegServer 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	echo Server registration done! 
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "MzCOM - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-
-ALL : "..\..\..\collects\mzcom\mzcom.exe" ".\Release\regsvr32.trg"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\mzcom.obj"
-	-@erase "$(INTDIR)\mzcom.res"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "..\..\..\collects\mzcom\mzcom.exe"
-	-@erase ".\mzcom.tlb"
-	-@erase ".\Release\mzobj.obj"
-	-@erase ".\Release\regsvr32.trg"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MT /W3 /O1 /I "..\..\mzcom" /I "." /I "..\..\..\collects\mzscheme\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /Fp"$(INTDIR)\MzCOM.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mzcom.res" /i "..\..\mzcom" /d "NDEBUG" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\MzCOM.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib mzsrc.lib gc.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\mzcom.pdb" /machine:I386 /out:"../../../collects/mzcom/mzcom.exe" /libpath:"..\mzsrc\Release" /libpath:"..\gc\Release" 
-LINK32_OBJS= \
-	"$(INTDIR)\mzcom.obj" \
-	".\Release\mzobj.obj" \
-	"$(INTDIR)\mzcom.res"
-
-"..\..\..\collects\mzcom\mzcom.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-OutDir=.\Release
-TargetPath=\plt\collects\mzcom\mzcom.exe
-InputPath=\plt\collects\mzcom\mzcom.exe
-SOURCE="$(InputPath)"
-
-"$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	"$(TargetPath)" /RegServer 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	echo Server registration done! 
-<< 
-	
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("MzCOM.dep")
-!INCLUDE "MzCOM.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "MzCOM.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "MzCOM - Win32 Debug" || "$(CFG)" == "MzCOM - Win32 Release"
-SOURCE=..\..\mzcom\mzcom.cxx
-
-!IF  "$(CFG)" == "MzCOM - Win32 Debug"
-
-CPP_SWITCHES=/nologo /MTd /W3 /Gm /ZI /Od /I "..\..\..\collects\mzscheme\include" /I "..\..\mzcom" /I "." /I "../../mzscheme/include ../worksp/mzcom" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /Fp"$(INTDIR)\MzCOM.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-"$(INTDIR)\mzcom.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "MzCOM - Win32 Release"
-
-CPP_SWITCHES=/nologo /MT /W3 /O1 /I "..\..\mzcom" /I "." /I "..\..\..\collects\mzscheme\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /Fp"$(INTDIR)\MzCOM.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\mzcom.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=..\..\mzcom\mzcom.idl
-
-!IF  "$(CFG)" == "MzCOM - Win32 Debug"
-
-MTL_SWITCHES=/tlb "./mzcom.tlb" 
-
-".\mzcom.tlb" : $(SOURCE) "$(INTDIR)"
-	$(MTL) @<<
-  $(MTL_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "MzCOM - Win32 Release"
-
-MTL_SWITCHES=/tlb "./mzcom.tlb" 
-
-".\mzcom.tlb" : $(SOURCE)
-	$(MTL) @<<
-  $(MTL_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=..\..\mzcom\mzobj.cxx
-
-!IF  "$(CFG)" == "MzCOM - Win32 Debug"
-
-
-"$(INTDIR)\mzobj.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "MzCOM - Win32 Release"
-
-
-".\Release\mzobj.obj" : $(SOURCE)
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\mzcom.rc
-
-"$(INTDIR)\mzcom.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) $(RSC_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/src/worksp/racket/uniplt.c b/src/worksp/racket/uniplt.c
index 1ad5e8bfc0..f293037ae2 100644
--- a/src/worksp/racket/uniplt.c
+++ b/src/worksp/racket/uniplt.c
@@ -1,40 +1,39 @@
-
-#include <windows.h>
-
-static int warned;
-
-HMODULE LoadUnicowsProc(void)
-{
-  /* We can't use Unicode functions, so we can't
-     use the library path as returned by scheme_get_dll_path().
-     Instead, just search for UnicoWS.dll in the standard
-     place. */
-  HMODULE h;
-  char *name;
-  int i;
-
-  h = LoadLibrary("UnicoWS.dll");
-  if (h) return h;
-  
-  name = (char *)GlobalAlloc(GMEM_FIXED, 1050);
-  GetModuleFileName(NULL, name, 1024);
-  name[1023] = 0;
-  for (i = 0; name[i]; i++) { }
-  --i;
-  while (i && (name[i] != '\\')) {
-    --i;
-  }
-  memcpy(name + i, "\\lib\\UnicoWS.dll", 17);
-
-  h = LoadLibrary(name);
-  if (h) return h;
-  
-  if (!warned) {
-    warned = 1;
-    MessageBox(NULL, name, "Can't load UnicoWS", MB_OK);
-  }
-
-  return NULL;
-}
-
-extern FARPROC _PfnLoadUnicows = (FARPROC) &LoadUnicowsProc;
+#include <windows.h>
+
+static int warned;
+
+HMODULE LoadUnicowsProc(void)
+{
+  /* We can't use Unicode functions, so we can't
+     use the library path as returned by scheme_get_dll_path().
+     Instead, just search for UnicoWS.dll in the standard
+     place. */
+  HMODULE h;
+  char *name;
+  int i;
+
+  h = LoadLibrary("UnicoWS.dll");
+  if (h) return h;
+  
+  name = (char *)GlobalAlloc(GMEM_FIXED, 1050);
+  GetModuleFileName(NULL, name, 1024);
+  name[1023] = 0;
+  for (i = 0; name[i]; i++) { }
+  --i;
+  while (i && (name[i] != '\\')) {
+    --i;
+  }
+  memcpy(name + i, "\\lib\\UnicoWS.dll", 17);
+
+  h = LoadLibrary(name);
+  if (h) return h;
+  
+  if (!warned) {
+    warned = 1;
+    MessageBox(NULL, name, "Can't load UnicoWS", MB_OK);
+  }
+
+  return NULL;
+}
+
+extern FARPROC _PfnLoadUnicows = (FARPROC) &LoadUnicowsProc;