From d41f989a78477fcc8c084e6788927a56ce984149 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Thu, 8 Oct 2015 11:42:15 +0200
Subject: [PATCH] use the error macros from opm-common

---
 examples/compute_eikonal_from_files.cpp            | 2 +-
 examples/compute_initial_state.cpp                 | 2 +-
 examples/compute_tof_from_files.cpp                | 2 +-
 opm/core/flowdiagnostics/DGBasis.cpp               | 2 +-
 opm/core/flowdiagnostics/FlowDiagnostics.cpp       | 2 +-
 opm/core/flowdiagnostics/TofDiscGalReorder.cpp     | 2 +-
 opm/core/flowdiagnostics/TofReorder.cpp            | 2 +-
 opm/core/linalg/LinearSolverFactory.cpp            | 2 +-
 opm/core/linalg/LinearSolverIstl.cpp               | 2 +-
 opm/core/linalg/LinearSolverPetsc.cpp              | 2 +-
 opm/core/linalg/ParallelIstlInformation.hpp        | 2 +-
 opm/core/pressure/CompressibleTpfa.cpp             | 2 +-
 opm/core/pressure/FlowBCManager.cpp                | 2 +-
 opm/core/pressure/IncompTpfa.cpp                   | 2 +-
 opm/core/pressure/IncompTpfaSinglePhase.cpp        | 2 +-
 opm/core/props/BlackoilPropertiesBasic.cpp         | 2 +-
 opm/core/props/IncompPropertiesBasic.cpp           | 2 +-
 opm/core/props/IncompPropertiesFromDeck.cpp        | 2 +-
 opm/core/props/IncompPropertiesShadow_impl.hpp     | 2 +-
 opm/core/props/IncompPropertiesSinglePhase.cpp     | 2 +-
 opm/core/props/phaseUsageFromDeck.hpp              | 2 +-
 opm/core/props/pvt/PvtPropertiesBasic.cpp          | 2 +-
 opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp | 2 +-
 opm/core/props/pvt/ThermalGasPvtWrapper.hpp        | 2 +-
 opm/core/props/pvt/ThermalOilPvtWrapper.hpp        | 2 +-
 opm/core/props/pvt/ThermalWaterPvtWrapper.hpp      | 2 +-
 opm/core/props/rock/RockCompressibility.cpp        | 2 +-
 opm/core/props/rock/RockFromDeck.cpp               | 2 +-
 opm/core/props/satfunc/SaturationPropsBasic.cpp    | 2 +-
 opm/core/simulator/initState_impl.hpp              | 2 +-
 opm/core/utility/miscUtilities.cpp                 | 2 +-
 opm/core/utility/miscUtilitiesBlackoil.cpp         | 2 +-
 opm/core/wells/WellsManager.cpp                    | 2 +-
 opm/core/wells/WellsManager_impl.hpp               | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/examples/compute_eikonal_from_files.cpp b/examples/compute_eikonal_from_files.cpp
index b583becb2..5574556a8 100644
--- a/examples/compute_eikonal_from_files.cpp
+++ b/examples/compute_eikonal_from_files.cpp
@@ -26,7 +26,7 @@
 #include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/grid/GridManager.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/StopWatch.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
diff --git a/examples/compute_initial_state.cpp b/examples/compute_initial_state.cpp
index 6093b694b..a8e3704d0 100644
--- a/examples/compute_initial_state.cpp
+++ b/examples/compute_initial_state.cpp
@@ -24,7 +24,7 @@
 
 #include <opm/core/grid.h>
 #include <opm/core/grid/GridManager.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/simulator/initStateEquil.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
diff --git a/examples/compute_tof_from_files.cpp b/examples/compute_tof_from_files.cpp
index f0964aaa2..fd2069206 100644
--- a/examples/compute_tof_from_files.cpp
+++ b/examples/compute_tof_from_files.cpp
@@ -28,7 +28,7 @@
 #include <opm/core/grid/GridManager.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellsManager.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/SparseTable.hpp>
 #include <opm/core/utility/StopWatch.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
