diff --git a/dumux/material/binarycoefficients/h2o_o2.hh b/dumux/material/binarycoefficients/h2o_o2.hh
index 36ba3fa5d6d8a40b6c09b64b2eab877ddd70c843..91f31bd163dbb443a1fa194167757d4760aff1e3 100644
--- a/dumux/material/binarycoefficients/h2o_o2.hh
+++ b/dumux/material/binarycoefficients/h2o_o2.hh
@@ -55,7 +55,7 @@ public:
         const Scalar H = -15.6449;
 
         return henryIAPWS(E, F, G, H, temperature);
-    };
+    }
 
     /*!
      * \brief Binary diffusion coefficent \f$\mathrm{[m^2/s]}\f$ for molecular water and nitrogen.
@@ -76,7 +76,7 @@ public:
         const Scalar M[2] = { H2O::molarMass()*1e3, O2::molarMass()*1e3 };
 
         return fullerMethod(M, SigmaNu, temperature, pressure);
-    };
+    }
 
     /*!
      * \brief Diffusion coefficent \f$\mathrm{[m^2/s]}\f$ for molecular nitrogen in liquid water.
@@ -104,7 +104,7 @@ public:
         const Scalar Texp = 273.15 + 25; // [K]
         const Scalar Dexp = 2.2e-9; // [m^2/s]
         return Dexp * temperature/Texp;
-    };
+    }
 };
 
 }
diff --git a/dumux/material/binarycoefficients/n2_o2.hh b/dumux/material/binarycoefficients/n2_o2.hh
index 38797c0b9b55c947ab6baaf8d464683abecbd71b..e300f46b2785a09a089d4b579fb88a99b8d95b19 100644
--- a/dumux/material/binarycoefficients/n2_o2.hh
+++ b/dumux/material/binarycoefficients/n2_o2.hh
@@ -50,7 +50,7 @@ public:
     static Scalar henry(Scalar temperature)
     {
         DUNE_THROW(Dune::NotImplemented, "henry coefficient for oxygen in liquid nitrogen");
-    };
+    }
 
     /*!
      * \brief Binary diffusion coefficent \f$\mathrm{[m^2/s]}\f$ for molecular oxygen in liquid nitrogen.
@@ -70,7 +70,7 @@ public:
         // molar masses [g/mol]
         const Scalar M[2] = { N2::molarMass()*1e3, O2::molarMass()*1e3 };
         return fullerMethod(M, SigmaNu, temperature, pressure);
-    };
+    }
 
     /*!
      * \brief Diffusion coefficent \f$\mathrm{[m^2/s]}\f$ for molecular oxygen in liquid nitrogen.
@@ -81,7 +81,7 @@ public:
     static Scalar liquidDiffCoeff(Scalar temperature, Scalar pressure)
     {
         DUNE_THROW(Dune::NotImplemented, "diffusion coefficient for liquid oxygen and nitrogen");
-    };
+    }
 };
 
 }
diff --git a/dumux/material/fluidsystems/brineairfluidsystem.hh b/dumux/material/fluidsystems/brineairfluidsystem.hh
index b0bd731941a65edf060916c42bce6db124b5f5c6..16cd6ce98c891c6d73cf494d7302f062d3711d34 100644
--- a/dumux/material/fluidsystems/brineairfluidsystem.hh
+++ b/dumux/material/fluidsystems/brineairfluidsystem.hh
@@ -131,7 +131,7 @@ public:
         case wPhaseIdx: return "liquid";
         case nPhaseIdx: return "gas";
         case sPhaseIdx: return "NaCl";
-        };
+        }
         DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
     }
 
@@ -228,7 +228,7 @@ public:
         case H2OIdx: return H2O::name();
         case AirIdx: return Air::name();
         case NaClIdx:return "NaCl";
-        };
+        }
         DUNE_THROW(Dune::InvalidStateException, "Invalid component index " << compIdx);
     }
 
@@ -244,7 +244,7 @@ public:
         case H2OIdx: return H2O::molarMass();
         case AirIdx: return Air::molarMass();
         case NaClIdx:return 35.453e-3 + 22.9898e-3;
-        };
+        }
         DUNE_THROW(Dune::InvalidStateException, "Invalid component index " << compIdx);
     }
     /*!
@@ -475,7 +475,7 @@ public:
     {
         // TODO!
         DUNE_THROW(Dune::NotImplemented, "Diffusion coefficients");
-    };
+    }
 
     /*!
      * \brief Given a phase's composition, temperature and pressure,
@@ -532,7 +532,7 @@ public:
             Valgrind::CheckDefined(result);
             return result;
         }
-    };
+    }
 
     /*!
      * \brief Given a phase's composition, temperature and pressure,
@@ -581,7 +581,7 @@ public:
             Valgrind::CheckDefined(result);
             return result;
         }
-    };
+    }
 
     /*!
     * \brief Returns the specific enthalpy \f$\mathrm{[J/kg]}\f$ of a component in a specific phase
@@ -784,7 +784,8 @@ private:
         /* Enthalpy of brine without Air */
         h_ls = (1-XlNaCl)*hw + XlNaCl*h_NaCl + XlNaCl*delta_h; /* kJ/kg */
         return (h_ls);
-    };
+    }
+
     static Scalar vaporPressure_(Scalar T, Scalar x)
     {
      Scalar p_0 = H2O::vaporPressure(T);//Saturation vapor pressure for pure water