diff --git a/COPYING b/COPYING
index 6b5d289f0abdb9de72a0fb466396448e36141d74..d68f799bee1dc6e571eb35ff25eac31b66bc9ed3 100644
--- a/COPYING
+++ b/COPYING
@@ -8,7 +8,7 @@ Copyright holders:
 2003          Marc Droske
 2003--2012    Christian Engwer
 2004--2012    Jorrit Fahlke
-2008          Bernd Flemisch
+2008--2013    Bernd Flemisch
 2005--2010    Carsten Gräser
 2010--2012    Christoph Grüninger
 2006          Bernhard Haasdonk
diff --git a/dune/common/parallel/indexset.hh b/dune/common/parallel/indexset.hh
index 164a6fbea7b33d6e835d176612bbcc74915dbba8..df9f9cc5acd1ba6f76de8412ae30515335251369 100644
--- a/dune/common/parallel/indexset.hh
+++ b/dune/common/parallel/indexset.hh
@@ -313,7 +313,10 @@ namespace Dune
      * @brief Get the state the index set is in.
      * @return The state of the index set.
      */
-    inline const ParallelIndexSetState& state();
+    inline const ParallelIndexSetState& state()
+    {
+      return state_;
+    }
 
     /**
      * @brief Indicate that the index set is to be resized.
diff --git a/dune/common/parallel/indicessyncer.hh b/dune/common/parallel/indicessyncer.hh
index 7f551ae25d20ea62de09150e22c9e56f40187b55..00c083737b29f430c9a378af79c833f68930791b 100644
--- a/dune/common/parallel/indicessyncer.hh
+++ b/dune/common/parallel/indicessyncer.hh
@@ -885,9 +885,6 @@ namespace Dune
   void IndicesSyncer<T>::packAndSend(int destination, char* buffer, std::size_t bufferSize, MPI_Request& request)
   {
     typedef typename ParallelIndexSet::const_iterator IndexIterator;
-    typedef typename RemoteIndexList::const_iterator RemoteIndexIterator;
-    typedef typename GlobalIndexList::const_iterator GlobalIterator;
-    typedef typename BoolList::const_iterator BoolIterator;
 
     IndexIterator iEnd       = indexSet_.end();
     int bpos       = 0;
@@ -1045,8 +1042,6 @@ namespace Dune
   void IndicesSyncer<T>::recvAndUnpack(T1& numberer)
   {
     typedef typename ParallelIndexSet::const_iterator IndexIterator;
-    typedef typename RemoteIndexList::iterator RemoteIndexIterator;
-    typedef typename GlobalIndexList::iterator GlobalIndexIterator;
 
     IndexIterator iEnd   = indexSet_.end();
     IndexIterator index  = indexSet_.begin();
diff --git a/dune/common/parallel/interface.hh b/dune/common/parallel/interface.hh
index b2f57ef933d4cb501860883041e4e9676c283ef8..dbc1f69c437cf373989ce44c0523798c0d7a05ca 100644
--- a/dune/common/parallel/interface.hh
+++ b/dune/common/parallel/interface.hh
@@ -360,7 +360,6 @@ namespace Dune
     // Allocate the memory for the data type construction.
     typedef R RemoteIndices;
     typedef typename RemoteIndices::RemoteIndexMap::const_iterator const_iterator;
-    typedef typename RemoteIndices::ParallelIndexSet::const_iterator LocalIterator;
 
     const const_iterator end=remoteIndices.end();
 
diff --git a/dune/common/parallel/remoteindices.hh b/dune/common/parallel/remoteindices.hh
index 42a20635ffb831ecae6b9b544c41b0a5d35bd6f5..893e0b4d0b922816402abf7a62a9e7cc095f684a 100644
--- a/dune/common/parallel/remoteindices.hh
+++ b/dune/common/parallel/remoteindices.hh
@@ -293,7 +293,6 @@ namespace Dune {
     template<typename C>
     void setNeighbours(const C& neighbours)
     {
-      typedef typename C::const_iterator Iter;
       neighbourIds.clear();
       neighbourIds.insert(neighbours.begin(), neighbours.end());
 
@@ -1715,7 +1714,6 @@ namespace Dune {
   CollectiveIterator<T,A>::CollectiveIterator(const RemoteIndexMap& pmap, bool send)
   {
     typedef typename RemoteIndexMap::const_iterator const_iterator;
-    typedef typename RemoteIndexMap::iterator iterator;
 
     const const_iterator end=pmap.end();
     for(const_iterator process=pmap.begin(); process != end; ++process) {