diff --git a/opm/material/Constants.hpp b/opm/material/Constants.hpp
index edbfa6d7a..11ac49d56 100644
--- a/opm/material/Constants.hpp
+++ b/opm/material/Constants.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
   Copyright (C) 2011 by Bernd Flemisch
diff --git a/opm/material/IdealGas.hpp b/opm/material/IdealGas.hpp
index ead050026..dee18ad11 100644
--- a/opm/material/IdealGas.hpp
+++ b/opm/material/IdealGas.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/binarycoefficients/Air_Mesitylene.hpp b/opm/material/binarycoefficients/Air_Mesitylene.hpp
index 3b6ccd578..38d6c6513 100644
--- a/opm/material/binarycoefficients/Air_Mesitylene.hpp
+++ b/opm/material/binarycoefficients/Air_Mesitylene.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/binarycoefficients/Air_Xylene.hpp b/opm/material/binarycoefficients/Air_Xylene.hpp
index 10011c52a..1d25a4d7b 100644
--- a/opm/material/binarycoefficients/Air_Xylene.hpp
+++ b/opm/material/binarycoefficients/Air_Xylene.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/binarycoefficients/Brine_CO2.hpp b/opm/material/binarycoefficients/Brine_CO2.hpp
index 388353818..cdbfa7691 100644
--- a/opm/material/binarycoefficients/Brine_CO2.hpp
+++ b/opm/material/binarycoefficients/Brine_CO2.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2012-2013 by Andreas Lauser
 
diff --git a/opm/material/binarycoefficients/FullerMethod.hpp b/opm/material/binarycoefficients/FullerMethod.hpp
index 0bb5a029b..5e38cdf21 100644
--- a/opm/material/binarycoefficients/FullerMethod.hpp
+++ b/opm/material/binarycoefficients/FullerMethod.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2010 by Benjamin Faigle
   Copyright (C) 2009-2013 by Andreas Lauser
diff --git a/opm/material/binarycoefficients/H2O_Air.hpp b/opm/material/binarycoefficients/H2O_Air.hpp
index 9c9a1a24e..de7a6fa8a 100644
--- a/opm/material/binarycoefficients/H2O_Air.hpp
+++ b/opm/material/binarycoefficients/H2O_Air.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2010 by Felix Bode
diff --git a/opm/material/binarycoefficients/H2O_CO2.hpp b/opm/material/binarycoefficients/H2O_CO2.hpp
index dfb4e4535..2e4bf032e 100644
--- a/opm/material/binarycoefficients/H2O_CO2.hpp
+++ b/opm/material/binarycoefficients/H2O_CO2.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/binarycoefficients/H2O_Mesitylene.hpp b/opm/material/binarycoefficients/H2O_Mesitylene.hpp
index c958920d3..1d5db3115 100644
--- a/opm/material/binarycoefficients/H2O_Mesitylene.hpp
+++ b/opm/material/binarycoefficients/H2O_Mesitylene.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/binarycoefficients/H2O_N2.hpp b/opm/material/binarycoefficients/H2O_N2.hpp
index f53383bb3..e9aa63a5f 100644
--- a/opm/material/binarycoefficients/H2O_N2.hpp
+++ b/opm/material/binarycoefficients/H2O_N2.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2012 by Bernd Flemisch
diff --git a/opm/material/binarycoefficients/H2O_Xylene.hpp b/opm/material/binarycoefficients/H2O_Xylene.hpp
index bb21f8871..380ab8cc4 100644
--- a/opm/material/binarycoefficients/H2O_Xylene.hpp
+++ b/opm/material/binarycoefficients/H2O_Xylene.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/binarycoefficients/HenryIapws.hpp b/opm/material/binarycoefficients/HenryIapws.hpp
index 6b543d480..166b9c709 100644
--- a/opm/material/binarycoefficients/HenryIapws.hpp
+++ b/opm/material/binarycoefficients/HenryIapws.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2010 by Benjamin Faigle
diff --git a/opm/material/common/ClassName.hpp b/opm/material/common/ClassName.hpp
index efbdb7775..6859db3cc 100644
--- a/opm/material/common/ClassName.hpp
+++ b/opm/material/common/ClassName.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2012-2013 by Andreas Lauser
   Copyright (C) 2010 by Oliver Sander
diff --git a/opm/material/common/ErrorMacros.hpp b/opm/material/common/ErrorMacros.hpp
index 092a88bf3..04dbec455 100644
--- a/opm/material/common/ErrorMacros.hpp
+++ b/opm/material/common/ErrorMacros.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright 2013 Andreas Lauser
   Copyright 2009, 2010 SINTEF ICT, Applied Mathematics.
diff --git a/opm/material/common/Exceptions.hpp b/opm/material/common/Exceptions.hpp
index 01785c531..e8f9b0e17 100644
--- a/opm/material/common/Exceptions.hpp
+++ b/opm/material/common/Exceptions.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2013 by Andreas Lauser
 
diff --git a/opm/material/common/MathToolbox.hpp b/opm/material/common/MathToolbox.hpp
index 94e0a872a..6c4b8098d 100644
--- a/opm/material/common/MathToolbox.hpp
+++ b/opm/material/common/MathToolbox.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/common/Means.hpp b/opm/material/common/Means.hpp
index 16e0df3e8..2e6360b08 100644
--- a/opm/material/common/Means.hpp
+++ b/opm/material/common/Means.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright 2015 Andreas Lauser
 
