diff --git a/src/SURFEX/avg_urban_fluxes.F90 b/src/SURFEX/avg_urban_fluxes.F90
index dcee5b764dd3a74426d85818e0f8f7f8be831d4a..8930eb0061ac5e099bff3e7e65c3d9dd396dc7cb 100644
--- a/src/SURFEX/avg_urban_fluxes.F90
+++ b/src/SURFEX/avg_urban_fluxes.F90
@@ -84,6 +84,7 @@ USE MODD_CSTS,ONLY : XCPD, XLVTT, XLSTT, XSTEFAN, XSURF_EPSILON
 USE MODD_ISBA_PAR, ONLY : XEMISVEG
 !
 USE MODE_THERMOS
+USE MODI_ABOR1_SFX
 !
 !
 USE YOMHOOK   ,ONLY : LHOOK,   DR_HOOK
diff --git a/src/SURFEX/carbon_dynamic.F90 b/src/SURFEX/carbon_dynamic.F90
index 95d1773afde1b1508cb824c9314c21cd8bbb55c8..dfefff9c2dc0cf88a9a95dcab53127cc2e7c1102 100644
--- a/src/SURFEX/carbon_dynamic.F90
+++ b/src/SURFEX/carbon_dynamic.F90
@@ -51,6 +51,7 @@ USE MODD_CSTS,         ONLY : XSIYEA, XTT
 USE MODD_SOILCARB_PAR, ONLY : XADVREF
 !
 USE MODE_HYDRO_DIF
+USE MODI_ABOR1_SFX
 !
 USE YOMHOOK,  ONLY : LHOOK,   DR_HOOK
 USE PARKIND1, ONLY : JPRB
diff --git a/src/SURFEX/coupling_teb_orographyn.F90 b/src/SURFEX/coupling_teb_orographyn.F90
index 83698fe146933406e3fd36d4e97e104fc751dcc9..6f4d36866fa95074b41e25e3e91a28fe67613cc0 100644
--- a/src/SURFEX/coupling_teb_orographyn.F90
+++ b/src/SURFEX/coupling_teb_orographyn.F90
@@ -61,6 +61,7 @@ USE YOMHOOK   ,ONLY : LHOOK,   DR_HOOK
 USE PARKIND1  ,ONLY : JPRB
 !
 USE MODI_COUPLING_TEB_n
+USE MODI_ABOR1_SFX
 !
 IMPLICIT NONE
 !
diff --git a/src/SURFEX/coupling_townn.F90 b/src/SURFEX/coupling_townn.F90
index 70e9de4eb58f29d376baf562926c2bbb4d552806..ff83179ff371824572bdd1c1dde97f2cddbbc474 100644
--- a/src/SURFEX/coupling_townn.F90
+++ b/src/SURFEX/coupling_townn.F90
@@ -54,6 +54,7 @@ USE PARKIND1  ,ONLY : JPRB
 USE MODI_COUPLING_IDEAL_FLUX
 !
 USE MODI_COUPLING_TEB_OROGRAPHY_n
+USE MODI_ABOR1_SFX
 !
 IMPLICIT NONE
 !
diff --git a/src/SURFEX/isba_meb.F90 b/src/SURFEX/isba_meb.F90
index f1d0d5dc1bd7456949b157ccd0ad234e1de338a4..e88d190931362961cb1e45f5281ece1ad227e3c7 100644
--- a/src/SURFEX/isba_meb.F90
+++ b/src/SURFEX/isba_meb.F90
@@ -114,6 +114,7 @@ USE MODN_IO_OFFLINE ,      ONLY : XTSTEP_SURF    ! time step of the surface
 !
 USE MODD_AGRI,             ONLY : LIRRIGMODE
 !
+USE MODI_ABOR1_SFX
 !
 USE YOMHOOK   ,ONLY : LHOOK,   DR_HOOK
 USE PARKIND1  ,ONLY : JPRB
diff --git a/src/SURFEX/solar_panel.F90 b/src/SURFEX/solar_panel.F90
index 5eb503fc4eba78fbc63e125247599ebd0745810e..4d678dad7f3890ad7a0ce4c1ddb5cd3ddc22b8b9 100644
--- a/src/SURFEX/solar_panel.F90
+++ b/src/SURFEX/solar_panel.F90
@@ -50,6 +50,8 @@ USE MODD_DIAG_MISC_TEB_n, ONLY : DIAG_MISC_TEB_t
 USE MODD_SURF_PAR, ONLY : XUNDEF
 USE MODD_CSTS,     ONLY : XSTEFAN
 !
