diff --git a/src/tools/Makefile b/src/tools/Makefile
index 284871603..2aef4d5c0 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -24,7 +24,7 @@ PERL_MODULES += DBD/Record.pm
 PERL_MODULES += DBD/Registrar.pm
 PERL_MODULES += DBD/Variable.pm
 
-PERL_MODULES += databaseModuleDirs.pm
+PERL_SCRIPTS += databaseModuleDirs.pm
 
 PERL_SCRIPTS += makeIncludeDbd.pl
 
diff --git a/src/tools/dbExpand.pl b/src/tools/dbExpand.pl
index 79a324512..25cab26cc 100644
--- a/src/tools/dbExpand.pl
+++ b/src/tools/dbExpand.pl
@@ -12,8 +12,9 @@
 use strict;
 
 use FindBin qw($Bin);
-use lib "$Bin/../../lib/perl";
+use lib ($Bin, "$Bin/../../lib/perl");
 use databaseModuleDirs;
+no lib $Bin;
 
 use DBD;
 use DBD::Parser;
diff --git a/src/tools/dbdExpand.pl b/src/tools/dbdExpand.pl
index 18d5597ee..a87ef47bb 100644
--- a/src/tools/dbdExpand.pl
+++ b/src/tools/dbdExpand.pl
@@ -10,8 +10,9 @@
 use strict;
 
 use FindBin qw($Bin);
-use lib "$Bin/../../lib/perl";
+use lib ($Bin, "$Bin/../../lib/perl");
 use databaseModuleDirs;
+no lib $Bin;
 
 use DBD;
 use DBD::Parser;
diff --git a/src/tools/dbdReport.pl b/src/tools/dbdReport.pl
index 6f5dc681a..0d4c85494 100644
--- a/src/tools/dbdReport.pl
+++ b/src/tools/dbdReport.pl
@@ -8,8 +8,9 @@
 #*************************************************************************
 
 use FindBin qw($Bin);
-use lib "$Bin/../../lib/perl";
+use lib ($Bin, "$Bin/../../lib/perl");
 use databaseModuleDirs;
+no lib $Bin;
 
 use DBD;
 use DBD::Parser;
@@ -64,4 +65,3 @@ if (%recordtypes) {
 my @records = sort keys %{$dbd->records};
 print wrap("Records: ", "\t", join(', ', @records)), "\n"
         if @records;
-
diff --git a/src/tools/dbdToHtml.pl b/src/tools/dbdToHtml.pl
index a809920aa..76b187147 100644
--- a/src/tools/dbdToHtml.pl
+++ b/src/tools/dbdToHtml.pl
@@ -10,8 +10,9 @@
 use strict;
 
 use FindBin qw($Bin);
-use lib "$Bin/../../lib/perl";
+use lib ($Bin, "$Bin/../../lib/perl");
 use databaseModuleDirs;
+no lib $Bin;
 
 use DBD;
 use DBD::Parser;
@@ -244,4 +245,3 @@ sub DBD::Recfield::writable {
         if $special eq "SPC_DBADDR";
     return $fld->dbf_type eq "DBF_NOACCESS" ? 'No' : 'Yes';
 }
-
diff --git a/src/tools/dbdToMenuH.pl b/src/tools/dbdToMenuH.pl
index b646d3afd..6bdcb8a6a 100644
--- a/src/tools/dbdToMenuH.pl
+++ b/src/tools/dbdToMenuH.pl
@@ -8,8 +8,9 @@
 #*************************************************************************
 
 use FindBin qw($Bin);
-use lib "$Bin/../../lib/perl";
+use lib ($Bin, "$Bin/../../lib/perl");
 use databaseModuleDirs;
+no lib $Bin;
 
 use EPICS::Getopts;
 use File::Basename;
diff --git a/src/tools/dbdToRecordtypeH.pl b/src/tools/dbdToRecordtypeH.pl
index de9db4057..730599029 100644
--- a/src/tools/dbdToRecordtypeH.pl
+++ b/src/tools/dbdToRecordtypeH.pl
@@ -8,8 +8,9 @@
 #*************************************************************************
 
 use FindBin qw($Bin);
-use lib "$Bin/../../lib/perl";
+use lib ($Bin, "$Bin/../../lib/perl");
 use databaseModuleDirs;
+no lib $Bin;
 
 use EPICS::Getopts;
 use File::Basename;
@@ -168,7 +169,7 @@ sub newtables {
         "\n};\n\n";
     print OUTFILE "static const ${rn}FieldIndex ${rn}RecordLinkFieldIndices[] = {\n",
         join(",\n", map {
-                "    ${rn}Record" . $_->name; 
+                "    ${rn}Record" . $_->name;
             } grep {
                 $_->dbf_type =~ m/^DBF_(IN|OUT|FWD)LINK/;
             } $rtyp->fields),
@@ -209,7 +210,7 @@ sub newtables {
         print OUTFILE "    dbRegisterMenu(pbase, \&${name}MenuMetaData);\n";
     }
     print OUTFILE map {
-            "    ${rn}FieldMetaData[${rn}Record" . 
+            "    ${rn}FieldMetaData[${rn}Record" .
             $_->name .
             "].typDat.pmenu = \n".
             "        \&" .
@@ -219,7 +220,7 @@ sub newtables {
     print OUTFILE map {
                 "    ${rn}FieldMetaData[${rn}Record" .
                 $_->name .
-            "].typDat.base = CT_HEX;\n"; 
+            "].typDat.base = CT_HEX;\n";
             } grep {
                 $_->attribute('base') eq 'HEX';
             } $rtyp->fields;
diff --git a/src/tools/registerRecordDeviceDriver.pl b/src/tools/registerRecordDeviceDriver.pl
index 07bf8edb9..02bb9b772 100644
--- a/src/tools/registerRecordDeviceDriver.pl
+++ b/src/tools/registerRecordDeviceDriver.pl
@@ -6,14 +6,15 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 
 use strict;
 
 use FindBin qw($Bin);
-use lib "$Bin/../../lib/perl";
+use lib ($Bin, "$Bin/../../lib/perl");
 use databaseModuleDirs;
+no lib $Bin;
 
 use DBD;
 use DBD::Parser;