diff --git a/opm/simulators/flow/NonlinearSystemNldd.hpp b/opm/simulators/flow/NonlinearSystemNldd.hpp
index 8472113f5e..f3b8fb6dde 100644
--- a/opm/simulators/flow/NonlinearSystemNldd.hpp
+++ b/opm/simulators/flow/NonlinearSystemNldd.hpp
@@ -21,8 +21,8 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPM_BLACKOILMODEL_NLDD_HEADER_INCLUDED
-#define OPM_BLACKOILMODEL_NLDD_HEADER_INCLUDED
+#ifndef OPM_NONLINEAR_SYSTEM_NLDD_HEADER_INCLUDED
+#define OPM_NONLINEAR_SYSTEM_NLDD_HEADER_INCLUDED
 
 #include <dune/common/timer.hh>
 #include <dune/istl/istlexception.hh>
@@ -1235,4 +1235,4 @@ private:
 
 } // namespace Opm
 
-#endif // OPM_BLACKOILMODEL_NLDD_HEADER_INCLUDED
+#endif // OPM_NONLINEAR_SYSTEM_NLDD_HEADER_INCLUDED
diff --git a/opm/simulators/flow/SimulatorFullyImplicit_impl.hpp b/opm/simulators/flow/SimulatorFullyImplicit_impl.hpp
index 89000a66cf..523d4ee8a6 100644
--- a/opm/simulators/flow/SimulatorFullyImplicit_impl.hpp
+++ b/opm/simulators/flow/SimulatorFullyImplicit_impl.hpp
@@ -19,8 +19,8 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPM_SIMULATOR_FULLY_IMPLICIT_BLACKOIL_IMPL_HEADER_INCLUDED
-#define OPM_SIMULATOR_FULLY_IMPLICIT_BLACKOIL_IMPL_HEADER_INCLUDED
+#ifndef OPM_SIMULATOR_FULLY_IMPLICIT_IMPL_HEADER_INCLUDED
+#define OPM_SIMULATOR_FULLY_IMPLICIT_IMPL_HEADER_INCLUDED
 
 // Improve IDE experience
 #ifndef OPM_SIMULATOR_FULLY_IMPLICIT_HEADER_HPP
@@ -591,4 +591,4 @@ createSolver(WellModel& wellModel)
 
 } // namespace Opm
 
-#endif // OPM_SIMULATOR_FULLY_IMPLICIT_BLACKOIL_IMPL_HEADER_INCLUDED
+#endif // OPM_SIMULATOR_FULLY_IMPLICIT_IMPL_HEADER_INCLUDED