diff --git a/distrib/msw/copybase.bat b/distrib/msw/copybase.bat
index 8512cde9d4..f1a3bf6056 100755
--- a/distrib/msw/copybase.bat
+++ b/distrib/msw/copybase.bat
@@ -3,7 +3,7 @@
 rem VZ: this is quick and _very_ dirty
 
 set VER=2.3.3
-set DEST=s:\upload\wxBase-%VER%
+set DEST=q:\wxBase-%VER%
 
 mkdir %DEST%
 mkdir %DEST%\include
@@ -27,14 +27,15 @@ rem Copy the files to the root directory
 
 copy /q docs\changes.txt %DEST%\CHANGES.txt
 copy /q docs\licence.txt %DEST%\LICENCE.txt
-copy /q docs\install.txt %DEST%\README.txt
-copy /q docs\symbols.txt %DEST%\SYMBOLS.txt
+copy /q docs\base\readme.txt %DEST%\README.txt
 
-rem Copy the project files
+rem Copy the project/make files
 
 copy /q src\wxBase.dsp %DEST%\src\wxBase.dsp
 copy /q src\wxBase.dsw %DEST%\src\wxBase.dsw
-copy /q include\wx\msw\setup.h %DEST%\include\wx\msw\setup.h
+copy /q include\wx\msw\setup0.h %DEST%\include\wx\msw\setup.h
+copy /q src\msw\makebase.b32 %DEST%\src\msw\makebase.b32
+copy /q src\makeb32.env %DEST%\src\makeb32.env
 
 rem Copy the sample
 
@@ -51,101 +52,27 @@ rem The files not in src/files.lst
 copy /q src\msw\dummy.cpp %DEST%\src\msw\dummy.cpp
 copy /q src\msw\dummydll.cpp %DEST%\src\msw\dummydll.cpp
 
+copy /q src\common\execcmn.cpp %DEST%\src\common\execcmn.cpp
 copy /q src\common\unictabl.inc %DEST%\src\common\unictabl.inc
+copy /q src\common\unzip.h %DEST%\src\common\unzip.h
 