diff --git a/opm/material/common/OpmFinal.hpp b/opm/material/common/OpmFinal.hpp
index 04f9be948..52d6dffd8 100644
--- a/opm/material/common/OpmFinal.hpp
+++ b/opm/material/common/OpmFinal.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/common/PolynomialUtils.hpp b/opm/material/common/PolynomialUtils.hpp
index 5a36b3645..4dde64b71 100644
--- a/opm/material/common/PolynomialUtils.hpp
+++ b/opm/material/common/PolynomialUtils.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2010-2013 by Andreas Lauser
 
diff --git a/opm/material/common/Spline.hpp b/opm/material/common/Spline.hpp
index 003a9be66..841d434b3 100644
--- a/opm/material/common/Spline.hpp
+++ b/opm/material/common/Spline.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2010-2013 by Andreas Lauser
 
diff --git a/opm/material/common/Tabulated1DFunction.hpp b/opm/material/common/Tabulated1DFunction.hpp
index 230135018..fc5e889f1 100644
--- a/opm/material/common/Tabulated1DFunction.hpp
+++ b/opm/material/common/Tabulated1DFunction.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/common/TridiagonalMatrix.hpp b/opm/material/common/TridiagonalMatrix.hpp
index 285b178bd..e785d3fc1 100644
--- a/opm/material/common/TridiagonalMatrix.hpp
+++ b/opm/material/common/TridiagonalMatrix.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2010-2013 by Andreas Lauser
 
diff --git a/opm/material/common/UniformTabulated2DFunction.hpp b/opm/material/common/UniformTabulated2DFunction.hpp
index 1dfbde17c..11f259e52 100644
--- a/opm/material/common/UniformTabulated2DFunction.hpp
+++ b/opm/material/common/UniformTabulated2DFunction.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2013 by Andreas Lauser
 
diff --git a/opm/material/common/UniformXTabulated2DFunction.hpp b/opm/material/common/UniformXTabulated2DFunction.hpp
index 88966f5aa..dbefd9842 100644
--- a/opm/material/common/UniformXTabulated2DFunction.hpp
+++ b/opm/material/common/UniformXTabulated2DFunction.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2013 by Andreas Lauser
 
diff --git a/opm/material/common/Unused.hpp b/opm/material/common/Unused.hpp
index 2ee4c2713..1606545a6 100644
--- a/opm/material/common/Unused.hpp
+++ b/opm/material/common/Unused.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2010-2013 by Andreas Lauser
 
diff --git a/opm/material/common/Valgrind.hpp b/opm/material/common/Valgrind.hpp
index 50ed6ee2e..3466dc1ee 100644
--- a/opm/material/common/Valgrind.hpp
+++ b/opm/material/common/Valgrind.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2013 by Andreas Lauser
 
diff --git a/opm/material/components/Air.hpp b/opm/material/components/Air.hpp
index 80960ff72..05344738e 100644
--- a/opm/material/components/Air.hpp
+++ b/opm/material/components/Air.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2010-2013 by Andreas Lauser
   Copyright (C) 2011 by Benjamin Faigle
diff --git a/opm/material/components/Brine.hpp b/opm/material/components/Brine.hpp
index cc00ac45c..50af28d43 100644
--- a/opm/material/components/Brine.hpp
+++ b/opm/material/components/Brine.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/components/CO2.hpp b/opm/material/components/CO2.hpp
index aa777dff2..044de0212 100644
--- a/opm/material/components/CO2.hpp
+++ b/opm/material/components/CO2.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2012-2013 by Andreas Lauser
 
diff --git a/opm/material/components/Component.hpp b/opm/material/components/Component.hpp
index ee2cea756..8fe5a301d 100644
--- a/opm/material/components/Component.hpp
+++ b/opm/material/components/Component.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2010 by Felix Bode
diff --git a/opm/material/components/Dnapl.hpp b/opm/material/components/Dnapl.hpp
index ffd6b22fe..70a441a6e 100644
--- a/opm/material/components/Dnapl.hpp
+++ b/opm/material/components/Dnapl.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2010-2012 by Markus Wolff
diff --git a/opm/material/components/H2O.hpp b/opm/material/components/H2O.hpp
index e9c3b5c76..4382cdb8f 100644
--- a/opm/material/components/H2O.hpp
+++ b/opm/material/components/H2O.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2010 by Jochen Fritz
diff --git a/opm/material/components/Lnapl.hpp b/opm/material/components/Lnapl.hpp
index 95b665ce7..2ea3bf896 100644
--- a/opm/material/components/Lnapl.hpp
+++ b/opm/material/components/Lnapl.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2010 by Felix Bode
   Copyright (C) 2011-2013 by Andreas Lauser
