diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 0c429596ef..6c569a9552 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -413,18 +413,24 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <include>$(INC_REGEX)</include>
         <include>$(INC_EXPAT)</include>
     </template>
+
+    <template id="msvc_setup_h">
+        <msvc-copy-setup-h/>
+    </template>
     
-    <template id="wx_lib" template="wx_lib_b,wx_3rdparty_includes"/>
-    <template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_includes">
+    <template id="wx_lib"
+              template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h"/>
+    <template id="wx_base_lib"
+              template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h">
         <define>wxUSE_GUI=0</define> 
     </template>
 
     <template id="wx_dll"
               template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
-              template_append="wx_append_nomono"/>
+              template_append="msvc_setup_h,wx_append_nomono"/>
     <template id="wx_base_dll"
               template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
-              template_append="wx_append_base_nomono">
+              template_append="msvc_setup_h,wx_append_base_nomono">
         <define>wxUSE_GUI=0</define> 
     </template>
                            
diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 2880c8e2f4..d67fed5f40 100644
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -19,7 +19,6 @@
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
         <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
-        <msvc-copy-setup-h/>
     </dll>
     
     <lib id="monolib" template="wx_lib"
@@ -27,7 +26,6 @@
         <define>wxUSE_BASE=1</define> 
         <sources>$(MONOLIB_SRC)</sources>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
-        <msvc-copy-setup-h/>
     </lib>
 
 </makefile>
diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index c8b2f0845f..2b8881e559 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -13,7 +13,6 @@
         <define>wxUSE_BASE=1</define>
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
-        <msvc-copy-setup-h/>
     </dll>
     
     <lib id="baselib" template="wx_base_lib"
@@ -21,7 +20,6 @@
         <define>wxUSE_BASE=1</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
-        <msvc-copy-setup-h/>
     </lib>
 
     <set var="MSVC6PRJ_MERGED_TARGETS" append="1">base=baselib+basedll</set>