diff --git a/configure.in b/configure.in
index 33e1b544e6..f51bf4e332 100644
--- a/configure.in
+++ b/configure.in
@@ -483,6 +483,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_IFF=no
   DEFAULT_wxUSE_XPM=no
   DEFAULT_wxUSE_ICO_CUR=no
+  DEFAULT_wxUSE_IMAGE_LOADING_IN_MSW=no
+  DEFAULT_wxUSE_RESOURCE_LOADING_IN_MSW=no
 else
   DEFAULT_wxUSE_UNIVERSAL=no
 
@@ -658,6 +660,8 @@ else
   DEFAULT_wxUSE_PNM=yes
   DEFAULT_wxUSE_XPM=yes
   DEFAULT_wxUSE_ICO_CUR=yes
+  DEFAULT_wxUSE_IMAGE_LOADING_IN_MSW=yes
+  DEFAULT_wxUSE_RESOURCE_LOADING_IN_MSW=yes
 fi
 
 dnl WX_ARG_WITH should be used to select whether an external package will be
@@ -1044,6 +1048,8 @@ WX_ARG_ENABLE(iff,         [  --enable-iff            use iff images (IFF file f
 WX_ARG_ENABLE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
 WX_ARG_ENABLE(xpm,         [  --enable-xpm            use xpm images (XPM file format)], wxUSE_XPM)
 WX_ARG_ENABLE(ico_cur,     [  --enable-icocur         use Windows ICO and CUR formats], wxUSE_ICO_CUR)
+WX_ARG_ENABLE(dynamic_dib, [  --disable-dynamic_dib   don't use dynamic DIB loading/saving code under MSW], wxUSE_IMAGE_LOADING_IN_MSW, disable)
+WX_ARG_ENABLE(dynamic_ico_cur, [  --disable-dynamic_ico_cur   don't use dynamic icon/cursor loading/saving code under MSW], wxUSE_RESOURCE_LOADING_IN_MSW, disable)
 
 fi
 
@@ -5174,6 +5180,14 @@ if test "$wxUSE_ICO_CUR" = "yes" ; then
   AC_DEFINE(wxUSE_ICO_CUR)
 fi
 
+if test "$wxUSE_IMAGE_LOADING_IN_MSW" = "yes"; then
+  AC_DEFINE(wxUSE_IMAGE_LOADING_IN_MSW)
+fi
+
+if test "$wxUSE_RESOURCE_LOADING_IN_MSW" = "yes"; then
+  AC_DEFINE(wxUSE_RESOURCE_LOADING_IN_MSW)
+fi
+
 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
   dnl Must be done this late because -lunicows must be before all the other libs
   LIBS=" -lunicows $LIBS"
diff --git a/setup.h.in b/setup.h.in
index 92ab6db4ec..e76d9d0bfa 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -858,6 +858,16 @@
  */
 #define wxUSE_ICO_CUR 0
 
+/*
+ * Use dynamic DIB loading/saving code in utils/dib under MSW
+ */
+#define wxUSE_IMAGE_LOADING_IN_MSW 0
+
+/*
+ * Use dynamic cursor/icon loading/saving code under MSW
+ */
+#define wxUSE_RESOURCE_LOADING_IN_MSW 0
+
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.