diff --git a/opm/material/components/Mesitylene.hpp b/opm/material/components/Mesitylene.hpp
index 255dab011..26efd206a 100644
--- a/opm/material/components/Mesitylene.hpp
+++ b/opm/material/components/Mesitylene.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2010 by Felix Bode
diff --git a/opm/material/components/N2.hpp b/opm/material/components/N2.hpp
index ea0168d73..ced8ff9e0 100644
--- a/opm/material/components/N2.hpp
+++ b/opm/material/components/N2.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2011 by Benjamin Faigle
diff --git a/opm/material/components/NullComponent.hpp b/opm/material/components/NullComponent.hpp
index 3ee3253fb..6fcdd9de6 100644
--- a/opm/material/components/NullComponent.hpp
+++ b/opm/material/components/NullComponent.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/components/SimpleCO2.hpp b/opm/material/components/SimpleCO2.hpp
index ca65cd9c8..c104d444e 100644
--- a/opm/material/components/SimpleCO2.hpp
+++ b/opm/material/components/SimpleCO2.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/components/SimpleH2O.hpp b/opm/material/components/SimpleH2O.hpp
index 7583085f8..c5568ee1c 100644
--- a/opm/material/components/SimpleH2O.hpp
+++ b/opm/material/components/SimpleH2O.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/components/TabulatedComponent.hpp b/opm/material/components/TabulatedComponent.hpp
index 3944304c2..563ed35c5 100644
--- a/opm/material/components/TabulatedComponent.hpp
+++ b/opm/material/components/TabulatedComponent.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/components/Unit.hpp b/opm/material/components/Unit.hpp
index ffda77b95..23e2f1d35 100644
--- a/opm/material/components/Unit.hpp
+++ b/opm/material/components/Unit.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/components/Xylene.hpp b/opm/material/components/Xylene.hpp
index 9c29759a4..63f8c97c3 100644
--- a/opm/material/components/Xylene.hpp
+++ b/opm/material/components/Xylene.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2012 by Vishal Jambhekar
diff --git a/opm/material/components/iapws/Common.hpp b/opm/material/components/iapws/Common.hpp
index 6e13a6cd0..d6ab76fc3 100644
--- a/opm/material/components/iapws/Common.hpp
+++ b/opm/material/components/iapws/Common.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2010-2013 by Andreas Lauser
   Copyright (C) 2012 by Philipp Nuske
diff --git a/opm/material/components/iapws/Region1.hpp b/opm/material/components/iapws/Region1.hpp
index 1ef300d1b..a05c07c5a 100644
--- a/opm/material/components/iapws/Region1.hpp
+++ b/opm/material/components/iapws/Region1.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2010 by Felix Bode
diff --git a/opm/material/components/iapws/Region2.hpp b/opm/material/components/iapws/Region2.hpp
index 73046d5f5..9a2bc0b99 100644
--- a/opm/material/components/iapws/Region2.hpp
+++ b/opm/material/components/iapws/Region2.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2010 by Felix Bode
diff --git a/opm/material/components/iapws/Region4.hpp b/opm/material/components/iapws/Region4.hpp
index 8d9602626..cb78dd872 100644
--- a/opm/material/components/iapws/Region4.hpp
+++ b/opm/material/components/iapws/Region4.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2012 by Benjamin Faigle
diff --git a/opm/material/constraintsolvers/CompositionFromFugacities.hpp b/opm/material/constraintsolvers/CompositionFromFugacities.hpp
index abb641179..e761831a2 100644
--- a/opm/material/constraintsolvers/CompositionFromFugacities.hpp
+++ b/opm/material/constraintsolvers/CompositionFromFugacities.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
   Copyright (C) 2012 by Bernd Flemisch
diff --git a/opm/material/constraintsolvers/ComputeFromReferencePhase.hpp b/opm/material/constraintsolvers/ComputeFromReferencePhase.hpp
index ffcadc177..18fa68585 100644
--- a/opm/material/constraintsolvers/ComputeFromReferencePhase.hpp
+++ b/opm/material/constraintsolvers/ComputeFromReferencePhase.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/constraintsolvers/ImmiscibleFlash.hpp b/opm/material/constraintsolvers/ImmiscibleFlash.hpp
index a3c8b34c1..d49a8a355 100644
--- a/opm/material/constraintsolvers/ImmiscibleFlash.hpp
+++ b/opm/material/constraintsolvers/ImmiscibleFlash.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp b/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp
index bdc0da72b..8effeb8ea 100644
--- a/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp
+++ b/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
   Copyright (C) 2011-2012 by Klaus Mosthaf
diff --git a/opm/material/constraintsolvers/NcpFlash.hpp b/opm/material/constraintsolvers/NcpFlash.hpp
index c2e2e2285..b6401ab6f 100644
--- a/opm/material/constraintsolvers/NcpFlash.hpp
+++ b/opm/material/constraintsolvers/NcpFlash.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/eos/PengRobinson.hpp b/opm/material/eos/PengRobinson.hpp
index 9f9f87abb..70e42dbbe 100644
--- a/opm/material/eos/PengRobinson.hpp
+++ b/opm/material/eos/PengRobinson.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/eos/PengRobinsonMixture.hpp b/opm/material/eos/PengRobinsonMixture.hpp
index 10f63ea94..d72ca00ea 100644
--- a/opm/material/eos/PengRobinsonMixture.hpp
+++ b/opm/material/eos/PengRobinsonMixture.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
   Copyright (C) 2012 by Bernd Flemisch
