diff --git a/src/dbHost/dbdReport b/src/dbHost/dbdReport
index bd6cd5a32..303782879 100755
--- a/src/dbHost/dbdReport
+++ b/src/dbHost/dbdReport
@@ -16,7 +16,7 @@ use DBD;
 use DBD::Parser;
 use EPICS::Getopts;
 use EPICS::macLib;
-use Readfile;
+use EPICS::Readfile;
 use Text::Wrap;
 
 #$EPICS::Readfile::debug = 1;
diff --git a/src/dbHost/dbdToHtml.pl b/src/dbHost/dbdToHtml.pl
index a6fb69dfc..936cbf48c 100644
--- a/src/dbHost/dbdToHtml.pl
+++ b/src/dbHost/dbdToHtml.pl
@@ -16,7 +16,7 @@ use DBD;
 use DBD::Parser;
 use EPICS::Getopts;
 use EPICS::macLib;
-use Readfile;
+use EPICS::Readfile;
 
 my $tool = 'dbdToHtml';
 getopts('DI@o:') or
diff --git a/src/dbHost/test/Recfield.pl b/src/dbHost/test/Recfield.pl
index 92833ecd3..45f4e455c 100644
--- a/src/dbHost/test/Recfield.pl
+++ b/src/dbHost/test/Recfield.pl
@@ -26,7 +26,7 @@ ok $fld_char->legal_value("-128"), 'Legal - value';
 ok $fld_char->legal_value("127"), 'Legal + value';
 ok !$fld_char->legal_value("0x80"), 'Illegal + hex value';
 $fld_char->check_valid;
-like $fld_char->toDeclaration, qr/^\s*signed\s+char\s+chr;\s*$/, "C declaration";
+like $fld_char->toDeclaration, qr/^\s*epicsInt8\s+chr;\s*$/, "C declaration";
 
 my $fld_uchar = DBD::Recfield->new('uchr', 'DBF_UCHAR');
 isa_ok $fld_uchar, 'DBD::Recfield';
@@ -38,7 +38,7 @@ ok $fld_uchar->legal_value("0"), 'Legal 0 value';
 ok $fld_uchar->legal_value("0377"), 'Legal + value';
 ok !$fld_uchar->legal_value("0400"), 'Illegal + octal value';
 $fld_uchar->check_valid;
-like $fld_uchar->toDeclaration, qr/^\s*unsigned\s+char\s+uchr;\s*$/, "C declaration";
+like $fld_uchar->toDeclaration, qr/^\s*epicsUInt8\s+uchr;\s*$/, "C declaration";
 
 my $fld_short = DBD::Recfield->new('shrt', 'DBF_SHORT');
 isa_ok $fld_short, 'DBD::Recfield';
@@ -50,7 +50,7 @@ ok $fld_short->legal_value("-32768"), 'Legal - value';
 ok $fld_short->legal_value("32767"), 'Legal + value';
 ok !$fld_short->legal_value("0x8000"), 'Illegal + hex value';
 $fld_short->check_valid;
-like $fld_short->toDeclaration, qr/^\s*short\s+shrt;\s*$/, "C declaration";
+like $fld_short->toDeclaration, qr/^\s*epicsInt16\s+shrt;\s*$/, "C declaration";
 
 my $fld_ushort = DBD::Recfield->new('ushrt', 'DBF_USHORT');
 isa_ok $fld_ushort, 'DBD::Recfield';
@@ -62,7 +62,7 @@ ok $fld_ushort->legal_value("0"), 'Legal 0 value';
 ok $fld_ushort->legal_value("65535"), 'Legal + value';
 ok !$fld_ushort->legal_value("0x10000"), 'Illegal + hex value';
 $fld_ushort->check_valid;
-like $fld_ushort->toDeclaration, qr/^\s*unsigned\s+short\s+ushrt;\s*$/, "C declaration";
+like $fld_ushort->toDeclaration, qr/^\s*epicsUInt16\s+ushrt;\s*$/, "C declaration";
 
 my $fld_long = DBD::Recfield->new('lng', 'DBF_LONG');
 isa_ok $fld_long, 'DBD::Recfield';
@@ -85,7 +85,7 @@ ok $fld_ulong->legal_value("00"), 'Legal 0 value';
 ok $fld_ulong->legal_value("0xffffffff"), 'Legal + value';
 ok !$fld_ulong->legal_value("0xfacepaint"), 'Illegal value';
 $fld_ulong->check_valid;
-like $fld_ulong->toDeclaration, qr/^\s*unsigned\s+long\s+ulng;\s*$/, "C declaration";
+like $fld_ulong->toDeclaration, qr/^\s*epicsUInt32\s+ulng;\s*$/, "C declaration";
 
 my $fld_float = DBD::Recfield->new('flt', 'DBF_FLOAT');
 isa_ok $fld_float, 'DBD::Recfield';
@@ -96,7 +96,7 @@ ok $fld_float->legal_value("-1.2345678e9"), 'Legal - value';
 ok $fld_float->legal_value("0.12345678e9"), 'Legal + value';
 ok !$fld_float->legal_value("0x1.5"), 'Illegal value';
 $fld_float->check_valid;
-like $fld_float->toDeclaration, qr/^\s*float\s+flt;\s*$/, "C declaration";
+like $fld_float->toDeclaration, qr/^\s*epicsFloat32\s+flt;\s*$/, "C declaration";
 
 my $fld_double = DBD::Recfield->new('dbl', 'DBF_DOUBLE');
 isa_ok $fld_double, 'DBD::Recfield';
@@ -107,5 +107,5 @@ ok $fld_double->legal_value("-12345e-67"), 'Legal - value';
 ok $fld_double->legal_value("12345678e+9"), 'Legal + value';
 ok !$fld_double->legal_value("e5"), 'Illegal value';
 $fld_double->check_valid;
-like $fld_double->toDeclaration, qr/^\s*double\s+dbl;\s*$/, "C declaration";
+like $fld_double->toDeclaration, qr/^\s*epicsFloat64\s+dbl;\s*$/, "C declaration";
 
diff --git a/src/dbHost/test/macLib.pl b/src/dbHost/test/macLib.pl
index db0a3122b..e8419baa6 100644
--- a/src/dbHost/test/macLib.pl
+++ b/src/dbHost/test/macLib.pl
@@ -1,13 +1,16 @@
 #!/usr/bin/perl
 
+use FindBin qw($Bin);
+use lib "$Bin/../../../lib/perl";
+
 use Test::More tests => 34;
 
-use macLib;
+use EPICS::macLib;
 
 use Data::Dumper;
 
-my $m = macLib->new;
-isa_ok $m, 'macLib';
+my $m = EPICS::macLib->new;
+isa_ok $m, 'EPICS::macLib';
 is $m->expandString(''), '', 'Empty string';
 is $m->expandString('$(undef)'), undef, 'Warning $(undef)';