diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp
index 2de978de..6d2e0123 100644
--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@@ -18,7 +18,6 @@
 #endif
 
 #if (BOOST_INTEL_CXX_VERSION <= 600) || !defined(BOOST_STRICT_CONFIG)
-//#  define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
 
 #  if defined(_MSC_VER)
       // Intel C++ 5.0.1 uses EDG 2.45, but fails to activate Koenig lookup
diff --git a/include/boost/config/compiler/metrowerks.hpp b/include/boost/config/compiler/metrowerks.hpp
index 3482ebd0..0bbb9f7b 100644
--- a/include/boost/config/compiler/metrowerks.hpp
+++ b/include/boost/config/compiler/metrowerks.hpp
@@ -8,14 +8,14 @@
 //  Metrowerks C++ compiler setup:
 
 #   if __MWERKS__ <= 0x2301  // 5.3
-#     define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
+#     define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
 #     define BOOST_NO_POINTER_TO_MEMBER_CONST
 #     define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
 #     define BOOST_NO_MEMBER_TEMPLATE_KEYWORD
 #   endif
 
 #   if __MWERKS__ <= 0x2401  // 6.2
-//#     define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
+//#     define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
 #   endif
 
 #   if(__MWERKS__ <= 0x2405) || !defined(BOOST_STRICT_CONFIG)  // 7.0
diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp
index 99bf8be5..259ca2e5 100644
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -16,6 +16,7 @@
 #if _MSC_VER <= 1200  // 1200 == VC++ 6.0
 #  define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
 #  define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
+#  define BOOST_NO_VOID_RETURNS
 #endif
 
 #if (_MSC_VER <= 1300) || !defined(BOOST_STRICT_CONFIG)  // VC7 Beta 2 or later
@@ -33,7 +34,7 @@
 #  define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 #  define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 #  define BOOST_NO_CV_VOID_SPECIALIZATIONS
-#  define BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
+#  define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
 #  define BOOST_NO_USING_TEMPLATE
 #  define BOOST_NO_SWPRINTF
 //#  define BOOST_NO_POINTER_TO_MEMBER_CONST