diff --git a/opm/models/blackoil/blackoilbrinemodules.hh b/opm/models/blackoil/blackoilbrinemodules.hh
index 58e6676e0..dc8e9ef2e 100644
--- a/opm/models/blackoil/blackoilbrinemodules.hh
+++ b/opm/models/blackoil/blackoilbrinemodules.hh
@@ -42,7 +42,6 @@
 
 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
 
 #include <dune/common/fvector.hh>
 
diff --git a/opm/models/blackoil/blackoilenergymodules.hh b/opm/models/blackoil/blackoilenergymodules.hh
index 9158cb05d..230153fcb 100644
--- a/opm/models/blackoil/blackoilenergymodules.hh
+++ b/opm/models/blackoil/blackoilenergymodules.hh
@@ -36,7 +36,6 @@
 
 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
 
 #include <dune/common/fvector.hh>
 
diff --git a/opm/models/blackoil/blackoilfoammodules.hh b/opm/models/blackoil/blackoilfoammodules.hh
index 99f7d8388..613f933dc 100644
--- a/opm/models/blackoil/blackoilfoammodules.hh
+++ b/opm/models/blackoil/blackoilfoammodules.hh
@@ -44,7 +44,6 @@
 
 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
 
 #include <dune/common/fvector.hh>
 
diff --git a/opm/models/blackoil/blackoilmodel.hh b/opm/models/blackoil/blackoilmodel.hh
index 89c7fb4a3..6bba9216f 100644
--- a/opm/models/blackoil/blackoilmodel.hh
+++ b/opm/models/blackoil/blackoilmodel.hh
@@ -53,7 +53,6 @@
 
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
 
 #include <sstream>
 #include <string>
diff --git a/opm/models/blackoil/blackoilpolymermodules.hh b/opm/models/blackoil/blackoilpolymermodules.hh
index ffb37e8bf..9249a9c11 100644
--- a/opm/models/blackoil/blackoilpolymermodules.hh
+++ b/opm/models/blackoil/blackoilpolymermodules.hh
@@ -46,7 +46,6 @@
 
 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
 
 #include <dune/common/fvector.hh>
 
diff --git a/opm/models/common/diffusionmodule.hh b/opm/models/common/diffusionmodule.hh
index c741c6bc4..95c6c682e 100644
--- a/opm/models/common/diffusionmodule.hh
+++ b/opm/models/common/diffusionmodule.hh
@@ -33,7 +33,6 @@
 
 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
 
 #include <dune/common/fvector.hh>
 
diff --git a/opm/models/common/energymodule.hh b/opm/models/common/energymodule.hh
index a785b5488..be9e17d35 100644
--- a/opm/models/common/energymodule.hh
+++ b/opm/models/common/energymodule.hh
@@ -34,7 +34,6 @@
 
 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
 
 #include <dune/common/fvector.hh>
 
diff --git a/opm/models/common/multiphasebaseproblem.hh b/opm/models/common/multiphasebaseproblem.hh
index 4ce8d53ae..9de30ef91 100644
--- a/opm/models/common/multiphasebaseproblem.hh
+++ b/opm/models/common/multiphasebaseproblem.hh
@@ -36,7 +36,6 @@
 #include <opm/material/fluidmatrixinteractions/NullMaterial.hpp>
 #include <opm/material/common/Means.hpp>
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
 
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
diff --git a/opm/models/discretefracture/discretefractureproblem.hh b/opm/models/discretefracture/discretefractureproblem.hh
index 77867bcd3..21b646239 100644
--- a/opm/models/discretefracture/discretefractureproblem.hh
+++ b/opm/models/discretefracture/discretefractureproblem.hh
@@ -34,7 +34,6 @@
 
 #include <opm/material/common/Means.hpp>
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
 
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh
index e899a5d31..db04be818 100644
--- a/opm/models/discretization/common/fvbaseelementcontext.hh
+++ b/opm/models/discretization/common/fvbaseelementcontext.hh
@@ -34,7 +34,6 @@
 #include <opm/models/utils/alignedallocator.hh>
 
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
 
 #include <dune/common/fvector.hh>
 
