diff --git a/examples/compute_eikonal_from_files.cpp b/examples/compute_eikonal_from_files.cpp
index b583becb..5574556a 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 6093b694..a8e3704d 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.cpp b/examples/compute_tof.cpp
index 2c80cbb0..a9ca0992 100644
--- a/examples/compute_tof.cpp
+++ b/examples/compute_tof.cpp
@@ -27,7 +27,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/Units.hpp>
diff --git a/examples/compute_tof_from_files.cpp b/examples/compute_tof_from_files.cpp
index f0964aaa..fd206920 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/examples/sim_2p_comp_reorder.cpp b/examples/sim_2p_comp_reorder.cpp
index cd8352f0..f72f4666 100644
--- a/examples/sim_2p_comp_reorder.cpp
+++ b/examples/sim_2p_comp_reorder.cpp
@@ -27,7 +27,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/simulator/initState.hpp>
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/core/simulator/SimulatorTimer.hpp>
diff --git a/examples/sim_2p_incomp.cpp b/examples/sim_2p_incomp.cpp
index e28e1bc0..97a9fe0e 100644
--- a/examples/sim_2p_incomp.cpp
+++ b/examples/sim_2p_incomp.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/simulator/initState.hpp>
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/core/simulator/SimulatorTimer.hpp>
diff --git a/opm/core/flowdiagnostics/DGBasis.cpp b/opm/core/flowdiagnostics/DGBasis.cpp
index 86210e24..8390e2b0 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 26f22206..e8c460c6 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 26f59400..bf053954 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 3cd0bfc2..99fab8cb 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/grid/CellQuadrature.hpp b/opm/core/grid/CellQuadrature.hpp
index 72953a2c..ab0eb043 100644
--- a/opm/core/grid/CellQuadrature.hpp
+++ b/opm/core/grid/CellQuadrature.hpp
@@ -21,7 +21,7 @@
 #define OPM_CELLQUADRATURE_HEADER_INCLUDED
 
 #include <opm/core/grid.h>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <algorithm>
 #include <cmath>
 
diff --git a/opm/core/grid/FaceQuadrature.hpp b/opm/core/grid/FaceQuadrature.hpp
index 505fc705..571b2f01 100644
--- a/opm/core/grid/FaceQuadrature.hpp
+++ b/opm/core/grid/FaceQuadrature.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_FACEQUADRATURE_HEADER_INCLUDED
 #define OPM_FACEQUADRATURE_HEADER_INCLUDED
 
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/grid.h>
 #include <cmath>
 
diff --git a/opm/core/grid/GridManager.cpp b/opm/core/grid/GridManager.cpp
index ffb4b41a..bcfbda60 100644
--- a/opm/core/grid/GridManager.cpp
+++ b/opm/core/grid/GridManager.cpp
@@ -24,7 +24,7 @@
 #include <opm/core/grid/cart_grid.h>
 #include <opm/core/grid/cornerpoint_grid.h>
 #include <opm/core/grid/MinpvProcessor.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 
 #include <array>
diff --git a/opm/core/grid/MinpvProcessor.hpp b/opm/core/grid/MinpvProcessor.hpp
index 072a29bc..2fdf7d5b 100644
--- a/opm/core/grid/MinpvProcessor.hpp
+++ b/opm/core/grid/MinpvProcessor.hpp
@@ -21,7 +21,7 @@
 #define OPM_MINPVPROCESSOR_HEADER_INCLUDED
 
 
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <array>
 
 
diff --git a/opm/core/io/eclipse/EclipseGridInspector.cpp b/opm/core/io/eclipse/EclipseGridInspector.cpp
index 4b851fe0..75f04f3f 100644
--- a/opm/core/io/eclipse/EclipseGridInspector.cpp
+++ b/opm/core/io/eclipse/EclipseGridInspector.cpp
@@ -38,7 +38,7 @@
 #include "config.h"
 #endif
 #include <opm/core/io/eclipse/EclipseGridInspector.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <stdexcept>
