diff --git a/opm/simulators/aquifers/BlackoilAquiferModel.hpp b/opm/simulators/aquifers/BlackoilAquiferModel.hpp
index add66531e..1138c41af 100644
--- a/opm/simulators/aquifers/BlackoilAquiferModel.hpp
+++ b/opm/simulators/aquifers/BlackoilAquiferModel.hpp
@@ -113,8 +113,6 @@ private:
 
 } // namespace Opm
 
-#ifndef OPM_BLACKOILAQUIFERMODEL_IMPL_HEADER_INCLUDED
 #include "BlackoilAquiferModel_impl.hpp"
-#endif
 
 #endif
diff --git a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
index c7576cfec..e77ef9595 100644
--- a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
+++ b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
@@ -17,11 +17,12 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
+#ifndef OPM_BLACKOILAQUIFERMODEL_IMPL_HEADER_INCLUDED
+#define OPM_BLACKOILAQUIFERMODEL_IMPL_HEADER_INCLUDED
 
 // Improve IDE experience
 #ifndef OPM_BLACKOILAQUIFERMODEL_HEADER_INCLUDED
 #include <config.h>
-#define OPM_BLACKOILAQUIFERMODEL_IMPL_HEADER_INCLUDED
 #include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
 #endif
 
@@ -375,3 +376,5 @@ void BlackoilAquiferModel<TypeTag>::computeConnectionAreaFraction() const
 }
 
 } // namespace Opm
+
+#endif
diff --git a/opm/simulators/wells/BlackoilWellModel.hpp b/opm/simulators/wells/BlackoilWellModel.hpp
index b0e3a6319..0123e2d94 100644
--- a/opm/simulators/wells/BlackoilWellModel.hpp
+++ b/opm/simulators/wells/BlackoilWellModel.hpp
@@ -581,8 +581,6 @@ template<class Scalar> class WellContributions;
 
 } // namespace Opm
 
-#ifndef OPM_BLACKOILWELLMODEL_IMPL_HEADER_INCLUDED
 #include "BlackoilWellModel_impl.hpp"
-#endif
 
 #endif
diff --git a/opm/simulators/wells/BlackoilWellModel_impl.hpp b/opm/simulators/wells/BlackoilWellModel_impl.hpp
index 002df0675..31ae29eb8 100644
--- a/opm/simulators/wells/BlackoilWellModel_impl.hpp
+++ b/opm/simulators/wells/BlackoilWellModel_impl.hpp
@@ -20,9 +20,11 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef OPM_BLACKOILWELLMODEL_IMPL_HEADER_INCLUDED
+#define OPM_BLACKOILWELLMODEL_IMPL_HEADER_INCLUDED
+
 // Improve IDE experience
 #ifndef OPM_BLACKOILWELLMODEL_HEADER_INCLUDED
-#define OPM_BLACKOILWELLMODEL_IMPL_HEADER_INCLUDED
 #include <config.h>
 #include <opm/simulators/wells/BlackoilWellModel.hpp>
 #endif
@@ -2861,3 +2863,5 @@ namespace Opm {
         }
     }
 } // namespace Opm
+
+#endif
diff --git a/opm/simulators/wells/GasLiftSingleWell.hpp b/opm/simulators/wells/GasLiftSingleWell.hpp
index cd0d530b5..d784ea1a2 100644
--- a/opm/simulators/wells/GasLiftSingleWell.hpp
+++ b/opm/simulators/wells/GasLiftSingleWell.hpp
@@ -72,8 +72,6 @@ private:
 
 } // namespace Opm
 
-#ifndef OPM_GASLIFT_SINGLE_WELL_IMPL_HEADER_INCLUDED
 #include "GasLiftSingleWell_impl.hpp"
-#endif
 
 #endif // OPM_GASLIFT_SINGLE_WELL_HEADER_INCLUDED
diff --git a/opm/simulators/wells/GasLiftSingleWell_impl.hpp b/opm/simulators/wells/GasLiftSingleWell_impl.hpp
index dc66be5ef..92da233b7 100644
--- a/opm/simulators/wells/GasLiftSingleWell_impl.hpp
+++ b/opm/simulators/wells/GasLiftSingleWell_impl.hpp
@@ -17,9 +17,11 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef OPM_GASLIFT_SINGLE_WELL_IMPL_HEADER_INCLUDED
+#define OPM_GASLIFT_SINGLE_WELL_IMPL_HEADER_INCLUDED
+
 // Improve IDE experience
 #ifndef OPM_GASLIFT_SINGLE_WELL_HEADER_INCLUDED
-#define OPM_GASLIFT_SINGLE_WELL_IMPL_HEADER_INCLUDED
 #include <config.h>
 #include <opm/simulators/wells/GasLiftSingleWell.hpp>
 #endif
@@ -250,3 +252,5 @@ checkThpControl_() const
 }
 
 }