-rem The rest is generated from src/files.lst
-
-copy /q include\wx\app.h %DEST%\include\wx\app.h
-copy /q include\wx\arrimpl.cpp %DEST%\include\wx\arrimpl.cpp
-copy /q include\wx\buffer.h %DEST%\include\wx\buffer.h
-copy /q include\wx\chkconf.h %DEST%\include\wx\chkconf.h
-copy /q include\wx\clntdata.h %DEST%\include\wx\clntdata.h
-copy /q include\wx\cmdline.h %DEST%\include\wx\cmdline.h
-copy /q include\wx\confbase.h %DEST%\include\wx\confbase.h
-copy /q include\wx\config.h %DEST%\include\wx\config.h
-copy /q include\wx\date.h %DEST%\include\wx\date.h
-copy /q include\wx\datetime.h %DEST%\include\wx\datetime.h
-copy /q include\wx\datetime.inl %DEST%\include\wx\datetime.inl
-copy /q include\wx\datstrm.h %DEST%\include\wx\datstrm.h
-copy /q include\wx\db.h %DEST%\include\wx\db.h
-copy /q include\wx\dbtable.h %DEST%\include\wx\dbtable.h
-copy /q include\wx\dde.h %DEST%\include\wx\dde.h
-copy /q include\wx\debug.h %DEST%\include\wx\debug.h
-copy /q include\wx\defs.h %DEST%\include\wx\defs.h
-copy /q include\wx\dir.h %DEST%\include\wx\dir.h
-copy /q include\wx\dynarray.h %DEST%\include\wx\dynarray.h
-copy /q include\wx\dynlib.h %DEST%\include\wx\dynlib.h
-copy /q include\wx\encconv.h %DEST%\include\wx\encconv.h
-copy /q include\wx\event.h %DEST%\include\wx\event.h
-copy /q include\wx\ffile.h %DEST%\include\wx\ffile.h
-copy /q include\wx\file.h %DEST%\include\wx\file.h
-copy /q include\wx\fileconf.h %DEST%\include\wx\fileconf.h
-copy /q include\wx\filefn.h %DEST%\include\wx\filefn.h
-copy /q include\wx\filename.h %DEST%\include\wx\filename.h
-copy /q include\wx\filesys.h %DEST%\include\wx\filesys.h
-copy /q include\wx\fontenc.h %DEST%\include\wx\fontenc.h
-copy /q include\wx\fontmap.h %DEST%\include\wx\fontmap.h
-copy /q include\wx\fs_inet.h %DEST%\include\wx\fs_inet.h
-copy /q include\wx\fs_mem.h %DEST%\include\wx\fs_mem.h
-copy /q include\wx\fs_zip.h %DEST%\include\wx\fs_zip.h
-copy /q include\wx\gsocket.h %DEST%\include\wx\gsocket.h
-copy /q include\wx\hash.h %DEST%\include\wx\hash.h
-copy /q include\wx\intl.h %DEST%\include\wx\intl.h
-copy /q include\wx\ioswrap.h %DEST%\include\wx\ioswrap.h
-copy /q include\wx\ipcbase.h %DEST%\include\wx\ipcbase.h
-copy /q include\wx\list.h %DEST%\include\wx\list.h
-copy /q include\wx\listimpl.cpp %DEST%\include\wx\listimpl.cpp
-copy /q include\wx\log.h %DEST%\include\wx\log.h
-copy /q include\wx\longlong.h %DEST%\include\wx\longlong.h
-copy /q include\wx\memconf.h %DEST%\include\wx\memconf.h
-copy /q include\wx\memory.h %DEST%\include\wx\memory.h
-copy /q include\wx\memtext.h %DEST%\include\wx\memtext.h
-copy /q include\wx\mimetype.h %DEST%\include\wx\mimetype.h
-copy /q include\wx\module.h %DEST%\include\wx\module.h
-copy /q include\wx\mstream.h %DEST%\include\wx\mstream.h
-copy /q include\wx\object.h %DEST%\include\wx\object.h
-copy /q include\wx\objstrm.h %DEST%\include\wx\objstrm.h
-copy /q include\wx\platform.h %DEST%\include\wx\platform.h
-copy /q include\wx\process.h %DEST%\include\wx\process.h
-copy /q include\wx\regex.h %DEST%\include\wx\regex.h
-copy /q include\wx\sckaddr.h %DEST%\include\wx\sckaddr.h
-copy /q include\wx\sckipc.h %DEST%\include\wx\sckipc.h
-copy /q include\wx\sckstrm.h %DEST%\include\wx\sckstrm.h
-copy /q include\wx\serbase.h %DEST%\include\wx\serbase.h
-copy /q include\wx\snglinst.h %DEST%\include\wx\snglinst.h
-copy /q include\wx\socket.h %DEST%\include\wx\socket.h
-copy /q include\wx\strconv.h %DEST%\include\wx\strconv.h
-copy /q include\wx\stream.h %DEST%\include\wx\stream.h
-copy /q include\wx\string.h %DEST%\include\wx\string.h
-copy /q include\wx\sysopt.h %DEST%\include\wx\sysopt.h
-copy /q include\wx\textbuf.h %DEST%\include\wx\textbuf.h
-copy /q include\wx\textfile.h %DEST%\include\wx\textfile.h
-copy /q include\wx\thread.h %DEST%\include\wx\thread.h
-copy /q include\wx\time.h %DEST%\include\wx\time.h
-copy /q include\wx\timer.h %DEST%\include\wx\timer.h
-copy /q include\wx\tokenzr.h %DEST%\include\wx\tokenzr.h
-copy /q include\wx\txtstrm.h %DEST%\include\wx\txtstrm.h
-copy /q include\wx\unzip.h %DEST%\include\wx\unzip.h
-copy /q include\wx\url.h %DEST%\include\wx\url.h
-copy /q include\wx\utils.h %DEST%\include\wx\utils.h
-copy /q include\wx\variant.h %DEST%\include\wx\variant.h
-copy /q include\wx\vector.h %DEST%\include\wx\vector.h
-copy /q include\wx\version.h %DEST%\include\wx\version.h
-copy /q include\wx\wfstream.h %DEST%\include\wx\wfstream.h
-copy /q include\wx\wx.h %DEST%\include\wx\wx.h
-copy /q include\wx\wxchar.h %DEST%\include\wx\wxchar.h
-copy /q include\wx\wxprec.h %DEST%\include\wx\wxprec.h
-copy /q include\wx\zipstrm.h %DEST%\include\wx\zipstrm.h
-copy /q include\wx\zstream.h %DEST%\include\wx\zstream.h
-copy /q include\wx\unix\gsockunx.h %DEST%\include\wx\unix\gsockunx.h
-copy /q include\wx\unix\mimetype.h %DEST%\include\wx\unix\mimetype.h
-copy /q include\wx\msw\dde.h %DEST%\include\wx\msw\dde.h
-copy /q include\wx\msw\mimetype.h %DEST%\include\wx\msw\mimetype.h
-copy /q include\wx\protocol\file.h %DEST%\include\wx\protocol\file.h
-copy /q include\wx\protocol\ftp.h %DEST%\include\wx\protocol\ftp.h
-copy /q include\wx\protocol\http.h %DEST%\include\wx\protocol\http.h
-copy /q include\wx\protocol\protocol.h %DEST%\include\wx\protocol\protocol.h
+copy /q include\wx\msw\gsockmsw.h %DEST%\include\wx\msw\gsockmsw.h
+copy /q include\wx\msw\missing.h %DEST%\include\wx\msw\missing.h
+copy /q include\wx\msw\mslu.h %DEST%\include\wx\msw\mslu.h
+copy /q include\wx\msw\msvcrt.h %DEST%\include\wx\msw\msvcrt.h
+copy /q include\wx\msw\private.h %DEST%\include\wx\msw\private.h
+copy /q include\wx\msw\regconf.h %DEST%\include\wx\msw\regconf.h
+copy /q include\wx\msw\registry.h %DEST%\include\wx\msw\registry.h
 
