diff --git a/src/as/Makefile b/src/as/Makefile
index cd27608f9..8188dcf0f 100644
--- a/src/as/Makefile
+++ b/src/as/Makefile
@@ -21,6 +21,7 @@ asIoc_DLL_LIBS  = dbIoc dbStaticIoc ca Com
 asHost_DIR=.
 PROD_LIBS = asHost dbStaticHost Com
 PROD_HOST = ascheck
+ascheck_SRCS = ascheck.c
 
 asHost_RCS_WIN32 = asHost.rc
 asIoc_RCS_WIN32 = asIoc.rc
@@ -34,13 +35,10 @@ include $(TOP)/configure/RULES
 # Extra rule since asLib_lex.c is included in asLib.c
 #   In my opinion, these objects should really be built
 #   independently.
-asLib$(OBJ): asLib_lex.c ../asLibRoutines.c
+asLib.c: asLib_lex.c ../asLibRoutines.c
 
 $(INSTALL_INC)/asLib.h:../asLib.h
 
 clean::
 	@$(RM) asLib.c asLib_lex.c 
 
-depends: asLib.c
-asLib.c : asLib_lex.c
-
diff --git a/src/bpt/Makefile b/src/bpt/Makefile
index c9f58691b..960bed5c8 100644
--- a/src/bpt/Makefile
+++ b/src/bpt/Makefile
@@ -13,9 +13,9 @@ DBD += bptTypeKdegF.dbd
 
 PROD_LIBS = dbStaticHost Com
 PROD_HOST += makeBpt
+makeBpt_SRCS=makeBpt
 
 include $(TOP)/configure/RULES
 
-inc: $(INSTALL_PROD)
+$(COMMON_DBDS): $(INSTALL_PROD)
 
-depends: $(INSTALL_PROD)
diff --git a/src/db/dbChannelIO.cpp b/src/db/dbChannelIO.cpp
index 0157c6a6a..c355f4e6d 100644
--- a/src/db/dbChannelIO.cpp
+++ b/src/db/dbChannelIO.cpp
@@ -15,7 +15,7 @@
  *	505 665 1831
  */
 
-#include "limits.h"
+#include <limits.h>
 
 #include "cacIO.h"
 #include "tsFreeList.h"
diff --git a/src/db/dbPutNotifyBlocker.cpp b/src/db/dbPutNotifyBlocker.cpp
index 978f5423c..2348a6926 100644
--- a/src/db/dbPutNotifyBlocker.cpp
+++ b/src/db/dbPutNotifyBlocker.cpp
@@ -16,8 +16,8 @@
  *	505 665 1831
  */
 
-#include "limits.h"
-#include "string.h"
+#include <limits.h>
+#include <string.h>
 
 #include "epicsMutex.h"
 #include "epicsEvent.h"
diff --git a/src/db/dbServiceIO.cpp b/src/db/dbServiceIO.cpp
index 6329b5a21..fe0bd9cfa 100644
--- a/src/db/dbServiceIO.cpp
+++ b/src/db/dbServiceIO.cpp
@@ -15,7 +15,7 @@
  *	505 665 1831
  */
 
-#include "limits.h"
+#include <limits.h>
 
 #include "epicsMutex.h"
 #include "tsFreeList.h"
diff --git a/src/db/dbSubscriptionIO.cpp b/src/db/dbSubscriptionIO.cpp
index d5def6183..ff0030085 100644
--- a/src/db/dbSubscriptionIO.cpp
+++ b/src/db/dbSubscriptionIO.cpp
@@ -15,7 +15,7 @@
  *	505 665 1831
  */
 
-#include "limits.h"
+#include <limits.h>
 
 #include "epicsMutex.h"
 #include "epicsEvent.h"
diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile
index c5a0cfca3..311914933 100644
--- a/src/dbStatic/Makefile
+++ b/src/dbStatic/Makefile
@@ -34,6 +34,11 @@ PROD_LIBS := dbStaticHost Com
 dbStaticHost_DIR=.
 PROD_HOST = dbReadTest dbExpand dbToMenuH dbToRecordtypeH
 PROD_HOST +=  dbMakeDBDDepends
+dbReadTest_SRCS = dbReadTest.c
+dbExpand_SRCS = dbExpand.c
+dbToMenuH_SRCS = dbToMenuH.c
+dbToRecordtypeH_SRCS = dbToRecordtypeH.c
+dbMakeDBDDepends_SRCS = dbMakeDBDDepends.c
 
 dbStaticHost_RCS_WIN32 = dbStaticHost.rc
 dbStaticIoc_RCS_WIN32 = dbStaticIoc.rc
@@ -41,7 +46,7 @@ dbStaticIoc_RCS_WIN32 = dbStaticIoc.rc
 include $(TOP)/configure/RULES
 
 # Extra rule since dbLexRoutines.c is included in dbYacc.c
-dbYacc$(OBJ): dbLex.c ../dbLexRoutines.c
+dbYacc.c: dbLex.c ../dbLexRoutines.c
 
 clean::
 	@$(RM) dbLex.c dbYacc.c 
diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile
index 085a829ca..3fd436a80 100644
--- a/src/dbtools/Makefile
+++ b/src/dbtools/Makefile
@@ -27,10 +27,8 @@ include $(TOP)/configure/RULES
 #	These lex sources are included in some C sources,
 #	so they have to be created in time:
 #
-dbLoadTemplate$(OBJ): dbLoadTemplate_lex.c ../dbLoadTemplate.h
+dbLoadTemplate.c: 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 99cb1e034..4c89e0cb4 100644
--- a/src/gdd/Makefile
+++ b/src/gdd/Makefile
@@ -80,7 +80,7 @@ $(COMMON_DIR)/gddApps.h : $(INSTALL_HOST_BIN)/genApps$(HOSTEXE)
 clean::
 	$(RM) aitConvertGenerated.cc gddApps.h
 
-depends: aitConvertGenerated.cc aitTypes.h
+aitConvert$(OBJ): aitConvertGenerated.cc
 
 #	EOF base/src/gdd/Makefile.Host:n
 
diff --git a/src/toolsComm/antelope/Makefile b/src/toolsComm/antelope/Makefile
index 1a59e4588..6063f5e56 100644
--- a/src/toolsComm/antelope/Makefile
+++ b/src/toolsComm/antelope/Makefile
@@ -20,4 +20,4 @@ PROD_HOST = antelope
 
 include $(TOP)/configure/RULES
 
-inc depends: $(INSTALL_PROD)
+inc: $(INSTALL_PROD)