diff --git a/configure/RULES.Db b/configure/RULES.Db
index 896e0b095..9ea256e04 100644
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -199,14 +199,14 @@ menu%.h$(DEP): menu%.dbd
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-%.dbd$(DEP): $(COMMON_DIR)/%Include.dbd 
+%.dbd$(DEP): %Include.dbd
 	@$(RM) $@
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-%.dbd$(DEP): %Include.dbd
+%.dbd$(DEP):
 	@$(RM) $@
-	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
+	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $($*_DBD) > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
 %.db$(RAW)$(DEP): %.substitutions
@@ -292,21 +292,16 @@ $(COMMON_DIR)/bpt%.dbd: bpt%.data
 	$(MAKEBPT) $< $(notdir $@)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd
-	$(ECHO) "Expanding created dbd file $(notdir $<)"
-	@$(RM) $(notdir $@)
-	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $<
-	@$(MV) $(notdir $@) $@
-
-$(COMMON_DIR)/%.dbd: %Include.dbd 
+$(COMMON_DIR)/%.dbd: %Include.dbd
 	$(ECHO) "Expanding dbd file $<"
 	@$(RM) $(notdir $@)
 	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%Include.dbd:
+$(COMMON_DIR)/%.dbd:
+	$(ECHO) "Creating dbd file $(notdir $<)"
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/makeIncludeDbd.pl $($*_DBD) $(notdir $@)
+	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $($*_DBD)
 	@$(MV) $(notdir $@) $@
 
 $(INSTALL_DBD)/%: $(COMMON_DIR)/%
diff --git a/src/tools/Makefile b/src/tools/Makefile
index cff0e8f5e..496b0e4d1 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -38,7 +38,6 @@ PERL_SCRIPTS += dos2unix.pl
 PERL_SCRIPTS += expandVars.pl
 PERL_SCRIPTS += fullPathName.pl
 PERL_SCRIPTS += installEpics.pl
-PERL_SCRIPTS += makeIncludeDbd.pl
 PERL_SCRIPTS += makeMakefile.pl
 PERL_SCRIPTS += makeTestfile.pl
 PERL_SCRIPTS += mkmf.pl
diff --git a/src/tools/makeIncludeDbd.pl b/src/tools/makeIncludeDbd.pl
deleted file mode 100644
index c0b8238db..000000000
--- a/src/tools/makeIncludeDbd.pl
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env perl
-#*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-#     National Laboratory.
-# Copyright (c) 2002 The Regents of the University of California, as
-#     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
-#*************************************************************************
-#
-# $Revision-Id$
-
-use File::Basename;
-
-sub Usage
-{
-	my ($txt) = @_;
-
-	print "Usage:\n";
-	print "\tmakeIncludeDbd.pl infile1 [ infile2 infile3 ...] outfile\n";
-	print "\nError: $txt\n" if $txt;
-
-	exit 2;
-}
-
-# need at least two args: ARGV[0] and ARGV[1]
-Usage("\"makeIncludeDbd.pl @ARGV\": No input files specified") if $#ARGV < 1;
-
-$target=$ARGV[$#ARGV];
-@sources=@ARGV[0..$#ARGV-1];
-
-open(OUT, "> $target") or die "Cannot create $target\n";;
-foreach $file ( @sources )
-{
-	$base=basename($file);
-	print OUT "include \"$base\"\n";
-}
-
-close OUT;
-
-#   EOF makeIncludeDbd.pl
-