diff --git a/ebos/collecttoiorank.hh b/ebos/collecttoiorank.hh
index ac90babb8..5ec462a8b 100644
--- a/ebos/collecttoiorank.hh
+++ b/ebos/collecttoiorank.hh
@@ -27,7 +27,7 @@
 #include <opm/output/data/Solution.hpp>
 
 //#if HAVE_OPM_GRID
-#include <dune/grid/common/p2pcommunicator.hh>
+#include <opm/grid/common/p2pcommunicator.hh>
 #include <dune/grid/utility/persistentcontainer.hh>
 #include <dune/grid/common/gridenums.hh>
 //#else
diff --git a/ebos/eclalugridvanguard.hh b/ebos/eclalugridvanguard.hh
index d8745bc3a..bc0749bcb 100644
--- a/ebos/eclalugridvanguard.hh
+++ b/ebos/eclalugridvanguard.hh
@@ -32,7 +32,7 @@
 
 #include <dune/alugrid/grid.hh>
 #include <dune/alugrid/common/fromtogridfactory.hh>
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 
 namespace Ewoms {
 template <class TypeTag>
diff --git a/ebos/eclcpgridvanguard.hh b/ebos/eclcpgridvanguard.hh
index 8f8819144..5e12178cf 100644
--- a/ebos/eclcpgridvanguard.hh
+++ b/ebos/eclcpgridvanguard.hh
@@ -30,8 +30,8 @@
 #include "eclbasevanguard.hh"
 #include "ecltransmissibility.hh"
 
-#include <dune/grid/CpGrid.hpp>
-#include <dune/grid/cpgrid/GridHelpers.hpp>
+#include <opm/grid/CpGrid.hpp>
+#include <opm/grid/cpgrid/GridHelpers.hpp>
 
 #include <dune/grid/common/mcmgmapper.hh>
 
diff --git a/ebos/eclpolyhedralgridvanguard.hh b/ebos/eclpolyhedralgridvanguard.hh
index 89f881b89..7654c8b4b 100644
--- a/ebos/eclpolyhedralgridvanguard.hh
+++ b/ebos/eclpolyhedralgridvanguard.hh
@@ -29,7 +29,7 @@
 
 #include "eclbasevanguard.hh"
 
-#include <dune/grid/polyhedralgrid.hh>
+#include <opm/grid/polyhedralgrid.hh>
 
 namespace Ewoms {
 template <class TypeTag>
diff --git a/ebos/ecltransmissibility.hh b/ebos/ecltransmissibility.hh
index c9cb74880..66980aff3 100644
--- a/ebos/ecltransmissibility.hh
+++ b/ebos/ecltransmissibility.hh
@@ -36,7 +36,7 @@
 #include <opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
 
-#include <dune/grid/CpGrid.hpp>
+#include <opm/grid/CpGrid.hpp>
 
 #include <opm/material/common/Exceptions.hpp>
 
diff --git a/ebos/equil/initstateequil.hh b/ebos/equil/initstateequil.hh
index 7832e712a..94198f258 100644
--- a/ebos/equil/initstateequil.hh
+++ b/ebos/equil/initstateequil.hh
@@ -34,7 +34,7 @@
 
 #include <ewoms/common/propertysystem.hh>
 
-#include <dune/grid/cpgrid/GridHelpers.hpp>
+#include <opm/grid/cpgrid/GridHelpers.hpp>
 
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
diff --git a/tests/test_equil.cc b/tests/test_equil.cc
index a30c38b2c..148ed7fa3 100644
--- a/tests/test_equil.cc
+++ b/tests/test_equil.cc
@@ -26,8 +26,8 @@
 #include <ebos/eclproblem.hh>
 #include <ewoms/common/start.hh>
 
-#include <opm/core/grid.h>
-#include <opm/core/grid/GridManager.hpp>
+#include <opm/grid/UnstructuredGrid.h>
+#include <opm/grid/GridManager.hpp>
 
 #include <opm/parser/eclipse/Units/Units.hpp>