diff --git a/PW/read_ncpp.f90 b/PW/read_ncpp.f90
index f8a9a6a4e..98d0989db 100644
--- a/PW/read_ncpp.f90
+++ b/PW/read_ncpp.f90
@@ -10,7 +10,12 @@
 subroutine read_ncpp (np, iunps)
   !-----------------------------------------------------------------------
   !
-  use pwcom
+  use parameters, only: dp, nchix, lmaxx, ndm
+  use atom,  only: zmesh, mesh, xmin, dx, r, rab, vnl, chi, oc, nchi, &
+       lchi, rho_at, rho_atc, numeric
+  use char, only: psd
+  use nl_c_c,only: nlcc, a_nlcc, b_nlcc, alpha_nlcc
+  use pseud, only: cc, alpc, zp, aps, alps, nlc, nnl, lmax, lloc, bhstype
   use funct
   implicit none
 
diff --git a/PW/read_pseudo.f90 b/PW/read_pseudo.f90
index 60d28a05d..10abc6126 100644
--- a/PW/read_pseudo.f90
+++ b/PW/read_pseudo.f90
@@ -9,7 +9,13 @@ subroutine read_pseudo (is, iunps, ierr)
   !
   ! PWSCF modules
   !
-  use pwcom
+  use atom,  only: zmesh, mesh,dx, r, rab, vnl, chi, oc, nchi, lchi, &
+       rho_at, rho_atc
+  use char,  only: psd
+  use pseud, only: zp, lmax, lloc
+  use nl_c_c,only: nlcc
+  use us,    only: dion, betar, qqq, qfcoef, qfunc, nqf, nqlc, rinner, &
+       nh, nbeta, kkbeta, lll, tvanp
   use funct
   !
   use pseudo_types
diff --git a/PW/readnewvan.f90 b/PW/readnewvan.f90
index 21320fe4b..ad9d68b4a 100644
--- a/PW/readnewvan.f90
+++ b/PW/readnewvan.f90
@@ -14,7 +14,16 @@ subroutine readnewvan (is, iunps)
   !     pseudopotential from the file produced by the atomic program.
   !     It is compatible only with the ld1 atomic code
   !
-  use pwcom
+  use parameters, only: dp, nchix, lmaxx, nbrx, ndm, npsx, lqmax
+  use constants, only: fpi
+  use atom,  only: zmesh, mesh, xmin, dx, r, rab, vnl, chi, oc, nchi, &
+       lchi, rho_at, rho_atc
+  use char,  only: psd
+  use pseud, only: zp, lmax, lloc
+  use nl_c_c,only: nlcc
+  use us,    only: dion, betar, qqq, qfcoef, qfunc, nqlc, rinner, &
+       nh, nbeta, kkbeta, lll, tvanp
+
   use funct
   !
   implicit none
diff --git a/PW/readvan.f90 b/PW/readvan.f90
index 9d6365c13..56c2eda07 100644
--- a/PW/readvan.f90
+++ b/PW/readvan.f90
@@ -17,7 +17,14 @@ subroutine readvan (is, iunps)
   !     In particular the Herman Skillman mesh is no more supported.
   !     It assume multiple rinner values.
   !
-  use pwcom
+  use parameters, only: dp, nchix, lmaxx, nbrx, ndm, npsx, nqfm, lqmax
+  use atom,  only: zmesh, mesh,dx, r, rab, vnl, chi, oc, nchi, lchi, &
+       rho_at, rho_atc
+  use char,  only: psd
+  use pseud, only: zp, lmax, lloc
+  use nl_c_c,only: nlcc
+  use us,    only: dion, betar, qqq, qfcoef, qfunc, nqf, nqlc, rinner, &
+       nh, nbeta, kkbeta, lll, tvanp, iver, ifqopt
   use funct
   implicit none
 
diff --git a/PW/remove_atomic_rho.f90 b/PW/remove_atomic_rho.f90
index d11902868..d078ad3b3 100644
--- a/PW/remove_atomic_rho.f90
+++ b/PW/remove_atomic_rho.f90
@@ -11,7 +11,10 @@ subroutine remove_atomic_rho
 #include "machine.h"
   USE io_global, ONLY: stdout
   USE io_files, ONLY: output_drho
-  use pwcom
+  USE parameters, ONLY: DP
+  USE gvect, ONLY: nrxx
+  USE lsda_mod, ONLY: lsda, nspin
+  USE scf, ONLY: rho
   implicit none
   integer :: ir
   ! do-loop variable on FFT grid