diff --git a/opm/material/eos/PengRobinsonParams.hpp b/opm/material/eos/PengRobinsonParams.hpp
index 05354d429..36c2f8ce5 100644
--- a/opm/material/eos/PengRobinsonParams.hpp
+++ b/opm/material/eos/PengRobinsonParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2012 by Bernd Flemisch
   Copyright (C) 2011-2013 by Andreas Lauser
diff --git a/opm/material/eos/PengRobinsonParamsMixture.hpp b/opm/material/eos/PengRobinsonParamsMixture.hpp
index f6af2caf4..ab282eb0a 100644
--- a/opm/material/eos/PengRobinsonParamsMixture.hpp
+++ b/opm/material/eos/PengRobinsonParamsMixture.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/BrooksCorey.hpp b/opm/material/fluidmatrixinteractions/BrooksCorey.hpp
index 21bdf1dcf..8482912b0 100644
--- a/opm/material/fluidmatrixinteractions/BrooksCorey.hpp
+++ b/opm/material/fluidmatrixinteractions/BrooksCorey.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2011 by Holger Class
diff --git a/opm/material/fluidmatrixinteractions/BrooksCoreyParams.hpp b/opm/material/fluidmatrixinteractions/BrooksCoreyParams.hpp
index cc2e993d0..7bc39fbfb 100644
--- a/opm/material/fluidmatrixinteractions/BrooksCoreyParams.hpp
+++ b/opm/material/fluidmatrixinteractions/BrooksCoreyParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2008-2013 by Andreas Lauser
   Copyright (C) 2011 by Holger Class
diff --git a/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp b/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp
index 1ea17d6a0..9700e9417 100644
--- a/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp
+++ b/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2008-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp b/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp
index d270ff062..dc0829301 100644
--- a/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp
+++ b/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp b/opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp
index 464209bfd..6e1950768 100644
--- a/opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp
+++ b/opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2008-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/EffToAbsLawParams.hpp b/opm/material/fluidmatrixinteractions/EffToAbsLawParams.hpp
index aa8cff356..66502bb68 100644
--- a/opm/material/fluidmatrixinteractions/EffToAbsLawParams.hpp
+++ b/opm/material/fluidmatrixinteractions/EffToAbsLawParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/LinearMaterial.hpp b/opm/material/fluidmatrixinteractions/LinearMaterial.hpp
index f81f13e22..e96cb0caf 100644
--- a/opm/material/fluidmatrixinteractions/LinearMaterial.hpp
+++ b/opm/material/fluidmatrixinteractions/LinearMaterial.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/LinearMaterialParams.hpp b/opm/material/fluidmatrixinteractions/LinearMaterialParams.hpp
index 8c8a4faa4..14fd1a1f6 100644
--- a/opm/material/fluidmatrixinteractions/LinearMaterialParams.hpp
+++ b/opm/material/fluidmatrixinteractions/LinearMaterialParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2012-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/MaterialTraits.hpp b/opm/material/fluidmatrixinteractions/MaterialTraits.hpp
index 030530348..e2b88e2bf 100644
--- a/opm/material/fluidmatrixinteractions/MaterialTraits.hpp
+++ b/opm/material/fluidmatrixinteractions/MaterialTraits.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/NullMaterial.hpp b/opm/material/fluidmatrixinteractions/NullMaterial.hpp
index 78bb0ec70..ad04cef9c 100644
--- a/opm/material/fluidmatrixinteractions/NullMaterial.hpp
+++ b/opm/material/fluidmatrixinteractions/NullMaterial.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2008-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/NullMaterialParams.hpp b/opm/material/fluidmatrixinteractions/NullMaterialParams.hpp
index 91582bc74..c72753959 100644
--- a/opm/material/fluidmatrixinteractions/NullMaterialParams.hpp
+++ b/opm/material/fluidmatrixinteractions/NullMaterialParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2012-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/ParkerLenhard.hpp b/opm/material/fluidmatrixinteractions/ParkerLenhard.hpp
index 7b342e325..b6714aaf4 100644
--- a/opm/material/fluidmatrixinteractions/ParkerLenhard.hpp
+++ b/opm/material/fluidmatrixinteractions/ParkerLenhard.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2008-2013 by Andreas Lauser
   Copyright (C) 2010 by Philipp Nuske
diff --git a/opm/material/fluidmatrixinteractions/ParkerLenhardParams.hpp b/opm/material/fluidmatrixinteractions/ParkerLenhardParams.hpp
index 7c8c0133b..7f8b29a29 100644
--- a/opm/material/fluidmatrixinteractions/ParkerLenhardParams.hpp
+++ b/opm/material/fluidmatrixinteractions/ParkerLenhardParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2012-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp b/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp
index d188f59fd..b019aaeba 100644
--- a/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp
+++ b/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterialParams.hpp b/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterialParams.hpp
index 2c043875a..1b844612d 100644
--- a/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterialParams.hpp
+++ b/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterialParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/RegularizedBrooksCorey.hpp b/opm/material/fluidmatrixinteractions/RegularizedBrooksCorey.hpp
index 26796bc7a..29ec2e612 100644
--- a/opm/material/fluidmatrixinteractions/RegularizedBrooksCorey.hpp
+++ b/opm/material/fluidmatrixinteractions/RegularizedBrooksCorey.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2008-2013 by Andreas Lauser
   Copyright (C) 2010 by Philipp Nuske