+rem The rest is generated from src/files.lst by pasting the ALL_SOURCES and
+rem ALL_HEADERS here and doing
+rem
+rem .,$s@^\s*\(.*\)/\([^ ]*\)\( \\\)\?$@copy /q src\\\1\\\2 %DEST%\\src\\\1\\\2
+rem
+rem and
+rem
+rem .,$s@/@\\@|exe "normal "|.,$s@^\s*\([^ ]*\)\( \\\)\?$@copy /q include\\wx\\\1 %DEST%\\include\\wx\\\1
+rem 
 copy /q src\common\init.cpp %DEST%\src\common\init.cpp
 copy /q src\common\appcmn.cpp %DEST%\src\common\appcmn.cpp
 copy /q src\common\clntdata.cpp %DEST%\src\common\clntdata.cpp
@@ -158,6 +85,7 @@ copy /q src\common\dbtable.cpp %DEST%\src\common\dbtable.cpp
 copy /q src\common\dircmn.cpp %DEST%\src\common\dircmn.cpp
 copy /q src\common\dynarray.cpp %DEST%\src\common\dynarray.cpp
 copy /q src\common\dynlib.cpp %DEST%\src\common\dynlib.cpp
+copy /q src\common\dynload.cpp %DEST%\src\common\dynload.cpp
 copy /q src\common\encconv.cpp %DEST%\src\common\encconv.cpp
 copy /q src\common\event.cpp %DEST%\src\common\event.cpp
 copy /q src\common\extended.c %DEST%\src\common\extended.c
@@ -173,6 +101,7 @@ copy /q src\common\fs_mem.cpp %DEST%\src\common\fs_mem.cpp
 copy /q src\common\fs_zip.cpp %DEST%\src\common\fs_zip.cpp
 copy /q src\common\ftp.cpp %DEST%\src\common\ftp.cpp
 copy /q src\common\hash.cpp %DEST%\src\common\hash.cpp
+copy /q src\common\hashmap.cpp %DEST%\src\common\hashmap.cpp
 copy /q src\common\http.cpp %DEST%\src\common\http.cpp
 copy /q src\common\intl.cpp %DEST%\src\common\intl.cpp
 copy /q src\common\ipcbase.cpp %DEST%\src\common\ipcbase.cpp
@@ -182,9 +111,9 @@ copy /q src\common\longlong.cpp %DEST%\src\common\longlong.cpp
 copy /q src\common\memory.cpp %DEST%\src\common\memory.cpp
 copy /q src\common\mimecmn.cpp %DEST%\src\common\mimecmn.cpp
 copy /q src\common\module.cpp %DEST%\src\common\module.cpp
+copy /q src\common\msgout.cpp %DEST%\src\common\msgout.cpp
 copy /q src\common\mstream.cpp %DEST%\src\common\mstream.cpp
 copy /q src\common\object.cpp %DEST%\src\common\object.cpp
-copy /q src\common\objstrm.cpp %DEST%\src\common\objstrm.cpp
 copy /q src\common\process.cpp %DEST%\src\common\process.cpp
 copy /q src\common\protocol.cpp %DEST%\src\common\protocol.cpp
 copy /q src\common\regex.cpp %DEST%\src\common\regex.cpp
