diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index f9caa6f61..0157f4755 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -643,7 +643,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/models/io/basevanguard.hh
   opm/models/io/cubegridvanguard.hh
   opm/models/io/dgfvanguard.hh
-  opm/models/io/restart.hh
+  opm/models/io/restart.hpp
   opm/models/io/simplexvanguard.hh
   opm/models/io/structuredgridvanguard.hh
   opm/models/io/unstructuredgridvanguard.hh
diff --git a/opm/models/discretization/common/fvbaseproblem.hh b/opm/models/discretization/common/fvbaseproblem.hh
index 377d33c46..a4474aff2 100644
--- a/opm/models/discretization/common/fvbaseproblem.hh
+++ b/opm/models/discretization/common/fvbaseproblem.hh
@@ -35,7 +35,7 @@
 #include <opm/models/discretization/common/restrictprolong.hh>
 
 #include <opm/models/io/vtkmultiwriter.hh>
-#include <opm/models/io/restart.hh>
+#include <opm/models/io/restart.hpp>
 
 #include <opm/models/utils/simulatorutils.hpp>
 
diff --git a/opm/models/io/restart.hh b/opm/models/io/restart.hpp
similarity index 99%
rename from opm/models/io/restart.hh
rename to opm/models/io/restart.hpp
index 18f11dfbf..b81298a28 100644
--- a/opm/models/io/restart.hh
+++ b/opm/models/io/restart.hpp
@@ -24,8 +24,8 @@
  * \file
  * \copydoc Opm::Restart
  */
-#ifndef EWOMS_RESTART_HH
-#define EWOMS_RESTART_HH
+#ifndef OPM_RESTART_HPP
+#define OPM_RESTART_HPP
 
 #include <string>
 #include <fstream>
@@ -270,6 +270,7 @@ private:
     std::ifstream inStream_;
     std::ofstream outStream_;
 };
+
 } // namespace Opm
 
-#endif
+#endif // OPM_RESTART_HPP
diff --git a/opm/models/utils/simulator.hh b/opm/models/utils/simulator.hh
index 85e6ef3fd..de4db24e0 100644
--- a/opm/models/utils/simulator.hh
+++ b/opm/models/utils/simulator.hh
@@ -32,7 +32,7 @@
 
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 
-#include <opm/models/io/restart.hh>
+#include <opm/models/io/restart.hpp>
 
 #include <opm/models/parallel/mpiutil.hpp>