diff --git a/opm/material/fluidmatrixinteractions/RegularizedBrooksCoreyParams.hpp b/opm/material/fluidmatrixinteractions/RegularizedBrooksCoreyParams.hpp
index 5e84f42b0..d459e9802 100644
--- a/opm/material/fluidmatrixinteractions/RegularizedBrooksCoreyParams.hpp
+++ b/opm/material/fluidmatrixinteractions/RegularizedBrooksCoreyParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2008-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp b/opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp
index b7d5f4dd6..e5dc7a98f 100644
--- a/opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp
+++ b/opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2008-2013 by Andreas Lauser
   Copyright (C) 2010 by Philipp Nuske
diff --git a/opm/material/fluidmatrixinteractions/RegularizedVanGenuchtenParams.hpp b/opm/material/fluidmatrixinteractions/RegularizedVanGenuchtenParams.hpp
index b1e09ee4f..076ef7267 100644
--- a/opm/material/fluidmatrixinteractions/RegularizedVanGenuchtenParams.hpp
+++ b/opm/material/fluidmatrixinteractions/RegularizedVanGenuchtenParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2012-2013 by Andreas Lauser
   Copyright (C) 2010 by Philipp Nuske
diff --git a/opm/material/fluidmatrixinteractions/SplineTwoPhaseMaterial.hpp b/opm/material/fluidmatrixinteractions/SplineTwoPhaseMaterial.hpp
index b26b150c8..47f68d23a 100644
--- a/opm/material/fluidmatrixinteractions/SplineTwoPhaseMaterial.hpp
+++ b/opm/material/fluidmatrixinteractions/SplineTwoPhaseMaterial.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/SplineTwoPhaseMaterialParams.hpp b/opm/material/fluidmatrixinteractions/SplineTwoPhaseMaterialParams.hpp
index f3553299a..f12a8f12b 100644
--- a/opm/material/fluidmatrixinteractions/SplineTwoPhaseMaterialParams.hpp
+++ b/opm/material/fluidmatrixinteractions/SplineTwoPhaseMaterialParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidmatrixinteractions/ThreePhaseParkerVanGenuchten.hpp b/opm/material/fluidmatrixinteractions/ThreePhaseParkerVanGenuchten.hpp
index f0cce424a..e31a2963c 100644
--- a/opm/material/fluidmatrixinteractions/ThreePhaseParkerVanGenuchten.hpp
+++ b/opm/material/fluidmatrixinteractions/ThreePhaseParkerVanGenuchten.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2008-2013 by Andreas Lauser
   Copyright (C) 2012 by Holger Class
diff --git a/opm/material/fluidmatrixinteractions/ThreePhaseParkerVanGenuchtenParams.hpp b/opm/material/fluidmatrixinteractions/ThreePhaseParkerVanGenuchtenParams.hpp
index 05079d3d4..7a0ed7a44 100644
--- a/opm/material/fluidmatrixinteractions/ThreePhaseParkerVanGenuchtenParams.hpp
+++ b/opm/material/fluidmatrixinteractions/ThreePhaseParkerVanGenuchtenParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2012 by Holger Class
diff --git a/opm/material/fluidmatrixinteractions/VanGenuchten.hpp b/opm/material/fluidmatrixinteractions/VanGenuchten.hpp
index 161fee5ab..439fa17b6 100644
--- a/opm/material/fluidmatrixinteractions/VanGenuchten.hpp
+++ b/opm/material/fluidmatrixinteractions/VanGenuchten.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2010 by Bernd Flemisch
diff --git a/opm/material/fluidmatrixinteractions/VanGenuchtenParams.hpp b/opm/material/fluidmatrixinteractions/VanGenuchtenParams.hpp
index c1839608c..61fe410ce 100644
--- a/opm/material/fluidmatrixinteractions/VanGenuchtenParams.hpp
+++ b/opm/material/fluidmatrixinteractions/VanGenuchtenParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/CompositionalFluidState.hpp b/opm/material/fluidstates/CompositionalFluidState.hpp
index 7a30d6f81..79e427e31 100644
--- a/opm/material/fluidstates/CompositionalFluidState.hpp
+++ b/opm/material/fluidstates/CompositionalFluidState.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/FluidStateCompositionModules.hpp b/opm/material/fluidstates/FluidStateCompositionModules.hpp
index 988f900ef..b842278f4 100644
--- a/opm/material/fluidstates/FluidStateCompositionModules.hpp
+++ b/opm/material/fluidstates/FluidStateCompositionModules.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/FluidStateDensityModules.hpp b/opm/material/fluidstates/FluidStateDensityModules.hpp
index f116c0e29..2a881a708 100644
--- a/opm/material/fluidstates/FluidStateDensityModules.hpp
+++ b/opm/material/fluidstates/FluidStateDensityModules.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/FluidStateEnthalpyModules.hpp b/opm/material/fluidstates/FluidStateEnthalpyModules.hpp
index 736dca8d4..b43a456e7 100644
--- a/opm/material/fluidstates/FluidStateEnthalpyModules.hpp
+++ b/opm/material/fluidstates/FluidStateEnthalpyModules.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/FluidStateFugacityModules.hpp b/opm/material/fluidstates/FluidStateFugacityModules.hpp
index 97b871c3d..0270a7ba7 100644
--- a/opm/material/fluidstates/FluidStateFugacityModules.hpp
+++ b/opm/material/fluidstates/FluidStateFugacityModules.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/FluidStatePressureModules.hpp b/opm/material/fluidstates/FluidStatePressureModules.hpp
index 9fff6db2f..27c652602 100644
--- a/opm/material/fluidstates/FluidStatePressureModules.hpp
+++ b/opm/material/fluidstates/FluidStatePressureModules.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/FluidStateSaturationModules.hpp b/opm/material/fluidstates/FluidStateSaturationModules.hpp
index f3b11851f..ddfab17e9 100644
--- a/opm/material/fluidstates/FluidStateSaturationModules.hpp
+++ b/opm/material/fluidstates/FluidStateSaturationModules.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/FluidStateTemperatureModules.hpp b/opm/material/fluidstates/FluidStateTemperatureModules.hpp
index 541a80a56..ee3713744 100644
--- a/opm/material/fluidstates/FluidStateTemperatureModules.hpp
+++ b/opm/material/fluidstates/FluidStateTemperatureModules.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
   Copyright (C) 2012 by Bernd Flemisch