diff --git a/opm/core/io/eclipse/EclipseWriter.cpp b/opm/core/io/eclipse/EclipseWriter.cpp
index 914c1376..16e8257d 100644
--- a/opm/core/io/eclipse/EclipseWriter.cpp
+++ b/opm/core/io/eclipse/EclipseWriter.cpp
@@ -31,7 +31,7 @@
 #include <opm/core/simulator/SimulatorTimerInterface.hpp>
 #include <opm/core/simulator/WellState.hpp>
 #include <opm/core/io/eclipse/EclipseWriteRFTHandler.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/parameters/Parameter.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/utility/Units.hpp>
diff --git a/opm/core/io/eclipse/writeECLData.cpp b/opm/core/io/eclipse/writeECLData.cpp
index d137b8c4..495090f1 100644
--- a/opm/core/io/eclipse/writeECLData.cpp
+++ b/opm/core/io/eclipse/writeECLData.cpp
@@ -25,7 +25,7 @@
 #include <opm/core/grid.h>
 #include <opm/core/io/eclipse/writeECLData.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <vector>
 
diff --git a/opm/core/io/vtk/writeVtkData.cpp b/opm/core/io/vtk/writeVtkData.cpp
index 8198c31a..2e5a8fa4 100644
--- a/opm/core/io/vtk/writeVtkData.cpp
+++ b/opm/core/io/vtk/writeVtkData.cpp
@@ -21,7 +21,7 @@
 #include <opm/core/io/vtk/writeVtkData.hpp>
 #include <opm/core/utility/DataMap.hpp>
 #include <opm/core/grid.h>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <boost/lexical_cast.hpp>
 #include <set>
 #include <cmath>
diff --git a/opm/core/linalg/LinearSolverFactory.cpp b/opm/core/linalg/LinearSolverFactory.cpp
index 0e22910b..d2bd3120 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 fa8bf115..26a7102e 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 044962d8..abcdc1e4 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 7a2ac3d2..a9d1a93f 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 1ef81767..c4f2d2aa 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 b326cf8c..79889cc0 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 1682270c..a7356d63 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 b39778c6..a534eb83 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 ac690ccd..2a923a26 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 18a03815..a4ad287f 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 5a29fbd2..73819cac 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 fef3a68a..3d3a8dde 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 e56ed32e..a0a284bf 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 280255f5..5cc06183 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/BlackoilPvtProperties.cpp b/opm/core/props/pvt/BlackoilPvtProperties.cpp
index 633cef61..99522100 100644
--- a/opm/core/props/pvt/BlackoilPvtProperties.cpp
+++ b/opm/core/props/pvt/BlackoilPvtProperties.cpp
@@ -28,7 +28,7 @@
 #include <opm/core/props/pvt/PvtConstCompr.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/utility/linearInterpolation.hpp>
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
diff --git a/opm/core/props/pvt/PvtConstCompr.hpp b/opm/core/props/pvt/PvtConstCompr.hpp
index 46e68f8f..70fc9b18 100644
--- a/opm/core/props/pvt/PvtConstCompr.hpp
+++ b/opm/core/props/pvt/PvtConstCompr.hpp
@@ -21,7 +21,7 @@
 #define OPM_PVTCONSTCOMPR_HEADER_INCLUDED
 
 #include <opm/core/props/pvt/PvtInterface.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <vector>
 #include <algorithm>
diff --git a/opm/core/props/pvt/PvtLiveGas.cpp b/opm/core/props/pvt/PvtLiveGas.cpp
index ce189c8b..f1aeaea1 100644
--- a/opm/core/props/pvt/PvtLiveGas.cpp
+++ b/opm/core/props/pvt/PvtLiveGas.cpp
@@ -30,7 +30,7 @@
 
 #include "config.h"
 #include <opm/core/props/pvt/PvtLiveGas.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/linearInterpolation.hpp>
 
 #include <algorithm>
diff --git a/opm/core/props/pvt/PvtLiveOil.cpp b/opm/core/props/pvt/PvtLiveOil.cpp
index 1502e710..a8d4f4ea 100644
--- a/opm/core/props/pvt/PvtLiveOil.cpp
+++ b/opm/core/props/pvt/PvtLiveOil.cpp
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include <opm/core/props/pvt/PvtLiveOil.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/linearInterpolation.hpp>
 
 #include <algorithm>
