From b73a33f4afea55157dc0ec255aa081d09cc90bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Thu, 14 Mar 2013 10:29:42 +0100
Subject: [PATCH] Adapt include statements to moved headers.

---
 examples/compute_tof_from_files.cpp                  |  4 ++--
 opm/core/pressure/CompressibleTpfa.cpp               |  2 +-
 opm/core/pressure/IncompTpfa.cpp                     |  4 ++--
 opm/core/props/BlackoilPropertiesBasic.cpp           |  2 +-
 opm/core/props/BlackoilPropertiesBasic.hpp           |  8 ++++----
 opm/core/props/BlackoilPropertiesFromDeck.cpp        |  2 +-
 opm/core/props/BlackoilPropertiesFromDeck.hpp        |  8 ++++----
 opm/core/props/IncompPropertiesBasic.cpp             |  2 +-
 opm/core/props/IncompPropertiesBasic.hpp             |  8 ++++----
 opm/core/props/IncompPropertiesFromDeck.cpp          |  2 +-
 opm/core/props/IncompPropertiesFromDeck.hpp          |  8 ++++----
 opm/core/props/phaseUsageFromDeck.hpp                |  2 +-
 opm/core/props/pvt/PvtPropertiesBasic.cpp            |  2 +-
 opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp   |  6 +++---
 opm/core/props/rock/RockBasic.cpp                    |  2 +-
 opm/core/props/rock/RockCompressibility.cpp          |  2 +-
 opm/core/props/rock/RockFromDeck.cpp                 |  2 +-
 opm/core/props/satfunc/SaturationPropsBasic.cpp      |  2 +-
 opm/core/props/satfunc/SaturationPropsFromDeck.cpp   |  2 +-
 opm/core/props/satfunc/SaturationPropsFromDeck.hpp   | 12 ++++++------
 .../props/satfunc/SaturationPropsFromDeck_impl.hpp   |  2 +-
 opm/core/props/satfunc/SaturationPropsInterface.hpp  |  2 +-
 opm/core/simulator/BlackoilState.hpp                 |  2 +-
 opm/core/simulator/TwophaseState.hpp                 |  2 +-
 .../reorder/TransportModelCompressibleTwophase.cpp   |  2 +-
 .../transport/reorder/TransportModelTwophase.cpp     |  2 +-
 opm/core/utility/initState_impl.hpp                  |  6 +++---
 opm/core/utility/miscUtilities.cpp                   |  6 +++---
 opm/core/utility/miscUtilitiesBlackoil.cpp           |  2 +-
 opm/core/wells/WellsGroup.cpp                        |  2 +-
 opm/core/wells/WellsGroup.hpp                        |  2 +-
 opm/core/wells/WellsManager.cpp                      |  2 +-
 32 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/examples/compute_tof_from_files.cpp b/examples/compute_tof_from_files.cpp
index b84213960..4bf56d38a 100644
--- a/examples/compute_tof_from_files.cpp
+++ b/examples/compute_tof_from_files.cpp
@@ -34,8 +34,8 @@
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 
-#include <opm/core/fluid/IncompPropertiesBasic.hpp>
-#include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
+#include <opm/core/props/IncompPropertiesBasic.hpp>
+#include <opm/core/props/IncompPropertiesFromDeck.hpp>
 
 #include <opm/core/linalg/LinearSolverFactory.hpp>
 
diff --git a/opm/core/pressure/CompressibleTpfa.cpp b/opm/core/pressure/CompressibleTpfa.cpp
index 742a8a27d..88765bf1c 100644
--- a/opm/core/pressure/CompressibleTpfa.cpp
+++ b/opm/core/pressure/CompressibleTpfa.cpp
@@ -30,7 +30,7 @@
 #include <opm/core/newwells.h>
 #include <opm/core/simulator/BlackoilState.hpp>
 #include <opm/core/simulator/WellState.hpp>
-#include <opm/core/fluid/RockCompressibility.hpp>
+#include <opm/core/props/rock/RockCompressibility.hpp>
 
 #include <algorithm>
 #include <cmath>
diff --git a/opm/core/pressure/IncompTpfa.cpp b/opm/core/pressure/IncompTpfa.cpp
index 8a45556fe..7b8818ffd 100644
--- a/opm/core/pressure/IncompTpfa.cpp
+++ b/opm/core/pressure/IncompTpfa.cpp
@@ -19,8 +19,8 @@
 
 #include <opm/core/pressure/IncompTpfa.hpp>
 
