diff --git a/examples/spu_2p.cpp b/examples/spu_2p.cpp
index 58f22fcf..d2cd8996 100644
--- a/examples/spu_2p.cpp
+++ b/examples/spu_2p.cpp
@@ -44,25 +44,26 @@
 #include <iterator>
 #include <vector>
 
-#include <ifs_tpfa.h>
-#include <trans_tpfa.h>
-#include <sparse_sys.h>
+#include <opmcore/linalg/sparse_sys.h>
 
-#include <transport_source.h>
+#include <opmcore/pressure/tpfa/ifs_tpfa.h>
+#include <opmcore/pressure/tpfa/trans_tpfa.h>
 
-#include <cart_grid.h>
+#include <opmcore/utility/cart_grid.h>
 
-#include <CSRMatrixUmfpackSolver.hpp>
+#include <opmcore/fluid/SimpleFluid2p.hpp>
 
-#include <NormSupport.hpp>
-#include <ImplicitAssembly.hpp>
-#include <ImplicitTransport.hpp>
-#include <JacobianSystem.hpp>
+#include <opmcore/transport/transport_source.h>
+#include <opmcore/transport/CSRMatrixUmfpackSolver.hpp>
 
-#include <CSRMatrixBlockAssembler.hpp>
+#include <opmcore/transport/NormSupport.hpp>
+#include <opmcore/transport/ImplicitAssembly.hpp>
+#include <opmcore/transport/ImplicitTransport.hpp>
+#include <opmcore/transport/JacobianSystem.hpp>
 
-#include <SimpleFluid2p.hpp>
-#include <SinglePointUpwindTwoPhase.hpp>
+#include <opmcore/transport/CSRMatrixBlockAssembler.hpp>
+
+#include <opmcore/transport/SinglePointUpwindTwoPhase.hpp>
 
 template <class Ostream, class Collection>
 Ostream&
diff --git a/opmcore/linalg/call_umfpack.c b/opmcore/linalg/call_umfpack.c
index 15215b4a..517dd292 100644
--- a/opmcore/linalg/call_umfpack.c
+++ b/opmcore/linalg/call_umfpack.c
@@ -38,8 +38,8 @@
 
 #include <suitesparse/umfpack.h>
 
