diff --git a/dumux/common/propertysystem.hh b/dumux/common/propertysystem.hh
index bf578abaa6506fac2dc1fd538e6147437bab36de..cdbf6885bbf1e7a5ac1d44a3589e69340b7d5f9f 100644
--- a/dumux/common/propertysystem.hh
+++ b/dumux/common/propertysystem.hh
@@ -55,8 +55,7 @@
 #include <string>
 #include <iostream>
 #include <sstream>
-
-#include <string.h>
+#include <cstring>
 
 namespace Dumux
 {
diff --git a/dumux/common/tabulated2dfunction.hh b/dumux/common/tabulated2dfunction.hh
index bdeb6a8734e2f2e245b56d7b10462c7f5c36c07f..1be18ed3d5ab7f8d51e384ac8968a3946bc7ce8e 100644
--- a/dumux/common/tabulated2dfunction.hh
+++ b/dumux/common/tabulated2dfunction.hh
@@ -27,7 +27,7 @@
 #define DUMUX_TABULATED_2D_FUNCTION_HH
 
 #include <vector>
-#include <assert.h>
+#include <cassert>
 
 namespace Dumux
 {
diff --git a/dumux/material/components/h2o.hh b/dumux/material/components/h2o.hh
index 5d874c6b041512b8bc4e6f2b0f2f83158bd8b53e..70e9db38a6ff5c713c431d7cb6dababa3c0d3f64 100644
--- a/dumux/material/components/h2o.hh
+++ b/dumux/material/components/h2o.hh
@@ -29,6 +29,9 @@
 #ifndef DUMUX_H2O_HH
 #define DUMUX_H2O_HH
 
+#include <cmath>
+#include <cassert>
+
 #include <dumux/material/idealgas.hh>
 #include <dumux/common/exceptions.hh>
 #include <dumux/common/valgrind.hh>
@@ -40,9 +43,6 @@
 #include "iapws/region2.hh"
 #include "iapws/region4.hh"
 
-#include <cmath>
-#include <assert.h>
-
 namespace Dumux
 {
 /*!
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index 363493a2724b1745f62d6d2ec4b4204ccf53311a..4dd46a7a8466087cfc326ade0ccbb10057cfd998 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -31,13 +31,13 @@
 #ifndef DUMUX_TABULATED_COMPONENT_HH
 #define DUMUX_TABULATED_COMPONENT_HH
 
-#include <dumux/common/exceptions.hh>
 #include <cmath>
 #include <limits>
-#include <assert.h>
-
+#include <cassert>
 #include <iostream>
 
+#include <dumux/common/exceptions.hh>
+
 namespace Dumux
 {
 
diff --git a/dumux/material/eos/pengrobinsonmixture.hh b/dumux/material/eos/pengrobinsonmixture.hh
index 2a0c20deb4b31a280d35b05e56f91e193d57386a..faeb00d38457db9f43bae2a378ce509078f9b50c 100644
--- a/dumux/material/eos/pengrobinsonmixture.hh
+++ b/dumux/material/eos/pengrobinsonmixture.hh
@@ -28,7 +28,6 @@
 #ifndef DUMUX_PENG_ROBINSON_MIXTURE_HH
 #define DUMUX_PENG_ROBINSON_MIXTURE_HH
 
-#include <stdlib.h>
 #include "pengrobinson.hh"
 
 #include <dumux/material/constants.hh>
diff --git a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
index 92baf2aa1c5fcbd4f874b63143dad7ae37fcc996..06629e89335837e8928d14ec314249396af6bd85 100644
--- a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
@@ -31,9 +31,8 @@
 #include "vangenuchtenparams.hh"
 
 #include <algorithm>
-
-#include <math.h>
-#include <assert.h>
+#include <cmath>
+#include <cassert>
 
 namespace Dumux
 {
diff --git a/dumux/material/fluidsystems/1pfluidsystem.hh b/dumux/material/fluidsystems/1pfluidsystem.hh
index d3cc6840188c42eeec75044c8757f6df7326abf0..41022823838c07df0f405611e296bd251ee596c0 100644
--- a/dumux/material/fluidsystems/1pfluidsystem.hh
+++ b/dumux/material/fluidsystems/1pfluidsystem.hh
@@ -27,6 +27,9 @@
 #ifndef DUMUX_1P_FLUIDSYSTEM_HH
 #define DUMUX_1P_FLUIDSYSTEM_HH
 
+#include <limits>
+#include <cassert>
+
 #include <dumux/material/fluidsystems/liquidphase.hh>
 #include <dumux/material/fluidsystems/gasphase.hh>
 
@@ -37,9 +40,6 @@
 #include <dumux/material/components/h2o.hh>
 #include <dumux/material/components/n2.hh>
 #include <dumux/material/components/tabulatedcomponent.hh>
-#include <limits>
-
-#include <assert.h>
 
 #ifdef DUMUX_PROPERTIES_HH
 #include <dumux/common/basicproperties.hh>
diff --git a/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh b/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
index 70b21a293b0d5b41866e2b977445639ccfbc971b..0153b1eb601062cd5730caeb4c16e41ab9fff717 100644
--- a/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
+++ b/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
@@ -32,6 +32,9 @@
 #ifndef DUMUX_2P_IMMISCIBLE_FLUID_SYSTEM_HH
 #define DUMUX_2P_IMMISCIBLE_FLUID_SYSTEM_HH
 
+#include <limits>
+#include <cassert>
+
 #include <dumux/material/fluidsystems/liquidphase.hh>
 #include <dumux/material/fluidsystems/gasphase.hh>
 #include <dumux/material/fluidstates/immisciblefluidstate.hh>
@@ -40,10 +43,6 @@
 
 #include "basefluidsystem.hh"
 
-#include <limits>
-
-#include <assert.h>
-
 namespace Dumux {
 namespace FluidSystems {
 
diff --git a/dumux/material/fluidsystems/h2oairfluidsystem.hh b/dumux/material/fluidsystems/h2oairfluidsystem.hh
index c24249fecf6fb834ee21a8a7540005a3f13ca518..872ac42202cd3a06b54550f5f332936325b9e482 100644
--- a/dumux/material/fluidsystems/h2oairfluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairfluidsystem.hh
@@ -31,6 +31,8 @@
 #ifndef DUMUX_H2O_AIR_SYSTEM_HH
 #define DUMUX_H2O_AIR_SYSTEM_HH
 
+#include <cassert>
+
 #include <dumux/material/idealgas.hh>
 
 #include <dumux/material/fluidsystems/basefluidsystem.hh>
@@ -42,8 +44,6 @@
 #include <dumux/common/valgrind.hh>
 #include <dumux/common/exceptions.hh>
 
-#include <assert.h>
-
 #ifdef DUMUX_PROPERTIES_HH
 #include <dumux/common/propertysystem.hh>
 #include <dumux/common/basicproperties.hh>
diff --git a/dumux/material/fluidsystems/h2on2fluidsystem.hh b/dumux/material/fluidsystems/h2on2fluidsystem.hh
index 725e1b4a53876ec84c97c01c291d5bd2796c7d54..cea5690d03ce8b68e8957d844483dc17264486ed 100644
--- a/dumux/material/fluidsystems/h2on2fluidsystem.hh
+++ b/dumux/material/fluidsystems/h2on2fluidsystem.hh
@@ -27,6 +27,8 @@
 #ifndef DUMUX_H2O_N2_FLUID_SYSTEM_HH
 #define DUMUX_H2O_N2_FLUID_SYSTEM_HH
 
+#include <cassert>
+
 #include <dumux/material/idealgas.hh>
 
 #include <dumux/material/components/n2.hh>
@@ -40,8 +42,6 @@
 
 #include "basefluidsystem.hh"
 
-#include <assert.h>
-
 #ifdef DUMUX_PROPERTIES_HH
 #include <dumux/common/basicproperties.hh>
 #include <dumux/material/fluidsystems/defaultcomponents.hh>
diff --git a/dumux/material/fluidsystems/h2on2liquidphasefluidsystem.hh b/dumux/material/fluidsystems/h2on2liquidphasefluidsystem.hh
index 155f7a6a06da0748dc23f12e2aa8b70df5de7b2c..c66b7f436c90e4e19efff1cf00acf98c2a105ee5 100644
--- a/dumux/material/fluidsystems/h2on2liquidphasefluidsystem.hh
+++ b/dumux/material/fluidsystems/h2on2liquidphasefluidsystem.hh
@@ -28,6 +28,8 @@
 #ifndef DUMUX_H2O_N2_LIQUIDPHASE_FLUID_SYSTEM_HH
 #define DUMUX_H2O_N2_LIQUIDPHASE_FLUID_SYSTEM_HH
 
+#include <cassert>
+
 #include <dumux/material/idealgas.hh>
 
 #include <dumux/material/components/n2.hh>
@@ -41,8 +43,6 @@
 
 #include <dumux/material/fluidsystems/basefluidsystem.hh>
 
-#include <assert.h>
-
 #ifdef DUMUX_PROPERTIES_HH
 #include <dumux/common/basicproperties.hh>
 #include <dumux/material/fluidsystems/defaultcomponents.hh>
diff --git a/dumux/material/fluidsystems/spe5parametercache.hh b/dumux/material/fluidsystems/spe5parametercache.hh
index 1772d53f0d8b56f8c7b2a2de7398ff7f57e8af6d..bfef0ba5dec1b2531b0a3c1a4b64d48fe2f530a6 100644
--- a/dumux/material/fluidsystems/spe5parametercache.hh
+++ b/dumux/material/fluidsystems/spe5parametercache.hh
@@ -28,14 +28,14 @@
 #ifndef SPE5_PARAMETER_CACHE_HH
 #define SPE5_PARAMETER_CACHE_HH
 
+#include <cassert>
+
 #include <dumux/material/components/h2o.hh>
 #include <dumux/material/fluidsystems/parametercachebase.hh>
 
 #include <dumux/material/eos/pengrobinson.hh>
 #include <dumux/material/eos/pengrobinsonparamsmixture.hh>
 
-#include <assert.h>
-
 namespace Dumux
 {
 /*!
diff --git a/dumux/parallel/mpibuffer.hh b/dumux/parallel/mpibuffer.hh
index 5b229f1face51588b48121ad317053d3f47ace09..b94c63ca07feb1b0bcbb963aa18996a93f390e72 100644
--- a/dumux/parallel/mpibuffer.hh
+++ b/dumux/parallel/mpibuffer.hh
@@ -27,7 +27,7 @@
 #ifndef DUMUX_MPI_BUFFER_HH
 #define DUMUX_MPI_BUFFER_HH
 
-#include <assert.h>
+#include <cassert>
 
 #if HAVE_MPI
 #include <mpi.h>