-#include <opm/core/fluid/IncompPropertiesInterface.hpp>
-#include <opm/core/fluid/RockCompressibility.hpp>
+#include <opm/core/props/IncompPropertiesInterface.hpp>
+#include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
 #include <opm/core/pressure/tpfa/trans_tpfa.h>
 #include <opm/core/pressure/mimetic/mimetic.h>
diff --git a/opm/core/props/BlackoilPropertiesBasic.cpp b/opm/core/props/BlackoilPropertiesBasic.cpp
index 2496d98ef..c81cc3ed7 100644
--- a/opm/core/props/BlackoilPropertiesBasic.cpp
+++ b/opm/core/props/BlackoilPropertiesBasic.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/fluid/BlackoilPropertiesBasic.hpp>
+#include <opm/core/props/BlackoilPropertiesBasic.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <iostream>
diff --git a/opm/core/props/BlackoilPropertiesBasic.hpp b/opm/core/props/BlackoilPropertiesBasic.hpp
index cc34a3cfe..3c8a657e0 100644
--- a/opm/core/props/BlackoilPropertiesBasic.hpp
+++ b/opm/core/props/BlackoilPropertiesBasic.hpp
@@ -21,10 +21,10 @@
 #define OPM_BLACKOILPROPERTIESBASIC_HEADER_INCLUDED
 
 
-#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
-#include <opm/core/fluid/RockBasic.hpp>
-#include <opm/core/fluid/PvtPropertiesBasic.hpp>
-#include <opm/core/fluid/SaturationPropsBasic.hpp>
+#include <opm/core/props/BlackoilPropertiesInterface.hpp>
+#include <opm/core/props/rock/RockBasic.hpp>
+#include <opm/core/props/pvt/PvtPropertiesBasic.hpp>
+#include <opm/core/props/satfunc/SaturationPropsBasic.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 
 namespace Opm
diff --git a/opm/core/props/BlackoilPropertiesFromDeck.cpp b/opm/core/props/BlackoilPropertiesFromDeck.cpp
index d49dc5b97..f0de36af6 100644
--- a/opm/core/props/BlackoilPropertiesFromDeck.cpp
+++ b/opm/core/props/BlackoilPropertiesFromDeck.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
+#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 
 namespace Opm
diff --git a/opm/core/props/BlackoilPropertiesFromDeck.hpp b/opm/core/props/BlackoilPropertiesFromDeck.hpp
index 2d3c1818f..aa5b590ff 100644
--- a/opm/core/props/BlackoilPropertiesFromDeck.hpp
+++ b/opm/core/props/BlackoilPropertiesFromDeck.hpp
@@ -21,10 +21,10 @@
 #define OPM_BLACKOILPROPERTIESFROMDECK_HEADER_INCLUDED
 
 
-#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
-#include <opm/core/fluid/RockFromDeck.hpp>
-#include <opm/core/fluid/blackoil/BlackoilPvtProperties.hpp>
-#include <opm/core/fluid/SaturationPropsFromDeck.hpp>
+#include <opm/core/props/BlackoilPropertiesInterface.hpp>
+#include <opm/core/props/rock/RockFromDeck.hpp>
+#include <opm/core/props/pvt/BlackoilPvtProperties.hpp>
+#include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
 #include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <boost/scoped_ptr.hpp>
diff --git a/opm/core/props/IncompPropertiesBasic.cpp b/opm/core/props/IncompPropertiesBasic.cpp
index ab68017c1..59df8ba4a 100644
--- a/opm/core/props/IncompPropertiesBasic.cpp
+++ b/opm/core/props/IncompPropertiesBasic.cpp
@@ -19,7 +19,7 @@
 
 
 
-#include <opm/core/fluid/IncompPropertiesBasic.hpp>
+#include <opm/core/props/IncompPropertiesBasic.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <iostream>
diff --git a/opm/core/props/IncompPropertiesBasic.hpp b/opm/core/props/IncompPropertiesBasic.hpp
index 72c39b1b0..76d2ebfd8 100644
--- a/opm/core/props/IncompPropertiesBasic.hpp
+++ b/opm/core/props/IncompPropertiesBasic.hpp
@@ -20,10 +20,10 @@
 #ifndef OPM_INCOMPPROPERTIESBASIC_HEADER_INCLUDED
 #define OPM_INCOMPPROPERTIESBASIC_HEADER_INCLUDED
 