diff --git a/opm/core/flowdiagnostics/DGBasis.cpp b/opm/core/flowdiagnostics/DGBasis.cpp
index 86210e241..8390e2b0d 100644
--- a/opm/core/flowdiagnostics/DGBasis.cpp
+++ b/opm/core/flowdiagnostics/DGBasis.cpp
@@ -20,7 +20,7 @@
 #include "config.h"
 #include <opm/core/flowdiagnostics/DGBasis.hpp>
 #include <opm/core/grid.h>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <numeric>
 
 namespace Opm
diff --git a/opm/core/flowdiagnostics/FlowDiagnostics.cpp b/opm/core/flowdiagnostics/FlowDiagnostics.cpp
index 26f22206a..e8c460c63 100644
--- a/opm/core/flowdiagnostics/FlowDiagnostics.cpp
+++ b/opm/core/flowdiagnostics/FlowDiagnostics.cpp
@@ -20,7 +20,7 @@
 #include <opm/core/flowdiagnostics/FlowDiagnostics.hpp>
 #include <opm/core/wells.h>
 
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <algorithm>
 #include <numeric>
 
diff --git a/opm/core/flowdiagnostics/TofDiscGalReorder.cpp b/opm/core/flowdiagnostics/TofDiscGalReorder.cpp
index 26f594008..bf0539542 100644
--- a/opm/core/flowdiagnostics/TofDiscGalReorder.cpp
+++ b/opm/core/flowdiagnostics/TofDiscGalReorder.cpp
@@ -23,7 +23,7 @@
 #include <opm/core/flowdiagnostics/TofDiscGalReorder.hpp>
 #include <opm/core/flowdiagnostics/DGBasis.hpp>
 #include <opm/core/grid.h>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/SparseTable.hpp>
 #include <opm/core/utility/VelocityInterpolation.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
diff --git a/opm/core/flowdiagnostics/TofReorder.cpp b/opm/core/flowdiagnostics/TofReorder.cpp
index 3cd0bfc2e..99fab8cbe 100644
--- a/opm/core/flowdiagnostics/TofReorder.cpp
+++ b/opm/core/flowdiagnostics/TofReorder.cpp
@@ -20,7 +20,7 @@
 #include "config.h"
 #include <opm/core/flowdiagnostics/TofReorder.hpp>
 #include <opm/core/grid.h>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/SparseTable.hpp>
 
 #include <algorithm>
diff --git a/opm/core/linalg/LinearSolverFactory.cpp b/opm/core/linalg/LinearSolverFactory.cpp
index 0e22910b2..d2bd31204 100644
--- a/opm/core/linalg/LinearSolverFactory.cpp
+++ b/opm/core/linalg/LinearSolverFactory.cpp
@@ -36,7 +36,7 @@
 #endif
 
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <string>
 
 
diff --git a/opm/core/linalg/LinearSolverIstl.cpp b/opm/core/linalg/LinearSolverIstl.cpp
index fa8bf1158..26a7102ee 100644
--- a/opm/core/linalg/LinearSolverIstl.cpp
+++ b/opm/core/linalg/LinearSolverIstl.cpp
@@ -24,7 +24,7 @@
 
 #include <opm/core/linalg/LinearSolverIstl.hpp>
 #include <opm/core/linalg/ParallelIstlInformation.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 // Silence compatibility warning from DUNE headers since we don't use
 // the deprecated member anyway (in this compilation unit)
diff --git a/opm/core/linalg/LinearSolverPetsc.cpp b/opm/core/linalg/LinearSolverPetsc.cpp
index 044962d8d..abcdc1e47 100644
--- a/opm/core/linalg/LinearSolverPetsc.cpp
+++ b/opm/core/linalg/LinearSolverPetsc.cpp
@@ -24,7 +24,7 @@
 #include <unordered_map>
 #define PETSC_CLANGUAGE_CXX 1 //enable CHKERRXX macro.
 #include <petsc.h>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/linalg/ParallelIstlInformation.hpp b/opm/core/linalg/ParallelIstlInformation.hpp
