diff --git a/base/modules/Makefile b/base/modules/Makefile
index ed2b34c8..20a848d4 100644
--- a/base/modules/Makefile
+++ b/base/modules/Makefile
@@ -124,7 +124,7 @@ FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). $(FIFLAG).
 
 objs:  $(MODULES) $(OBJS) $(MPFOBJS)
 	/bin/cp -p $(CPUPDFLAG) *$(.mod) $(MODDIR)
-	/bin/cp -p $(CPUPDFLAG) *.h $(INCDIR)
+	/bin/cp -p $(CPUPDFLAG) psb_config.h $(INCDIR)
 
 lib: objs  $(LIBDIR)/$(LIBNAME) 
 
@@ -417,7 +417,8 @@ penv/psi_collective_mod.o: penv/psi_collective_mod.F90 $(BASIC_MODS)
 	$(FC)   $(FINCLUDES) $(FDEFINES) $(FCOPT) $(EXTRA_OPT) -c $< -o $@
 
 clean:
-	/bin/rm -f $(MODULES) $(OBJS) $(MPFOBJS) *$(.mod)
+	/bin/rm -f $(MODULES) $(OBJS) $(MPFOBJS) *$(.mod) 
 
 veryclean: clean
+	/bin/rm -f *.h
 
diff --git a/base/modules/fakempi.c b/base/modules/psb_fakempi.c
similarity index 99%
rename from base/modules/fakempi.c
rename to base/modules/psb_fakempi.c
index 290815db..8e37f7fe 100644
--- a/base/modules/fakempi.c
+++ b/base/modules/psb_fakempi.c
@@ -1,7 +1,7 @@
 #include <sys/time.h>
 #include <stdio.h>
 #include <string.h>
-#include "psb_internals.h"
+#include "psb_fakempi.h"
 
 double mpi_wtime() 
 {
diff --git a/base/modules/psb_internals.h b/base/modules/psb_fakempi.h
similarity index 100%
rename from base/modules/psb_internals.h
rename to base/modules/psb_fakempi.h
diff --git a/cbind/base/psb_c_base.h b/cbind/base/psb_c_base.h
index febb2ad3..09f7f7dd 100644
--- a/cbind/base/psb_c_base.h
+++ b/cbind/base/psb_c_base.h
@@ -1,4 +1,3 @@
-
 #ifndef PSB_C_BASE__
 #define PSB_C_BASE__
 #ifdef __cplusplus
@@ -14,35 +13,7 @@ extern "C" {
 #include <stdio.h>
 #include <stdbool.h>
 
-
-  typedef int32_t psb_m_t;
-
-#if defined(IPK4) &&  defined(LPK4)
-  typedef int32_t psb_i_t;
-  typedef int32_t psb_l_t;
-#elif defined(IPK4) &&  defined(LPK8)
-  typedef int32_t psb_i_t;
-  typedef int64_t psb_l_t;
-#elif defined(IPK8) &&  defined(LPK8)
-  typedef int64_t psb_i_t;
-  typedef int64_t psb_l_t;
-#else
-#endif
-  typedef int64_t psb_e_t;
-
-  typedef float  psb_s_t;
-  typedef double psb_d_t;
-
-#ifdef  __cplusplus
-   typedef std::complex<float> psb_c_t;
-   typedef std::complex<double> psb_z_t;
-#else
-   typedef float complex psb_c_t;
-   typedef float complex psb_z_t;
-#endif
-
-#define PSB_ERR_ERROR  -1
-#define PSB_ERR_SUCCESS 0
+#include "psb_config.h"
 
 
   typedef struct PSB_C_DESCRIPTOR {