diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index 8f7521e079..8f142e1a9a 100644
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -8,7 +8,7 @@
         <set var="wxUSE_LIBJPEG">builtin</set>
     </if>
     <set var="LIB_JPEG">
-        <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg</if>
+        <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_JPEG">
         <if cond="wxUSE_LIBJPEG=='builtin'">$(SRCDIR)/src/jpeg</if>
diff --git a/build/bakefiles/odbc.bkl b/build/bakefiles/odbc.bkl
index ca2c0ca129..fd325a5fa2 100644
--- a/build/bakefiles/odbc.bkl
+++ b/build/bakefiles/odbc.bkl
@@ -11,7 +11,7 @@
         </set>
     </if>
     <set var="LIB_ODBC">
-        <if cond="wxUSE_ODBC=='builtin'">wxodbc</if>
+        <if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_ODBC">
         <if cond="wxUSE_ODBC=='builtin'">$(SRCDIR)/src/odbc</if>
diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index 6f83cf4050..f2a88541be 100644
--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -8,7 +8,7 @@
         <set var="wxUSE_LIBPNG">builtin</set>
     </if>
     <set var="LIB_PNG">
-        <if cond="wxUSE_LIBPNG=='builtin'">wxpng</if>
+        <if cond="wxUSE_LIBPNG=='builtin'">wxpng$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_PNG">
         <if cond="wxUSE_LIBPNG=='builtin'">$(SRCDIR)/src/png</if>
diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index 41b7301dd2..f0fc48c539 100644
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -8,7 +8,7 @@
         <set var="wxUSE_REGEX">builtin</set>
     </if>
     <set var="LIB_REGEX">
-        <if cond="wxUSE_REGEX=='builtin'">wxregex</if>
+        <if cond="wxUSE_REGEX=='builtin'">wxregex$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_REGEX">
         <if cond="wxUSE_REGEX=='builtin'">$(SRCDIR)/src/regex</if>
diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 87d711ad01..60558a5743 100644
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -8,7 +8,7 @@
         <set var="wxUSE_LIBTIFF">builtin</set>
     </if>
     <set var="LIB_TIFF">
-        <if cond="wxUSE_LIBTIFF=='builtin'">wxtiff</if>
+        <if cond="wxUSE_LIBTIFF=='builtin'">wxtiff$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_TIFF">
         <if cond="wxUSE_LIBTIFF=='builtin'">$(SRCDIR)/src/tiff</if>
diff --git a/build/bakefiles/zlib.bkl b/build/bakefiles/zlib.bkl
index 21c75be96c..12e0f9db75 100644
--- a/build/bakefiles/zlib.bkl
+++ b/build/bakefiles/zlib.bkl
@@ -8,7 +8,7 @@
         <set var="wxUSE_ZLIB">builtin</set>
     </if>
     <set var="LIB_ZLIB">
-        <if cond="wxUSE_ZLIB=='builtin'">wxzlib</if>
+        <if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)</if>
     </set>
     <set var="INC_ZLIB">
         <if cond="wxUSE_ZLIB=='builtin'">$(SRCDIR)/src/zlib</if>