diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index a700aa95ee..6747e1edc8 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -163,10 +163,20 @@
     
     <set var="LIBDIRNAME" make_var="1">
         <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
-        <if cond="FORMAT!='autoconf'">
-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART)
+        <if cond="FORMAT!='autoconf' and SHARED=='0'">
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_lib$(CFG)
+        </if>
+        <if cond="FORMAT!='autoconf' and SHARED=='1'">
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_dll$(CFG)
         </if>
     </set>
+    
+    <if cond="FORMAT!='autoconf'">
+        <set var="SETUPHDIR" make_var="1">
+            $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+        </set>
+    </if>
+    
 
     
     <!-- =============================================================== -->
@@ -253,14 +263,7 @@
         <define>$(UNICODE_DEFINE)</define>
         <include>$(TOP_SRCDIR)include</include>
         <lib-path>$(LIBDIRNAME)</lib-path>        
-        <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
-        <include>$(INC_TIFF)</include>
-        <include>$(INC_JPEG)</include>
-        <include>$(INC_PNG)</include>
-        <include>$(INC_ZLIB)</include>
-        <include>$(INC_ODBC)</include>
-        <include>$(INC_REGEX)</include>
-        <include>$(INC_EXPAT)</include>
+        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
     </template>
 
     <!-- for both GUI and wxBase libs/samples: -->
@@ -400,16 +403,28 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
         <depends cond="FORMAT=='autoconf'">wxodbc</depends>
         <depends>wxregex</depends>
     </template>
+
+    <template id="wx_3rdparty_includes">
+        <include>$(INC_TIFF)</include>
+        <include>$(INC_JPEG)</include>
+        <include>$(INC_PNG)</include>
+        <include>$(INC_ZLIB)</include>
+        <include>$(INC_ODBC)</include>
+        <include>$(INC_REGEX)</include>
+        <include>$(INC_EXPAT)</include>
+    </template>
     
-    <template id="wx_lib" template="wx_lib_b"/>
-    <template id="wx_base_lib" template="wx_lib_b">
+    <template id="wx_lib" template="wx_lib_b,wx_3rdparty_includes"/>
+    <template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_includes">
         <define>wxUSE_GUI=0</define> 
     </template>
 
-    <template id="wx_dll" template="wx_dll_b,wx_3rdparty_dependencies"
-                          template_append="wx_append_nomono"/>
-    <template id="wx_base_dll" template="wx_dll_b,wx_3rdparty_dependencies"
-                               template_append="wx_append_base_nomono">
+    <template id="wx_dll"
+              template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
+              template_append="wx_append_nomono"/>
+    <template id="wx_base_dll"
+              template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
+              template_append="wx_append_base_nomono">
         <define>wxUSE_GUI=0</define> 
     </template>
                            
diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index 66b17c91f6..66aab149c5 100644
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -19,7 +19,7 @@
     <lib id="wxjpeg" template="3rdparty_lib"
          cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
-        <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
+        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <cflags-borland>-w-8004 -w-8008 -w-8057 -w-8066</cflags-borland>
         <sources>
             src/jpeg/jcomapi.c
diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 30358874cb..feded73cb9 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -129,26 +129,30 @@
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
-        <mkdir id="libdir_wx">
+        <mkdir id="libdir_setup">
             <depends>libdir</depends>
+            <dir>$(SETUPHDIR)</dir>            
+        </mkdir>
+        <mkdir id="libdir_setup_wx">
+            <depends>libdir_setup</depends>
             <dependency-of>setup_h</dependency-of>
-            <dir>$(LIBDIRNAME)/wx</dir>            
+            <dir>$(SETUPHDIR)/wx</dir>            
         </mkdir>
 
-        <set var="SETUP_H_DIR">
+        <set var="SETUP_H_SUBDIR">
             <if cond="WXUNIV=='1'">univ</if>
             <if cond="WXUNIV=='0'">msw</if>
         </set>
         
         <copy-file-to-file-if-not-exist id="master_setup.h">
-            <src>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup0.h</src>
-            <dst>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup.h</dst>
+            <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup0.h</src>
+            <dst>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</dst>
             <dependency-of>setup_h</dependency-of>
         </copy-file-to-file-if-not-exist>
         <copy-file-to-file-if-not-exist id="setup.h">
             <dependency-of>setup_h</dependency-of>
-            <src>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup.h</src>
-            <dst>$(LIBDIRNAME)/wx/setup.h</dst>
+            <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
+            <dst>$(SETUPHDIR)/wx/setup.h</dst>
         </copy-file-to-file-if-not-exist>
     </if>
 
diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index 3423c64a8b..a87a235cb6 100644
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -15,6 +15,7 @@ def __noopSubst(func, name):
     return '$(%s)' % name
 utils.addSubstituteCallback('CFG', __noopSubst)
 utils.addSubstituteCallback('LIBDIRNAME', __noopSubst)
+utils.addSubstituteCallback('SETUPHDIR', __noopSubst)
 utils.addSubstituteCallback('OBJS', __noopSubst)