+USE MODI_ABOR1_SFX
+!
 USE YOMHOOK   ,ONLY : LHOOK,   DR_HOOK
 USE PARKIND1  ,ONLY : JPRB
 !
diff --git a/src/SURFEX/switch_time.F90 b/src/SURFEX/switch_time.F90
index 16f80829a6d2e4b15754d576646b45531dbdaa3d..982700a520572ce576c849ce7a479389736184fe 100644
--- a/src/SURFEX/switch_time.F90
+++ b/src/SURFEX/switch_time.F90
@@ -43,6 +43,7 @@ USE MODD_CSTS,        ONLY: XDAY
 !
 USE MODI_ADD_FORECAST_TO_DATE_SURF
 USE MODI_SUBSTRACT_TO_DATE_SURF
+USE MODI_ABOR1_SFX
 !------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/SURFEX/town_energy_balance.F90 b/src/SURFEX/town_energy_balance.F90
index 522c5774e21d16a9da984e3ea4daea7e51b9a279..aba42e3f5f5a38781c39d68bd1ab18de07e7b748 100644
--- a/src/SURFEX/town_energy_balance.F90
+++ b/src/SURFEX/town_energy_balance.F90
@@ -129,6 +129,7 @@ USE MODI_ALLOC_LW_COEF
 USE MODI_DEALLOC_LW_COEF
 USE MODI_TEB_SPARTACUS
 USE MODI_EXPLICIT_LONGWAVE
+USE MODI_ABOR1_SFX
 !
 USE YOMHOOK   ,ONLY : LHOOK,   DR_HOOK
 USE PARKIND1  ,ONLY : JPRB
diff --git a/src/SURFEX/trad_body_isba.F90 b/src/SURFEX/trad_body_isba.F90
index 32a1280351c501b6de4af6f4ccf92080bdf91c73..e7a0838171f4cc9d5a1f7abce7306aa2deffa611 100644
--- a/src/SURFEX/trad_body_isba.F90
+++ b/src/SURFEX/trad_body_isba.F90
@@ -61,6 +61,7 @@ FUNCTION TRAD_BODY_ISBA(HPROGRAM, PSCA_SW, PREF_SW, PEMIT_LW, PLW_RAD,&
 !               ------------
 !
 USE MODD_CSTS, ONLY : XSTEFAN, XPI, XSURF_EPSILON, XI0
+USE MODI_ABOR1_SFX  
 !
 USE YOMHOOK   ,ONLY : LHOOK,   DR_HOOK
 USE PARKIND1  ,ONLY : JPRB
diff --git a/src/SURFEX/trad_body_teb.F90 b/src/SURFEX/trad_body_teb.F90
index 30cf78e4317ab9334483c4555ddb2545c19a4853..2cc88d3f0279953625bafdc79b9659490bbaca49 100644
--- a/src/SURFEX/trad_body_teb.F90
+++ b/src/SURFEX/trad_body_teb.F90
@@ -91,6 +91,7 @@ FUNCTION TRAD_BODY_TEB(HPROGRAM, PSCA_SW, PREF_SW_FAC, PREF_SW_GRND,         &
 !               ------------
 !
 USE MODD_CSTS, ONLY : XSTEFAN, XPI, XSURF_EPSILON, XI0
+USE MODI_ABOR1_SFX  
 !
 USE YOMHOOK   ,ONLY : LHOOK,   DR_HOOK
 USE PARKIND1  ,ONLY : JPRB
diff --git a/src/SURFEX/utci_teb.F90 b/src/SURFEX/utci_teb.F90
index 137fbb6c2f3f5ccbfdc44ffbd5e63b9bcb650f0f..80b877d9f78868eea6ccfc9c4d7422b2f9d5db03 100644
--- a/src/SURFEX/utci_teb.F90
+++ b/src/SURFEX/utci_teb.F90
@@ -54,6 +54,7 @@ USE MODD_TEB_OPTION_n, ONLY : TEB_OPTIONS_t
 USE MODD_CSTS, ONLY : XTT
 USE MODI_UTCI_APPROX
 USE MODI_TRAD_BODY_TEB
+USE MODI_ABOR1_SFX
 !
 USE YOMHOOK , ONLY : LHOOK, DR_HOOK
 USE PARKIND1, ONLY : JPRB