diff --git a/src/LIB/FOREFIRE/C_ForeFire_Interface.c b/src/LIB/FOREFIRE/C_ForeFire_Interface.c
index a2fad3353d9148479a19d72a7be8421c0836c65a..f00a1a015a7f92a5cd4a2a16ec56f00751d0cc35 100644
--- a/src/LIB/FOREFIRE/C_ForeFire_Interface.c
+++ b/src/LIB/FOREFIRE/C_ForeFire_Interface.c
@@ -1,5 +1,5 @@
 /*
-*MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+*MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier
 *MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 *MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 *MNH_LIC for details. version 1.
diff --git a/src/LIB/FOREFIRE/F_ForeFire_Interface.f90 b/src/LIB/FOREFIRE/F_ForeFire_Interface.f90
index b9457e78139f07d2d5a26672b220a8677fd77ef7..2792cbb56ce5e377ab1914cc2ac2a6680ffd9945 100644
--- a/src/LIB/FOREFIRE/F_ForeFire_Interface.f90
+++ b/src/LIB/FOREFIRE/F_ForeFire_Interface.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
diff --git a/src/LIB/FOREFIRE/coupling_forefiren.f90 b/src/LIB/FOREFIRE/coupling_forefiren.f90
index a4f1a86d01996425165c477a6cd5e2cb478b53fa..6308f5c59ffa05a32c219332f07574b725f5c037 100644
--- a/src/LIB/FOREFIRE/coupling_forefiren.f90
+++ b/src/LIB/FOREFIRE/coupling_forefiren.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
diff --git a/src/LIB/FOREFIRE/init_forefiren.f90 b/src/LIB/FOREFIRE/init_forefiren.f90
index 00c85c6238af9cc3d0e675fcfd4b3dce258002e0..767f92d1c5dd314339f55245b96930ee6f88ae73 100644
--- a/src/LIB/FOREFIRE/init_forefiren.f90
+++ b/src/LIB/FOREFIRE/init_forefiren.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -34,6 +34,7 @@
 !!    -------
 !!      P. Tulet  CNRM
 !!      X. Pialat SPE
+!!      J.B.Filippi (SPE)
 
 USE MODD_FOREFIRE
 USE MODD_FOREFIRE_n
diff --git a/src/LIB/FOREFIRE/modd_forefire.f90 b/src/LIB/FOREFIRE/modd_forefire.f90
index 4afe973443e1e0f8c13132c7cbeda66b51c4a1e4..563962a05b53a354c2898a93761a913cb536cf31 100644
--- a/src/LIB/FOREFIRE/modd_forefire.f90
+++ b/src/LIB/FOREFIRE/modd_forefire.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -12,6 +12,7 @@
 !!    ------
 !	           : P. Tulet,  LACy / CNRM
 !!            : X. Pialat, SPE
+!               J.B.Filippi (SPE)
 !	Creation   : 15.02.2012
 !
 !-------------------------------------------------------------------------------
diff --git a/src/LIB/FOREFIRE/modd_forefiren.f90 b/src/LIB/FOREFIRE/modd_forefiren.f90
index bea6c974552a5fbd6718f79f8f8ac44fc6b5ea66..6c019357d6e82de5236c2f79daff6534bd9a327c 100644
--- a/src/LIB/FOREFIRE/modd_forefiren.f90
+++ b/src/LIB/FOREFIRE/modd_forefiren.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -8,7 +8,7 @@
 !!    AUTHOR
 !!    ------
 !!	P. Tulet     *Meteo France*
-!!
+!!!               J.B.Filippi (SPE)
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    07/08
diff --git a/src/LIB/FOREFIRE/modn_forefire.f90 b/src/LIB/FOREFIRE/modn_forefire.f90
index a1e956163d9f898b4128677f1161619c594a1f7e..337ff931683ebeacbc246d4b9e2671d84046e60f 100644
--- a/src/LIB/FOREFIRE/modn_forefire.f90
+++ b/src/LIB/FOREFIRE/modn_forefire.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -11,7 +11,8 @@
 !!    AUTHOR
 !!    ------
 !	           : P. Tulet (LACy / CNRM)
-!!              X. Pialat (SPE)
+!               X. Pialat (SPE)
+!               J.B.Filippi (SPE)
 !	Creation   : 09.10.2010
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_one_wayn.f90 b/src/MNH/ini_one_wayn.f90
index aa8cb5ebbaa9de1ba16a5b2fc181bc97d3396d9b..70c20e10a462c48c3d24abc10a979ff529bd5589 100644
--- a/src/MNH/ini_one_wayn.f90
+++ b/src/MNH/ini_one_wayn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1999-2021 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1999-2023 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !MNH_LIC for details. version 1.
diff --git a/src/MNH/spawn_field2.f90 b/src/MNH/spawn_field2.f90
index 5f4c6a1777ce6e7592c37a49d374906604d97651..82bb5add4c00e790b6a9ebf9d10e2236b1181a13 100644
--- a/src/MNH/spawn_field2.f90
+++ b/src/MNH/spawn_field2.f90
@@ -175,7 +175,11 @@ USE MODD_IO,              ONLY: TFILEDATA
 USE MODD_LATZ_EDFLX,      ONLY: LTH_FLX, LUV_FLX
 USE MODD_LBC_n,           ONLY: LBC_MODEL
 USE MODD_LUNIT_n,         ONLY: TLUOUT
-USE MODD_NSV             
+#ifdef MNH_FOREFIRE
+USE MODD_NSV
+#else
+USE MODD_NSV              ONLY: NSV, NSV_CSBEG, NSV_CSEND, NSV_PPBEG, NSV_PPEND, NSV_USER, TSVLIST
+#endif
 USE MODD_RELFRC_n,        ONLY: RELFRC_MODEL
 USE MODD_SPAWN
 !