index 7a2ac3d2c..a9d1a93f4 100644
--- a/opm/core/linalg/ParallelIstlInformation.hpp
+++ b/opm/core/linalg/ParallelIstlInformation.hpp
@@ -23,7 +23,7 @@
 
 
 #include <opm/core/grid.h>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <boost/any.hpp>
 #include <exception>
 
diff --git a/opm/core/pressure/CompressibleTpfa.cpp b/opm/core/pressure/CompressibleTpfa.cpp
index 1ef817671..c4f2d2aa8 100644
--- a/opm/core/pressure/CompressibleTpfa.cpp
+++ b/opm/core/pressure/CompressibleTpfa.cpp
@@ -26,7 +26,7 @@
 #include <opm/core/pressure/tpfa/trans_tpfa.h>
 #include <opm/core/linalg/LinearSolverInterface.hpp>
 #include <opm/core/linalg/sparse_sys.h>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/simulator/BlackoilState.hpp>
diff --git a/opm/core/pressure/FlowBCManager.cpp b/opm/core/pressure/FlowBCManager.cpp
index b326cf8c0..79889cc0f 100644
--- a/opm/core/pressure/FlowBCManager.cpp
+++ b/opm/core/pressure/FlowBCManager.cpp
@@ -20,7 +20,7 @@
 
 #include "config.h"
 #include <opm/core/pressure/FlowBCManager.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/grid.h>
 #include <vector>
 
diff --git a/opm/core/pressure/IncompTpfa.cpp b/opm/core/pressure/IncompTpfa.cpp
index 1682270c2..a7356d63b 100644
--- a/opm/core/pressure/IncompTpfa.cpp
+++ b/opm/core/pressure/IncompTpfa.cpp
@@ -30,7 +30,7 @@
 #include <opm/core/linalg/sparse_sys.h>
 #include <opm/core/simulator/TwophaseState.hpp>
 #include <opm/core/simulator/WellState.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/wells.h>
 #include <iostream>
diff --git a/opm/core/pressure/IncompTpfaSinglePhase.cpp b/opm/core/pressure/IncompTpfaSinglePhase.cpp
index b39778c6b..a534eb831 100644
--- a/opm/core/pressure/IncompTpfaSinglePhase.cpp
+++ b/opm/core/pressure/IncompTpfaSinglePhase.cpp
@@ -30,7 +30,7 @@
 #include <opm/core/linalg/sparse_sys.h>
 // #include <opm/core/simulator/TwophaseState.hpp>
 // #include <opm/core/simulator/WellState.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 // #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/wells.h>
 // #include <iostream>
diff --git a/opm/core/props/BlackoilPropertiesBasic.cpp b/opm/core/props/BlackoilPropertiesBasic.cpp
index ac690ccd9..2a923a267 100644
--- a/opm/core/props/BlackoilPropertiesBasic.cpp
+++ b/opm/core/props/BlackoilPropertiesBasic.cpp
@@ -20,7 +20,7 @@
 #include "config.h"
 #include <opm/core/props/BlackoilPropertiesBasic.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <iostream>
 
 namespace Opm
diff --git a/opm/core/props/IncompPropertiesBasic.cpp b/opm/core/props/IncompPropertiesBasic.cpp
index 18a03815a..a4ad287f0 100644
--- a/opm/core/props/IncompPropertiesBasic.cpp
+++ b/opm/core/props/IncompPropertiesBasic.cpp
@@ -22,7 +22,7 @@
 #include "config.h"
 #include <opm/core/props/IncompPropertiesBasic.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <iostream>
 
 namespace Opm
