diff --git a/dumux/implicit/common/implicitproblem.hh b/dumux/implicit/common/implicitproblem.hh
index 934698cbf162aac3dddc0e6321fff8048bf8e4c6..caab75353f603f526ef4af161977b7a75cc872a0 100644
--- a/dumux/implicit/common/implicitproblem.hh
+++ b/dumux/implicit/common/implicitproblem.hh
@@ -126,7 +126,7 @@ public:
     {
         if (resultWriter_)
             delete resultWriter_;
-    };
+    }
 
 
     /*!
@@ -857,7 +857,7 @@ protected:
 private:
     // makes sure that the result writer exists
     void createResultWriter_()
-    { if (!resultWriter_) resultWriter_ = new VtkMultiWriter(gridView_, asImp_().name()); };
+    { if (!resultWriter_) resultWriter_ = new VtkMultiWriter(gridView_, asImp_().name()); }
 
     std::string simName_;
     const GridView gridView_;
diff --git a/dumux/linear/boxlinearsolver.hh b/dumux/linear/boxlinearsolver.hh
index 437dcffd883696e60a0d4d1554d44e6f0392cfad..c8cba18c91c2916a64b12b2eb01363acf5221b30 100644
--- a/dumux/linear/boxlinearsolver.hh
+++ b/dumux/linear/boxlinearsolver.hh
@@ -72,7 +72,7 @@ public:
         overlapMatrix_ = 0;
         overlapb_ = 0;
         overlapx_ = 0;
-    };
+    }
 
     ~BoxLinearSolver()
     { cleanup_(); }
@@ -89,7 +89,7 @@ public:
     {
         cleanup_();
         prepare_();
-    };
+    }
 
     /*!
      * \brief Actually solve the linear system of equations.
@@ -165,7 +165,7 @@ private:
         // solution
         overlapb_ = new OverlappingVector(overlapMatrix_->overlap());
         overlapx_ = new OverlappingVector(*overlapb_);
-    };
+    }
 
     void cleanup_()
     {
@@ -177,7 +177,7 @@ private:
         overlapMatrix_ = 0;
         overlapb_ = 0;
         overlapx_ = 0;
-    };
+    }
 
     const Problem &problem_;
 
diff --git a/dumux/linear/domesticoverlapfrombcrsmatrix.hh b/dumux/linear/domesticoverlapfrombcrsmatrix.hh
index 05f671e4942667699d17248486c23f06e883f13d..38fe79b31cb8ab9b907a98d4d38c4bf5fde2147d 100644
--- a/dumux/linear/domesticoverlapfrombcrsmatrix.hh
+++ b/dumux/linear/domesticoverlapfrombcrsmatrix.hh
@@ -102,7 +102,7 @@ public:
      * rank) triples for all indices on a process border.
      */
     const BorderList& borderList() const
-    { return foreignOverlap_.borderList(); };
+    { return foreignOverlap_.borderList(); }
 
 
     /*!
@@ -111,20 +111,20 @@ public:
     bool isBorder(int domesticIdx) const
     {
         return isLocal(domesticIdx) && foreignOverlap_.isBorder(domesticIdx);
-    };
+    }
 
     /*!
      * \brief Returns true iff a domestic index is a front index.
      */
     bool isFront(int domesticIdx) const
-    { return borderDistance_[domesticIdx] == foreignOverlap_.overlapSize(); };
+    { return borderDistance_[domesticIdx] == foreignOverlap_.overlapSize(); }
 
     /*!
      * \brief Returns the number of processes which "see" a given
      *        index.
      */
     int numPeers(int domesticIdx) const
-    { return domesticOverlapByIndex_[domesticIdx].size(); };
+    { return domesticOverlapByIndex_[domesticIdx].size(); }
 
     /*!
      * \brief Returns whether a given domestic index is a front index
@@ -138,7 +138,7 @@ public:
             return false; // not seen by the process
 
         return it->second == foreignOverlap_.overlapSize();
-    };
+    }
 
     /*!
      * \brief Return the number of processes which "see" a domestic
@@ -159,7 +159,7 @@ public:
         }
 
         return result;
-    };
+    }
 
     /*!
      * \brief Returns the rank of the current process.
@@ -224,7 +224,7 @@ public:
      * \brief Returns the number local indices
      */
     int numLocal() const
-    { return foreignOverlap_.numLocal(); };
+    { return foreignOverlap_.numLocal(); }
 
     /*!
      * \brief Returns the number domestic indices.
@@ -233,14 +233,14 @@ public:
      * plus its copies of indices in the overlap regions
      */
     int numDomestic() const
-    { return globalIndices_.numDomestic(); };
+    { return globalIndices_.numDomestic(); }
 
     /*!
      * \brief Return true if a domestic index is local for the process
      *        (i.e. interior or border)
      */
     bool isLocal(int domesticIdx) const
