diff --git a/headers/header_spec.txt b/headers/header_spec.txt
index 32832478186a2582d8a38acfd8cee26c3b43367c..7fdecae8316b409d5dc49098688c2cf5cd52f1a9 100644
--- a/headers/header_spec.txt
+++ b/headers/header_spec.txt
@@ -763,6 +763,23 @@ src/plugins/constant_propagation/propagationParameters.ml: CEA_LGPL_OR_PROPRIETA
 src/plugins/constant_propagation/propagationParameters.mli: CEA_LGPL_OR_PROPRIETARY
 src/plugins/constant_propagation/api.ml: CEA_LGPL_OR_PROPRIETARY
 src/plugins/constant_propagation/api.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/build.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/build.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/callstack.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/callstack.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/configure.ac: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/Dive.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/graph_types.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/imprecision_graph.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/imprecision_graph.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/main.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/Makefile.in: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/node_kind.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/node_kind.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/self.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/self.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/server_interface.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/dive/server_interface.mli: CEA_LGPL_OR_PROPRIETARY
 src/plugins/from/From.mli: CEA_LGPL_OR_PROPRIETARY
 src/plugins/from/callwise.ml: CEA_LGPL_OR_PROPRIETARY
 src/plugins/from/callwise.mli: CEA_LGPL_OR_PROPRIETARY
diff --git a/src/plugins/dive/Dive.mli b/src/plugins/dive/Dive.mli
index c6933a73bc1ab71a5559c38eb2484f432f7cb092..182bc40a8e1af00f6d1329952d449d0f2e6808e1 100644
--- a/src/plugins/dive/Dive.mli
+++ b/src/plugins/dive/Dive.mli
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/Makefile.in b/src/plugins/dive/Makefile.in
index d2a945eff911dd095ea6ced22598bd4176c7b790..c4b5b76d4ebd24d5079b2f275873c66fc25a1166 100644
--- a/src/plugins/dive/Makefile.in
+++ b/src/plugins/dive/Makefile.in
@@ -1,6 +1,6 @@
 ##########################################################################
 #                                                                        #
-#  This file is part of the Frama-C plug-in `Dive'.                      #
+#  This file is part of Frama-C.                                         #
 #                                                                        #
 #  Copyright (C) 2007-2020                                               #
 #    CEA (Commissariat à l'énergie atomique et aux énergies              #
@@ -53,16 +53,6 @@ PLUGIN_DISTRIB_EXTERNAL:= Makefile.in configure.ac configure
 
 include $(FRAMAC_SHARE)/Makefile.dynamic
 
-##########
-# Header #
-##########
-
-headers::
-	@echo "Applying Headers..."
-	headache -c licence/headache_config.txt -h licence/LGPL_HEADER \
-		*.ml *.mli \
-		Makefile.in configure.ac
-
 #####################################
 # Regenerating the Makefile on need #
 #####################################
diff --git a/src/plugins/dive/build.ml b/src/plugins/dive/build.ml
index b22b27cca538c5ac7a297b6e188effb500e90ebb..236582ae1ad1e06d21eac2f065347021e7c06d7e 100644
--- a/src/plugins/dive/build.ml
+++ b/src/plugins/dive/build.ml
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/build.mli b/src/plugins/dive/build.mli
index 2de92ccbd83580846875b4be9f8a891b2a7cdc18..990e3e6f89cf5916b7abd11f2acbb360a16cc448 100644
--- a/src/plugins/dive/build.mli
+++ b/src/plugins/dive/build.mli
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/callstack.ml b/src/plugins/dive/callstack.ml
index d61097fd5356cca5960b29b67c551a715e88b0e1..8b25837a11357d83f0dd791d749baf2e11225b77 100644
--- a/src/plugins/dive/callstack.ml
+++ b/src/plugins/dive/callstack.ml
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/callstack.mli b/src/plugins/dive/callstack.mli
index f8073bfcf775f96f11fb25da2d69b74408bff3b0..48d3a417b9614086235ce292a695fc084efd16b0 100644
--- a/src/plugins/dive/callstack.mli
+++ b/src/plugins/dive/callstack.mli
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/configure.ac b/src/plugins/dive/configure.ac
index fe369c0ccd85c4f9e9b7c060de35605bc45c3e8d..dddb5ed24e2092387c4c801ab35f0a3d061f8b41 100644
--- a/src/plugins/dive/configure.ac
+++ b/src/plugins/dive/configure.ac
@@ -1,6 +1,6 @@
 ##########################################################################
 #                                                                        #
