diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp
index c281e412..cb656f93 100644
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -19,9 +19,6 @@
 #  define BOOST_NO_VOID_RETURNS
    // disable min/max macro defines on vc6:
    //
-#  ifndef NOMINMAX
-#     define NOMINMAX
-#  endif
 #endif
 
 #if (_MSC_VER <= 1300) // || !defined(BOOST_STRICT_CONFIG) // VC7 Beta 2 or later
@@ -50,15 +47,6 @@
 #  define BOOST_NO_TEMPLATE_TEMPLATES
 #  if (_MSC_VER > 1200)
 #     define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
-#  endif
-   //
-   // disable min/max macros if defined:
-   //
-#  ifdef min
-#     undef min
-#  endif
-#  ifdef max
-#     undef max
 #  endif
 
 #endif
diff --git a/include/boost/config/platform/win32.hpp b/include/boost/config/platform/win32.hpp
index 491b8c3d..6ca504bb 100644
--- a/include/boost/config/platform/win32.hpp
+++ b/include/boost/config/platform/win32.hpp
@@ -37,3 +37,16 @@
 #define BOOST_HAS_FTIME
 
 #endif
+
+//
+// disable min/max macros:
+//
+#ifdef min
+#  undef min
+#endif
+#ifdef max
+#  undef max
+#endif
+#ifndef NOMINMAX
+#  define NOMINMAX
+#endif
diff --git a/include/boost/config/stdlib/dinkumware.hpp b/include/boost/config/stdlib/dinkumware.hpp
index 8d81d09e..afd5ba1f 100644
--- a/include/boost/config/stdlib/dinkumware.hpp
+++ b/include/boost/config/stdlib/dinkumware.hpp
@@ -46,14 +46,8 @@
       // Updated Dinkum library defines this, and provides
       // its own min and max definitions.
 #     define BOOST_NO_STD_MIN_MAX
-#     undef min
-#     undef max
 #     define BOOST_NO_MS_INT64_NUMERIC_LIMITS
 #  endif
-#  ifndef NOMINMAX
-      // avoid spurious NOMINMAX redefinition warning
-#     define NOMINMAX
-#  endif
 #endif
 
 #if defined(_MSC_VER) && (_MSC_VER <= 1200) || !defined(_CPPLIB_VER) || _CPPLIB_VER < 306