diff --git a/opm/core/props/IncompPropertiesFromDeck.cpp b/opm/core/props/IncompPropertiesFromDeck.cpp
index 5a29fbd25..73819cac1 100644
--- a/opm/core/props/IncompPropertiesFromDeck.cpp
+++ b/opm/core/props/IncompPropertiesFromDeck.cpp
@@ -22,7 +22,7 @@
 #include <opm/core/props/IncompPropertiesFromDeck.hpp>
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <iostream>
 
 namespace Opm
diff --git a/opm/core/props/IncompPropertiesShadow_impl.hpp b/opm/core/props/IncompPropertiesShadow_impl.hpp
index fef3a68a6..3d3a8ddeb 100644
--- a/opm/core/props/IncompPropertiesShadow_impl.hpp
+++ b/opm/core/props/IncompPropertiesShadow_impl.hpp
@@ -4,7 +4,7 @@
 #error Do not include IncompPropertiesShadow_impl.hpp directly!
 #endif /* OPM_INCOMPPROPERTIESSHADOW_HEADER_INCLUDED */
 
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/props/IncompPropertiesSinglePhase.cpp b/opm/core/props/IncompPropertiesSinglePhase.cpp
index e56ed32e3..a0a284bf4 100644
--- a/opm/core/props/IncompPropertiesSinglePhase.cpp
+++ b/opm/core/props/IncompPropertiesSinglePhase.cpp
@@ -23,7 +23,7 @@
 #include <opm/core/props/IncompPropertiesSinglePhase.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 // #include <iostream>
 
 namespace Opm
diff --git a/opm/core/props/phaseUsageFromDeck.hpp b/opm/core/props/phaseUsageFromDeck.hpp
index 280255f5a..5cc061830 100644
--- a/opm/core/props/phaseUsageFromDeck.hpp
+++ b/opm/core/props/phaseUsageFromDeck.hpp
@@ -21,7 +21,7 @@
 #define OPM_PHASEUSAGEFROMDECK_HEADER_INCLUDED
 
 #include <opm/core/props/BlackoilPhases.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
diff --git a/opm/core/props/pvt/PvtPropertiesBasic.cpp b/opm/core/props/pvt/PvtPropertiesBasic.cpp
index d136f12e6..40eb75ffd 100644
--- a/opm/core/props/pvt/PvtPropertiesBasic.cpp
+++ b/opm/core/props/pvt/PvtPropertiesBasic.cpp
@@ -22,7 +22,7 @@
 #include "config.h"
 #include <opm/core/props/pvt/PvtPropertiesBasic.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 
 namespace Opm
diff --git a/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp b/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
index 271763518..906b7b773 100644
--- a/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
+++ b/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
@@ -22,7 +22,7 @@
 #include <opm/core/props/pvt/PvtPropertiesIncompFromDeck.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 
 
diff --git a/opm/core/props/pvt/ThermalGasPvtWrapper.hpp b/opm/core/props/pvt/ThermalGasPvtWrapper.hpp
index 6c5e02858..d84d87508 100644
--- a/opm/core/props/pvt/ThermalGasPvtWrapper.hpp
+++ b/opm/core/props/pvt/ThermalGasPvtWrapper.hpp
@@ -20,7 +20,7 @@
 #define OPM_THERMAL_GAS_PVT_WRAPPER_HPP
 
 #include <opm/core/props/pvt/PvtInterface.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 
diff --git a/opm/core/props/pvt/ThermalOilPvtWrapper.hpp b/opm/core/props/pvt/ThermalOilPvtWrapper.hpp
index 31d8fe21f..efb376222 100644
--- a/opm/core/props/pvt/ThermalOilPvtWrapper.hpp
+++ b/opm/core/props/pvt/ThermalOilPvtWrapper.hpp
@@ -21,7 +21,7 @@
 #define OPM_THERMAL_OIL_PVT_WRAPPER_HPP
 
 #include <opm/core/props/pvt/PvtInterface.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 
