diff --git a/base/comm/Makefile b/base/comm/Makefile
index 36e861c8..598ab0c2 100644
--- a/base/comm/Makefile
+++ b/base/comm/Makefile
@@ -11,7 +11,7 @@ MPFOBJS=psb_dscatter.o psb_zscatter.o psb_iscatter.o psb_cscatter.o psb_sscatter
 	psb_dspgather.o psb_sspgather.o psb_zspgather.o psb_cspgather.o
 LIBDIR=..
 MODDIR=../modules
-FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG).
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) 
 
 lib: mpfobjs $(OBJS) 
 	$(AR) $(LIBDIR)/$(LIBNAME) $(MPFOBJS) $(OBJS)
diff --git a/base/internals/Makefile b/base/internals/Makefile
index 94cb660f..31ed7435 100644
--- a/base/internals/Makefile
+++ b/base/internals/Makefile
@@ -19,7 +19,7 @@ MPFOBJS = psi_dswapdata.o psi_dswaptran.o\
 	psi_fnd_owner.o psb_indx_map_fnd_owner.o
 LIBDIR=..
 MODDIR=../modules
-FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG).
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR)
 CINCLUDES=-I. 
 
 lib: mpfobjs $(FOBJS) $(FOBJS2) $(COBJS) $(MPFOBJS2) $(MPFOBJS) 
diff --git a/base/psblas/Makefile b/base/psblas/Makefile
index fbb06a8b..a2aabe49 100644
--- a/base/psblas/Makefile
+++ b/base/psblas/Makefile
@@ -14,7 +14,7 @@ OBJS= psb_ddot.o psb_damax.o psb_dasum.o psb_daxpby.o\
 
 LIBDIR=..
 MODDIR=../modules
-FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG).
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) 
 
 
 lib: $(OBJS) 
diff --git a/base/serial/Makefile b/base/serial/Makefile
index 3dce39fa..3600a49f 100644
--- a/base/serial/Makefile
+++ b/base/serial/Makefile
@@ -11,7 +11,7 @@ FOBJS = psb_lsame.o psi_serial_impl.o psb_sort_impl.o \
 
 LIBDIR=..
 MODDIR=../modules
-FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG).
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) 
 
 lib: auxd  f77d impld lib1 $(FOBJS)
 	$(AR) $(LIBDIR)/$(LIBNAME) $(FOBJS)
diff --git a/base/serial/aux/Makefile b/base/serial/aux/Makefile
index e3bf0bf8..f5a20800 100644
--- a/base/serial/aux/Makefile
+++ b/base/serial/aux/Makefile
@@ -23,7 +23,7 @@ OBJS=$(FOBJS)
 SPARKERDIR=..
 LIBDIR=../..
 MODDIR=../../modules
-FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(SPARKERDIR)  $(FMFLAG). 
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) 
 
 #
 # No change should be needed below 
diff --git a/base/serial/f77/Makefile b/base/serial/f77/Makefile
index 77070be8..5c45a24a 100644
--- a/base/serial/f77/Makefile
+++ b/base/serial/f77/Makefile
@@ -15,7 +15,7 @@ OBJS=$(FOBJS)
 SPARKERDIR=..
 LIBDIR=../..
 MODDIR=../../modules
-FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(SPARKERDIR)  $(FMFLAG). 
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) 
 #LIBNAME=libsparker.a	
 #LIBNAME=$(BASELIBNAME)
 LIBFILE=$(LIBDIR)/$(LIBNAME)
diff --git a/base/serial/impl/Makefile b/base/serial/impl/Makefile
index 9e1e2260..c8513fcb 100644
--- a/base/serial/impl/Makefile
+++ b/base/serial/impl/Makefile
@@ -17,7 +17,7 @@ OBJS=$(BOBJS) $(SOBJS)  $(DOBJS)  $(COBJS)  $(ZOBJS)
 SPARKERDIR=..
 LIBDIR=../..
 MODDIR=../../modules
-FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(SPARKERDIR)  $(FMFLAG). 
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(SPARKERDIR) $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) 
 #LIBNAME=libsparker.a	
 LIBFILE=$(LIBDIR)/$(LIBNAME)
 
diff --git a/base/tools/Makefile b/base/tools/Makefile
index 2a63fbac..8ac704f7 100644
--- a/base/tools/Makefile
+++ b/base/tools/Makefile
@@ -26,7 +26,7 @@ MPFOBJS = psb_icdasb.o psb_ssphalo.o  psb_dsphalo.o psb_csphalo.o psb_zsphalo.o
 
 LIBDIR=..
 MODDIR=../modules
-FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG)$(MODDIR) $(FMFLAG). $(FIFLAG)$(MODDIR)
+FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) $(FMFLAG)$(LIBDIR) $(FIFLAG)$(MODDIR)
 
 lib: mpfobjs $(FOBJS) 
 	$(AR) $(LIBDIR)/$(LIBNAME) $(MPFOBJS) $(FOBJS)