diff --git a/dune/common/densevector.hh b/dune/common/densevector.hh
index 54ecbc2dee3886475cbc1fd82e2667b29887b296..2f46df40d64bee42f30e903c9039aeeac6f61c3a 100644
--- a/dune/common/densevector.hh
+++ b/dune/common/densevector.hh
@@ -125,11 +125,11 @@ namespace Dune {
   class DenseIterator :
     public Dune::RandomAccessIteratorFacade<DenseIterator<C,T,R>,T, R, std::ptrdiff_t>
   {
-    friend class DenseIterator<typename remove_const<C>::type, typename remove_const<T>::type, typename mutable_reference<R>::type >;
-    friend class DenseIterator<const typename remove_const<C>::type, const typename remove_const<T>::type, typename const_reference<R>::type >;
+    friend class DenseIterator<typename std::remove_const<C>::type, typename std::remove_const<T>::type, typename mutable_reference<R>::type >;
+    friend class DenseIterator<const typename std::remove_const<C>::type, const typename std::remove_const<T>::type, typename const_reference<R>::type >;
 
-    typedef DenseIterator<typename remove_const<C>::type, typename remove_const<T>::type, typename mutable_reference<R>::type > MutableIterator;
-    typedef DenseIterator<const typename remove_const<C>::type, const typename remove_const<T>::type, typename const_reference<R>::type > ConstIterator;
+    typedef DenseIterator<typename std::remove_const<C>::type, typename std::remove_const<T>::type, typename mutable_reference<R>::type > MutableIterator;
+    typedef DenseIterator<const typename std::remove_const<C>::type, const typename std::remove_const<T>::type, typename const_reference<R>::type > ConstIterator;
   public:
 
     /**
@@ -193,13 +193,13 @@ namespace Dune {
       position_=position_+n;
     }
 
-    DifferenceType distanceTo(DenseIterator<const typename remove_const<C>::type,const typename remove_const<T>::type> other) const
+    DifferenceType distanceTo(DenseIterator<const typename std::remove_const<C>::type,const typename std::remove_const<T>::type> other) const
     {
       assert(other.container_==container_);
       return other.position_ - position_;
     }
 
-    DifferenceType distanceTo(DenseIterator<typename remove_const<C>::type, typename remove_const<T>::type> other) const
+    DifferenceType distanceTo(DenseIterator<typename std::remove_const<C>::type, typename std::remove_const<T>::type> other) const
     {
       assert(other.container_==container_);
       return other.position_ - position_;
diff --git a/dune/common/diagonalmatrix.hh b/dune/common/diagonalmatrix.hh
index 0d9ed3ade5176aeafb4fadb208eb5e941214923c..47ac785cb0e7875322053dfa200d19c4e79f4ea1 100644
--- a/dune/common/diagonalmatrix.hh
+++ b/dune/common/diagonalmatrix.hh
@@ -978,7 +978,7 @@ namespace Dune {
   template<class CW, class T, class R>
   class ContainerWrapperIterator : public BidirectionalIteratorFacade<ContainerWrapperIterator<CW,T,R>,T, R, int>
   {
-    typedef typename remove_const<CW>::type NonConstCW;
+    typedef typename std::remove_const<CW>::type NonConstCW;
 
     friend class ContainerWrapperIterator<CW, typename mutable_reference<T>::type, typename mutable_reference<R>::type>;
     friend class ContainerWrapperIterator<CW, typename const_reference<T>::type, typename const_reference<R>::type>;
diff --git a/dune/common/genericiterator.hh b/dune/common/genericiterator.hh
index 13bd726bf3eefef7893a3a72b368890ce8fc52d9..865b8ecae2d727c2d84c7dc22144e748c2202117 100644
--- a/dune/common/genericiterator.hh
+++ b/dune/common/genericiterator.hh
@@ -149,11 +149,11 @@ namespace Dune {
   class GenericIterator :
     public IteratorFacade<GenericIterator<C,T,R,D,IteratorFacade>,T,R,D>
   {
-    friend class GenericIterator<typename remove_const<C>::type, typename remove_const<T>::type, typename mutable_reference<R>::type, D, IteratorFacade>;
-    friend class GenericIterator<const typename remove_const<C>::type, const typename remove_const<T>::type, typename const_reference<R>::type, D, IteratorFacade>;
+    friend class GenericIterator<typename std::remove_const<C>::type, typename std::remove_const<T>::type, typename mutable_reference<R>::type, D, IteratorFacade>;
+    friend class GenericIterator<const typename std::remove_const<C>::type, const typename std::remove_const<T>::type, typename const_reference<R>::type, D, IteratorFacade>;
 
-    typedef GenericIterator<typename remove_const<C>::type, typename remove_const<T>::type, typename mutable_reference<R>::type, D, IteratorFacade> MutableIterator;
-    typedef GenericIterator<const typename remove_const<C>::type, const typename remove_const<T>::type, typename const_reference<R>::type, D, IteratorFacade> ConstIterator;
+    typedef GenericIterator<typename std::remove_const<C>::type, typename std::remove_const<T>::type, typename mutable_reference<R>::type, D, IteratorFacade> MutableIterator;
+    typedef GenericIterator<const typename std::remove_const<C>::type, const typename std::remove_const<T>::type, typename const_reference<R>::type, D, IteratorFacade> ConstIterator;
 
   public:
 
diff --git a/dune/common/iteratorfacades.hh b/dune/common/iteratorfacades.hh
index ed27c197d0ef4fa14be7759288080e9dfc3c5258..a8c9b78e6405f5a635f0f2f8b375d9aff0372940 100644
--- a/dune/common/iteratorfacades.hh
+++ b/dune/common/iteratorfacades.hh
@@ -27,8 +27,8 @@ namespace Dune
      template<class C, class T>
      class TestIterator : public Dune::BidirectionalIteratorFacade<TestIterator<C,T>,T, T&, int>
      {
-      friend class TestIterator<typename remove_const<C>::type, typename remove_const<T>::type >;
-      friend class TestIterator<const typename remove_const<C>::type, const typename remove_const<T>::type >;
+      friend class TestIterator<typename std::remove_const<C>::type, typename std::remove_const<T>::type >;
+      friend class TestIterator<const typename std::remove_const<C>::type, const typename std::remove_const<T>::type >;
 
      public:
 
@@ -40,23 +40,23 @@ namespace Dune
         : container_(&cont), position_(pos)
       {}
 
-      TestIterator(const TestIterator<typename remove_const<C>::type, typename remove_const<T>::type >& other)
+      TestIterator(const TestIterator<typename std::remove_const<C>::type, typename std::remove_const<T>::type >& other)
         : container_(other.container_), position_(other.position_)
       {}
 
 
-      TestIterator(const TestIterator<const typename remove_const<C>::type, const typename remove_const<T>::type >& other)
+      TestIterator(const TestIterator<const typename std::remove_const<C>::type, const typename std::remove_const<T>::type >& other)
         : container_(other.container_), position_(other.position_)
       {}
 
       // Methods needed by the forward iterator
-      bool equals(const TestIterator<typename remove_const<C>::type,typename remove_const<T>::type>& other) const
+      bool equals(const TestIterator<typename std::remove_const<C>::type,typename std::remove_const<T>::type>& other) const
       {
         return position_ == other.position_ && container_ == other.container_;
       }
 
 
-      bool equals(const TestIterator<const typename remove_const<C>::type,const typename remove_const<T>::type>& other) const
+      bool equals(const TestIterator<const typename std::remove_const<C>::type,const typename std::remove_const<T>::type>& other) const
       {
         return position_ == other.position_ && container_ == other.container_;
       }
@@ -88,13 +88,13 @@ namespace Dune
         position_=position_+n;
       }
 
-      std::ptrdiff_t distanceTo(TestIterator<const typename remove_const<C>::type,const typename remove_const<T>::type> other) const
+      std::ptrdiff_t distanceTo(TestIterator<const typename std::remove_const<C>::type,const typename std::remove_const<T>::type> other) const
       {
         assert(other.container_==container_);
         return other.position_ - position_;
       }
 
-      std::ptrdiff_t distanceTo(TestIterator<const typename remove_const<C>::type, typename remove_const<T>::type> other) const
+      std::ptrdiff_t distanceTo(TestIterator<const typename std::remove_const<C>::type, typename std::remove_const<T>::type> other) const
       {
         assert(other.container_==container_);
         return other.position_ - position_;
@@ -134,7 +134,7 @@ namespace Dune
   template<class T, class V, class R = V&, class D = std::ptrdiff_t>
   class ForwardIteratorFacade :
     public std::iterator< std::forward_iterator_tag,
-        typename remove_const<V>::type,                   // std::iterator needs mutable value type
+        typename std::remove_const<V>::type,                   // std::iterator needs mutable value type
         D,
         V*,
         R>
@@ -265,7 +265,7 @@ namespace Dune
   template<class T, class V, class R = V&, class D = std::ptrdiff_t>
   class BidirectionalIteratorFacade :
     public std::iterator< std::bidirectional_iterator_tag,
-        typename remove_const<V>::type,                   // std::iterator needs mutable value type
+        typename std::remove_const<V>::type,                   // std::iterator needs mutable value type
         D,
         V*,
         R>
@@ -423,7 +423,7 @@ namespace Dune
   template<class T, class V, class R = V&, class D = std::ptrdiff_t>
   class RandomAccessIteratorFacade :
     public std::iterator< std::random_access_iterator_tag,
-        typename remove_const<V>::type,                   // std::iterator needs mutable value type
+        typename std::remove_const<V>::type,                   // std::iterator needs mutable value type
         D,
         V*,
         R>
diff --git a/dune/common/test/dummyiterator.hh b/dune/common/test/dummyiterator.hh
index fa4e45aa127bb6a06f7c38c4111c3f2d42f6df3a..efcd74d50220767ea4b369d728ca6cbd752beab8 100644
--- a/dune/common/test/dummyiterator.hh
+++ b/dune/common/test/dummyiterator.hh
@@ -13,7 +13,7 @@ class dummyiterator
   : public Dune::BidirectionalIteratorFacade<dummyiterator<T>, T, T&,
         std::ptrdiff_t>
 {
-  friend class dummyiterator<const typename Dune::remove_const<T>::type>;
+  friend class dummyiterator<const typename std::remove_const<T>::type>;
 
   T *value;
 
diff --git a/dune/common/test/iteratortest.hh b/dune/common/test/iteratortest.hh
index 5fd9913c5debce5165818c498ed7880fb47738f6..bc145e0d5925c26fcf2efad9c3cca9ec77e041e7 100644
--- a/dune/common/test/iteratortest.hh
+++ b/dune/common/test/iteratortest.hh
@@ -329,7 +329,7 @@ int testIterator(Iter& begin, Iter& end, Opt& opt)
 
 template<class T>
 class Printer {
-  typename Dune::remove_const<T>::type res;
+  typename std::remove_const<T>::type res;
 public:
   Printer() : res(0){}
   void operator()(const T& t){