diff --git a/opm/core/props/pvt/ThermalWaterPvtWrapper.hpp b/opm/core/props/pvt/ThermalWaterPvtWrapper.hpp
index 9d9738b0a..ffc9108b5 100644
--- a/opm/core/props/pvt/ThermalWaterPvtWrapper.hpp
+++ b/opm/core/props/pvt/ThermalWaterPvtWrapper.hpp
@@ -21,7 +21,7 @@
 #define OPM_THERMAL_WATER_PVT_WRAPPER_HPP
 
 #include <opm/core/props/pvt/PvtInterface.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 
diff --git a/opm/core/props/rock/RockCompressibility.cpp b/opm/core/props/rock/RockCompressibility.cpp
index 9e8d3eb0d..af84c8094 100644
--- a/opm/core/props/rock/RockCompressibility.cpp
+++ b/opm/core/props/rock/RockCompressibility.cpp
@@ -21,7 +21,7 @@
 #include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/linearInterpolation.hpp>
 
 
diff --git a/opm/core/props/rock/RockFromDeck.cpp b/opm/core/props/rock/RockFromDeck.cpp
index ea71d9f6b..91af70a80 100644
--- a/opm/core/props/rock/RockFromDeck.cpp
+++ b/opm/core/props/rock/RockFromDeck.cpp
@@ -21,7 +21,7 @@
 #include "config.h"
 #include <opm/core/props/rock/RockFromDeck.hpp>
 #include <opm/core/grid.h>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
diff --git a/opm/core/props/satfunc/SaturationPropsBasic.cpp b/opm/core/props/satfunc/SaturationPropsBasic.cpp
index f64b829c3..1f420af41 100644
--- a/opm/core/props/satfunc/SaturationPropsBasic.cpp
+++ b/opm/core/props/satfunc/SaturationPropsBasic.cpp
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include <opm/core/props/satfunc/SaturationPropsBasic.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <iostream>
 
 namespace Opm
diff --git a/opm/core/simulator/initState_impl.hpp b/opm/core/simulator/initState_impl.hpp
index a943cc0f8..02c97c135 100644
--- a/opm/core/simulator/initState_impl.hpp
+++ b/opm/core/simulator/initState_impl.hpp
@@ -24,7 +24,7 @@
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/grid/GridHelpers.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/MonotCubicInterpolator.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
diff --git a/opm/core/utility/miscUtilities.cpp b/opm/core/utility/miscUtilities.cpp
index b7f409b8e..4f29c8592 100644
--- a/opm/core/utility/miscUtilities.cpp
+++ b/opm/core/utility/miscUtilities.cpp
@@ -26,7 +26,7 @@
 #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 <opm/common/ErrorMacros.hpp>
 #include <iostream>
 #include <algorithm>
 #include <functional>
diff --git a/opm/core/utility/miscUtilitiesBlackoil.cpp b/opm/core/utility/miscUtilitiesBlackoil.cpp
index f650b945d..442895750 100644
--- a/opm/core/utility/miscUtilitiesBlackoil.cpp
+++ b/opm/core/utility/miscUtilitiesBlackoil.cpp
@@ -28,7 +28,7 @@
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/simulator/BlackoilState.hpp>
 #include <opm/core/simulator/WellState.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/Units.hpp>
 
 #include <algorithm>
diff --git a/opm/core/wells/WellsManager.cpp b/opm/core/wells/WellsManager.cpp
index 444d9f40b..09d435453 100644
--- a/opm/core/wells/WellsManager.cpp
+++ b/opm/core/wells/WellsManager.cpp
@@ -24,7 +24,7 @@
 #include <opm/core/grid.h>
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/wells/WellCollection.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 
diff --git a/opm/core/wells/WellsManager_impl.hpp b/opm/core/wells/WellsManager_impl.hpp
index ac2fd9031..3d4fc243e 100644
--- a/opm/core/wells/WellsManager_impl.hpp
+++ b/opm/core/wells/WellsManager_impl.hpp
@@ -1,7 +1,7 @@
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/grid/GridHelpers.hpp>
 
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/compressedToCartesian.hpp>
 
 #include <algorithm>