diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 6a8b71e517..10fbf5f1fe 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -1131,6 +1131,19 @@ samples/wizard/*.ico
 samples/wizard/*.txt
 samples/wizard/*.pro
 
+samples/wxtest/*.cpp
+samples/wxtest/*.h
+samples/wxtest/makefile*
+samples/wxtest/*.rc
+samples/wxtest/*.def
+samples/wxtest/*.bmp
+samples/wxtest/*.xpm
+samples/wxtest/*.xbm
+samples/wxtest/*.png
+samples/wxtest/*.ico
+samples/wxtest/*.txt
+samples/wxtest/*.pro
+
 demos/makefile*
 demos/configure
 demos/configure.in
diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 0985a6c5dc..70b576d666 100644
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -99,6 +99,9 @@ samples/grid/griddemo.dsw
 samples/help/help.dsp
 samples/help/help.dsw
 
+samples/htlbox/htlbox.dsp
+samples/htlbox/htlbox.dsw
+
 samples/html/about/about.dsp
 samples/html/about/about.dsw
 samples/html/help/help.dsp
@@ -238,9 +241,15 @@ samples/typetest/typetest.dsw
 samples/validate/validate.dsp
 samples/validate/validate.dsw
 
+samples/vscroll/vscroll.dsp
+samples/vscroll/vscroll.dsw
+
 samples/wizard/wizard.dsp
 samples/wizard/wizard.dsw
 
+samples/wxtest/wxtest.dsp
+samples/wxtest/wxtest.dsw
+
 samples/widgets/widgets.dsp
 samples/widgets/widgets.dsw
 samples/widgets/widgetsUniv.dsp
diff --git a/distrib/msw/wince.rsp b/distrib/msw/wince.rsp
index 99f020f17d..36069765f0 100644
--- a/distrib/msw/wince.rsp
+++ b/distrib/msw/wince.rsp
@@ -1,9 +1,383 @@
 src/msw/wince/wxWindowsCE.vcp
 src/msw/wince/wxWindowsCE.vcw
 
+src/jpeg/jpegCE.vcp
+src/jpeg/jpegCE.vcw
+
+src/tiff/tiffCE.vcp
+src/tiff/tiffCE.vcw
+
+src/zlib/zlibCE.vcp
+src/zlib/zlibCE.vcw
+
+src/png/pngCE.vcp
+src/png/pngCE.vcw
+
+src/regex/regexCE.vcp
+src/regex/regexCE.vcw
+
+samples/samplesCE.vcw
+
+samples/access/accessCE.vcp
+samples/access/accessCE.vcw
+
+samples/artprov/artprovCE.vcp
+samples/artprov/artprovCE.vcw
+
+samples/calendar/arttestCE.vcp
+samples/calendar/arttestCE.vcw
+
+samples/calendar/calendarCE.vcp
+samples/calendar/calendarCE.vcw
+
+samples/caret/caretCE.vcp
+samples/caret/caretCE.vcw
+
+samples/checklst/checklstCE.vcp
+samples/checklst/checklstCE.vcw
+
+samples/config/configCE.vcp
+samples/config/configCE.vcw
+
+samples/console/consoleCE.vcp
+samples/console/consoleCE.vcw
+
+samples/controls/controlsCE.vcp
+samples/controls/controlsCE.vcw
+
+samples/db/dbCE.vcp
+samples/db/dbCE.vcw
+
+samples/dialogs/dialogsCE.vcp
+samples/dialogs/dialogsCE.vcw
+
+samples/dialup/dialupCE.vcp
+samples/dialup/dialupCE.vcw
+
+samples/display/displayCE.vcp
+samples/display/displayCE.vcw
+
+samples/dnd/dndCE.vcp
+samples/dnd/dndCE.vcw
+
+samples/dragimag/dragimagCE.vcp
+samples/dragimag/dragimagCE.vcw
+
+samples/docview/docviewCE.vcp
+samples/docview/docviewCE.vcw
+
+samples/docvwmdi/docvwmdiCE.vcp
+samples/docvwmdi/docvwmdiCE.vcw
+
+samples/drawing/drawingCE.vcp
+samples/drawing/drawingCE.vcw
+
+samples/dynamic/dynamicCE.vcp
+samples/dynamic/dynamicCE.vcw
+
+samples/erase/eraseCE.vcp
+samples/erase/eraseCE.vcw
+
+samples/event/eventCE.vcp
+samples/event/eventCE.vcw
+
+samples/exec/execCE.vcp
+samples/exec/execCE.vcw
+
+samples/font/fontCE.vcp
+samples/font/fontCE.vcw
+
+samples/grid/griddemoCE.vcp
+samples/grid/griddemoCE.vcw
+
+samples/help/helpCE.vcp
+samples/help/helpCE.vcw
+
+samples/htlbox/htlboxCE.vcp
+samples/htlbox/htlboxCE.vcw
+
+samples/html/about/aboutCE.vcp
+samples/html/about/aboutCE.vcw
+samples/html/help/helpCE.vcp
+samples/html/help/helpCE.vcw
+samples/html/helpview/helpviewCE.vcp
+samples/html/helpview/helpviewCE.vcw
+samples/html/printing/printingCE.vcp
+samples/html/printing/printingCE.vcw
+samples/html/test/testCE.vcp
+samples/html/test/testCE.vcw
+samples/html/virtual/virtualCE.vcp
+samples/html/virtual/virtualCE.vcw
+samples/html/widget/widgetCE.vcp
+samples/html/widget/widgetCE.vcw
+samples/html/zip/zipCE.vcp
+samples/html/zip/zipCE.vcw
+
+samples/image/imageCE.vcp
+samples/image/imageCE.vcw
+
+samples/internat/internatCE.vcp
+samples/internat/internatCE.vcw
+
+samples/keyboard/keyboardCE.vcp
+samples/keyboard/keyboardCE.vcw
+
+samples/ipc/clientCE.vcp
+samples/ipc/clientCE.vcw
+samples/ipc/serverCE.vcp
+samples/ipc/serverCE.vcw
+
+samples/joytest/joytestCE.vcp
+samples/joytest/joytestCE.vcw
+
+samples/layout/layoutCE.vcp
+samples/layout/layoutCE.vcw
+
+samples/listbox/lboxtestCE.vcp
+samples/listbox/lboxtestCE.vcw
+
+samples/listctrl/listctrlCE.vcp
+samples/listctrl/listctrlCE.vcw
+
+samples/mdi/mdiCE.vcp
+samples/mdi/mdiCE.vcw
+
+samples/memcheck/memcheckCE.vcp
+samples/memcheck/memcheckCE.vcw
+
+samples/menu/menuCE.vcp
+samples/menu/menuCE.vcw
+
+samples/mfc/mfcCE.vcp
+samples/mfc/mfcCE.vcw
+
 samples/minimal/minimalCE.vcp
 samples/minimal/minimalCE.vcw
 
+samples/minifram/miniframCE.vcp
+samples/minifram/miniframCE.vcw
+
+samples/mobile/styles/stylesCE.vcp
+samples/mobile/wxedit/wxeditCE.vcw
+
+samples/multimon/multimon_testCE.vcp
+samples/multimon/multimon_testCE.vcw
+
+samples/nativdlg/nativdlgCE.vcp
+samples/nativdlg/nativdlgCE.vcw
+
+samples/notebook/notebookCE.vcp
+samples/notebook/notebookCE.vcw
+
+samples/oleauto/oleautoCE.vcp
+samples/oleauto/oleautoCE.vcw
+
+samples/ownerdrw/ownerDrwCE.vcp
+samples/ownerdrw/ownerDrwCE.vcw
+
+samples/png/pngCE.vcp
+samples/png/pngCE.vcw
+
+samples/printing/printingCE.vcp
+samples/printing/printingCE.vcw
+
+samples/propsize/propsizeCE.vcp
+samples/propsize/propsizeCE.vcw
+
+samples/regtest/regtestCE.vcp
+samples/regtest/regtestCE.vcw
+
+samples/rotate/rotateCE.vcp
+samples/rotate/rotateCE.vcw
+
+samples/sashtest/sashtestCE.vcp
+samples/sashtest/sashtestCE.vcw
+
+samples/scroll/scrollCE.vcp
+samples/scroll/scrollCE.vcw
+
+samples/scrollsub/scrollsubCE.vcp
+samples/scrollsub/scrollsubCE.vcw
+
+samples/shaped/shapedCE.vcp
+samples/shaped/shapedCE.vcw
+
+samples/sockets/clientCE.vcp
+samples/sockets/serverCE.vcp
+samples/sockets/clientCE.vcw
+samples/sockets/serverCE.vcw
+
+samples/splitter/splitterCE.vcp
+samples/splitter/splitterCE.vcw
+
+samples/statbar/statbarCE.vcp
+samples/statbar/statbarCE.vcw
+
+samples/taskbar/taskbarCE.vcp
+samples/taskbar/taskbarCE.vcw
+
+samples/text/textCE.vcp
+samples/text/textCE.vcw
+
+samples/thread/threadCE.vcp
+samples/thread/threadCE.vcw
+
+samples/toolbar/toolbarCE.vcp
+samples/toolbar/toolbarCE.vcw
+
+samples/treectrl/treetestCE.vcp
+samples/treectrl/treetestCE.vcw
+
+samples/typetest/typetestCE.vcp
+samples/typetest/typetestCE.vcw
+
+samples/validate/validateCE.vcp
+samples/validate/validateCE.vcw
+
+samples/vscroll/vscrollCE.vcp
+samples/vscroll/vscrollCE.vcw
+
+samples/wizard/wizardCE.vcp
+samples/wizard/wizardCE.vcw
+
+samples/wxtest/wxtestCE.vcp
+samples/wxtest/wxtestCE.vcw
+
 samples/widgets/widgetsCE.vcp
 samples/widgets/widgetsCE.vcw
 
+samples/opengl/cube/cubeCE.vcp
+samples/opengl/cube/cubeCE.vcw
+samples/opengl/isosurf/isosurfCE.vcp
+samples/opengl/isosurf/isosurfCE.vcw
+samples/opengl/penguin/penguinCE.vcp
+samples/opengl/penguin/penguinCE.vcw
+
+demos/bombs/bombsCE.vcp
+demos/bombs/bombsCE.vcw
+
+demos/dbbrowse/dbbrowseCE.vcp
+demos/dbbrowse/dbbrowseCE.vcw
+
+demos/forty/fortyCE.vcp
+demos/forty/fortyCE.vcw
+
+demos/fractal/fractalCE.vcp
+demos/fractal/fractalCE.vcw
+
+demos/life/lifeCE.vcp
+demos/life/lifeCE.vcw
+
+demos/poem/poemCE.vcp
+demos/poem/poemCE.vcw
+
+utils/dialoged/src/DialogEdCE.vcp
+utils/dialoged/src/DialogEdCE.vcw
+
+utils/tex2rtf/src/Tex2RTFCE.vcp
+utils/tex2rtf/src/Tex2RTFCE.vcw
+
+utils/hhp2cached/hhp2cachedCE.vcp
+utils/hhp2cached/hhp2cachedCE.vcw
+
+utils/helpgen/src/HelpGenCE.vcp
+utils/helpgen/src/HelpGenCE.vcw
+
+utils/helpview/src/helpviewCE.vcp
+utils/helpview/src/helpviewCE.vcw
+utils/helpview/src/clientCE.vcp
+utils/helpview/src/clientCE.vcw
+
+contrib/src/ogl/OglCE.vcp
+contrib/src/ogl/OglCE.vcw
+
+contrib/samples/ogl/ogledit/OgleditCE.vcp
+contrib/samples/ogl/ogledit/OgleditCE.vcw
+contrib/samples/ogl/studio/StudioCE.vcp
+contrib/samples/ogl/studio/StudioCE.vcw
+
+contrib/src/xrc/XrcCE.vcp
+contrib/src/xrc/XrcCE.vcw
+
+contrib/samples/xrc/XrcDemoCE.vcp
+contrib/samples/xrc/XrcDemoCE.vcw
+
+contrib/src/mmedia/MmediaCE.vcp
+contrib/src/mmedia/MMediaCE.vcw
+
+contrib/samples/mmedia/MmboardCE.vcp
+contrib/samples/mmedia/MmboardCE.vcw
+
+contrib/src/stc/StcCE.vcp
+contrib/src/stc/StcCE.vcw
+
+contrib/samples/stc/StcTestCE.vcp
+contrib/samples/stc/StcTestCE.vcw
+
+contrib/utils/wxrc/wxrcCE.vcp
+contrib/utils/wxrc/wxrcCE.vcw
+
+contrib/utils/convertrc/ConvertCE.vcp
+contrib/utils/convertrc/ConvertCE.vcw
+
+contrib/utils/wxrcedit/wxRcEditCE.vcp
+contrib/utils/wxrcedit/wxRcEditCE.vcw
+
+contrib/src/canvas/CanvasCE.vcp
+contrib/src/canvas/CanvasCE.vcw
+contrib/samples/canvas/simple/SimpleCE.vcp
+contrib/samples/canvas/simple/SimpleCE.vcw
+contrib/samples/canvas/test/TestCE.vcp
+contrib/samples/canvas/test/TestCE.vcw
+
+contrib/src/plot/PlotCE.vcp
+contrib/src/plot/PlotCE.vcw
+contrib/samples/plot/PlotCE.vcp
+contrib/samples/plot/PlotCE.vcw
+
+contrib/src/gizmos/GizmosCE.vcp
+contrib/src/gizmos/GizmosCE.vcw
+contrib/samples/gizmos/dynsash/dynsashCE.vcp
+contrib/samples/gizmos/dynsash/dynsashCE.vcw
+contrib/samples/gizmos/dynsash_switch/dynsash_switchCE.vcp
+contrib/samples/gizmos/dynsash_switch/dynsash_switchCE.vcw
+contrib/samples/gizmos/editlbox/editlboxCE.vcp
+contrib/samples/gizmos/editlbox/editlboxCE.vcw
+contrib/samples/gizmos/multicell/multicellCE.vcp
+contrib/samples/gizmos/multicell/multicellCE.vcw
+contrib/samples/gizmos/splittree/TreeCE.vcp
+contrib/samples/gizmos/splittree/TreeCE.vcw
+
+contrib/src/animate/AnimateCE.vcp
+contrib/src/animate/AnimateCE.vcw
+contrib/samples/animate/AniTestCE.vcp
+contrib/samples/animate/AniTestCE.vcw
+
+contrib/src/fl/flCE.vcp
+contrib/src/fl/flCE.vcw
+contrib/samples/fl/fl_demo1/fl_demoCE.vcp
+contrib/samples/fl/fl_demo1/fl_demoCE.vcw
+contrib/samples/fl/fl_demo2/fl_demoCE.vcp
+contrib/samples/fl/fl_demo2/fl_demoCE.vcw
+contrib/samples/fl/fl_sample1/fl_demoCE.vcp
+contrib/samples/fl/fl_sample1/fl_demoCE.vcw
+contrib/samples/fl/fl_sample2/fl_demoCE.vcp
+contrib/samples/fl/fl_sample2/fl_demoCE.vcw
+contrib/samples/fl/fl_sample3/fl_demoCE.vcp
+contrib/samples/fl/fl_sample3/fl_demoCE.vcw
+
+contrib/src/net/NetCE.vcp
+contrib/src/net/NetCE.vcw
+
+contrib/src/deprecated/deprecatedCE.vcp
+
+contrib/samples/deprecated/proplist/proplistCE.vcp
+contrib/samples/deprecated/proplist/proplistCE.vcw
+
+contrib/samples/deprecated/resource/resourceCE.vcp
+contrib/samples/deprecated/resource/resourceCE.vcw
+
+contrib/samples/deprecated/treelay/treelayCE.vcp
+contrib/samples/deprecated/treelay/treelayCE.vcw
+
+