diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index dbd52bd39e..e166c53906 100644
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -10,8 +10,12 @@
     <set var="LIB_JPEG">
         <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg</if>
     </set>
+    <set var="INC_JPEG">
+        <if cond="wxUSE_LIBJPEG=='builtin'">$(SRCDIR)/src/jpeg</if>
+    </set>
 
-    <lib id="wxjpeg" cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxjpeg" template="anylib"
+         cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
             src/jpeg/jcomapi.c
diff --git a/build/bakefiles/odbc.bkl b/build/bakefiles/odbc.bkl
index eec210764d..f76a8d2f1e 100644
--- a/build/bakefiles/odbc.bkl
+++ b/build/bakefiles/odbc.bkl
@@ -5,13 +5,20 @@
         <option name="wxUSE_ODBC"/>
     </if>
     <if cond="FORMAT!='autoconf'">
-        <set var="wxUSE_ODBC">builtin</set>
+        <set var="wxUSE_ODBC">
+            <if cond="PLATFORM_UNIX=='1'">builtin</if>
+            <if cond="PLATFORM_UNIX=='0'">0</if>
+        </set>
     </if>
     <set var="LIB_ODBC">
         <if cond="wxUSE_ODBC=='builtin'">wxodbc</if>
     </set>
+    <set var="INC_ODBC">
+        <if cond="wxUSE_ODBC=='builtin'">$(SRCDIR)/src/odbc</if>
+    </set>
 
-    <lib id="wxodbc" cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxodbc" template="anylib"
+         cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
  		    src/iodbc/catalog.c
diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index 8d80297d2c..2f6b6d74de 100644
--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -10,9 +10,14 @@
     <set var="LIB_PNG">
         <if cond="wxUSE_LIBPNG=='builtin'">wxpng</if>
     </set>
+    <set var="INC_PNG">
+        <if cond="wxUSE_LIBPNG=='builtin'">$(SRCDIR)/src/png</if>
+    </set>
 
-    <lib id="wxpng" cond="wxUSE_LIBPNG=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxpng" template="anylib"
+         cond="wxUSE_LIBPNG=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
+        <include>$(INC_ZLIB)</include>
         <sources>
 		    src/png/png.c
 		    src/png/pngerror.c
diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index fa07162d7c..4a07538688 100644
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -10,8 +10,12 @@
     <set var="LIB_REGEX">
         <if cond="wxUSE_REGEX=='builtin'">wxregex</if>
     </set>
+    <set var="INC_REGEX">
+        <if cond="wxUSE_REGEX=='builtin'">$(SRCDIR)/src/regex</if>
+    </set>
 
-    <lib id="wxregex" cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxregex" template="anylib"
+         cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
             src/regex/regcomp.c
diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 815b2b8edc..453d8570bc 100644
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -10,10 +10,20 @@
     <set var="LIB_TIFF">
         <if cond="wxUSE_LIBTIFF=='builtin'">wxtiff</if>
     </set>
+    <set var="INC_TIFF">
+        <if cond="wxUSE_LIBTIFF=='builtin'">$(SRCDIR)/src/tiff</if>
+    </set>
 
-    <lib id="wxtiff" cond="wxUSE_LIBTIFF=='builtin' and BUILDING_LIB=='1'">
+    <set var="TIFF_PLATFORM_SRC">
+        <if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
+        <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
+    </set>
+    
+    <lib id="wxtiff" template="anylib"
+         cond="wxUSE_LIBTIFF=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
+            $(TIFF_PLATFORM_SRC)
 		    src/tiff/tif_aux.c
 		    src/tiff/tif_close.c
 		    src/tiff/tif_codec.c
@@ -42,7 +52,6 @@
 		    src/tiff/tif_strip.c
 		    src/tiff/tif_thunder.c
 		    src/tiff/tif_tile.c
-		    src/tiff/tif_unix.c
 		    src/tiff/tif_version.c
 		    src/tiff/tif_warning.c
 		    src/tiff/tif_write.c
diff --git a/build/bakefiles/zlib.bkl b/build/bakefiles/zlib.bkl
index c32306acd3..18020fa730 100644
--- a/build/bakefiles/zlib.bkl
+++ b/build/bakefiles/zlib.bkl
@@ -10,8 +10,12 @@
     <set var="LIB_ZLIB">
         <if cond="wxUSE_ZLIB=='builtin'">wxzlib</if>
     </set>
+    <set var="INC_ZLIB">
+        <if cond="wxUSE_ZLIB=='builtin'">$(SRCDIR)/src/zlib</if>
+    </set>
 
-    <lib id="wxzlib" cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxzlib" teplate="anylib"
+         cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
             src/zlib/adler32.c