diff --git a/dumux/material/fluidsystems/brineco2fluidsystem.hh b/dumux/material/fluidsystems/brineco2fluidsystem.hh
index a85cbca0e35e597b5df118c1d1b72769a532db43..c9e4163a04c96464aef06693e748f184421b7627 100644
--- a/dumux/material/fluidsystems/brineco2fluidsystem.hh
+++ b/dumux/material/fluidsystems/brineco2fluidsystem.hh
@@ -459,7 +459,7 @@ public:
     {
         // TODO!
         DUNE_THROW(Dune::NotImplemented, "Diffusion coefficients");
-    };
+    }
 
     /*!
      * \brief Given the phase compositions, return the binary
@@ -498,7 +498,7 @@ public:
             Valgrind::CheckDefined(result);
             return result;
         }
-    };
+    }
 
     /*!
      * \brief Given the phase composition, return the specific
@@ -728,7 +728,7 @@ NEW_PROP_TAG(Salinity);
 SET_TYPE_PROP(NumericModel, CO2Table, Dumux::CO2Tables);
 // Set salinity defaults
 SET_SCALAR_PROP(NumericModel, Salinity, 1e-3);
-};
+}
 
 /*!
  * \brief A compositional fluid with brine and carbon as
diff --git a/test/boxmodels/co2/heterogeneousco2tables.hh b/test/boxmodels/co2/heterogeneousco2tables.hh
index 49b6cfc775efaa981debc62c32a6266b9eb58ef8..022e8d1fd35fd4c4a784d48590f94c51b7179056 100644
--- a/test/boxmodels/co2/heterogeneousco2tables.hh
+++ b/test/boxmodels/co2/heterogeneousco2tables.hh
@@ -27,7 +27,8 @@
 #ifndef DUMUX_HETEROGENEOUS_CO2TABLES_HH
 #define DUMUX_HETEROGENEOUS_CO2TABLES_HH
 
-#include <assert.h>
+#include <cassert>
+#include <dumux/material/components/co2tablereader.hh>
 
 namespace Dumux
 {
diff --git a/test/boxmodels/co2/heterogeneousspatialparameters.hh b/test/boxmodels/co2/heterogeneousspatialparameters.hh
index 8705fdbaf896c7977d8eab55ada7e574047e345b..168eaebd8305a583953800caf4d03362f83b9a97 100644
--- a/test/boxmodels/co2/heterogeneousspatialparameters.hh
+++ b/test/boxmodels/co2/heterogeneousspatialparameters.hh
@@ -35,7 +35,6 @@
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
 
-
 namespace Dumux
 {