diff --git a/src/LIB/SURCOUCHE/src/mode_mnh_world.f90 b/src/LIB/SURCOUCHE/src/mode_mnh_world.f90
index 287f0a519aea9cdad900ae9799925c4afe1734b7..52a9bb5edcbd813e3ac12ef7d4590a7989e34e7f 100644
--- a/src/LIB/SURCOUCHE/src/mode_mnh_world.f90
+++ b/src/LIB/SURCOUCHE/src/mode_mnh_world.f90
@@ -2,15 +2,6 @@
 #undef MNH_OPENACC
 #endif
 
-#ifdef MNH_COMPILER_NVHPC
-#define MNH_ACC_SZ MNHINT32
-#elif MNH_COMPILER_CCE
-#define MNH_ACC_SZ MNHINT64
-#else
-#define MNH_ACC_SZ KIND(1)
-#endif
-
-
 !MNH_LIC Copyright 1994-2022 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
@@ -221,8 +212,8 @@ CONTAINS
   CONTAINS
     SUBROUTINE MNH_PRINT_DEVICE_PROPERTIES(KDEVTYPE,HMSG)
       !
-      INTEGER(KIND=MNH_ACC_SZ), INTENT(IN) :: KDEVTYPE
-      CHARACTER(LEN=*),         INTENT(IN) :: HMSG
+      INTEGER(KIND=ACC_DEVICE_KIND), INTENT(IN) :: KDEVTYPE
+      CHARACTER(LEN=*),              INTENT(IN) :: HMSG
       !
       INTEGER                :: INUMDEV, IDXNAMEDEV, IDXVENDORDEV, IDXDRIVERDEV
       INTEGER(KIND=MNHINT64) :: IMEMDEV