@@ -192,7 +121,6 @@ copy /q src\common\sckaddr.cpp %DEST%\src\common\sckaddr.cpp
 copy /q src\common\sckfile.cpp %DEST%\src\common\sckfile.cpp
 copy /q src\common\sckipc.cpp %DEST%\src\common\sckipc.cpp
 copy /q src\common\sckstrm.cpp %DEST%\src\common\sckstrm.cpp
-copy /q src\common\serbase.cpp %DEST%\src\common\serbase.cpp
 copy /q src\common\socket.cpp %DEST%\src\common\socket.cpp
 copy /q src\common\strconv.cpp %DEST%\src\common\strconv.cpp
 copy /q src\common\stream.cpp %DEST%\src\common\stream.cpp
@@ -229,3 +157,103 @@ copy /q src\msw\snglinst.cpp %DEST%\src\msw\snglinst.cpp
 copy /q src\msw\thread.cpp %DEST%\src\msw\thread.cpp
 copy /q src\msw\utils.cpp %DEST%\src\msw\utils.cpp
 copy /q src\msw\utilsexc.cpp %DEST%\src\msw\utilsexc.cpp
+copy /q src\msw\volume.cpp %DEST%\src\msw\volume.cpp
+
+copy /q include\wx\app.h %DEST%\include\wx\app.h
+copy /q include\wx\arrimpl.cpp %DEST%\include\wx\arrimpl.cpp
+copy /q include\wx\buffer.h %DEST%\include\wx\buffer.h
+copy /q include\wx\build.h %DEST%\include\wx\build.h
+copy /q include\wx\chkconf.h %DEST%\include\wx\chkconf.h
+copy /q include\wx\clntdata.h %DEST%\include\wx\clntdata.h
+copy /q include\wx\cmdline.h %DEST%\include\wx\cmdline.h
+copy /q include\wx\confbase.h %DEST%\include\wx\confbase.h
+copy /q include\wx\config.h %DEST%\include\wx\config.h
+copy /q include\wx\date.h %DEST%\include\wx\date.h
+copy /q include\wx\datetime.h %DEST%\include\wx\datetime.h
+copy /q include\wx\datetime.inl %DEST%\include\wx\datetime.inl
+copy /q include\wx\datstrm.h %DEST%\include\wx\datstrm.h
+copy /q include\wx\db.h %DEST%\include\wx\db.h
+copy /q include\wx\dbtable.h %DEST%\include\wx\dbtable.h
+copy /q include\wx\dde.h %DEST%\include\wx\dde.h
+copy /q include\wx\debug.h %DEST%\include\wx\debug.h
+copy /q include\wx\defs.h %DEST%\include\wx\defs.h
+copy /q include\wx\dir.h %DEST%\include\wx\dir.h
+copy /q include\wx\dynarray.h %DEST%\include\wx\dynarray.h
+copy /q include\wx\dynlib.h %DEST%\include\wx\dynlib.h
+copy /q include\wx\dynload.h %DEST%\include\wx\dynload.h
+copy /q include\wx\encconv.h %DEST%\include\wx\encconv.h
+copy /q include\wx\event.h %DEST%\include\wx\event.h
+copy /q include\wx\features.h %DEST%\include\wx\features.h
+copy /q include\wx\ffile.h %DEST%\include\wx\ffile.h
+copy /q include\wx\file.h %DEST%\include\wx\file.h
+copy /q include\wx\fileconf.h %DEST%\include\wx\fileconf.h
+copy /q include\wx\filefn.h %DEST%\include\wx\filefn.h
+copy /q include\wx\filename.h %DEST%\include\wx\filename.h
+copy /q include\wx\filesys.h %DEST%\include\wx\filesys.h
+copy /q include\wx\fontenc.h %DEST%\include\wx\fontenc.h
+copy /q include\wx\fontmap.h %DEST%\include\wx\fontmap.h
+copy /q include\wx\fs_inet.h %DEST%\include\wx\fs_inet.h
+copy /q include\wx\fs_mem.h %DEST%\include\wx\fs_mem.h
+copy /q include\wx\fs_zip.h %DEST%\include\wx\fs_zip.h
+copy /q include\wx\gsocket.h %DEST%\include\wx\gsocket.h
+copy /q include\wx\hash.h %DEST%\include\wx\hash.h
+copy /q include\wx\hashmap.h %DEST%\include\wx\hashmap.h
+copy /q include\wx\intl.h %DEST%\include\wx\intl.h
+copy /q include\wx\ioswrap.h %DEST%\include\wx\ioswrap.h
+copy /q include\wx\ipc.h %DEST%\include\wx\ipc.h
+copy /q include\wx\ipcbase.h %DEST%\include\wx\ipcbase.h
+copy /q include\wx\isql.h %DEST%\include\wx\isql.h
+copy /q include\wx\isqlext.h %DEST%\include\wx\isqlext.h
+copy /q include\wx\list.h %DEST%\include\wx\list.h
+copy /q include\wx\listimpl.cpp %DEST%\include\wx\listimpl.cpp
+copy /q include\wx\log.h %DEST%\include\wx\log.h
+copy /q include\wx\longlong.h %DEST%\include\wx\longlong.h
+copy /q include\wx\memconf.h %DEST%\include\wx\memconf.h
+copy /q include\wx\memory.h %DEST%\include\wx\memory.h
+copy /q include\wx\memtext.h %DEST%\include\wx\memtext.h
+copy /q include\wx\mimetype.h %DEST%\include\wx\mimetype.h
+copy /q include\wx\module.h %DEST%\include\wx\module.h
+copy /q include\wx\msgout.h %DEST%\include\wx\msgout.h
+copy /q include\wx\mstream.h %DEST%\include\wx\mstream.h
+copy /q include\wx\object.h %DEST%\include\wx\object.h
+copy /q include\wx\platform.h %DEST%\include\wx\platform.h
+copy /q include\wx\process.h %DEST%\include\wx\process.h
+copy /q include\wx\regex.h %DEST%\include\wx\regex.h
+copy /q include\wx\sckaddr.h %DEST%\include\wx\sckaddr.h
+copy /q include\wx\sckipc.h %DEST%\include\wx\sckipc.h
+copy /q include\wx\sckstrm.h %DEST%\include\wx\sckstrm.h
+copy /q include\wx\snglinst.h %DEST%\include\wx\snglinst.h
+copy /q include\wx\socket.h %DEST%\include\wx\socket.h
+copy /q include\wx\strconv.h %DEST%\include\wx\strconv.h
+copy /q include\wx\stream.h %DEST%\include\wx\stream.h
+copy /q include\wx\string.h %DEST%\include\wx\string.h
+copy /q include\wx\sysopt.h %DEST%\include\wx\sysopt.h
+copy /q include\wx\textbuf.h %DEST%\include\wx\textbuf.h
+copy /q include\wx\textfile.h %DEST%\include\wx\textfile.h
+copy /q include\wx\thread.h %DEST%\include\wx\thread.h
+copy /q include\wx\thrimpl.cpp %DEST%\include\wx\thrimpl.cpp
+copy /q include\wx\time.h %DEST%\include\wx\time.h
+copy /q include\wx\timer.h %DEST%\include\wx\timer.h
+copy /q include\wx\tokenzr.h %DEST%\include\wx\tokenzr.h
+copy /q include\wx\txtstrm.h %DEST%\include\wx\txtstrm.h
+copy /q include\wx\url.h %DEST%\include\wx\url.h
+copy /q include\wx\utils.h %DEST%\include\wx\utils.h
+copy /q include\wx\variant.h %DEST%\include\wx\variant.h
+copy /q include\wx\vector.h %DEST%\include\wx\vector.h
+copy /q include\wx\version.h %DEST%\include\wx\version.h
+copy /q include\wx\volume.h %DEST%\include\wx\volume.h
+copy /q include\wx\wfstream.h %DEST%\include\wx\wfstream.h
+copy /q include\wx\wx.h %DEST%\include\wx\wx.h
+copy /q include\wx\wxchar.h %DEST%\include\wx\wxchar.h
+copy /q include\wx\wxprec.h %DEST%\include\wx\wxprec.h
+copy /q include\wx\zipstrm.h %DEST%\include\wx\zipstrm.h
+copy /q include\wx\zstream.h %DEST%\include\wx\zstream.h
+copy /q include\wx\unix\gsockunx.h %DEST%\include\wx\unix\gsockunx.h
+copy /q include\wx\unix\mimetype.h %DEST%\include\wx\unix\mimetype.h
+copy /q include\wx\msw\dde.h %DEST%\include\wx\msw\dde.h
+copy /q include\wx\msw\mimetype.h %DEST%\include\wx\msw\mimetype.h
+copy /q include\wx\msw\winundef.h %DEST%\include\wx\msw\winundef.h
+copy /q include\wx\protocol\file.h %DEST%\include\wx\protocol\file.h
+copy /q include\wx\protocol\ftp.h %DEST%\include\wx\protocol\ftp.h
+copy /q include\wx\protocol\http.h %DEST%\include\wx\protocol\http.h
+copy /q include\wx\protocol\protocol.h %DEST%\include\wx\protocol\protocol.h