diff --git a/applications/ebos/alucartesianindexmapper.hh b/applications/ebos/alucartesianindexmapper.hh
index 5b6da25fe..5b02fabae 100644
--- a/applications/ebos/alucartesianindexmapper.hh
+++ b/applications/ebos/alucartesianindexmapper.hh
@@ -1,13 +1,11 @@
 // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 // vi: set et ts=4 sw=4 sts=4:
 /*
-  Copyright 2015 IRIS AS
-
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
+  the Free Software Foundation, either version 2 of the License, or
   (at your option) any later version.
 
   OPM is distributed in the hope that it will be useful,
@@ -17,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 #ifndef EWOMS_ALU_CARTESIANINDEXMAPPER_HH
 #define EWOMS_ALU_CARTESIANINDEXMAPPER_HH
diff --git a/applications/ebos/eclalugridmanager.hh b/applications/ebos/eclalugridmanager.hh
index f8d0e6ba0..f01f7ffb7 100644
--- a/applications/ebos/eclalugridmanager.hh
+++ b/applications/ebos/eclalugridmanager.hh
@@ -15,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 /*!
  * \file
diff --git a/applications/ebos/eclbasegridmanager.hh b/applications/ebos/eclbasegridmanager.hh
index 25766cad6..32e85c2cc 100644
--- a/applications/ebos/eclbasegridmanager.hh
+++ b/applications/ebos/eclbasegridmanager.hh
@@ -15,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 /*!
  * \file
diff --git a/applications/ebos/eclcpgridmanager.hh b/applications/ebos/eclcpgridmanager.hh
index 0c19587eb..4bef6a1d5 100644
--- a/applications/ebos/eclcpgridmanager.hh
+++ b/applications/ebos/eclcpgridmanager.hh
@@ -15,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 /*!
  * \file
diff --git a/applications/ebos/ecldummygradientcalculator.hh b/applications/ebos/ecldummygradientcalculator.hh
index a55322048..e3ab29cb3 100644
--- a/applications/ebos/ecldummygradientcalculator.hh
+++ b/applications/ebos/ecldummygradientcalculator.hh
@@ -1,8 +1,6 @@
 // -*- 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
-
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify
@@ -17,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 /*!
  * \file
diff --git a/applications/ebos/eclequilinitializer.hh b/applications/ebos/eclequilinitializer.hh
index fd5f1b0b9..5a3078f40 100644
--- a/applications/ebos/eclequilinitializer.hh
+++ b/applications/ebos/eclequilinitializer.hh
@@ -1,6 +1,6 @@
+// -*- 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
-
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify
@@ -15,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 /**
  * \file
diff --git a/applications/ebos/eclfluxmodule.hh b/applications/ebos/eclfluxmodule.hh
index 896c8d9f3..ba93d2233 100644
--- a/applications/ebos/eclfluxmodule.hh
+++ b/applications/ebos/eclfluxmodule.hh
@@ -1,8 +1,6 @@
 // -*- 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
-
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify
@@ -17,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 /*!
  * \file
diff --git a/applications/ebos/ecloutputblackoilmodule.hh b/applications/ebos/ecloutputblackoilmodule.hh
index 0380ab9ab..24d5e3411 100644
--- a/applications/ebos/ecloutputblackoilmodule.hh
+++ b/applications/ebos/ecloutputblackoilmodule.hh
@@ -1,8 +1,6 @@
 // -*- 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
-
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify
@@ -17,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 /*!
  * \file
diff --git a/applications/ebos/eclpeacemanwell.hh b/applications/ebos/eclpeacemanwell.hh
index 53beb42bc..2d0a324a7 100644
--- a/applications/ebos/eclpeacemanwell.hh
+++ b/applications/ebos/eclpeacemanwell.hh
@@ -1,8 +1,6 @@
 // -*- 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
-
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify
@@ -17,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 /**
  * \file
diff --git a/applications/ebos/eclproblem.hh b/applications/ebos/eclproblem.hh
index 3a5dc9446..4f0ba5e0d 100644
--- a/applications/ebos/eclproblem.hh
+++ b/applications/ebos/eclproblem.hh
@@ -1,8 +1,6 @@
 // -*- 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
-
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify
@@ -17,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 /*!
  * \file
diff --git a/applications/ebos/eclthresholdpressure.hh b/applications/ebos/eclthresholdpressure.hh
index 20d3be8df..06d1648ce 100644
--- a/applications/ebos/eclthresholdpressure.hh
+++ b/applications/ebos/eclthresholdpressure.hh
@@ -1,8 +1,6 @@
 // -*- 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
-
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify
@@ -17,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 /*!
  * \file
diff --git a/applications/ebos/ecltransmissibility.hh b/applications/ebos/ecltransmissibility.hh
index 14d8bf78a..3d2990ead 100644
--- a/applications/ebos/ecltransmissibility.hh
+++ b/applications/ebos/ecltransmissibility.hh
@@ -1,8 +1,6 @@
 // -*- 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
-
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify
@@ -17,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 /*!
  * \file
diff --git a/applications/ebos/eclwellmanager.hh b/applications/ebos/eclwellmanager.hh
index 890866984..b82e15eed 100644
--- a/applications/ebos/eclwellmanager.hh
+++ b/applications/ebos/eclwellmanager.hh
@@ -1,8 +1,6 @@
 // -*- 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-2015 by Andreas Lauser
-
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify
@@ -17,6 +15,10 @@
 
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
 */
 /**
  * \file
diff --git a/ewoms/aux/compatibility.hh b/ewoms/aux/compatibility.hh
index a9d0f7c9b..f1906cbaa 100644
--- a/ewoms/aux/compatibility.hh
+++ b/ewoms/aux/compatibility.hh
@@ -1,3 +1,25 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
+*/
 #ifndef EWOMS_DUNE_COMPATIBILITY_HH
 #define EWOMS_DUNE_COMPATIBILITY_HH