diff --git a/include/boost/mpl/apply.hpp b/include/boost/mpl/apply.hpp
index dddaffc..acb5179 100644
--- a/include/boost/mpl/apply.hpp
+++ b/include/boost/mpl/apply.hpp
@@ -171,7 +171,7 @@ struct apply0 : F
     BOOST_MPL_AUX_LAMBDA_SUPPORT(1, apply0, (F))
 };
 
-#if defined(BOOST_MPL_MSVC_ETI_BUG)
+#if defined(BOOST_MPL_MSVC_70_ETI_BUG)
 //: workaround for the ETI bug
 template<>
 struct apply0<int>
@@ -259,7 +259,7 @@ struct BOOST_PP_CAT(apply,i)
 
 #   endif // workarounds
 
-#if defined(BOOST_MPL_MSVC_ETI_BUG)
+#if defined(BOOST_MPL_MSVC_70_ETI_BUG)
 //: workaround for ETI bug
 template<>
 struct BOOST_PP_CAT(apply,i)<AUX_APPLY_N_SPEC_PARAMS(i, int)>
diff --git a/include/boost/mpl/iterator_category.hpp b/include/boost/mpl/iterator_category.hpp
index 6a137d4..f69c140 100644
--- a/include/boost/mpl/iterator_category.hpp
+++ b/include/boost/mpl/iterator_category.hpp
@@ -36,7 +36,7 @@ struct iterator_category
 #if defined(BOOST_MPL_MSVC_ETI_BUG)
 template<> struct iterator_category<int>
 {
-    typedef iterator_category<int> type;
+    typedef int type;
 };
 #endif
 
diff --git a/include/boost/mpl/next.hpp b/include/boost/mpl/next.hpp
index da26328..a700485 100644
--- a/include/boost/mpl/next.hpp
+++ b/include/boost/mpl/next.hpp
@@ -36,7 +36,7 @@ struct next
 #if defined(BOOST_MPL_MSVC_70_ETI_BUG)
 template<> struct next<int>
 {
-    typedef next<int> type;
+    typedef int type;
 };
 #endif
 
diff --git a/include/boost/mpl/prior.hpp b/include/boost/mpl/prior.hpp
index 138075d..90254a9 100644
--- a/include/boost/mpl/prior.hpp
+++ b/include/boost/mpl/prior.hpp
@@ -36,7 +36,7 @@ struct prior
 #if defined(BOOST_MPL_MSVC_70_ETI_BUG)
 template<> struct prior<int>
 {
-    typedef prior<int> type;
+    typedef int type;
 };
 #endif
 
diff --git a/include/boost/mpl/select1st.hpp b/include/boost/mpl/select1st.hpp
index 7054688..6c44598 100644
--- a/include/boost/mpl/select1st.hpp
+++ b/include/boost/mpl/select1st.hpp
@@ -36,7 +36,7 @@ struct select1st
 #if defined(BOOST_MPL_MSVC_ETI_BUG)
 template<> struct select1st<int>
 {
-    typedef select1st<int> type;
+    typedef int type;
 };
 #endif