-#include <opm/core/fluid/IncompPropertiesInterface.hpp>
-#include <opm/core/fluid/RockBasic.hpp>
-#include <opm/core/fluid/PvtPropertiesBasic.hpp>
-#include <opm/core/fluid/SaturationPropsBasic.hpp>
+#include <opm/core/props/IncompPropertiesInterface.hpp>
+#include <opm/core/props/rock/RockBasic.hpp>
+#include <opm/core/props/pvt/PvtPropertiesBasic.hpp>
+#include <opm/core/props/satfunc/SaturationPropsBasic.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/props/IncompPropertiesFromDeck.cpp b/opm/core/props/IncompPropertiesFromDeck.cpp
index 9aa690980..bad017e59 100644
--- a/opm/core/props/IncompPropertiesFromDeck.cpp
+++ b/opm/core/props/IncompPropertiesFromDeck.cpp
@@ -18,7 +18,7 @@
 */
 
 
-#include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
+#include <opm/core/props/IncompPropertiesFromDeck.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <iostream>
diff --git a/opm/core/props/IncompPropertiesFromDeck.hpp b/opm/core/props/IncompPropertiesFromDeck.hpp
index fd0812f39..0ca78b95a 100644
--- a/opm/core/props/IncompPropertiesFromDeck.hpp
+++ b/opm/core/props/IncompPropertiesFromDeck.hpp
@@ -20,10 +20,10 @@
 #ifndef OPM_INCOMPPROPERTIESFROMDECK_HEADER_INCLUDED
 #define OPM_INCOMPPROPERTIESFROMDECK_HEADER_INCLUDED
 
-#include <opm/core/fluid/IncompPropertiesInterface.hpp>
-#include <opm/core/fluid/RockFromDeck.hpp>
-#include <opm/core/fluid/PvtPropertiesIncompFromDeck.hpp>
-#include <opm/core/fluid/SaturationPropsFromDeck.hpp>
+#include <opm/core/props/IncompPropertiesInterface.hpp>
+#include <opm/core/props/rock/RockFromDeck.hpp>
+#include <opm/core/props/pvt/PvtPropertiesIncompFromDeck.hpp>
+#include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
 #include <opm/core/io/eclipse/EclipseGridParser.hpp>
 
 struct UnstructuredGrid;
diff --git a/opm/core/props/phaseUsageFromDeck.hpp b/opm/core/props/phaseUsageFromDeck.hpp
index fa139e2d6..30e3475c4 100644
--- a/opm/core/props/phaseUsageFromDeck.hpp
+++ b/opm/core/props/phaseUsageFromDeck.hpp
@@ -22,7 +22,7 @@
 
 
 #include <opm/core/io/eclipse/EclipseGridParser.hpp>
-#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
+#include <opm/core/props/BlackoilPhases.hpp>
 
 
 namespace Opm
diff --git a/opm/core/props/pvt/PvtPropertiesBasic.cpp b/opm/core/props/pvt/PvtPropertiesBasic.cpp
index 5220502ad..ae8da3b9f 100644
--- a/opm/core/props/pvt/PvtPropertiesBasic.cpp
+++ b/opm/core/props/pvt/PvtPropertiesBasic.cpp
@@ -19,7 +19,7 @@
 
 
 
-#include <opm/core/fluid/PvtPropertiesBasic.hpp>
+#include <opm/core/props/pvt/PvtPropertiesBasic.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 
diff --git a/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp b/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
index 42e36c1cd..9fe0a5269 100644
--- a/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
+++ b/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
@@ -18,12 +18,12 @@
 */
 
 
-#include <opm/core/fluid/PvtPropertiesIncompFromDeck.hpp>
-#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
+#include <opm/core/props/pvt/PvtPropertiesIncompFromDeck.hpp>
+#include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
-#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
+#include <opm/core/props/BlackoilPhases.hpp>
 
 
 namespace Opm
diff --git a/opm/core/props/rock/RockBasic.cpp b/opm/core/props/rock/RockBasic.cpp
index b66ccccec..aebc775a4 100644
--- a/opm/core/props/rock/RockBasic.cpp
+++ b/opm/core/props/rock/RockBasic.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/fluid/RockBasic.hpp>
+#include <opm/core/props/rock/RockBasic.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/props/rock/RockCompressibility.cpp b/opm/core/props/rock/RockCompressibility.cpp
index a39bfcbaf..a358368ce 100644
--- a/opm/core/props/rock/RockCompressibility.cpp
+++ b/opm/core/props/rock/RockCompressibility.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/fluid/RockCompressibility.hpp>
+#include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/utility/Units.hpp>
diff --git a/opm/core/props/rock/RockFromDeck.cpp b/opm/core/props/rock/RockFromDeck.cpp
index ec7db9a6a..70abb4903 100644
--- a/opm/core/props/rock/RockFromDeck.cpp
+++ b/opm/core/props/rock/RockFromDeck.cpp
@@ -18,7 +18,7 @@
 */
 
 