diff --git a/opm/material/fluidstates/FluidStateViscosityModules.hpp b/opm/material/fluidstates/FluidStateViscosityModules.hpp
index 2c76316bd..ea9926537 100644
--- a/opm/material/fluidstates/FluidStateViscosityModules.hpp
+++ b/opm/material/fluidstates/FluidStateViscosityModules.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2012 by Bernd Flemisch
   Copyright (C) 2011-2013 by Andreas Lauser
diff --git a/opm/material/fluidstates/ImmiscibleFluidState.hpp b/opm/material/fluidstates/ImmiscibleFluidState.hpp
index c5457149e..3fda53354 100644
--- a/opm/material/fluidstates/ImmiscibleFluidState.hpp
+++ b/opm/material/fluidstates/ImmiscibleFluidState.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/ModularFluidState.hpp b/opm/material/fluidstates/ModularFluidState.hpp
index 37991d45b..edddeafc3 100644
--- a/opm/material/fluidstates/ModularFluidState.hpp
+++ b/opm/material/fluidstates/ModularFluidState.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/NonEquilibriumFluidState.hpp b/opm/material/fluidstates/NonEquilibriumFluidState.hpp
index f1d555bd8..c58cd01f5 100644
--- a/opm/material/fluidstates/NonEquilibriumFluidState.hpp
+++ b/opm/material/fluidstates/NonEquilibriumFluidState.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/PressureOverlayFluidState.hpp b/opm/material/fluidstates/PressureOverlayFluidState.hpp
index 91adf8b7a..0e44b178d 100644
--- a/opm/material/fluidstates/PressureOverlayFluidState.hpp
+++ b/opm/material/fluidstates/PressureOverlayFluidState.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/SaturationOverlayFluidState.hpp b/opm/material/fluidstates/SaturationOverlayFluidState.hpp
index 95e03cab6..e9d3532ec 100644
--- a/opm/material/fluidstates/SaturationOverlayFluidState.hpp
+++ b/opm/material/fluidstates/SaturationOverlayFluidState.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidstates/TemperatureOverlayFluidState.hpp b/opm/material/fluidstates/TemperatureOverlayFluidState.hpp
index 3c46d8624..34d49910e 100644
--- a/opm/material/fluidstates/TemperatureOverlayFluidState.hpp
+++ b/opm/material/fluidstates/TemperatureOverlayFluidState.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/BaseFluidSystem.hpp b/opm/material/fluidsystems/BaseFluidSystem.hpp
index 3c6f382b0..6268a2442 100644
--- a/opm/material/fluidsystems/BaseFluidSystem.hpp
+++ b/opm/material/fluidsystems/BaseFluidSystem.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2012 by Philipp Nuske
diff --git a/opm/material/fluidsystems/BlackOilFluidSystem.hpp b/opm/material/fluidsystems/BlackOilFluidSystem.hpp
index c9d7670c5..110f3b347 100644
--- a/opm/material/fluidsystems/BlackOilFluidSystem.hpp
+++ b/opm/material/fluidsystems/BlackOilFluidSystem.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/BrineCO2FluidSystem.hpp b/opm/material/fluidsystems/BrineCO2FluidSystem.hpp
index 37d78fdef..c76431115 100644
--- a/opm/material/fluidsystems/BrineCO2FluidSystem.hpp
+++ b/opm/material/fluidsystems/BrineCO2FluidSystem.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/GasPhase.hpp b/opm/material/fluidsystems/GasPhase.hpp
index a9375494b..ff2227de3 100644
--- a/opm/material/fluidsystems/GasPhase.hpp
+++ b/opm/material/fluidsystems/GasPhase.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/H2OAirFluidSystem.hpp b/opm/material/fluidsystems/H2OAirFluidSystem.hpp
index 5781d3e7f..72c238898 100644
--- a/opm/material/fluidsystems/H2OAirFluidSystem.hpp
+++ b/opm/material/fluidsystems/H2OAirFluidSystem.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp b/opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp
index d4dbff112..8d83f3597 100644
--- a/opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp
+++ b/opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2011 by Benjamin Faigle
diff --git a/opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp b/opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp
index 67234b98b..9b41fb077 100644
--- a/opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp
+++ b/opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
   Copyright (C) 2011 by Benjamin Faigle
