diff --git a/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp b/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
index bee7efe28..9adb03a7e 100644
--- a/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
+++ b/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
@@ -66,7 +66,7 @@ namespace Opm
         if (deck.hasField("PVTW")) {
             const std::vector<double>& pvtw = deck.getPVTW().pvtw_[region_number];
             if (pvtw[2] != 0.0 || pvtw[4] != 0.0) {
-                MESSAGE("Compressibility effects in PVTW are ignored.");
+                OPM_MESSAGE("Compressibility effects in PVTW are ignored.");
             }
             reservoir_density_[phase_usage.phase_pos[PhaseUsage::Aqua]] /= pvtw[1];
             viscosity_[phase_usage.phase_pos[PhaseUsage::Aqua]] = pvtw[3];
@@ -80,7 +80,7 @@ namespace Opm
         if (deck.hasField("PVCDO")) {
             const std::vector<double>& pvcdo = deck.getPVCDO().pvcdo_[region_number];
             if (pvcdo[2] != 0.0 || pvcdo[4] != 0.0) {
-                MESSAGE("Compressibility effects in PVCDO are ignored.");
+                OPM_MESSAGE("Compressibility effects in PVCDO are ignored.");
             }
             reservoir_density_[phase_usage.phase_pos[PhaseUsage::Liquid]] /= pvcdo[1];
             viscosity_[phase_usage.phase_pos[PhaseUsage::Liquid]] = pvcdo[3];
diff --git a/opm/core/tof/TofDiscGalReorder.cpp b/opm/core/tof/TofDiscGalReorder.cpp
index 609fc7acf..2c2331eb6 100644
--- a/opm/core/tof/TofDiscGalReorder.cpp
+++ b/opm/core/tof/TofDiscGalReorder.cpp
@@ -113,7 +113,7 @@ namespace Opm
         const double cum_src = std::accumulate(source, source + grid_.number_of_cells, 0.0);
         if (std::fabs(cum_src) > *std::max_element(source, source + grid_.number_of_cells)*1e-2) {
             // OPM_THROW(std::runtime_error, "Sources do not sum to zero: " << cum_src);
-            MESSAGE("Warning: sources do not sum to zero: " << cum_src);
+            OPM_MESSAGE("Warning: sources do not sum to zero: " << cum_src);
         }
 #endif
         const int num_basis = basis_func_->numBasisFunc();
@@ -191,7 +191,7 @@ namespace Opm
         const double cum_src = std::accumulate(source, source + grid_.number_of_cells, 0.0);
         if (std::fabs(cum_src) > *std::max_element(source, source + grid_.number_of_cells)*1e-2) {
             // OPM_THROW(std::runtime_error, "Sources do not sum to zero: " << cum_src);
-            MESSAGE("Warning: sources do not sum to zero: " << cum_src);
+            OPM_MESSAGE("Warning: sources do not sum to zero: " << cum_src);
         }
 #endif
         const int num_basis = basis_func_->numBasisFunc();
diff --git a/opm/core/utility/miscUtilities.cpp b/opm/core/utility/miscUtilities.cpp
index d5c359500..6ed26f1a8 100644
--- a/opm/core/utility/miscUtilities.cpp
+++ b/opm/core/utility/miscUtilities.cpp
@@ -459,7 +459,7 @@ namespace Opm
         for (int w = 0; w < wells.number_of_wells; ++w) {
             const int cur = wells.ctrls[w]->current;
             if (wells.ctrls[w]->num != 1) {
-                MESSAGE("In wellsToSrc(): well has more than one control, all but current control will be ignored.");
+                OPM_MESSAGE("In wellsToSrc(): well has more than one control, all but current control will be ignored.");
             }
             if (wells.ctrls[w]->type[cur] != RESERVOIR_RATE) {
                 OPM_THROW(std::runtime_error, "In wellsToSrc(): well is something other than RESERVOIR_RATE.");
diff --git a/opm/core/wells/WellsManager.cpp b/opm/core/wells/WellsManager.cpp
index 7cea11fa3..82ac19128 100644
--- a/opm/core/wells/WellsManager.cpp
+++ b/opm/core/wells/WellsManager.cpp
@@ -249,7 +249,7 @@ namespace Opm
         keywords.push_back("COMPDAT");
 //      keywords.push_back("WELTARG");
         if (!deck.hasFields(keywords)) {
-            MESSAGE("Missing well keywords in deck, initializing no wells.");
+            OPM_MESSAGE("Missing well keywords in deck, initializing no wells.");
             return;
         }
         if (!(deck.hasField("WCONINJE") || deck.hasField("WCONPROD")) ) {
@@ -385,7 +385,7 @@ namespace Opm
                             double radius = 0.5*compdat.compdat[kw].diameter_;
                             if (radius <= 0.0) {
                                 radius = 0.5*unit::feet;
-                                MESSAGE("**** Warning: Well bore internal radius set to " << radius);
+                                OPM_MESSAGE("**** Warning: Well bore internal radius set to " << radius);
                             }
                             std::array<double, 3> cubical = getCubeDim(grid, cell);
                             const double* cell_perm = &permeability[grid.dimensions*grid.dimensions*cell];