diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 712d01378c..4d30154a41 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -88,4 +88,22 @@
 
     </if>
 
+
+    <!-- copy setup.h on Windows: -->    
+    <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
+        <mkdir id="libdir">
+            <dir>$(LIBDIRNAME)/wx</dir>
+        </mkdir>
+        <copy-file-to-file id="msw/setup.h">
+            <src>$(SRCDIR)/include/wx/msw/setup0.h</src>
+            <dst>$(SRCDIR)/include/wx/msw/setup.h</dst>
+        </copy-file-to-file>
+        <copy-file-to-file id="setup.h">
+            <depends>msw/setup.h</depends>
+            <depends>libdir</depends>
+            <src>$(SRCDIR)/include/wx/msw/setup.h</src>
+            <dst>$(LIBDIRNAME)/wx/setup.h</dst>            
+        </copy-file-to-file>
+    </if>
+
 </makefile>