diff --git a/src/a_prep/initialize_environment.f90 b/src/a_prep/initialize_environment.f90
index 248be4a..bc65a4d 100644
--- a/src/a_prep/initialize_environment.f90
+++ b/src/a_prep/initialize_environment.f90
@@ -710,7 +710,7 @@ subroutine initialize_mesh(nx, ny, nz, ax, ay, az, fx, fy, fz, &
     real(8) axt, ayt, azt
     integer(8) mesh_try
     real*8, allocatable :: rion_sav(:, :)
-#ifdef __DEBUG
+#ifdef _DEBUG
     real(8) x(3)
 #endif
 
@@ -912,7 +912,7 @@ subroutine initialize_mesh(nx, ny, nz, ax, ay, az, fx, fy, fz, &
 
     if (rank .eq. 0) write (6, *) ' Total number of buffers (lower bound) ', totnbuf
 
-#ifdef __DEBUG
+#ifdef _DEBUG
     if (rank .eq. 0) then
         write (6, *) ' Writing grid positions on a file '
         open (unit=91, file='turbogrid.dat', form='formatted', position='rewind', status='unknown')
diff --git a/src/a_turborvb/reweight0_k6.f90 b/src/a_turborvb/reweight0_k6.f90
index 3a6a548..4a3e041 100644
--- a/src/a_turborvb/reweight0_k6.f90
+++ b/src/a_turborvb/reweight0_k6.f90
@@ -392,7 +392,7 @@ subroutine reweight0(nw, in1, npr, npm, factorsr                 &
             call mpi_allreduce(cost, devmaxp, 1, MPI_DOUBLE_PRECISION, MPI_MAX, MPI_COMM_WORLD, ierr)
 #endif
 
-#ifdef __DEBUG
+#ifdef _DEBUG
             if (rank .eq. 0) write (6, *) ' i_max / force / error / deviation: ', &
                 jmax, forza(jmax), err(jmax), forza(jmax)/cost
 #endif
@@ -964,7 +964,7 @@ subroutine reweight0(nw, in1, npr, npm, factorsr                 &
                                 end do
                             end if
 
-#ifdef __DEBUG
+#ifdef _DEBUG
                             if (rank .eq. 0) then
 !       check symmetry
                                 cost = 0.d0
diff --git a/src/c_adjoint_forward/compute_fast.f90 b/src/c_adjoint_forward/compute_fast.f90
index 144cb94..6b5b1c8 100644
--- a/src/c_adjoint_forward/compute_fast.f90
+++ b/src/c_adjoint_forward/compute_fast.f90
@@ -171,12 +171,12 @@ subroutine compute_eloc_logpsi(indt, indt4, indt4j, nelorb, nelup, neldo&
         nelused = nel
     endif
 
-#if defined (_OFFLOAD) && defined (__DEBUG)
+#if defined (_OFFLOAD) && defined (_DEBUG)
 !$omp target update from (winvbar,ainv,winvjbar,agp(:,:,walker:walker)&
 !$omp &,agpn,winv,winvj,winvfn,winvbarfn) if(yes_ontarget)
 #endif
 
-#ifdef __DEBUG
+#ifdef _DEBUG
   if(epscuttype.eq.2) agp_old=sum(abs(agp(:,:,walker)))
   vpotreg_old=sum(abs(vpotreg(:,1:nel)))
   kel_old=sum(kel(:,:,:))
@@ -247,7 +247,7 @@ subroutine compute_eloc_logpsi(indt, indt4, indt4j, nelorb, nelup, neldo&
     else
         yesfn = .true.
     endif
-#ifdef __DEBUG 
+#ifdef _DEBUG 
 ! Otherwise I cannot check averything
   movedions=1
   yesupwf=.true.
@@ -560,7 +560,7 @@ subroutine compute_eloc_logpsi(indt, indt4, indt4j, nelorb, nelup, neldo&
        write(6,*)
      endif
 #endif
-#ifdef __DEBUG
+#ifdef _DEBUG
 #ifdef _OFFLOAD
 !$omp target  update from (winvbar)
 !$omp target update from (winvbarfn(ind_winvbarfn:ind_winvbarfn+nel2barfn-1)) if(yesfn)
diff --git a/src/m_common/allio.f90 b/src/m_common/allio.f90
index 7bc81e2..45c56d7 100644
--- a/src/m_common/allio.f90
+++ b/src/m_common/allio.f90
@@ -904,7 +904,7 @@ subroutine update_kgrid
             if (rank .eq. 0) then
                 write (6, *) 'Warning: updated kgrid considering Det/Jastrow:', count1, count1j
                 write (6, *) 'Warning: lowest wf discarded=', exp(-max_rejected)
-#ifdef __DEBUG
+#ifdef _DEBUG
                 write (6, *) ' Grid considered /ion'
                 do i = 1, nion
                     write (6, *) ' ion # ', i, 'dimension =', kgrid_atom(i)%dimshell