diff --git a/opm/models/discretization/common/fvbaselocalresidual.hh b/opm/models/discretization/common/fvbaselocalresidual.hh
index af3a0fcca..d8d0ccb61 100644
--- a/opm/models/discretization/common/fvbaselocalresidual.hh
+++ b/opm/models/discretization/common/fvbaselocalresidual.hh
@@ -35,7 +35,6 @@
 
 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
 
 #include <dune/istl/bvector.hh>
 #include <dune/grid/common/geometry.hh>
diff --git a/opm/models/discretization/common/fvbaseproblem.hh b/opm/models/discretization/common/fvbaseproblem.hh
index 397b6e0e0..ed10a37cb 100644
--- a/opm/models/discretization/common/fvbaseproblem.hh
+++ b/opm/models/discretization/common/fvbaseproblem.hh
@@ -35,8 +35,6 @@
 #include <opm/models/discretization/common/restrictprolong.hh>
 
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
-
 #include <dune/common/fvector.hh>
 
 #include <iostream>
diff --git a/opm/models/io/baseoutputmodule.hh b/opm/models/io/baseoutputmodule.hh
index be16f2883..58f89eb34 100644
--- a/opm/models/io/baseoutputmodule.hh
+++ b/opm/models/io/baseoutputmodule.hh
@@ -35,8 +35,6 @@
 #include <opm/models/common/multiphasebaseproperties.hh>
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 
-#include <opm/material/common/Exceptions.hpp>
-
 #include <dune/istl/bvector.hh>
 #include <dune/common/fvector.hh>
 
diff --git a/opm/models/io/vtktensorfunction.hh b/opm/models/io/vtktensorfunction.hh
index 570064834..bd8852c02 100644
--- a/opm/models/io/vtktensorfunction.hh
+++ b/opm/models/io/vtktensorfunction.hh
@@ -33,8 +33,6 @@
 #include <dune/common/fvector.hh>
 #include <dune/common/version.hh>
 
-#include <opm/material/common/Exceptions.hpp>
-
 #include <string>
 #include <limits>
 #include <vector>
diff --git a/opm/models/parallel/threadmanager.hh b/opm/models/parallel/threadmanager.hh
index 6ecb29d3e..c5d67250f 100644
--- a/opm/models/parallel/threadmanager.hh
+++ b/opm/models/parallel/threadmanager.hh
@@ -34,8 +34,6 @@
 #include <opm/models/utils/parametersystem.hh>
 #include <opm/models/utils/propertysystem.hh>
 
-#include <opm/material/common/Exceptions.hpp>
-
 #include <dune/common/version.hh>
 
 namespace Opm {
diff --git a/opm/models/utils/parametersystem.hh b/opm/models/utils/parametersystem.hh
index c5819a800..d7a2180ac 100644
--- a/opm/models/utils/parametersystem.hh
+++ b/opm/models/utils/parametersystem.hh
@@ -34,7 +34,6 @@
 
 #include <opm/models/utils/propertysystem.hh>
 
-#include <opm/material/common/Exceptions.hpp>
 #include <opm/material/common/Unused.hpp>
 
 #if HAVE_QUAD
diff --git a/opm/simulators/linalg/nullborderlistmanager.hh b/opm/simulators/linalg/nullborderlistmanager.hh
index 9d67cef38..0073bd152 100644
--- a/opm/simulators/linalg/nullborderlistmanager.hh
+++ b/opm/simulators/linalg/nullborderlistmanager.hh
@@ -30,7 +30,6 @@
 #include "overlaptypes.hh"
 
 #include <opm/material/common/Unused.hpp>
-#include <opm/material/common/Exceptions.hpp>
 
 #include <dune/grid/common/datahandleif.hh>
 #include <dune/grid/common/gridenums.hh>