diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 438e01b0c..98bfd4724 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -164,7 +164,7 @@ $(DIRECTORY_TARGETS) :
 #  The order of the following rules is
 #  VERY IMPORTANT !!!!
 
-depends: buildInstall $(SRC_FILES)
+depends: inc $(SRC_FILES)
 	@$(RM) DEPENDS
 	@touch DEPENDS
 ifneq (,$(strip $(SRC_FILES)))
@@ -290,7 +290,7 @@ $(MUNCHNAME):%.munch : %.o
 	$(NM) $<  > nm.out
 	$(PERL) $(TOOLS)/munch.pl < nm.out > ctdt.c
 	$(COMPILE.c) -traditional ctdt.c
-	$(GCC_LD) -o $@ $(LDFLAGS) $< ctdt.o
+	$(LD) -o $@ $(LDFLAGS) $< ctdt.o
 
 binInstalls:  $(BIN_INSTALLS)
 	@echo "Installing $(^F)"
@@ -385,6 +385,7 @@ $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR)/%: %
 .PRECIOUS: $(COMMON_INC)
 
 -include $(CONFIG)/RULES.Db
+
 -include DEPENDS
 
 .PHONY: all inc depends build install clean rebuild buildInstall binInstalls \
diff --git a/src/as/Makefile b/src/as/Makefile
index b37576a73..af14b45be 100644
--- a/src/as/Makefile
+++ b/src/as/Makefile
@@ -37,5 +37,4 @@ $(INSTALL_INC)/asLib.h:../asLib.h
 clean::
 	@$(RM) asLib.c asLib_lex.c 
 
-$(INSTALL_INC)/asLib.h:../asLib.h
-
+depends: asLib_lex.c
diff --git a/src/bpt/Makefile b/src/bpt/Makefile
index 0b660b8f8..bd16082b0 100644
--- a/src/bpt/Makefile
+++ b/src/bpt/Makefile
@@ -17,3 +17,5 @@ PROD += makeBpt
 include $(TOP)/configure/RULES
 
 inc: $(INSTALL_PROD)
+
+depends: $(INSTALL_PROD)
diff --git a/src/db/Makefile b/src/db/Makefile
index 1b61e9be0..d70a79e64 100644
--- a/src/db/Makefile
+++ b/src/db/Makefile
@@ -76,3 +76,5 @@ $(COMMON_DIR)/dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd $(COMMON_DIR)
 	$(RM) $@
 	$(DBTORECORDTYPEH) -I .. $< $@
 
+depends: $(INSTALL_DBD)/dbCommon.dbd
+
diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile
index 7d5c8745f..c397b553e 100644
--- a/src/dbStatic/Makefile
+++ b/src/dbStatic/Makefile
@@ -42,4 +42,6 @@ dbYacc$(OBJ): dbLex.c ../dbLexRoutines.c
 clean::
 	@$(RM) dbLex.c dbYacc.c 
 
+depends : $(INSTALL_LIBS) $(INSTALL_PROD)
+
 #	EOF Makefile.Host for base/src/dbStatic
diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile
index fad7d4471..0bc645c7b 100644
--- a/src/dbtools/Makefile
+++ b/src/dbtools/Makefile
@@ -28,3 +28,5 @@ dbLoadTemplate$(OBJ): dbLoadTemplate_lex.c ../dbLoadTemplate.h
 clean::
 	@$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c 
 
+depends: dbLoadTemplate_lex.c
+
diff --git a/src/gdd/Makefile b/src/gdd/Makefile
index 3ac353650..b7d655e0c 100644
--- a/src/gdd/Makefile
+++ b/src/gdd/Makefile
@@ -67,7 +67,7 @@ dbMapper.o:	../gdd.h ../gddI.h ../gddContainer.h ../gddContainerI.h \
 
 # Rules for generated files
 #
-aitConvertGenerated.cc: $(EPICS_BASE_HOST_BIN)/aitGen$(HOSTEXE) ../aitTypes.h
+aitConvertGenerated.cc: $(EPICS_BASE_HOST_BIN)/aitGen$(HOSTEXE) aitTypes.h
 	$(EPICS_BASE_HOST_BIN)/aitGen$(HOSTEXE)
 
 $(COMMON_DIR)/gddApps.h : $(EPICS_BASE_HOST_BIN)/genApps$(HOSTEXE)
@@ -76,5 +76,7 @@ $(COMMON_DIR)/gddApps.h : $(EPICS_BASE_HOST_BIN)/genApps$(HOSTEXE)
 clean::
 	$(RM) aitConvertGenerated.cc gddApps.h
 
+depends: aitConvertGenerated.cc aitTypes.h
+
 #	EOF base/src/gdd/Makefile.Host:n
 
diff --git a/src/libCom/Makefile b/src/libCom/Makefile
index 348472eec..8c98fdecb 100644
--- a/src/libCom/Makefile
+++ b/src/libCom/Makefile
@@ -19,7 +19,7 @@ INC += epicsRingBytes.h
 INC += epicsReadline.h
 INC += osdReadline.h
 SRCS += epicsRingPointer.cpp
-SRCS += epicsRingBytes.cpp
+SRCS += epicsRingBytes.c
 SRCS += epicsReadline.c
 
 SRC_DIRS += $(LIBCOM)/calc
@@ -235,3 +235,5 @@ $(COMMON_DIR)/epicsVersion.h: $(TOP)/configure/CONFIG_BASE_VERSION
 clean::
 	@$(RM) errSymTbl.c envData.c
 
+depends: $(INSTALL_LIBS)
+
diff --git a/src/makeBaseApp/top/configure/Makefile b/src/makeBaseApp/top/configure/Makefile
index be4f418eb..fd63e6dea 100644
--- a/src/makeBaseApp/top/configure/Makefile
+++ b/src/makeBaseApp/top/configure/Makefile
@@ -16,3 +16,4 @@ CONFIG_APP_INCLUDE: $(TOP)/configure/RELEASE $(TOP)/configure/CONFIG_APP
 	@$(RM) $@
 	@$(PERL) $(TOOLS)/makeConfigAppInclude.pl $(EPICS_HOST_ARCH) $(T_A) $@ $(TOP)
 
+depends: install
diff --git a/src/toolsComm/antelope/Makefile b/src/toolsComm/antelope/Makefile
index 9840073c5..418e5cc43 100644
--- a/src/toolsComm/antelope/Makefile
+++ b/src/toolsComm/antelope/Makefile
@@ -20,3 +20,4 @@ PROD = antelope
 
 include $(TOP)/configure/RULES
 
+depends: $(INSTALL_PROD)
diff --git a/src/toolsComm/flex/Makefile b/src/toolsComm/flex/Makefile
index a15f55611..6423c23c9 100644
--- a/src/toolsComm/flex/Makefile
+++ b/src/toolsComm/flex/Makefile
@@ -42,4 +42,6 @@ include $(TOP)/configure/RULES
 clean::
 	$(RM) parse.c parse.h
 
+depends: $(INSTALL_PROD)
+
 #	EOF Makefile.Host for base/src/toolsComm/flex