diff --git a/drivers/hrldas/Makefile b/drivers/hrldas/Makefile
index b03fb9d9..eb85a108 100644
--- a/drivers/hrldas/Makefile
+++ b/drivers/hrldas/Makefile
@@ -28,11 +28,15 @@ OBJS = NoahmpGroundwaterInitMod.o \
 all:	$(OBJS)
 
 .F90.o:
-	$(COMPILERF90) -c $(F90FLAGS) $(FREESOURCE) -I. -I../../src -I../../utility -I../../../hrldas/Utility_routines \
-        $(NETCDFMOD) $(*).F90
+	@echo ""
+	$(RM) $(*).f90
+	$(CPP) $(CPPFLAGS) $(*).F90 > $(*).f90
+	$(COMPILERF90) -c -I. -I../../src -I../../utility -I../../../hrldas/Utility_routines \
+                          -I../../../hrldas/MPP $(F90FLAGS) $(FREESOURCE) $(NETCDFMOD) $(*).f90
+	@echo ""
 
 clean:
-	rm -f *.o *.mod *.exe
+	rm -f *.o *.mod *.exe *.f90
 
 #
 # Dependencies:
diff --git a/src/Makefile b/src/Makefile
index f8289ef8..706c0219 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -137,17 +137,20 @@ all:	$(OBJS)
 GroundWaterMmfMod.o: GroundWaterMmfMod.F90
 	@echo ""
 	$(RM) GroundWaterMmfMod.f90
-	$(CPP) $(CPPFLAGS) $(CPPHRLDAS) $(*).F90 > $(*).f90
-	$(COMPILERF90) -o $(@) -c $(F90FLAGS) $(FREESOURCE) -I ../../hrldas/MPP -I. \
-	-I../../hrldas/Utility_routines -I../utility $(NETCDFMOD) $(*).f90
-	$(RM) GroundWaterMmfMod.f90
+	$(CPP) $(CPPFLAGS) $(*).F90 > $(*).f90
+	$(COMPILERF90) -c -I../../hrldas/MPP -I. -I../../hrldas/Utility_routines \
+        -I../utility -I../drivers/hrldas $(F90FLAGS) $(FREESOURCE) $(NETCDFMOD) $(*).f90
 	@echo ""
 
 .F90.o:
-	$(COMPILERF90) -c $(F90FLAGS) $(FREESOURCE) -I../utility -I../drivers/hrldas $(NETCDFMOD) $(*).F90
+	@echo ""
+	$(RM) $(*).f90
+	$(CPP) $(CPPFLAGS) $(*).F90 > $(*).f90
+	$(COMPILERF90) -c -I. -I../utility -I../drivers/hrldas $(F90FLAGS) $(FREESOURCE) $(NETCDFMOD) $(*).f90
+	@echo ""
 
 clean:
-	rm -f *.o *.mod *.exe
+	rm -f *.o *.mod *.exe *.f90
 
 #
 # Dependencies:
@@ -310,7 +313,7 @@ BiochemCropMainMod.o:                    ../utility/Machine.o NoahmpVarType.o Co
 IrrigationPrepareMod.o:                  ../utility/Machine.o NoahmpVarType.o ConstantDefineMod.o IrrigationTriggerMod.o
 BalanceErrorCheckMod.o:                  ../utility/Machine.o NoahmpVarType.o ConstantDefineMod.o
 GeneralInitMod.o:                        ../utility/Machine.o NoahmpVarType.o ConstantDefineMod.o
-GroundWaterMmfMod.o:                     ../utility/Machine.o NoahmpVarType.o ../drivers/hrldas/NoahmpIOVarType.o 
+GroundWaterMmfMod.o:                     ../utility/Machine.o NoahmpVarType.o ../drivers/hrldas/NoahmpIOVarType.o
 BalanceErrorCheckGlacierMod.o:           ../utility/Machine.o NoahmpVarType.o ConstantDefineMod.o
 EnergyMainGlacierMod.o:                  ../utility/Machine.o NoahmpVarType.o ConstantDefineMod.o SnowCoverGlacierMod.o \
                                          GroundRoughnessPropertyGlacierMod.o GroundThermalPropertyGlacierMod.o \
diff --git a/utility/Makefile b/utility/Makefile
index bab607d2..dc3130fd 100644
--- a/utility/Makefile
+++ b/utility/Makefile
@@ -12,15 +12,22 @@ OBJS = Machine.o \
 all:	$(OBJS)
 
 .F90.o:
-	$(COMPILERF90) -c $(F90FLAGS) $(FREESOURCE) $(NETCDFMOD) $(*).F90
+	@echo ""
+	$(RM) $(*).f90
+	$(CPP) $(CPPFLAGS) $(*).F90 > $(*).f90
+	$(COMPILERF90) -c $(F90FLAGS) $(FREESOURCE) $(NETCDFMOD) $(*).f90
+	@echo ""
 
 #
 # This command cleans up object (etc) files:
 #
 
 clean:
-	rm -f *.o *.mod *.exe
+	rm -f *.o *.mod *.exe *.f90
 
 #
 # Dependencies:
 #
+CheckNanMod.o: Machine.o
+
+