diff --git a/opm/material/fluidsystems/H2ON2FluidSystem.hpp b/opm/material/fluidsystems/H2ON2FluidSystem.hpp
index d48ccdca9..c5982379b 100644
--- a/opm/material/fluidsystems/H2ON2FluidSystem.hpp
+++ b/opm/material/fluidsystems/H2ON2FluidSystem.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp b/opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp
index 2b969cb8b..2ea4a95dd 100644
--- a/opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp
+++ b/opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2009-2013 by Andreas Lauser
   Copyright (C) 2012 by Bernd Flemisch
diff --git a/opm/material/fluidsystems/LiquidPhase.hpp b/opm/material/fluidsystems/LiquidPhase.hpp
index 5dcac1134..324972d67 100644
--- a/opm/material/fluidsystems/LiquidPhase.hpp
+++ b/opm/material/fluidsystems/LiquidPhase.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2010-2013 by Andreas Lauser
   Copyright (C) 2010 by Markus Wolff
diff --git a/opm/material/fluidsystems/NullParameterCache.hpp b/opm/material/fluidsystems/NullParameterCache.hpp
index ee394291e..15a202da3 100644
--- a/opm/material/fluidsystems/NullParameterCache.hpp
+++ b/opm/material/fluidsystems/NullParameterCache.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/ParameterCacheBase.hpp b/opm/material/fluidsystems/ParameterCacheBase.hpp
index c79efc41b..135ac19a7 100644
--- a/opm/material/fluidsystems/ParameterCacheBase.hpp
+++ b/opm/material/fluidsystems/ParameterCacheBase.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
   Copyright (C) 2012 by Bernd Flemisch
diff --git a/opm/material/fluidsystems/SinglePhaseFluidSystem.hpp b/opm/material/fluidsystems/SinglePhaseFluidSystem.hpp
index 77245e02a..390ba32ae 100644
--- a/opm/material/fluidsystems/SinglePhaseFluidSystem.hpp
+++ b/opm/material/fluidsystems/SinglePhaseFluidSystem.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
   Copyright (C) 2012 by Bernd Flemisch
diff --git a/opm/material/fluidsystems/Spe5FluidSystem.hpp b/opm/material/fluidsystems/Spe5FluidSystem.hpp
index ed3f8b72d..29ea45582 100644
--- a/opm/material/fluidsystems/Spe5FluidSystem.hpp
+++ b/opm/material/fluidsystems/Spe5FluidSystem.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/Spe5ParameterCache.hpp b/opm/material/fluidsystems/Spe5ParameterCache.hpp
index b7f47617f..6c56f4e8f 100644
--- a/opm/material/fluidsystems/Spe5ParameterCache.hpp
+++ b/opm/material/fluidsystems/Spe5ParameterCache.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2012-2013 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp b/opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp
index b0e0d0c77..6b5e28442 100644
--- a/opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp
+++ b/opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
   Copyright (C) 2011-2012 by Bernd Flemisch
diff --git a/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp b/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp
index a690371f0..2b58827d0 100644
--- a/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp
+++ b/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp b/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp
index 126ca966a..aba26adcf 100644
--- a/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp
+++ b/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp b/opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp
index 6751cea04..e30a508a4 100644
--- a/opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp
+++ b/opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp b/opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp
index eee3933b8..325911350 100644
--- a/opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp
+++ b/opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/blackoilpvt/GasPvtInterface.hpp b/opm/material/fluidsystems/blackoilpvt/GasPvtInterface.hpp
index 5463cad5b..b705c13f6 100644
--- a/opm/material/fluidsystems/blackoilpvt/GasPvtInterface.hpp
+++ b/opm/material/fluidsystems/blackoilpvt/GasPvtInterface.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp b/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp
index 7a67a7846..f3f637232 100644
--- a/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp
+++ b/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/blackoilpvt/OilPvtInterface.hpp b/opm/material/fluidsystems/blackoilpvt/OilPvtInterface.hpp
index fbebc866e..249abe241 100644
--- a/opm/material/fluidsystems/blackoilpvt/OilPvtInterface.hpp
+++ b/opm/material/fluidsystems/blackoilpvt/OilPvtInterface.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/blackoilpvt/WaterPvtInterface.hpp b/opm/material/fluidsystems/blackoilpvt/WaterPvtInterface.hpp
index da7c1c30c..baedd7623 100644
--- a/opm/material/fluidsystems/blackoilpvt/WaterPvtInterface.hpp
+++ b/opm/material/fluidsystems/blackoilpvt/WaterPvtInterface.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp b/opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp
index 793593ad3..a0fc2171e 100644
--- a/opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp
+++ b/opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/heatconduction/DummyHeatConductionLaw.hpp b/opm/material/heatconduction/DummyHeatConductionLaw.hpp
index d081a47e2..b2ca9cac0 100644
--- a/opm/material/heatconduction/DummyHeatConductionLaw.hpp
+++ b/opm/material/heatconduction/DummyHeatConductionLaw.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/opm/material/heatconduction/FluidConduction.hpp b/opm/material/heatconduction/FluidConduction.hpp
index b8a38435d..0edcc83a9 100644
--- a/opm/material/heatconduction/FluidConduction.hpp
+++ b/opm/material/heatconduction/FluidConduction.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2008-2013 by Andreas Lauser
 