diff --git a/opm/core/props/pvt/PvtPropertiesBasic.cpp b/opm/core/props/pvt/PvtPropertiesBasic.cpp
index d136f12e..40eb75ff 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 27176351..906b7b77 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 6c5e0285..d84d8750 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 31d8fe21..efb37622 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 9d9738b0..ffc9108b 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 9e8d3eb0..af84c809 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 ea71d9f6..91af70a8 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 f64b829c..1f420af4 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/AdaptiveTimeStepping.hpp b/opm/core/simulator/AdaptiveTimeStepping.hpp
index 81c6b474..732e4006 100644
--- a/opm/core/simulator/AdaptiveTimeStepping.hpp
+++ b/opm/core/simulator/AdaptiveTimeStepping.hpp
@@ -25,7 +25,7 @@
 #include <utility>
 
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/simulator/SimulatorTimer.hpp>
 #include <opm/core/simulator/TimeStepControlInterface.hpp>
 
diff --git a/opm/core/simulator/SimulatorCompressibleTwophase.cpp b/opm/core/simulator/SimulatorCompressibleTwophase.cpp
index 730306e2..c0875a2e 100644
--- a/opm/core/simulator/SimulatorCompressibleTwophase.cpp
+++ b/opm/core/simulator/SimulatorCompressibleTwophase.cpp
@@ -23,7 +23,7 @@
 
 #include <opm/core/simulator/SimulatorCompressibleTwophase.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <opm/core/pressure/CompressibleTpfa.hpp>
 
diff --git a/opm/core/simulator/SimulatorIncompTwophase.cpp b/opm/core/simulator/SimulatorIncompTwophase.cpp
index 271cc8fe..385e6ca4 100644
--- a/opm/core/simulator/SimulatorIncompTwophase.cpp
+++ b/opm/core/simulator/SimulatorIncompTwophase.cpp
@@ -24,7 +24,7 @@
 #include <opm/core/simulator/SimulatorIncompTwophase.hpp>
 #include <opm/core/utility/NullStream.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <opm/core/pressure/IncompTpfa.hpp>
 
diff --git a/opm/core/simulator/SimulatorState.cpp b/opm/core/simulator/SimulatorState.cpp
index 838a5475..180f464e 100644
--- a/opm/core/simulator/SimulatorState.cpp
+++ b/opm/core/simulator/SimulatorState.cpp
@@ -1,4 +1,4 @@
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/simulator/SimulatorState.hpp>
 #include <opm/core/grid.h>
 
diff --git a/opm/core/simulator/TimeStepControl.cpp b/opm/core/simulator/TimeStepControl.cpp
index 260a1287..cd0fb73f 100644
--- a/opm/core/simulator/TimeStepControl.cpp
+++ b/opm/core/simulator/TimeStepControl.cpp
@@ -24,7 +24,7 @@
 #include <iostream>
 #include <stdexcept>
 
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/simulator/TimeStepControl.hpp>
 
diff --git a/opm/core/simulator/initState_impl.hpp b/opm/core/simulator/initState_impl.hpp
index a943cc0f..02c97c13 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/transport/implicit/CSRMatrixUmfpackSolver.hpp b/opm/core/transport/implicit/CSRMatrixUmfpackSolver.hpp
index 729c3001..518ea222 100644
--- a/opm/core/transport/implicit/CSRMatrixUmfpackSolver.hpp
+++ b/opm/core/transport/implicit/CSRMatrixUmfpackSolver.hpp
@@ -37,7 +37,7 @@
 #define OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER
 
 #include <opm/core/linalg/call_umfpack.h>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/transport/implicit/SimpleFluid2pWrappingProps_impl.hpp b/opm/core/transport/implicit/SimpleFluid2pWrappingProps_impl.hpp
index 0a58fa32..fa8a5c3b 100644
--- a/opm/core/transport/implicit/SimpleFluid2pWrappingProps_impl.hpp
+++ b/opm/core/transport/implicit/SimpleFluid2pWrappingProps_impl.hpp
@@ -30,7 +30,7 @@
 
 #include <opm/core/transport/implicit/SimpleFluid2pWrappingProps.hpp>
 #include <cassert>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 namespace Opm{
 
     inline SimpleFluid2pWrappingProps::SimpleFluid2pWrappingProps(const Opm::IncompPropertiesInterface& props)