+
+#endif
diff --git a/opm/simulators/wells/MultisegmentWell.hpp b/opm/simulators/wells/MultisegmentWell.hpp
index be0bbebe8..b61b48437 100644
--- a/opm/simulators/wells/MultisegmentWell.hpp
+++ b/opm/simulators/wells/MultisegmentWell.hpp
@@ -324,8 +324,6 @@ namespace Opm {
 
 }
 
-#ifndef OPM_MULTISEGMENTWELL_IMPL_HEADER_INCLUDED
 #include "MultisegmentWell_impl.hpp"
-#endif
 
 #endif // OPM_MULTISEGMENTWELL_HEADER_INCLUDED
diff --git a/opm/simulators/wells/MultisegmentWell_impl.hpp b/opm/simulators/wells/MultisegmentWell_impl.hpp
index b22195865..091f06ff7 100644
--- a/opm/simulators/wells/MultisegmentWell_impl.hpp
+++ b/opm/simulators/wells/MultisegmentWell_impl.hpp
@@ -19,8 +19,10 @@
 */
 
 // Improve IDE experience
-#ifndef OPM_MULTISEGMENTWELL_HEADER_INCLUDED
+#ifndef OPM_MULTISEGMENTWELL_IMPL_HEADER_INCLUDED
 #define OPM_MULTISEGMENTWELL_IMPL_HEADER_INCLUDED
+
+#ifndef OPM_MULTISEGMENTWELL_HEADER_INCLUDED
 #include <config.h>
 #include <opm/simulators/wells/MultisegmentWell.hpp>
 #endif
@@ -2314,3 +2316,5 @@ namespace Opm
     }
 
 } // namespace Opm
+
+#endif
diff --git a/opm/simulators/wells/StandardWell.hpp b/opm/simulators/wells/StandardWell.hpp
index dec3145cd..b6e2408b6 100644
--- a/opm/simulators/wells/StandardWell.hpp
+++ b/opm/simulators/wells/StandardWell.hpp
@@ -471,8 +471,6 @@ namespace Opm
 
 }
 
-#ifndef OPM_STANDARDWELL_IMPL_HEADER_INCLUDED
 #include "StandardWell_impl.hpp"
-#endif
 
 #endif // OPM_STANDARDWELL_HEADER_INCLUDED
diff --git a/opm/simulators/wells/StandardWell_impl.hpp b/opm/simulators/wells/StandardWell_impl.hpp
index 7c11c187e..679b503c9 100644
--- a/opm/simulators/wells/StandardWell_impl.hpp
+++ b/opm/simulators/wells/StandardWell_impl.hpp
@@ -19,9 +19,11 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef OPM_STANDARDWELL_IMPL_HEADER_INCLUDED
+#define OPM_STANDARDWELL_IMPL_HEADER_INCLUDED
+
 // Improve IDE experience
 #ifndef OPM_STANDARDWELL_HEADER_INCLUDED
-#define OPM_STANDARDWELL_IMPL_HEADER_INCLUDED
 #include <config.h>
 #include <opm/simulators/wells/StandardWell.hpp>
 #endif
@@ -2646,3 +2648,5 @@ namespace Opm
         return result * this->well_efficiency_factor_;
     }
 } // namespace Opm
+
+#endif
diff --git a/opm/simulators/wells/WellInterface.hpp b/opm/simulators/wells/WellInterface.hpp
index 71d4e9702..8f6af4e61 100644
--- a/opm/simulators/wells/WellInterface.hpp
+++ b/opm/simulators/wells/WellInterface.hpp
@@ -507,8 +507,6 @@ protected:
 
 } // namespace Opm
 
-#ifndef OPM_WELLINTERFACE_IMPL_HEADER_INCLUDED
 #include "WellInterface_impl.hpp"
-#endif
 
 #endif // OPM_WELLINTERFACE_HEADER_INCLUDED
diff --git a/opm/simulators/wells/WellInterface_impl.hpp b/opm/simulators/wells/WellInterface_impl.hpp
index a35f46c77..bdcb89811 100644
--- a/opm/simulators/wells/WellInterface_impl.hpp
+++ b/opm/simulators/wells/WellInterface_impl.hpp
@@ -19,10 +19,12 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef OPM_WELLINTERFACE_IMPL_HEADER_INCLUDED
+#define OPM_WELLINTERFACE_IMPL_HEADER_INCLUDED
+
 // Improve IDE experience
 #ifndef OPM_WELLINTERFACE_HEADER_INCLUDED
 #include <config.h>
-#define OPM_WELLINTERFACE_IMPL_HEADER_INCLUDED
 #include <opm/simulators/wells/WellInterface.hpp>
 #endif
 
@@ -2056,3 +2058,5 @@ namespace Opm
     }
 
 } // namespace Opm
+
+#endif