diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 859180d3bf..e22e718bbb 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -434,14 +434,17 @@
             the LIBDIRNAME and not any wx libraries installed system-wide.
         -->
         <ldlibs cond="FORMAT=='autoconf'">$(WX_LDFLAGS)</ldlibs>
-        <res-define>$(WIN32_DPI_MANIFEST)</res-define>
-        <ldflags>$(WIN32_DPI_LINKFLAG)</ldflags>
         <if cond="FORMAT=='msvc'">
             <ldflags>$(LINK_TARGET_CPU)</ldflags>
             <define>$(TARGET_CPU_COMPFLAG)</define>
         </if>
     </template>
 
+    <template id="wx_dpi">
+        <res-define>$(WIN32_DPI_MANIFEST)</res-define>
+        <ldflags>$(WIN32_DPI_LINKFLAG)</ldflags>
+    </template>
+
     <template id="anylib">
         <dirname>$(LIBDIRNAME)</dirname>
         <install-to>$(LIBDIR)</install-to>
diff --git a/build/bakefiles/common_samples_intree.bkl b/build/bakefiles/common_samples_intree.bkl
index f35c5e1414..8bb8503826 100644
--- a/build/bakefiles/common_samples_intree.bkl
+++ b/build/bakefiles/common_samples_intree.bkl
@@ -19,7 +19,7 @@
         <define>$(DLLFLAG)</define>
     </template>
 
-    <template id="wx_util" template="wx_util_b">
+    <template id="wx_util" template="wx_util_b,wx_dpi">
         <app-type>gui</app-type>
         <!-- resource files includes: -->
         <include>$(SRCDIR)/$(WXTOPDIR)samples</include>