diff --git a/opm/core/utility/Factory.hpp b/opm/core/utility/Factory.hpp
index 84bf803d..267b22c7 100644
--- a/opm/core/utility/Factory.hpp
+++ b/opm/core/utility/Factory.hpp
@@ -35,7 +35,7 @@
 #ifndef OPM_FACTORY_HEADER
 #define OPM_FACTORY_HEADER
 
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <map>
 #include <memory>
diff --git a/opm/core/utility/NonuniformTableLinear.hpp b/opm/core/utility/NonuniformTableLinear.hpp
index 42247f3b..3354daa3 100644
--- a/opm/core/utility/NonuniformTableLinear.hpp
+++ b/opm/core/utility/NonuniformTableLinear.hpp
@@ -26,7 +26,7 @@
 #include <vector>
 #include <utility>
 
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/linearInterpolation.hpp>
 
 namespace Opm
diff --git a/opm/core/utility/RootFinders.hpp b/opm/core/utility/RootFinders.hpp
index 12c8e228..6624399f 100644
--- a/opm/core/utility/RootFinders.hpp
+++ b/opm/core/utility/RootFinders.hpp
@@ -36,7 +36,7 @@
 #ifndef OPM_ROOTFINDERS_HEADER
 #define OPM_ROOTFINDERS_HEADER
 
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <algorithm>
 #include <limits>
diff --git a/opm/core/utility/SparseTable.hpp b/opm/core/utility/SparseTable.hpp
index 190602a9..60c14ccf 100644
--- a/opm/core/utility/SparseTable.hpp
+++ b/opm/core/utility/SparseTable.hpp
@@ -39,7 +39,7 @@
 #include <numeric>
 #include <algorithm>
 #include <boost/range/iterator_range.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <ostream>
 
diff --git a/opm/core/utility/SparseVector.hpp b/opm/core/utility/SparseVector.hpp
index 3b03a634..09f2e102 100644
--- a/opm/core/utility/SparseVector.hpp
+++ b/opm/core/utility/SparseVector.hpp
@@ -41,7 +41,7 @@
 #include <numeric>
 #include <algorithm>
 #include <boost/range/iterator_range.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/utility/StopWatch.cpp b/opm/core/utility/StopWatch.cpp
index 4a41df94..3ed60c7f 100644
--- a/opm/core/utility/StopWatch.cpp
+++ b/opm/core/utility/StopWatch.cpp
@@ -37,7 +37,7 @@
 #endif
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <opm/core/utility/StopWatch.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/utility/UniformTableLinear.hpp b/opm/core/utility/UniformTableLinear.hpp
index 2ede43b3..dc7f75e2 100644
--- a/opm/core/utility/UniformTableLinear.hpp
+++ b/opm/core/utility/UniformTableLinear.hpp
@@ -26,7 +26,7 @@
 #include <utility>
 #include <iostream>
 
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 namespace Opm {
 
diff --git a/opm/core/utility/miscUtilities.cpp b/opm/core/utility/miscUtilities.cpp
index b7f409b8..4f29c859 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 f650b945..44289575 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/utility/parameters/ParameterGroup_impl.hpp b/opm/core/utility/parameters/ParameterGroup_impl.hpp
index 51e52556..7f9da7f5 100644
--- a/opm/core/utility/parameters/ParameterGroup_impl.hpp
+++ b/opm/core/utility/parameters/ParameterGroup_impl.hpp
@@ -44,7 +44,7 @@
 #include <opm/core/utility/parameters/ParameterStrings.hpp>
 #include <opm/core/utility/parameters/ParameterTools.hpp>
 #include <opm/core/utility/parameters/Parameter.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 namespace Opm {
     namespace parameter {
diff --git a/opm/core/wells/WellsManager.cpp b/opm/core/wells/WellsManager.cpp
index 444d9f40..09d43545 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 ac2fd903..3d4fc243 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>
diff --git a/tests/test_blackoilfluid.cpp b/tests/test_blackoilfluid.cpp
index 8b4a554a..862872ad 100644
--- a/tests/test_blackoilfluid.cpp
+++ b/tests/test_blackoilfluid.cpp
@@ -9,7 +9,7 @@
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/core/props/pvt/BlackoilPvtProperties.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/utility/ErrorMacros.hpp>
+#include <opm/common/ErrorMacros.hpp>
 
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseMode.hpp>