-#  This file is part of the Frama-C plug-in `Dive'.                      #
+#  This file is part of Frama-C.                                         #
 #                                                                        #
 #  Copyright (C) 2007-2020                                               #
 #    CEA (Commissariat à l'énergie atomique et aux énergies              #
diff --git a/src/plugins/dive/graph_types.mli b/src/plugins/dive/graph_types.mli
index cfd8a04aa9a36957c7408329b57e667075b68603..f1920b35026e847eaa92a1921861890d3087a590 100644
--- a/src/plugins/dive/graph_types.mli
+++ b/src/plugins/dive/graph_types.mli
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/headers/close-source/LGPL.Dive b/src/plugins/dive/headers/close-source/LGPL.Dive
deleted file mode 100644
index 367db7ff3b1f999280ca73fb656daed399fccea2..0000000000000000000000000000000000000000
--- a/src/plugins/dive/headers/close-source/LGPL.Dive
+++ /dev/null
@@ -1,19 +0,0 @@
-
-This file is part of the Frama-C plug-in `Dive'.
-
-Copyright (C) 2007-2020
-  CEA (Commissariat à l'énergie atomique et aux énergies
-       alternatives)
-
-you can redistribute it and/or modify it under the terms of the GNU
-Lesser General Public License as published by the Free Software
-Foundation, version 2.1.
-
-It 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 Lesser General Public License for more details.
-
-See the GNU Lesser General Public License version 2.1
-for more details (enclosed in the file licenses/LGPLv2.1).
-
diff --git a/src/plugins/dive/headers/header_spec.txt b/src/plugins/dive/headers/header_spec.txt
deleted file mode 100644
index b6d32434c6e07e646771c1f131566690e51a77be..0000000000000000000000000000000000000000
--- a/src/plugins/dive/headers/header_spec.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-build.ml: LGPL.Dive
-build.mli: LGPL.Dive
-callstack.ml: LGPL.Dive
-callstack.mli: LGPL.Dive
-configure.ac: LGPL.Dive
-Dive.mli: LGPL.Dive
-graph_types.mli: LGPL.Dive
-imprecision_graph.ml: LGPL.Dive
-imprecision_graph.mli: LGPL.Dive
-main.ml: LGPL.Dive
-Makefile.in: LGPL.Dive
-node_kind.ml: LGPL.Dive
-node_kind.mli: LGPL.Dive
-self.ml: LGPL.Dive
-self.mli: LGPL.Dive
-server_interface.ml: LGPL.Dive
-server_interface.mli: LGPL.Dive
diff --git a/src/plugins/dive/headers/open-source/LGPL.Dive b/src/plugins/dive/headers/open-source/LGPL.Dive
deleted file mode 100644
index 367db7ff3b1f999280ca73fb656daed399fccea2..0000000000000000000000000000000000000000
--- a/src/plugins/dive/headers/open-source/LGPL.Dive
+++ /dev/null
@@ -1,19 +0,0 @@
-
-This file is part of the Frama-C plug-in `Dive'.
-
-Copyright (C) 2007-2020
-  CEA (Commissariat à l'énergie atomique et aux énergies
-       alternatives)
-
-you can redistribute it and/or modify it under the terms of the GNU
-Lesser General Public License as published by the Free Software
-Foundation, version 2.1.
-
-It 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 Lesser General Public License for more details.
-
-See the GNU Lesser General Public License version 2.1
-for more details (enclosed in the file licenses/LGPLv2.1).
-
diff --git a/src/plugins/dive/imprecision_graph.ml b/src/plugins/dive/imprecision_graph.ml
index a2afcae0b514863d8d480dd416d5354556958506..2ebd12cf182b051b49c551f7a1dd71d7b3b7c7b4 100644
--- a/src/plugins/dive/imprecision_graph.ml
+++ b/src/plugins/dive/imprecision_graph.ml
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/imprecision_graph.mli b/src/plugins/dive/imprecision_graph.mli
index e3194bab010165637eed018c3d2153330dd26147..dae5176aff12bbd6e7ead1c57dfd62394775f788 100644
--- a/src/plugins/dive/imprecision_graph.mli
+++ b/src/plugins/dive/imprecision_graph.mli
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/main.ml b/src/plugins/dive/main.ml
index 373bab6c9a573ecd3d1810fe23c2ca36441030db..7638783ac208063427b5dcbdfed54ac28913dcb4 100644
--- a/src/plugins/dive/main.ml
+++ b/src/plugins/dive/main.ml
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/node_kind.ml b/src/plugins/dive/node_kind.ml
index e0335300fb1526617f032168a14dce4761be10fe..5c6b5979cf3e4eba1ddb71edcf4f073fe240ea62 100644
--- a/src/plugins/dive/node_kind.ml
+++ b/src/plugins/dive/node_kind.ml
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/node_kind.mli b/src/plugins/dive/node_kind.mli
index 606d161a8fbdb99a386434237f0debc1c7d9b1be..a65055305c6980a5f09e07fe79305cbded635561 100644
--- a/src/plugins/dive/node_kind.mli
+++ b/src/plugins/dive/node_kind.mli
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/self.ml b/src/plugins/dive/self.ml
index ec9312e31cbb70ef5a47f96b041f2cdc1244d3e2..aed894bef8fa06efc944b8fb0a615e6639af2825 100644
--- a/src/plugins/dive/self.ml
+++ b/src/plugins/dive/self.ml
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/self.mli b/src/plugins/dive/self.mli
index ff3819ddf14a1a967bfe3ced74ce61a8e0cae07f..f15ce3c96bd820641bf5a421de36bc8181ae046a 100644
--- a/src/plugins/dive/self.mli
+++ b/src/plugins/dive/self.mli
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/server_interface.ml b/src/plugins/dive/server_interface.ml
index cf378625c7da10817519f8abe43bd33f4b559ad7..c80a64405a8e1a0ef15b57487b4429728382618f 100644
--- a/src/plugins/dive/server_interface.ml
+++ b/src/plugins/dive/server_interface.ml
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/server_interface.mli b/src/plugins/dive/server_interface.mli
index acb8b1fda94de1e45926806a01cc0244d13e82db..6b8cd770d93ac0573027b76620aa88ab4cf0316b 100644
--- a/src/plugins/dive/server_interface.mli
+++ b/src/plugins/dive/server_interface.mli
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2007-2020                                               *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)
diff --git a/src/plugins/dive/simple_deps.ml b/src/plugins/dive/simple_deps.ml
index f67f9e05d8153849c79969d1faae473b2f58d6a6..3bb0950359e2eda8dd834695764d394b28aa67dc 100644
--- a/src/plugins/dive/simple_deps.ml
+++ b/src/plugins/dive/simple_deps.ml
@@ -1,6 +1,6 @@
 (**************************************************************************)
 (*                                                                        *)
-(*  This file is part of the Frama-C plug-in `Dive'.                      *)
+(*  This file is part of Frama-C.                                         *)
 (*                                                                        *)
 (*  Copyright (C) 2018                                                    *)
 (*    CEA (Commissariat à l'énergie atomique et aux énergies              *)