diff --git a/include/boost/mpl/at.hpp b/include/boost/mpl/at.hpp
index 77ac522..b5e0c07 100644
--- a/include/boost/mpl/at.hpp
+++ b/include/boost/mpl/at.hpp
@@ -41,7 +41,7 @@ template<
     >
 struct at_c
     : at_impl< typename sequence_tag<Sequence>::type >
-        ::template apply< Sequence,long_<N> >
+        ::template apply< Sequence,mpl::long_<N> >
 {
 };
 
diff --git a/include/boost/mpl/for_each.hpp b/include/boost/mpl/for_each.hpp
index 3dfc188..79419e3 100644
--- a/include/boost/mpl/for_each.hpp
+++ b/include/boost/mpl/for_each.hpp
@@ -72,7 +72,7 @@ struct for_each_impl<false>
         value_initialized<arg> x;
         aux::unwrap(f, 0)(boost::get(x));
         
-        typedef typename next<Iterator>::type iter;
+        typedef typename mpl::next<Iterator>::type iter;
         for_each_impl<boost::is_same<iter,LastIterator>::value>
             ::execute((iter*)0, (LastIterator*)0, (TransformFunc*)0, f);
     }
diff --git a/include/boost/mpl/vector/aux_/O1_size.hpp b/include/boost/mpl/vector/aux_/O1_size.hpp
index c735bd5..b675a9e 100644
--- a/include/boost/mpl/vector/aux_/O1_size.hpp
+++ b/include/boost/mpl/vector/aux_/O1_size.hpp
@@ -42,7 +42,7 @@ template< long N >
 struct O1_size_impl< aux::vector_tag<N> >
 {
     template< typename Vector > struct apply
-        : long_<N>
+        : mpl::long_<N>
     {
     };
 };
diff --git a/include/boost/mpl/vector/aux_/iterator.hpp b/include/boost/mpl/vector/aux_/iterator.hpp
index 3a070e7..c64a915 100644
--- a/include/boost/mpl/vector/aux_/iterator.hpp
+++ b/include/boost/mpl/vector/aux_/iterator.hpp
@@ -40,7 +40,7 @@ struct v_iter
     typedef typename v_at<Vector,n_>::type type;
 
     typedef Vector vector_;
-    typedef long_<n_> pos;
+    typedef mpl::long_<n_> pos;
 
 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
     enum { 
@@ -95,7 +95,7 @@ template<
     , BOOST_MPL_AUX_NTTP_DECL(long, m_)
     > 
 struct distance< v_iter<Vector,n_>, v_iter<Vector,m_> >
-    : long_<(m_ - n_)>
+    : mpl::long_<(m_ - n_)>
 {
 };