diff --git a/contrib/build/animate/animate.bkl b/contrib/build/animate/animate.bkl
index 09a802a0dc..aa4e51a37d 100644
--- a/contrib/build/animate/animate.bkl
+++ b/contrib/build/animate/animate.bkl
@@ -27,6 +27,6 @@
         <sources>$(ANIMATE_SRC)</sources>
     </lib>
 
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">animate=animatedll+animatelib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">animate=animatelib+animatedll</set>
 
 </makefile>
diff --git a/contrib/build/animate/animate.dsw b/contrib/build/animate/animate.dsw
index 4d91013e9a..0ec1375d1e 100644
--- a/contrib/build/animate/animate.dsw
+++ b/contrib/build/animate/animate.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "animate"=animate.dsp - Package Owner=<4>
 
 Package=<5>
@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/contrib/build/deprecated/deprecated.bkl b/contrib/build/deprecated/deprecated.bkl
index 5b3fd85991..eac0cda1d8 100644
--- a/contrib/build/deprecated/deprecated.bkl
+++ b/contrib/build/deprecated/deprecated.bkl
@@ -49,7 +49,7 @@
         <sources>$(DEPRECATED_SRC)</sources>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">deprecated=deprecateddll+deprecatedlib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">deprecated=deprecatedlib+deprecateddll</set>
 
 </makefile>
 
diff --git a/contrib/build/deprecated/deprecated.dsw b/contrib/build/deprecated/deprecated.dsw
index 6aee33c8d6..69b4fe9eb1 100644
--- a/contrib/build/deprecated/deprecated.dsw
+++ b/contrib/build/deprecated/deprecated.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "deprecated"=deprecated.dsp - Package Owner=<4>
 
 Package=<5>
@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/contrib/build/fl/fl.bkl b/contrib/build/fl/fl.bkl
index aaf5076d29..9504cd959b 100644
--- a/contrib/build/fl/fl.bkl
+++ b/contrib/build/fl/fl.bkl
@@ -61,7 +61,7 @@
         <sources>$(FL_SRC)</sources>
     </lib>
 
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">fl=fldll+fllib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">fl=fllib+fldll</set>
 
 </makefile>
 
diff --git a/contrib/build/fl/fl.dsw b/contrib/build/fl/fl.dsw
index dfe257be33..1eeadeeea1 100644
--- a/contrib/build/fl/fl.dsw
+++ b/contrib/build/fl/fl.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "fl"=fl.dsp - Package Owner=<4>
 
 Package=<5>
@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/contrib/build/gizmos/gizmos.bkl b/contrib/build/gizmos/gizmos.bkl
index 65226aea98..90752612bd 100644
--- a/contrib/build/gizmos/gizmos.bkl
+++ b/contrib/build/gizmos/gizmos.bkl
@@ -38,6 +38,6 @@
         <sources>$(GIZMOS_SRC)</sources>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos=gizmosdll+gizmoslib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos=gizmoslib+gizmosdll</set>
 
 </makefile>
diff --git a/contrib/build/gizmos/gizmos.dsw b/contrib/build/gizmos/gizmos.dsw
index 1bb5e56a1e..43c56eb763 100644
--- a/contrib/build/gizmos/gizmos.dsw
+++ b/contrib/build/gizmos/gizmos.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "gizmos"=gizmos.dsp - Package Owner=<4>
 
 Package=<5>
@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/contrib/build/mmedia/mmedia.bkl b/contrib/build/mmedia/mmedia.bkl
index da2990e00c..f14f68ce9c 100644
--- a/contrib/build/mmedia/mmedia.bkl
+++ b/contrib/build/mmedia/mmedia.bkl
@@ -85,7 +85,7 @@
         <sources>$(MMEDIA_SRC)</sources>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">mmedia=mmediadll+mmedialib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">mmedia=mmedialib+mmediadll</set>
 
 </makefile>
 
diff --git a/contrib/build/mmedia/mmedia.dsw b/contrib/build/mmedia/mmedia.dsw
index bffc120d86..b25e9807ce 100644
--- a/contrib/build/mmedia/mmedia.dsw
+++ b/contrib/build/mmedia/mmedia.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "mmedia"=mmedia.dsp - Package Owner=<4>
 
 Package=<5>
@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/contrib/build/net/netutils.bkl b/contrib/build/net/netutils.bkl
index 861def5b3a..ba4e545d18 100644
--- a/contrib/build/net/netutils.bkl
+++ b/contrib/build/net/netutils.bkl
@@ -32,6 +32,6 @@
         <sources>$(NETUTILS_SRC)</sources>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">netutils=netutilsdll+netutilslib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">netutils=netutilslib+netutilsdll</set>
 
 </makefile>
