diff --git a/Makefile.in b/Makefile.in
index e6796159fe..ef857a02e3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8605,8 +8605,6 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
 @COND_USE_XRC_1@__wxrc___depname = wxrc
 @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
 @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
-@COND_USE_GUI_1@__install_afm___depname = install-afm
-@COND_USE_GUI_1@__install_gsafm___depname = install-gsafm
 @COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r
 @COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install
 @COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r
@@ -9168,14 +9166,6 @@ samples:
 @COND_USE_XRC_1@install-wxrc: 
 @COND_USE_XRC_1@	(test -d utils/wxrc && cd utils/wxrc && $(MAKE) install) || true
 
-@COND_USE_GUI_1@install-afm: 
-@COND_USE_GUI_1@	$(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/afm
-@COND_USE_GUI_1@	(cd $(srcdir) ; $(INSTALL_DATA)  misc/afm/*.afm $(DESTDIR)$(datadir)/wx/afm)
-
-@COND_USE_GUI_1@install-gsafm: 
-@COND_USE_GUI_1@	$(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/gs_afm
-@COND_USE_GUI_1@	(cd $(srcdir) ; $(INSTALL_DATA)  misc/gs_afm/*.afm $(DESTDIR)$(datadir)/wx/gs_afm)
-
 install-wxconfig: 
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
@@ -24012,11 +24002,6 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/wxrc/*.rc $(DISTDIR)/utils/wxrc
 
 MISC_DIST: ALL_GUI_DIST
-	mkdir $(DISTDIR)/misc
-	mkdir $(DISTDIR)/misc/afm
-	cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
-	mkdir $(DISTDIR)/misc/gs_afm
-	cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
 
 INTL_DIST:
 	mkdir $(DISTDIR)/locale
diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 1e6b068b06..8e99d0c922 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -972,11 +972,6 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/wxrc/*.rc $(DISTDIR)/utils/wxrc
 
 MISC_DIST: ALL_GUI_DIST
-	mkdir $(DISTDIR)/misc
-	mkdir $(DISTDIR)/misc/afm
-	cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
-	mkdir $(DISTDIR)/misc/gs_afm
-	cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
 
 INTL_DIST:
 	mkdir $(DISTDIR)/locale
diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 8b8b4cdcb6..197f1b4d7a 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -74,15 +74,6 @@
             <install-to>$(DATADIR)/aclocal</install-to>
         </data-files>
 
-        <data-files-tg id="install-afm" cond="USE_GUI=='1'">
-            <files>misc/afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/afm</install-to>
-        </data-files-tg>
-        <data-files-tg id="install-gsafm" cond="USE_GUI=='1'">
-            <files>misc/gs_afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/gs_afm</install-to>
-        </data-files-tg>
-
         <action id="install-wxconfig">
             <dependency-of>install</dependency-of>
             <command>
diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 7679c5baec..771818f821 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -151,9 +151,6 @@ lib/dummy
 
 tools/gettext/*.*
 
-misc/afm/*.afm
-misc/gs_afm/*.afm
-
 utils/*.bkl
 utils/make*.*
 utils/configure
@@ -1427,8 +1424,8 @@ demos/dbbrowse/*.bkl
 
 tests/*.bkl
 tests/makefile*.*
-tests/test.dsp
-tests/test.dsw
+tests/*.dsp
+tests/*.dsw
 tests/*.cpp
 tests/*.fc
 
@@ -1439,7 +1436,9 @@ tests/filename/*.cpp
 tests/filesys/*.cpp
 tests/fontmap/*.cpp
 tests/formatconverter/*.cpp
+tests/geometry/*.cpp
 tests/hashes/*.cpp
+tests/lists/*.cpp
 tests/longlong/*.cpp
 tests/mbconv/*.cpp
 
diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp
index b662dd0a89..dbdd2467fc 100644
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -84,6 +84,7 @@ include/wx/msw/ole/*.h
 include/wx/msw/*.cur
 include/wx/msw/*.ico
 include/wx/msw/*.bmp
+include/wx/msvc/wx/*.h
 
 include/wx/msw/wince/*.h
 include/wx/msw/wince/*.rc