diff --git a/include/boost/mpl/arithmetic/divides.hpp b/include/boost/mpl/arithmetic/divides.hpp
index f133ae2..382a9bc 100644
--- a/include/boost/mpl/arithmetic/divides.hpp
+++ b/include/boost/mpl/arithmetic/divides.hpp
@@ -60,11 +60,11 @@ struct divides
           BOOST_MPL_AUX_TYPEOF(T1,
              T1::value / T2::value / T3::value / T4::value / T5::value
             )
-        , BOOST_MPL_AUX_VALUE_WKND(T1)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T2)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T3)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T4)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T5)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T1)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T2)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T3)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T4)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T5)::value
         >
 {
     BOOST_MPL_AUX_LAMBDA_SUPPORT(5, divides, (T1,T2,T3,T4,T5))
diff --git a/include/boost/mpl/arithmetic/minus.hpp b/include/boost/mpl/arithmetic/minus.hpp
index 9752306..314c5ce 100644
--- a/include/boost/mpl/arithmetic/minus.hpp
+++ b/include/boost/mpl/arithmetic/minus.hpp
@@ -52,11 +52,11 @@ struct minus
           BOOST_MPL_AUX_TYPEOF(T1,
              T1::value - T2::value - T3::value - T4::value - T5::value
             )
-        , BOOST_MPL_AUX_VALUE_WKND(T1)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T2)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T3)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T4)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T5)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T1)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T2)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T3)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T4)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T5)::value
         >
 {
     BOOST_MPL_AUX_LAMBDA_SUPPORT(5, minus, (T1,T2,T3,T4,T5))
diff --git a/include/boost/mpl/arithmetic/modulus.hpp b/include/boost/mpl/arithmetic/modulus.hpp
index 11132ed..104aaad 100644
--- a/include/boost/mpl/arithmetic/modulus.hpp
+++ b/include/boost/mpl/arithmetic/modulus.hpp
@@ -57,8 +57,8 @@ struct modulus
           BOOST_MPL_AUX_TYPEOF(T1,
              T1::value % T2::value
             )
-        , BOOST_MPL_AUX_VALUE_WKND(T1)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T2)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T1)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T2)::value
         >
 {
     BOOST_MPL_AUX_LAMBDA_SUPPORT(2, modulus, (T1,T2))
diff --git a/include/boost/mpl/arithmetic/multiplies.hpp b/include/boost/mpl/arithmetic/multiplies.hpp
index c184ca8..e3fc86e 100644
--- a/include/boost/mpl/arithmetic/multiplies.hpp
+++ b/include/boost/mpl/arithmetic/multiplies.hpp
@@ -52,11 +52,11 @@ struct multiplies
           BOOST_MPL_AUX_TYPEOF(T1,
              T1::value * T2::value * T3::value * T4::value * T5::value
             )
-        , BOOST_MPL_AUX_VALUE_WKND(T1)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T2)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T3)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T4)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T5)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T1)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T2)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T3)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T4)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T5)::value
         >
 {
     BOOST_MPL_AUX_LAMBDA_SUPPORT(5, multiplies, (T1,T2,T3,T4,T5))
diff --git a/include/boost/mpl/arithmetic/plus.hpp b/include/boost/mpl/arithmetic/plus.hpp
index 73fc3a3..e8ffa65 100644
--- a/include/boost/mpl/arithmetic/plus.hpp
+++ b/include/boost/mpl/arithmetic/plus.hpp
@@ -52,11 +52,11 @@ struct plus
           BOOST_MPL_AUX_TYPEOF(T1,
              T1::value + T2::value + T3::value + T4::value + T5::value
             )
-        , BOOST_MPL_AUX_VALUE_WKND(T1)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T2)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T3)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T4)::value
-        , BOOST_MPL_AUX_VALUE_WKND(T5)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T1)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T2)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T3)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T4)::value
+        , BOOST_MPL_AUX_MSVC_VALUE_WKND(T5)::value
         >
 {
     BOOST_MPL_AUX_LAMBDA_SUPPORT(5, plus, (T1,T2,T3,T4,T5))