-#include <opm/core/fluid/RockFromDeck.hpp>
+#include <opm/core/props/rock/RockFromDeck.hpp>
 #include <opm/core/grid.h>
 #include <tr1/array>
 
diff --git a/opm/core/props/satfunc/SaturationPropsBasic.cpp b/opm/core/props/satfunc/SaturationPropsBasic.cpp
index 10ddf23dd..1fdbb96ce 100644
--- a/opm/core/props/satfunc/SaturationPropsBasic.cpp
+++ b/opm/core/props/satfunc/SaturationPropsBasic.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/fluid/SaturationPropsBasic.hpp>
+#include <opm/core/props/satfunc/SaturationPropsBasic.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <iostream>
 
diff --git a/opm/core/props/satfunc/SaturationPropsFromDeck.cpp b/opm/core/props/satfunc/SaturationPropsFromDeck.cpp
index 83c942c59..b099699eb 100644
--- a/opm/core/props/satfunc/SaturationPropsFromDeck.cpp
+++ b/opm/core/props/satfunc/SaturationPropsFromDeck.cpp
@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/core/fluid/SaturationPropsFromDeck.hpp>
+#include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/buildUniformMonotoneTable.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
diff --git a/opm/core/props/satfunc/SaturationPropsFromDeck.hpp b/opm/core/props/satfunc/SaturationPropsFromDeck.hpp
index e2b22c914..f2892e12a 100644
--- a/opm/core/props/satfunc/SaturationPropsFromDeck.hpp
+++ b/opm/core/props/satfunc/SaturationPropsFromDeck.hpp
@@ -20,13 +20,13 @@
 #ifndef OPM_SATURATIONPROPSFROMDECK_HEADER_INCLUDED
 #define OPM_SATURATIONPROPSFROMDECK_HEADER_INCLUDED
 
-#include <opm/core/fluid/SaturationPropsInterface.hpp>
+#include <opm/core/props/satfunc/SaturationPropsInterface.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/io/eclipse/EclipseGridParser.hpp>
-#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
-#include <opm/core/fluid/SatFuncStone2.hpp>
-#include <opm/core/fluid/SatFuncSimple.hpp>
-#include <opm/core/fluid/SatFuncGwseg.hpp>
+#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/core/props/satfunc/SatFuncStone2.hpp>
+#include <opm/core/props/satfunc/SatFuncSimple.hpp>
+#include <opm/core/props/satfunc/SatFuncGwseg.hpp>
 #include <vector>
 
 struct UnstructuredGrid;
@@ -136,7 +136,7 @@ namespace Opm
 } // namespace Opm
 
 
-#include <opm/core/fluid/SaturationPropsFromDeck_impl.hpp>
+#include <opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp>
 
 
 #endif // OPM_SATURATIONPROPSFROMDECK_HEADER_INCLUDED
diff --git a/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp b/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
index 089d1a59a..5f1983c4e 100644
--- a/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
+++ b/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
@@ -23,7 +23,7 @@
 
 #include <opm/core/utility/UniformTableLinear.hpp>
 #include <opm/core/utility/NonuniformTableLinear.hpp>
-#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
+#include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/core/grid.h>
 
 namespace Opm
diff --git a/opm/core/props/satfunc/SaturationPropsInterface.hpp b/opm/core/props/satfunc/SaturationPropsInterface.hpp
index 30f277cc1..ad2a9439f 100644
--- a/opm/core/props/satfunc/SaturationPropsInterface.hpp
+++ b/opm/core/props/satfunc/SaturationPropsInterface.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_SATURATIONPROPSINTERFACE_HEADER_INCLUDED
 #define OPM_SATURATIONPROPSINTERFACE_HEADER_INCLUDED
 
-#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
+#include <opm/core/props/BlackoilPhases.hpp>
 
 
 namespace Opm
diff --git a/opm/core/simulator/BlackoilState.hpp b/opm/core/simulator/BlackoilState.hpp
index 6da857a74..153c2eed5 100644
--- a/opm/core/simulator/BlackoilState.hpp
+++ b/opm/core/simulator/BlackoilState.hpp
@@ -21,7 +21,7 @@
 #define OPM_BLACKOILSTATE_HEADER_INCLUDED
 
 #include <opm/core/grid.h>
-#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
+#include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <vector>
 
 namespace Opm
diff --git a/opm/core/simulator/TwophaseState.hpp b/opm/core/simulator/TwophaseState.hpp
index 499a5b4f1..e1eaa1741 100644
--- a/opm/core/simulator/TwophaseState.hpp
+++ b/opm/core/simulator/TwophaseState.hpp
@@ -21,7 +21,7 @@
 #define OPM_TWOPHASESTATE_HEADER_INCLUDED
 
 #include <opm/core/grid.h>