diff --git a/contrib/build/net/netutils.dsw b/contrib/build/net/netutils.dsw
index fc8ecfea47..1052235b93 100644
--- a/contrib/build/net/netutils.dsw
+++ b/contrib/build/net/netutils.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "netutils"=netutils.dsp - Package Owner=<4>
 
 Package=<5>
@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/contrib/build/ogl/ogl.bkl b/contrib/build/ogl/ogl.bkl
index d104cdec79..44aa5e89c2 100644
--- a/contrib/build/ogl/ogl.bkl
+++ b/contrib/build/ogl/ogl.bkl
@@ -52,6 +52,6 @@
         <sources>$(OGL_SRC)</sources>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">ogl=ogldll+ogllib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">ogl=ogllib+ogldll</set>
 
 </makefile>
diff --git a/contrib/build/ogl/ogl.dsw b/contrib/build/ogl/ogl.dsw
index 66ef09b388..bb71f75d5f 100644
--- a/contrib/build/ogl/ogl.dsw
+++ b/contrib/build/ogl/ogl.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "ogl"=ogl.dsp - Package Owner=<4>
 
 Package=<5>
@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/contrib/build/plot/plot.bkl b/contrib/build/plot/plot.bkl
index a286d13f3a..05d778e403 100644
--- a/contrib/build/plot/plot.bkl
+++ b/contrib/build/plot/plot.bkl
@@ -34,6 +34,6 @@
         <sources>$(PLOT_SRC)</sources>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">plot=plotdll+plotlib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">plot=plotlib+plotdll</set>
 
 </makefile>
diff --git a/contrib/build/plot/plot.dsw b/contrib/build/plot/plot.dsw
index 249ab31fef..39529fbfaa 100644
--- a/contrib/build/plot/plot.dsw
+++ b/contrib/build/plot/plot.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "plot"=plot.dsp - Package Owner=<4>
 
 Package=<5>
@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/contrib/build/stc/stc.bkl b/contrib/build/stc/stc.bkl
index c03d07d413..083152732a 100644
--- a/contrib/build/stc/stc.bkl
+++ b/contrib/build/stc/stc.bkl
@@ -84,6 +84,6 @@
 
     <lib id="stclib" template="wx_contrib_lib,stc_base" cond="SHARED=='0'"/>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">stc=stcdll+stclib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">stc=stclib+stcdll</set>
 
 </makefile>
diff --git a/contrib/build/stc/stc.dsw b/contrib/build/stc/stc.dsw
index 3c382f640c..38bdfac798 100644
--- a/contrib/build/stc/stc.dsw
+++ b/contrib/build/stc/stc.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "stc"=stc.dsp - Package Owner=<4>
 
 Package=<5>
@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/contrib/build/svg/svg.bkl b/contrib/build/svg/svg.bkl
index b9ad317e19..bf77566f4e 100644
--- a/contrib/build/svg/svg.bkl
+++ b/contrib/build/svg/svg.bkl
@@ -27,6 +27,6 @@
         <sources>$(SVG_SRC)</sources>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">svg=svgdll+svglib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">svg=svglib+svgdll</set>
 
 </makefile>
diff --git a/contrib/build/svg/svg.dsw b/contrib/build/svg/svg.dsw
index dadc88aaa5..a809c47b61 100644
--- a/contrib/build/svg/svg.dsw
+++ b/contrib/build/svg/svg.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "svg"=svg.dsp - Package Owner=<4>
 
 Package=<5>
@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/contrib/build/xrc/xrc.bkl b/contrib/build/xrc/xrc.bkl
index 55fb8f6b0d..3a6f12564e 100644
--- a/contrib/build/xrc/xrc.bkl
+++ b/contrib/build/xrc/xrc.bkl
@@ -106,6 +106,6 @@
         <sources>$(XRC_SRC)</sources>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">xrc=xrcdll+xrclib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">xrc=xrclib+xrcdll</set>
 
 </makefile>
diff --git a/contrib/build/xrc/xrc.dsw b/contrib/build/xrc/xrc.dsw
index e4eb91c9f0..838c4bba3e 100644
--- a/contrib/build/xrc/xrc.dsw
+++ b/contrib/build/xrc/xrc.dsw
@@ -2,78 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
-Project: "html"=..\..\..\build\msw\wx_html.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "adv"=..\..\..\build\msw\wx_adv.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xml"=..\..\..\build\msw\wx_xml.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "xrc"=xrc.dsp - Package Owner=<4>
 
 Package=<5>
@@ -82,21 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
-Begin Project Dependency
-Project_Dep_Name html
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name adv
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name xml
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
 }}}
 
 ###############################################################################