-#include <sparse_sys.h>
-#include "call_umfpack.h"
+#include <opmcore/linalg/sparse_sys.h>
+#include <opmcore/linalg/call_umfpack.h>
 
 struct CSCMatrix {
     UF_long  n;
diff --git a/opmcore/pressure/cfsh.c b/opmcore/pressure/cfsh.c
index 4bfdbb94..04241f00 100644
--- a/opmcore/pressure/cfsh.c
+++ b/opmcore/pressure/cfsh.c
@@ -24,10 +24,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "fsh.h"
-#include "fsh_common_impl.h"
-#include "hybsys.h"
-#include "hybsys_global.h"
+#include <opmcore/pressure/fsh.h>
+#include <opmcore/pressure/fsh_common_impl.h>
+#include <opmcore/pressure/mimetic/hybsys.h>
+#include <opmcore/pressure/mimetic/hybsys_global.h>
 
 
 
diff --git a/opmcore/pressure/fsh.c b/opmcore/pressure/fsh.c
index 86c8509a..84bb3a0c 100644
--- a/opmcore/pressure/fsh.c
+++ b/opmcore/pressure/fsh.c
@@ -24,10 +24,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "fsh.h"
-#include "fsh_common_impl.h"
-#include "hybsys.h"
-#include "hybsys_global.h"
+#include <opmcore/pressure/fsh.h>
+#include <opmcore/pressure/fsh_common_impl.h>
+#include <opmcore/pressure/mimetic/hybsys.h>
+#include <opmcore/pressure/mimetic/hybsys_global.h>
 
 
 
diff --git a/opmcore/pressure/fsh.h b/opmcore/pressure/fsh.h
index 917b78aa..2a6f5fe1 100644
--- a/opmcore/pressure/fsh.h
+++ b/opmcore/pressure/fsh.h
@@ -20,9 +20,9 @@
 #ifndef OPM_FSH_HEADER_INCLUDED
 #define OPM_FHS_HEADER_INCLUDED
 
-#include "grid.h"
-#include "well.h"
-#include "flow_bc.h"
+#include <opmcore/grid.h>
+#include <opmcore/well.h>
+#include <opmcore/pressure/flow_bc.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/opmcore/pressure/fsh_common_impl.c b/opmcore/pressure/fsh_common_impl.c
index 28ba65b9..02ee3713 100644
--- a/opmcore/pressure/fsh_common_impl.c
+++ b/opmcore/pressure/fsh_common_impl.c
@@ -24,15 +24,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "grid.h"
-#include "flow_bc.h"
-#include "well.h"
+#include <opmcore/grid.h>
+#include <opmcore/well.h>
+#include <opmcore/pressure/flow_bc.h>
 
-#include "fsh.h"
-#include "fsh_common_impl.h"
+#include <opmcore/pressure/fsh.h>
+#include <opmcore/pressure/fsh_common_impl.h>
 
-#include "hybsys.h"
-#include "hybsys_global.h"
+#include <opmcore/pressure/mimetic/hybsys.h>
+#include <opmcore/pressure/mimetic/hybsys_global.h>
 
 #if defined MAX
 #undef MAX
diff --git a/opmcore/pressure/ifsh.c b/opmcore/pressure/ifsh.c
index f58f4ac3..1248ed2a 100644
--- a/opmcore/pressure/ifsh.c
+++ b/opmcore/pressure/ifsh.c
@@ -24,10 +24,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "fsh.h"
-#include "fsh_common_impl.h"
-#include "hybsys.h"
-#include "hybsys_global.h"
+#include <opmcore/pressure/fsh.h>
+#include <opmcore/pressure/fsh_common_impl.h>
+#include <opmcore/pressure/mimetic/hybsys.h>
+#include <opmcore/pressure/mimetic/hybsys_global.h>
 
 
 /* ---------------------------------------------------------------------- */
diff --git a/opmcore/pressure/mimetic/hybsys.c b/opmcore/pressure/mimetic/hybsys.c
index c0ac9172..cf2d666e 100644
--- a/opmcore/pressure/mimetic/hybsys.c
+++ b/opmcore/pressure/mimetic/hybsys.c
@@ -22,8 +22,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "blas_lapack.h"
-#include "hybsys.h"
+#include <opmcore/linalg/blas_lapack.h>
+#include <opmcore/pressure/mimetic/hybsys.h>
 
 
 #if defined(MAX)
diff --git a/opmcore/pressure/mimetic/hybsys_global.c b/opmcore/pressure/mimetic/hybsys_global.c
index 3a2af4a7..67b3abfb 100644
--- a/opmcore/pressure/mimetic/hybsys_global.c
+++ b/opmcore/pressure/mimetic/hybsys_global.c
@@ -21,8 +21,11 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "hash_set.h"
-#include "hybsys_global.h"
+/* ---> Layering violation! */
+#include <opmcore/pressure/msmfem/hash_set.h>
+/* <--- Layering violation! */
+
+#include <opmcore/pressure/mimetic/hybsys_global.h>
 
 
 #if defined MAX
diff --git a/opmcore/pressure/mimetic/hybsys_global.h b/opmcore/pressure/mimetic/hybsys_global.h
index 5680c577..6b023f7a 100644
--- a/opmcore/pressure/mimetic/hybsys_global.h
+++ b/opmcore/pressure/mimetic/hybsys_global.h
@@ -24,9 +24,9 @@
 extern "C" {
 #endif
 
-#include "grid.h"
-#include "well.h"
-#include "sparse_sys.h"
+#include <opmcore/grid.h>
+#include <opmcore/well.h>
+#include <opmcore/linalg/sparse_sys.h>
 
 struct CSRMatrix *
 hybsys_define_globconn(grid_t *G, well_t *W);
diff --git a/opmcore/pressure/mimetic/mimetic.c b/opmcore/pressure/mimetic/mimetic.c
index c61121bb..e7a49cce 100644
--- a/opmcore/pressure/mimetic/mimetic.c
+++ b/opmcore/pressure/mimetic/mimetic.c
@@ -21,8 +21,8 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "blas_lapack.h"
-#include "mimetic.h"
+#include <opmcore/linalg/blas_lapack.h>
+#include <opmcore/pressure/mimetic/mimetic.h>
 
 /* ------------------------------------------------------------------ */
 void
diff --git a/opmcore/pressure/msmfem/coarse_conn.c b/opmcore/pressure/msmfem/coarse_conn.c
index 3df30f47..33548748 100644
--- a/opmcore/pressure/msmfem/coarse_conn.c
+++ b/opmcore/pressure/msmfem/coarse_conn.c
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "hash_set.h"
-#include "coarse_conn.h"
+#include <opmcore/pressure/msmfem/hash_set.h>
+#include <opmcore/pressure/msmfem/coarse_conn.h>
 
 #define MAX(a,b)   (((a) > (b)) ? (a) : (b))
 #define MIN(a,b)   (-MAX(-(a), -(b)))
diff --git a/opmcore/pressure/msmfem/coarse_sys.c b/opmcore/pressure/msmfem/coarse_sys.c
index 17503571..1cfc3a59 100644
--- a/opmcore/pressure/msmfem/coarse_sys.c
+++ b/opmcore/pressure/msmfem/coarse_sys.c
@@ -34,14 +34,16 @@
 #endif
 
 
-#include "blas_lapack.h"
-#include "coarse_conn.h"
-#include "coarse_sys.h"
-#include "hybsys.h"
-#include "hybsys_global.h"
-#include "mimetic.h"
-#include "partition.h"
-#include "sparse_sys.h"
+#include <opmcore/linalg/blas_lapack.h>
+#include <opmcore/linalg/sparse_sys.h>
+
+#include <opmcore/pressure/mimetic/hybsys.h>
+#include <opmcore/pressure/mimetic/hybsys_global.h>
+#include <opmcore/pressure/mimetic/mimetic.h>
+
+#include <opmcore/pressure/msmfem/coarse_conn.h>
+#include <opmcore/pressure/msmfem/coarse_sys.h>
+#include <opmcore/pressure/msmfem/partition.h>
 
 
 #if defined(MAX)
@@ -506,7 +508,7 @@ compute_fs_ip(grid_t *g, const double *perm,
     return Binv;
 }
 #elif USE_MIM_IP_TPFA
-#include "trans_tpfa.h"
+#include <opmcore/pressure/tpfa/trans_tpfa.h>
 /* ---------------------------------------------------------------------- */
 static double *
 compute_fs_ip(grid_t *g, const double *perm,
diff --git a/opmcore/pressure/msmfem/coarse_sys.h b/opmcore/pressure/msmfem/coarse_sys.h
index 69a86f55..04673239 100644
--- a/opmcore/pressure/msmfem/coarse_sys.h
+++ b/opmcore/pressure/msmfem/coarse_sys.h
@@ -20,12 +20,12 @@
 #ifndef OPM_COARSE_SYS_HEADER_INCLUDED
 #define OPM_COARSE_SYS_HEADER_INCLUDED
 
+#include <opmcore/grid.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "grid.h"
-
 /* ---------------------------------------------------------------------- */
 
 struct coarse_sys {
diff --git a/opmcore/pressure/msmfem/ifsh_ms.c b/opmcore/pressure/msmfem/ifsh_ms.c
index fc49e88a..606b0aab 100644
--- a/opmcore/pressure/msmfem/ifsh_ms.c
+++ b/opmcore/pressure/msmfem/ifsh_ms.c
@@ -21,14 +21,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "blas_lapack.h"
-#include "coarse_conn.h"
-#include "coarse_sys.h"
-#include "hybsys.h"
-#include "hybsys_global.h"
-#include "ifsh_ms.h"
-#include "partition.h"
-#include "sparse_sys.h"
+#include <opmcore/linalg/blas_lapack.h>
+#include <opmcore/linalg/sparse_sys.h>
+
+#include <opmcore/pressure/mimetic/hybsys.h>
+#include <opmcore/pressure/mimetic/hybsys_global.h>
+#include <opmcore/pressure/mimetic/mimetic.h>
+
+#include <opmcore/pressure/msmfem/coarse_conn.h>
+#include <opmcore/pressure/msmfem/coarse_sys.h>
+#include <opmcore/pressure/msmfem/partition.h>
+#include <opmcore/pressure/msmfem/ifsh_ms.h>
 
 
 #if defined(MAX)
diff --git a/opmcore/pressure/msmfem/ifsh_ms.h b/opmcore/pressure/msmfem/ifsh_ms.h
index acfe64f2..d1c940fb 100644
--- a/opmcore/pressure/msmfem/ifsh_ms.h
+++ b/opmcore/pressure/msmfem/ifsh_ms.h
@@ -26,8 +26,8 @@ extern "C" {
 
 #include <stddef.h>
 
-#include "grid.h"
-#include "coarse_sys.h"
+#include <opmcore/grid.h>
+#include <opmcore/pressure/msmfem/coarse_sys.h>
 
 struct CSRMatrix;
 struct ifsh_ms_impl;
diff --git a/opmcore/pressure/tpfa/cfs_tpfa.c b/opmcore/pressure/tpfa/cfs_tpfa.c
index 90d58eeb..14d3576a 100644
--- a/opmcore/pressure/tpfa/cfs_tpfa.c
+++ b/opmcore/pressure/tpfa/cfs_tpfa.c
@@ -4,14 +4,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "blas_lapack.h"
-#include "flow_bc.h"
-#include "well.h"
+#include <opmcore/well.h>
+#include <opmcore/linalg/blas_lapack.h>
+#include <opmcore/linalg/sparse_sys.h>
+#include <opmcore/pressure/flow_bc.h>
 
-#include "compr_quant.h"
-#include "trans_tpfa.h"
-#include "cfs_tpfa.h"
-#include "sparse_sys.h"
+#include <opmcore/pressure/tpfa/compr_quant.h>
+#include <opmcore/pressure/tpfa/trans_tpfa.h>
+#include <opmcore/pressure/tpfa/cfs_tpfa.h>
 
 
 #if defined(MAX)
diff --git a/opmcore/pressure/tpfa/cfs_tpfa.h b/opmcore/pressure/tpfa/cfs_tpfa.h
index acd809ea..7d1ed80d 100644
--- a/opmcore/pressure/tpfa/cfs_tpfa.h
+++ b/opmcore/pressure/tpfa/cfs_tpfa.h
@@ -20,9 +20,9 @@
 #ifndef OPM_CFS_TPFA_HEADER_INCLUDED
 #define OPM_CFS_TPFA_HEADER_INCLUDED
 
-#include "grid.h"
-#include "flow_bc.h"
-#include "well.h"
+#include <opmcore/grid.h>
+#include <opmcore/well.h>
+#include <opmcore/pressure/flow_bc.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/opmcore/pressure/tpfa/cfs_tpfa_residual.c b/opmcore/pressure/tpfa/cfs_tpfa_residual.c
index 9eb8e469..e7953145 100644
--- a/opmcore/pressure/tpfa/cfs_tpfa_residual.c
+++ b/opmcore/pressure/tpfa/cfs_tpfa_residual.c
@@ -4,15 +4,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "blas_lapack.h"
-#include "well.h"
+#include <opmcore/well.h>
+#include <opmcore/linalg/blas_lapack.h>
+#include <opmcore/linalg/sparse_sys.h>
 
-#include "compr_quant_general.h"
-#include "compr_source.h"
-#include "sparse_sys.h"
-#include "trans_tpfa.h"
+#include <opmcore/pressure/tpfa/compr_quant_general.h>
+#include <opmcore/pressure/tpfa/compr_source.h>
+#include <opmcore/pressure/tpfa/trans_tpfa.h>
 
-#include "cfs_tpfa_residual.h"
+#include <opmcore/pressure/tpfa/cfs_tpfa_residual.h>
 
 #if defined(MAX)
 #undef MAX
diff --git a/opmcore/pressure/tpfa/cfs_tpfa_residual.h b/opmcore/pressure/tpfa/cfs_tpfa_residual.h
index a3a14f67..1e852639 100644
--- a/opmcore/pressure/tpfa/cfs_tpfa_residual.h
+++ b/opmcore/pressure/tpfa/cfs_tpfa_residual.h
@@ -20,7 +20,7 @@
 #ifndef OPM_CFS_TPFA_HEADER_INCLUDED
 #define OPM_CFS_TPFA_HEADER_INCLUDED
 
-#include "grid.h"
+#include <opmcore/grid.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/opmcore/pressure/tpfa/compr_quant.h b/opmcore/pressure/tpfa/compr_quant.h
index cacfb551..6175f4c0 100644
--- a/opmcore/pressure/tpfa/compr_quant.h
+++ b/opmcore/pressure/tpfa/compr_quant.h
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "grid.h"
+#include <opmcore/grid.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/opmcore/pressure/tpfa/compr_quant_general.c b/opmcore/pressure/tpfa/compr_quant_general.c
index 361c1fba..6fc3dd0d 100644
--- a/opmcore/pressure/tpfa/compr_quant_general.c
+++ b/opmcore/pressure/tpfa/compr_quant_general.c
@@ -19,8 +19,8 @@
 
 #include <stdlib.h>
 
-#include "sparse_sys.h"
-#include "compr_quant_general.h"
+#include <opmcore/linalg/sparse_sys.h>
+#include <opmcore/pressure/tpfa/compr_quant_general.h>
 
 
 void
diff --git a/opmcore/pressure/tpfa/ifs_tpfa.c b/opmcore/pressure/tpfa/ifs_tpfa.c
index f2cb76d5..df059c82 100644
--- a/opmcore/pressure/tpfa/ifs_tpfa.c
+++ b/opmcore/pressure/tpfa/ifs_tpfa.c
@@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "ifs_tpfa.h"
-#include "sparse_sys.h"
+#include <opmcore/linalg/sparse_sys.h>
+#include <opmcore/pressure/tpfa/ifs_tpfa.h>
 
 
 struct ifs_tpfa_impl {
diff --git a/opmcore/pressure/tpfa/ifs_tpfa.h b/opmcore/pressure/tpfa/ifs_tpfa.h
index 6fa5fb41..4b9aab62 100644
--- a/opmcore/pressure/tpfa/ifs_tpfa.h
+++ b/opmcore/pressure/tpfa/ifs_tpfa.h
@@ -20,7 +20,7 @@
 #ifndef OPM_IFS_TPFA_HEADER_INCLUDED
 #define OPM_IFS_TPFA_HEADER_INCLUDED
 
-#include "grid.h"
+#include <opmcore/grid.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/opmcore/pressure/tpfa/trans_tpfa.c b/opmcore/pressure/tpfa/trans_tpfa.c
index f1feece0..863eb53f 100644
--- a/opmcore/pressure/tpfa/trans_tpfa.c
+++ b/opmcore/pressure/tpfa/trans_tpfa.c
@@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "blas_lapack.h"
-#include "trans_tpfa.h"
+#include <opmcore/linalg/blas_lapack.h>
+#include <opmcore/pressure/tpfa/trans_tpfa.h>
 
 /* ---------------------------------------------------------------------- */
 /* htrans <- sum(C(:,i) .* K(cellNo,:) .* N(:,j), 2) ./ sum(C.*C, 2) */
diff --git a/opmcore/pressure/tpfa/trans_tpfa.h b/opmcore/pressure/tpfa/trans_tpfa.h
index d895729e..dda48f09 100644
--- a/opmcore/pressure/tpfa/trans_tpfa.h
+++ b/opmcore/pressure/tpfa/trans_tpfa.h
@@ -20,7 +20,7 @@
 #ifndef OPM_TRANS_TPFA_HEADER_INCLUDED
 #define OPM_TRANS_TPFA_HEADER_INCLUDED
 
-#include "grid.h"
+#include <opmcore/grid.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/opmcore/pressure/well.c b/opmcore/pressure/well.c
index 2667391d..aab5dbd0 100644
--- a/opmcore/pressure/well.c
+++ b/opmcore/pressure/well.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-#include "well.h"
+#include <opmcore/well.h>
 
 
 /* Release memory resources for cell->well mapping. */
diff --git a/opmcore/transport/CSRMatrixBlockAssembler.hpp b/opmcore/transport/CSRMatrixBlockAssembler.hpp
index d3f44c11..55bed160 100644
--- a/opmcore/transport/CSRMatrixBlockAssembler.hpp
+++ b/opmcore/transport/CSRMatrixBlockAssembler.hpp
@@ -42,7 +42,7 @@
 #include <algorithm>
 #include <vector>
 
-#include <sparse_sys.h>
+#include <opmcore/linalg/sparse_sys.h>
 
 namespace Opm {
     namespace ImplicitTransportDefault {
diff --git a/opmcore/transport/CSRMatrixUmfpackSolver.hpp b/opmcore/transport/CSRMatrixUmfpackSolver.hpp
index daaf836a..8649b2fd 100644
--- a/opmcore/transport/CSRMatrixUmfpackSolver.hpp
+++ b/opmcore/transport/CSRMatrixUmfpackSolver.hpp
@@ -36,7 +36,7 @@
 #ifndef OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER
 #define OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER
 
-#include <call_umfpack.h>
+#include <opmcore/linalg/call_umfpack.h>
 
 namespace Opm {
     namespace ImplicitTransportLinAlgSupport {
diff --git a/opmcore/transport/spu_explicit.c b/opmcore/transport/spu_explicit.c
index 0039c277..702d1760 100644
--- a/opmcore/transport/spu_explicit.c
+++ b/opmcore/transport/spu_explicit.c
@@ -6,8 +6,9 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include "grid.h"
-#include "spu_explicit.h"
+
+#include <opmcore/grid.h>
+#include <opmcore/transport/spu_explicit.h>
 
 
 /* Twophase mobility-weighted upwind */
diff --git a/opmcore/transport/spu_implicit.c b/opmcore/transport/spu_implicit.c
index 950bed92..383fba95 100644
--- a/opmcore/transport/spu_implicit.c
+++ b/opmcore/transport/spu_implicit.c
@@ -9,8 +9,9 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <math.h>
-#include "grid.h"
-#include "spu_implicit.h"
+
+#include <opmcore/grid.h>
+#include <opmcore/transport/spu_implicit.h>
 
 
 
diff --git a/opmcore/utility/cart_grid.h b/opmcore/utility/cart_grid.h
index d26146bf..59511b41 100644
--- a/opmcore/utility/cart_grid.h
+++ b/opmcore/utility/cart_grid.h
@@ -34,7 +34,7 @@
 extern "C" {
 #endif
 
-#include <grid.h>
+#include <opmcore/grid.h>
 
 void
 destroy_cart_grid(grid_t *G);
diff --git a/opmcore/utility/cpgpreprocess/mxgrdecl.c b/opmcore/utility/cpgpreprocess/mxgrdecl.c
index a3d90245..5d79a54d 100644
--- a/opmcore/utility/cpgpreprocess/mxgrdecl.c
+++ b/opmcore/utility/cpgpreprocess/mxgrdecl.c
@@ -39,7 +39,7 @@ along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 #include <mex.h>
 
 
-#include "grdecl.h"
+#include <grdecl.h>
 
 
 
diff --git a/tests/test_cfs_tpfa.c b/tests/test_cfs_tpfa.c
index ab59c11f..31a2703c 100644
--- a/tests/test_cfs_tpfa.c
+++ b/tests/test_cfs_tpfa.c
@@ -5,14 +5,17 @@
 
 #include <suitesparse/umfpack.h>
 
-#include "cfs_tpfa.h"
-#include "sparse_sys.h"
-#include "compr_quant.h"
-#include "trans_tpfa.h"
+#include <opmcore/grid.h>
+#include <opmcore/well.h>
+
+#include <opmcore/linalg/sparse_sys.h>
+
+#include <opmcore/pressure/flow_bc.h>
+
+#include <opmcore/pressure/tpfa/cfs_tpfa.h>
+#include <opmcore/pressure/tpfa/compr_quant.h>
+#include <opmcore/pressure/tpfa/trans_tpfa.h>
 
-#include "grid.h"
-#include "flow_bc.h"
-#include "well.h"
 
 
 struct CSCMatrix {
diff --git a/tests/test_jacsys.cpp b/tests/test_jacsys.cpp
index 60929877..8fa4980a 100644
--- a/tests/test_jacsys.cpp
+++ b/tests/test_jacsys.cpp
@@ -78,7 +78,7 @@ main() {
 #endif
 
 #if 0
-#include "JacobianSystem.hpp"
+#include <opmcore/transport/JacobianSystem.hpp>
 
 //using namespace Opm::LinAlgSupport;
 using namespace Opm::ImplicitTransportDefault;
@@ -101,11 +101,11 @@ main() {
 #endif
 
 #if 1
-#include <sparse_sys.h>
+#include <opmcore/linalg/sparse_sys.h>
 
-#include <JacobianSystem.hpp>
-#include <CSRMatrixBlockAssembler.hpp>
-#include <CSRMatrixUmfpackSolver.hpp>
+#include <opmcore/transport/JacobianSystem.hpp>
+#include <opmcore/transport/CSRMatrixBlockAssembler.hpp>
+#include <opmcore/transport/CSRMatrixUmfpackSolver.hpp>
 
 using namespace Opm::ImplicitTransportDefault;
 
diff --git a/tests/test_readvector.cpp b/tests/test_readvector.cpp
index 8ceaf32b..43c26277 100644
--- a/tests/test_readvector.cpp
+++ b/tests/test_readvector.cpp
@@ -2,11 +2,11 @@
 #include <string>
 #include <vector>
 
-#include "grid.h"
-#include "preprocess.h"
-#include "cgridinterface.h"
+#include <opmcore/grid.h>
+#include <opmcore/utility/cpgpreprocess/preprocess.h>
+#include <opmcore/utility/cpgpreprocess/cgridinterface.h>
 
-#include "readvector.hpp"
+#include <opmcore/utility/cpgpreprocess/readvector.hpp>
 
 static struct CornerpointGrid
 read_grid(const std::string& dir)
diff --git a/tests/test_sf2p.cpp b/tests/test_sf2p.cpp
index e33db9a9..0cc0550e 100644
--- a/tests/test_sf2p.cpp
+++ b/tests/test_sf2p.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <iterator>
 
-#include <SimpleFluid2p.hpp>
+#include <opmcore/fluid/SimpleFluid2p.hpp>
 
 template <class Ostream, typename T, size_t n>
 Ostream&