-#include <opm/core/fluid/IncompPropertiesInterface.hpp>
+#include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <vector>
 
 namespace Opm
diff --git a/opm/core/transport/reorder/TransportModelCompressibleTwophase.cpp b/opm/core/transport/reorder/TransportModelCompressibleTwophase.cpp
index bad712630..045a0203f 100644
--- a/opm/core/transport/reorder/TransportModelCompressibleTwophase.cpp
+++ b/opm/core/transport/reorder/TransportModelCompressibleTwophase.cpp
@@ -19,7 +19,7 @@
 
 
 #include <opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp>
-#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
+#include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/transport/reorder/reordersequence.h>
 #include <opm/core/utility/RootFinders.hpp>
diff --git a/opm/core/transport/reorder/TransportModelTwophase.cpp b/opm/core/transport/reorder/TransportModelTwophase.cpp
index 2740d065e..1643dc27b 100644
--- a/opm/core/transport/reorder/TransportModelTwophase.cpp
+++ b/opm/core/transport/reorder/TransportModelTwophase.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <opm/core/transport/reorder/TransportModelTwophase.hpp>
-#include <opm/core/fluid/IncompPropertiesInterface.hpp>
+#include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/transport/reorder/reordersequence.h>
 #include <opm/core/utility/RootFinders.hpp>
diff --git a/opm/core/utility/initState_impl.hpp b/opm/core/utility/initState_impl.hpp
index 73d09ae9b..a28fd0960 100644
--- a/opm/core/utility/initState_impl.hpp
+++ b/opm/core/utility/initState_impl.hpp
@@ -27,9 +27,9 @@
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/MonotCubicInterpolator.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/fluid/IncompPropertiesInterface.hpp>
-#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
-#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
+#include <opm/core/props/IncompPropertiesInterface.hpp>
+#include <opm/core/props/BlackoilPropertiesInterface.hpp>
+#include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <cmath>
 
 namespace Opm
diff --git a/opm/core/utility/miscUtilities.cpp b/opm/core/utility/miscUtilities.cpp
index d678f1ec4..1552065c3 100644
--- a/opm/core/utility/miscUtilities.cpp
+++ b/opm/core/utility/miscUtilities.cpp
@@ -21,9 +21,9 @@
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/newwells.h>
-#include <opm/core/fluid/IncompPropertiesInterface.hpp>
-#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
-#include <opm/core/fluid/RockCompressibility.hpp>
+#include <opm/core/props/IncompPropertiesInterface.hpp>
+#include <opm/core/props/BlackoilPropertiesInterface.hpp>
+#include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <algorithm>
 #include <functional>
diff --git a/opm/core/utility/miscUtilitiesBlackoil.cpp b/opm/core/utility/miscUtilitiesBlackoil.cpp
index ae806e9a4..3afcad640 100644
--- a/opm/core/utility/miscUtilitiesBlackoil.cpp
+++ b/opm/core/utility/miscUtilitiesBlackoil.cpp
@@ -22,7 +22,7 @@
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/newwells.h>
-#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
+#include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/simulator/BlackoilState.hpp>
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
diff --git a/opm/core/wells/WellsGroup.cpp b/opm/core/wells/WellsGroup.cpp
index 8ffb30273..cba604dee 100644
--- a/opm/core/wells/WellsGroup.cpp
+++ b/opm/core/wells/WellsGroup.cpp
@@ -20,7 +20,7 @@
 #include <opm/core/wells/WellsGroup.hpp>
 #include <cmath>
 #include <opm/core/newwells.h>
-#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
+#include <opm/core/props/phaseUsageFromDeck.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/wells/WellsGroup.hpp b/opm/core/wells/WellsGroup.hpp
index f21759471..0da2008ad 100644
--- a/opm/core/wells/WellsGroup.hpp
+++ b/opm/core/wells/WellsGroup.hpp
@@ -24,7 +24,7 @@
 #include <opm/core/wells/ProductionSpecification.hpp>
 #include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/grid.h>
-#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
+#include <opm/core/props/BlackoilPhases.hpp>
 #include <string>
 
 
diff --git a/opm/core/wells/WellsManager.cpp b/opm/core/wells/WellsManager.cpp
index a7bc3edd0..1bc7fa9c4 100644
--- a/opm/core/wells/WellsManager.cpp
+++ b/opm/core/wells/WellsManager.cpp
@@ -25,7 +25,7 @@
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/wells/WellCollection.hpp>
-#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
+#include <opm/core/props/phaseUsageFromDeck.hpp>
 
 #include <tr1/array>
 #include <algorithm>