diff --git a/base/modules/Makefile b/base/modules/Makefile
index e8801da1..c5dae3ac 100644
--- a/base/modules/Makefile
+++ b/base/modules/Makefile
@@ -35,8 +35,8 @@ FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). $(FIFLAG).
 lib:  penvmod  $(UTIL_MODS)  $(OBJS)  
 	$(AR) $(LIBDIR)/$(LIBNAME) $(MODULES) $(OBJS) $(MPFOBJS)
 	$(RANLIB) $(LIBDIR)/$(LIBNAME)
-	/bin/cp -p $(LIBMOD) $(LIBDIR)
-	/bin/cp -p *$(.mod) $(LIBDIR)
+	/bin/cp -p $(CPUPDFLAG) $(LIBMOD) $(LIBDIR)
+	/bin/cp -p $(CPUPDFLAG) *$(.mod) $(LIBDIR)
 
 
 psi_comm_buffers_mod.o: psb_const_mod.o 
diff --git a/base/modules/cutil.c b/base/modules/cutil.c
index 28718f5c..13b7e1e9 100644
--- a/base/modules/cutil.c
+++ b/base/modules/cutil.c
@@ -1,6 +1,7 @@
 #include <sys/time.h>
 #include <stdio.h>
 #include <string.h>
+#include "psb_internals.h"
 
 #ifdef LowerUnderscore
 #define psi_c_diffadd   psi_c_diffadd_
diff --git a/base/modules/fakempi.c b/base/modules/fakempi.c
index 3ba717c9..344fdf85 100644
--- a/base/modules/fakempi.c
+++ b/base/modules/fakempi.c
@@ -1,21 +1,7 @@
 #include <sys/time.h>
 #include <stdio.h>
 #include <string.h>
-
-#ifndef LowerUnderscore
-#ifndef LowerDoubleUnderscore
-#ifndef LowerCase
-#ifndef UpperUnderscore
-#ifndef UpperDoubleUnderscore 
-#ifndef UpperCase
-#define LowerUnderscore 1  /* 20110404 the default */
-/* #error "should specify a default mangling scheme" */
-#endif
-#endif
-#endif
-#endif
-#endif
-#endif
+#include "psb_internals.h"
 
 
 #ifdef LowerUnderscore
diff --git a/base/modules/psb_internals.h b/base/modules/psb_internals.h
new file mode 100644
index 00000000..5335ffd2
--- /dev/null
+++ b/base/modules/psb_internals.h
@@ -0,0 +1,20 @@
+#ifndef PSB_INTERNALS_H
+#define PSB_INTERNALS_H
+
+/* providing a default mangling scheme */
+#ifndef LowerUnderscore
+#ifndef LowerDoubleUnderscore
+#ifndef LowerCase
+#ifndef UpperUnderscore
+#ifndef UpperDoubleUnderscore 
+#ifndef UpperCase
+#define LowerUnderscore 1  /* 20110404 the default */
+/* #error "should specify a default mangling scheme" */
+#endif
+#endif
+#endif
+#endif
+#endif
+#endif
+
+#endif