diff --git a/opm/material/heatconduction/FluidConductionParams.hpp b/opm/material/heatconduction/FluidConductionParams.hpp
index 09e9ec319..a9fc005b7 100644
--- a/opm/material/heatconduction/FluidConductionParams.hpp
+++ b/opm/material/heatconduction/FluidConductionParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2012-2013 by Andreas Lauser
 
diff --git a/opm/material/heatconduction/Somerton.hpp b/opm/material/heatconduction/Somerton.hpp
index fb0367d84..0de6da88f 100644
--- a/opm/material/heatconduction/Somerton.hpp
+++ b/opm/material/heatconduction/Somerton.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2008-2013 by Andreas Lauser
 
diff --git a/opm/material/heatconduction/SomertonParams.hpp b/opm/material/heatconduction/SomertonParams.hpp
index 3c6fa7ffb..75395b0bf 100644
--- a/opm/material/heatconduction/SomertonParams.hpp
+++ b/opm/material/heatconduction/SomertonParams.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2012-2013 by Andreas Lauser
 
diff --git a/opm/material/localad/Evaluation.hpp b/opm/material/localad/Evaluation.hpp
index 664f2f7f7..f86651207 100644
--- a/opm/material/localad/Evaluation.hpp
+++ b/opm/material/localad/Evaluation.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/opm/material/localad/Math.hpp b/opm/material/localad/Math.hpp
index 7e18bacf1..24b1a2ea0 100644
--- a/opm/material/localad/Math.hpp
+++ b/opm/material/localad/Math.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/tests/checkComponent.hpp b/tests/checkComponent.hpp
index 7f56e6aac..0dbb4216b 100644
--- a/tests/checkComponent.hpp
+++ b/tests/checkComponent.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/tests/checkFluidSystem.hpp b/tests/checkFluidSystem.hpp
index 1e3305966..f881fc21c 100644
--- a/tests/checkFluidSystem.hpp
+++ b/tests/checkFluidSystem.hpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/tests/test_2dtables.cpp b/tests/test_2dtables.cpp
index 3528b86d4..bb2804e80 100644
--- a/tests/test_2dtables.cpp
+++ b/tests/test_2dtables.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2014 by Andreas Lauser
 
diff --git a/tests/test_components.cpp b/tests/test_components.cpp
index dfe2bc1e3..2ecfb1784 100644
--- a/tests/test_components.cpp
+++ b/tests/test_components.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/tests/test_fluidmatrixinteractions.cpp b/tests/test_fluidmatrixinteractions.cpp
index d0715c603..40651f377 100644
--- a/tests/test_fluidmatrixinteractions.cpp
+++ b/tests/test_fluidmatrixinteractions.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/tests/test_fluidsystems.cpp b/tests/test_fluidsystems.cpp
index c58e826ca..e7fc8543c 100644
--- a/tests/test_fluidsystems.cpp
+++ b/tests/test_fluidsystems.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/tests/test_immiscibleflash.cpp b/tests/test_immiscibleflash.cpp
index 4923dfb63..ffd561fd5 100644
--- a/tests/test_immiscibleflash.cpp
+++ b/tests/test_immiscibleflash.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/tests/test_localad.cpp b/tests/test_localad.cpp
index 033bb9f46..ec790f7fd 100644
--- a/tests/test_localad.cpp
+++ b/tests/test_localad.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2015 by Andreas Lauser
 
diff --git a/tests/test_ncpflash.cpp b/tests/test_ncpflash.cpp
index b90c37b95..a02b95c06 100644
--- a/tests/test_ncpflash.cpp
+++ b/tests/test_ncpflash.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/tests/test_pengrobinson.cpp b/tests/test_pengrobinson.cpp
index 8138d04f2..7aa5f38be 100644
--- a/tests/test_pengrobinson.cpp
+++ b/tests/test_pengrobinson.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2011-2013 by Andreas Lauser
 
diff --git a/tests/test_spline.cpp b/tests/test_spline.cpp
index 27be79508..ccd11b5ac 100644
--- a/tests/test_spline.cpp
+++ b/tests/test_spline.cpp
@@ -1,5 +1,7 @@
 // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 // vi: set et ts=4 sw=4 sts=4:
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*****************************************************************************
  *   Copyright (C) 2010-2012 by Andreas Lauser                               *
  *                                                                           *
diff --git a/tests/test_tabulation.cpp b/tests/test_tabulation.cpp
index eb82ebb30..cdecdbb2e 100644
--- a/tests/test_tabulation.cpp
+++ b/tests/test_tabulation.cpp
@@ -1,3 +1,5 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright (C) 2010-2013 by Andreas Lauser