diff --git a/opm/core/eclipse/EclipseGridParser.cpp b/opm/core/eclipse/EclipseGridParser.cpp
index 7c7962b7..b496c98d 100644
--- a/opm/core/eclipse/EclipseGridParser.cpp
+++ b/opm/core/eclipse/EclipseGridParser.cpp
@@ -52,13 +52,13 @@
 #include <boost/filesystem.hpp>
 
 #ifdef HAVE_ERT
-#include <fortio.h>
-#include <ecl_grid.h>
-#include <ecl_kw_magic.h>
-#include <ecl_kw.h>
-#include <ecl_util.h>
-#include <ecl_init_file.h>
-#include <ecl_file.h>
+#include <ert/ecl/fortio.h>
+#include <ert/ecl/ecl_grid.h>
+#include <ert/ecl/ecl_kw_magic.h>
+#include <ert/ecl/ecl_kw.h>
+#include <ert/ecl/ecl_util.h>
+#include <ert/ecl/ecl_init_file.h>
+#include <ert/ecl/ecl_file.h>
 #endif
 
 using namespace std;
diff --git a/opm/core/eclipse/EclipseGridParser.hpp b/opm/core/eclipse/EclipseGridParser.hpp
index f09280ee..da330287 100644
--- a/opm/core/eclipse/EclipseGridParser.hpp
+++ b/opm/core/eclipse/EclipseGridParser.hpp
@@ -47,8 +47,8 @@ along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <opm/core/grid/cornerpoint_grid.h>
 #ifdef HAVE_ERT
-#include <ecl_kw.h>
-#include <ecl_grid.h>
+#include <ert/ecl/ecl_kw.h>
+#include <ert/ecl/ecl_grid.h>
 #endif
 
 
diff --git a/opm/core/utility/writeECLData.cpp b/opm/core/utility/writeECLData.cpp
index 7df07016..959989ce 100644
--- a/opm/core/utility/writeECLData.cpp
+++ b/opm/core/utility/writeECLData.cpp
@@ -31,9 +31,9 @@
 
 #ifdef HAVE_ERT // This one goes almost to the bottom of the file
 
-#include <ecl_grid.h>
-#include <ecl_util.h>
-#include <ecl_rst_file.h>
+#include <ert/ecl/ecl_grid.h>
+#include <ert/ecl/ecl_util.h>
+#include <ert/ecl/ecl_rst_file.h>
 
 
 namespace Opm