diff --git a/ebos/ecldummygradientcalculator.hh b/ebos/ecldummygradientcalculator.hh
index d5e2525f7..57b516ac0 100644
--- a/ebos/ecldummygradientcalculator.hh
+++ b/ebos/ecldummygradientcalculator.hh
@@ -28,7 +28,7 @@
 #ifndef EWOMS_ECL_DUMMY_GRADIENT_CALCULATOR_HH
 #define EWOMS_ECL_DUMMY_GRADIENT_CALCULATOR_HH
 
-#include <ewoms/disc/common/fvbaseproperties.hh>
+#include <opm/models/discretization/common/fvbaseproperties.hh>
 
 #include <opm/material/common/Exceptions.hpp>
 
diff --git a/ebos/eclfluxmodule.hh b/ebos/eclfluxmodule.hh
index 9dec7fd86..09ea27436 100644
--- a/ebos/eclfluxmodule.hh
+++ b/ebos/eclfluxmodule.hh
@@ -31,7 +31,7 @@
 #ifndef EWOMS_ECL_FLUX_MODULE_HH
 #define EWOMS_ECL_FLUX_MODULE_HH
 
-#include <ewoms/disc/common/fvbaseproperties.hh>
+#include <opm/models/discretization/common/fvbaseproperties.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/utils/signum.hh>
 
diff --git a/ebos/eclpeacemanwell.hh b/ebos/eclpeacemanwell.hh
index 79875dc7e..eee337d9f 100644
--- a/ebos/eclpeacemanwell.hh
+++ b/ebos/eclpeacemanwell.hh
@@ -29,7 +29,7 @@
 #define EWOMS_ECL_PEACEMAN_WELL_HH
 
 #include <opm/models/blackoil/blackoilproperties.hh>
-#include <ewoms/disc/common/baseauxiliarymodule.hh>
+#include <opm/models/discretization/common/baseauxiliarymodule.hh>
 #include <opm/models/utils/propertysystem.hh>
 #include <opm/models/utils/alignedallocator.hh>
 
diff --git a/ebos/eclproblem.hh b/ebos/eclproblem.hh
index ed8b4b3e1..d1ee4e5b6 100644
--- a/ebos/eclproblem.hh
+++ b/ebos/eclproblem.hh
@@ -66,7 +66,7 @@
 
 #include <opm/models/utils/pffgridvector.hh>
 #include <opm/models/blackoil/blackoilmodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/material/thermal/EclThermalLawManager.hpp>
diff --git a/ebos/eclwellmanager.hh b/ebos/eclwellmanager.hh
index 26dc32a4b..8dbd99651 100644
--- a/ebos/eclwellmanager.hh
+++ b/ebos/eclwellmanager.hh
@@ -30,7 +30,7 @@
 
 #include "eclpeacemanwell.hh"
 
-#include <ewoms/disc/common/fvbaseproperties.hh>
+#include <opm/models/discretization/common/fvbaseproperties.hh>
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
diff --git a/ebos/eclwriter.hh b/ebos/eclwriter.hh
index e65a979b6..f93621e89 100644
--- a/ebos/eclwriter.hh
+++ b/ebos/eclwriter.hh
@@ -32,7 +32,7 @@
 #include "ecloutputblackoilmodule.hh"
 
 #include <opm/models/blackoil/blackoilmodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include <ewoms/io/baseoutputwriter.hh>
 #include <opm/models/parallel/tasklets.hh>
 
diff --git a/opm/simulators/wells/WellConnectionAuxiliaryModule.hpp b/opm/simulators/wells/WellConnectionAuxiliaryModule.hpp
index f5cb8266f..d37c7801c 100644
--- a/opm/simulators/wells/WellConnectionAuxiliaryModule.hpp
+++ b/opm/simulators/wells/WellConnectionAuxiliaryModule.hpp
@@ -21,7 +21,7 @@
 #ifndef OPM_WELLCONNECTIONAUXILIARYMODULE_HEADER_INCLUDED
 #define OPM_WELLCONNECTIONAUXILIARYMODULE_HEADER_INCLUDED
 
-#include <ewoms/disc/common/baseauxiliarymodule.hh>
+#include <opm/models/discretization/common/baseauxiliarymodule.hh>
 
 #include <opm/grid/CpGrid.hpp>