diff --git a/GIPAW/Makefile b/GIPAW/Makefile
index 3ac49c951..60749f61c 100644
--- a/GIPAW/Makefile
+++ b/GIPAW/Makefile
@@ -72,6 +72,7 @@ MODULES = \
 ../Modules/parallel_include.o \
 ../Modules/parameters.o \
 ../Modules/parser.o \
+../Modules/paw_variables.o \
 ../Modules/printout_base.o \
 ../Modules/pseudo_types.o \
 ../Modules/ptoolkit.o \
diff --git a/GIPAW/make.depend b/GIPAW/make.depend
index 5b59aa430..086ac9ecd 100644
--- a/GIPAW/make.depend
+++ b/GIPAW/make.depend
@@ -141,7 +141,6 @@ paw_gipaw.o : ../Modules/pseudo_types.o
 paw_gipaw.o : ../Modules/radial_grids.o
 paw_gipaw.o : ../Modules/read_upf.o
 paw_gipaw.o : ../Modules/splinelib.o
-paw_gipaw.o : gipaw_module.o
 stop_code.o : ../Modules/kind.o
 stop_code.o : ../Modules/mp.o
 stop_code.o : ../Modules/parallel_include.o
diff --git a/GIPAW/paw_gipaw.f90 b/GIPAW/paw_gipaw.f90
index 0a9104a17..267d05c36 100644
--- a/GIPAW/paw_gipaw.f90
+++ b/GIPAW/paw_gipaw.f90
@@ -10,7 +10,7 @@ MODULE paw_gipaw
   USE kinds,        ONLY: DP
   USE parameters,   ONLY: npsx
   use radial_grids, ONLY: ndmx
-  use gipaw_module, ONLY: nbrx
+  !!use gipaw_module, ONLY: nbrx
   !
   ! ... These parameters are needed for the paw variables
   !
@@ -74,6 +74,8 @@ MODULE paw_gipaw
 !  
 !  INTEGER, ALLOCATABLE :: gipaw_ncore_orbital ( : )
 !  REAL(dp), ALLOCATABLE :: gipaw_core_orbital ( :, :, : )
+
+  integer, parameter :: nbrx = 20
   
   INTEGER :: &
        paw_nkb,            & ! total number of beta functions, with st.fact.