-    { return domesticIdx < numLocal(); };
+    { return domesticIdx < numLocal(); }
 
     /*!
      * \brief Return true iff the current process is the master of a
@@ -251,7 +251,7 @@ public:
         if (!isLocal(domesticIdx))
             return false;
         return foreignOverlap_.masterOf(domesticIdx) == myRank_;
-    };
+    }
 
     /*!
      * \brief Return true iff a given index is shared by more than one process
@@ -261,7 +261,7 @@ public:
         if (!isLocal(domesticIdx))
             return false;
         return foreignOverlap_.isShared(domesticIdx);
-    };
+    }
 
     /*!
      * \brief Return true iff a given rank is the master of a given
@@ -285,7 +285,7 @@ public:
         }
 
         return masterIdx == peerRank;
-    };
+    }
 
     /*!
      * \brief Print the foreign overlap for debugging purposes.
@@ -293,7 +293,7 @@ public:
     void print() const
     {
         globalIndices_.print();
-    };
+    }
 
     /*!
      * \brief Returns a domestic index given a global one
@@ -360,7 +360,7 @@ protected:
             int peerRank = *peerIt;
             waitSendIndices_(peerRank);
         }
-    };
+    }
 
     void sendIndicesToPeer_(int peerRank)
     {
@@ -432,7 +432,7 @@ protected:
             peersSendBuff_[peerRank][i]->wait();
             delete peersSendBuff_[peerRank][i];
         }
-    };
+    }
 
     void receiveIndicesFromPeer_(int peerRank)
     {
diff --git a/dumux/linear/impetbicgstabilu0solver.hh b/dumux/linear/impetbicgstabilu0solver.hh
index 753b3de9a06f2ba6772abc2424eb4920ac0482a1..79672445a78e90d40cf0f75b15ae97fc535b231e 100644
--- a/dumux/linear/impetbicgstabilu0solver.hh
+++ b/dumux/linear/impetbicgstabilu0solver.hh
@@ -88,7 +88,7 @@ public:
         overlapMatrix_ = 0;
         overlapb_ = 0;
         overlapx_ = 0;
-    };
+    }
 
     ~IMPETBiCGStabILU0Solver()
     { cleanup_(); }
@@ -105,7 +105,7 @@ public:
     {
         cleanup_();
         prepare_();
-    };
+    }
 
     /*!
      * \brief Actually solve the linear system of equations.
@@ -166,7 +166,7 @@ public:
 
         // return the result of the solver
         return result.converged;
-    };
+    }
 
 private:
     void prepare_(const Matrix &M)
@@ -184,7 +184,7 @@ private:
         // solution
         overlapb_ = new OverlappingVector(overlapMatrix_->overlap());
         overlapx_ = new OverlappingVector(*overlapb_);
-    };
+    }
 
     void cleanup_()
     {
@@ -196,7 +196,7 @@ private:
         overlapMatrix_ = 0;
         overlapb_ = 0;
         overlapx_ = 0;
-    };
+    }
 
     const Problem &problem_;
 
diff --git a/dumux/linear/overlappingbcrsmatrix.hh b/dumux/linear/overlappingbcrsmatrix.hh
index ee5f6b917d63b3b17fe38ef582d208f150004afb..5569ceb68191957723eaa3aed807c902e134e632 100644
--- a/dumux/linear/overlappingbcrsmatrix.hh
+++ b/dumux/linear/overlappingbcrsmatrix.hh
@@ -68,7 +68,7 @@ public:
     OverlappingBCRSMatrix(const OverlappingBCRSMatrix &M)
         : ParentType(M)
     {
-    };
+    }
 
     OverlappingBCRSMatrix(const BCRSMatrix &M,
                           const BorderList &foreignBorderList,
@@ -84,7 +84,7 @@ public:
         // build the overlapping matrix from the non-overlapping
         // matrix and the overlap
         build_(M);
-    };
+    }
 
     ~OverlappingBCRSMatrix()
     {
@@ -386,7 +386,7 @@ private:
         // entries
         entryValuesSendBuff_[peerRank] = new MpiBuffer<block_type>(numEntries);
 #endif // HAVE_MPI
-    };
+    }
 
     // receive the overlap indices to a peer
     void receiveRowIndices_(int peerRank)
@@ -435,7 +435,7 @@ private:
             }
         }
 #endif // HAVE_MPI
-    };
+    }
 
     // communicates and adds up the contents of overlapping rows
     void syncAdd_()
@@ -517,7 +517,7 @@ private:
             for (int j = 0; j < mpiRowSizesSendBuff[i]; ++j) {
                 Index domColIdx = mpiColIndicesSendBuff[k];
                 for (; colIt.index() < domColIdx; ++colIt)
-                { };
+                { }
                 assert(colIt.index() == domColIdx);
 
                 mpiSendBuff[k] = (*colIt);
diff --git a/dumux/nonlinear/newtonconvergencewriter.hh b/dumux/nonlinear/newtonconvergencewriter.hh
index 30bde64bf2d288a4569d87d68df359550a831544..c6889f6ff3571946d9ae937e353c5e9e55fee417 100644
--- a/dumux/nonlinear/newtonconvergencewriter.hh
+++ b/dumux/nonlinear/newtonconvergencewriter.hh
@@ -54,13 +54,13 @@ public:
     }
 
     ~NewtonConvergenceWriter()
-    { delete vtkMultiWriter_; };
+    { delete vtkMultiWriter_; }
 
     void beginTimestep()
     {
         ++timeStepIndex_;
         iteration_ = 0;
-    };
+    }
 
     void beginIteration(const GridView &gv)
     {
@@ -68,21 +68,21 @@ public:
         if (!vtkMultiWriter_)
             vtkMultiWriter_ = new VtkMultiWriter(gv, "convergence");
         vtkMultiWriter_->beginWrite(timeStepIndex_ + iteration_ / 100.0);
-    };
+    }
 
     void writeFields(const SolutionVector &uLastIter,
                      const SolutionVector &deltaU)
     {
         ctl_.method().model().addConvergenceVtkFields(*vtkMultiWriter_, uLastIter, deltaU);
-    };
+    }
 
     void endIteration()
-    { vtkMultiWriter_->endWrite(); };
+    { vtkMultiWriter_->endWrite(); }
 
     void endTimestep()
     {
         iteration_ = 0;
-    };
+    }
 
 private:
     int timeStepIndex_;