diff --git a/Digest.pm b/Digest.pm
index 2ae6eec..b7389ea 100644
--- a/Digest.pm
+++ b/Digest.pm
@@ -1,11 +1,11 @@
 package Digest;
 
 use strict;
-use vars qw($VERSION %MMAP $AUTOLOAD);
 
-$VERSION = "1.17";
+our $VERSION = "1.17";
+our $AUTOLOAD;
 
-%MMAP = (
+our %MMAP = (
   "SHA-1"      => [["Digest::SHA", 1], "Digest::SHA1", ["Digest::SHA2", 1]],
   "SHA-224"    => [["Digest::SHA", 224]],
   "SHA-256"    => [["Digest::SHA", 256], ["Digest::SHA2", 256]],
diff --git a/Digest/base.pm b/Digest/base.pm
index 2535901..c009975 100644
--- a/Digest/base.pm
+++ b/Digest/base.pm
@@ -1,8 +1,8 @@
 package Digest::base;
 
 use strict;
-use vars qw($VERSION);
-$VERSION = "1.16";
+
+our $VERSION = "1.16";
 
 # subclass is supposed to implement at least these
 sub new;
diff --git a/Digest/file.pm b/Digest/file.pm
index 3b86e63..d8e13cd 100644
--- a/Digest/file.pm
+++ b/Digest/file.pm
@@ -2,15 +2,12 @@ package Digest::file;
 
 use strict;
 
-use Exporter ();
+use Exporter qw(import);
 use Carp qw(croak);
 use Digest ();
 
-use vars qw($VERSION @ISA @EXPORT_OK);
-
-$VERSION = "1.16";
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(digest_file_ctx digest_file digest_file_hex digest_file_base64);
+our $VERSION = "1.16";
+our @EXPORT_OK = qw(digest_file_ctx digest_file digest_file_hex digest_file_base64);
 
 sub digest_file_ctx {
     my $file = shift;
diff --git a/t/base.t b/t/base.t
index 9fc861e..d19b42c 100644
--- a/t/base.t
+++ b/t/base.t
@@ -4,9 +4,7 @@ use Test::More tests => 13;
 
 {
    package LenDigest;
-   require Digest::base;
-   use vars qw(@ISA);
-   @ISA = qw(Digest::base);
+   use parent qw(Digest::base);
 
    sub new {
 	my $class = shift;
diff --git a/t/file.t b/t/file.t
index 79f32de..a3200fc 100644
--- a/t/file.t
+++ b/t/file.t
@@ -4,9 +4,9 @@ use Test::More tests => 5;
 
 {
    package Digest::Foo;
-   require Digest::base;
-   use vars qw(@ISA $VERSION);
-   @ISA = qw(Digest::base);
+   use parent qw(Digest::base);
+
+   our $VERSION;
 
    sub new {
 	my $class = shift;
diff --git a/t/lib/Digest/Dummy.pm b/t/lib/Digest/Dummy.pm
index b3db0db..dd5f0f1 100644
--- a/t/lib/Digest/Dummy.pm
+++ b/t/lib/Digest/Dummy.pm
@@ -1,11 +1,9 @@
 package Digest::Dummy;
 
 use strict;
-use vars qw($VERSION @ISA);
-$VERSION = 1;
+use parent qw(Digest::base);
 
-require Digest::base;
-@ISA = qw(Digest::base);
+our $VERSION = 1;
 
 sub new {
     my $class = shift;