11 files changed, 18 insertions, 9 deletions
diff --git a/extensions/TrackingFlags/Config.pm b/extensions/TrackingFlags/Config.pm
index 1854cb9fd..d0bc5ca20 100644
--- a/extensions/TrackingFlags/Config.pm
+++ b/extensions/TrackingFlags/Config.pm
@@ -6,7 +6,10 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::TrackingFlags;
+
+use 5.10.1;
 use strict;
+use warnings;
 
 use constant NAME => 'TrackingFlags';
 
diff --git a/extensions/TrackingFlags/Extension.pm b/extensions/TrackingFlags/Extension.pm
index 08e7968a0..5f6715fc8 100644
--- a/extensions/TrackingFlags/Extension.pm
+++ b/extensions/TrackingFlags/Extension.pm
@@ -7,7 +7,9 @@
 
 package Bugzilla::Extension::TrackingFlags;
 
+use 5.10.1;
 use strict;
+use warnings;
 
 use base qw(Bugzilla::Extension);
 
diff --git a/extensions/TrackingFlags/bin/bug_825946.pl b/extensions/TrackingFlags/bin/bug_825946.pl
index 2531228de..8f48a671a 100755
--- a/extensions/TrackingFlags/bin/bug_825946.pl
+++ b/extensions/TrackingFlags/bin/bug_825946.pl
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../../..";
+use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/TrackingFlags/bin/bulk_flag_clear.pl b/extensions/TrackingFlags/bin/bulk_flag_clear.pl
index 1eff355fe..6b05a50a3 100755
--- a/extensions/TrackingFlags/bin/bulk_flag_clear.pl
+++ b/extensions/TrackingFlags/bin/bulk_flag_clear.pl
@@ -9,10 +9,8 @@
 use strict;
 use warnings;
 
-use FindBin '$RealBin';
-use lib "$RealBin/../../..";
-use lib "$RealBin/../../../lib";
-use lib "$RealBin/../lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/TrackingFlags/bin/migrate_tracking_flags.pl b/extensions/TrackingFlags/bin/migrate_tracking_flags.pl
index 06b3596c4..bca03f9f9 100755
--- a/extensions/TrackingFlags/bin/migrate_tracking_flags.pl
+++ b/extensions/TrackingFlags/bin/migrate_tracking_flags.pl
@@ -12,10 +12,8 @@
 use strict;
 use warnings;
 
-use FindBin '$RealBin';
-use lib "$RealBin/../../..";
-use lib "$RealBin/../../../lib";
-use lib "$RealBin/../lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/TrackingFlags/lib/Admin.pm b/extensions/TrackingFlags/lib/Admin.pm
index 1adcad241..50a0e0a61 100644
--- a/extensions/TrackingFlags/lib/Admin.pm
+++ b/extensions/TrackingFlags/lib/Admin.pm
@@ -7,6 +7,7 @@
 
 package Bugzilla::Extension::TrackingFlags::Admin;
 
+use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/TrackingFlags/lib/Constants.pm b/extensions/TrackingFlags/lib/Constants.pm
index 0b1ae3a1a..00827aa7a 100644
--- a/extensions/TrackingFlags/lib/Constants.pm
+++ b/extensions/TrackingFlags/lib/Constants.pm
@@ -7,7 +7,10 @@
 
 package Bugzilla::Extension::TrackingFlags::Constants;
 
+use 5.10.1;
 use strict;
+use warnings;
+
 use base qw(Exporter);
 
 our @EXPORT = qw(
diff --git a/extensions/TrackingFlags/lib/Flag.pm b/extensions/TrackingFlags/lib/Flag.pm
index 7b6effa98..82c0314e3 100644
--- a/extensions/TrackingFlags/lib/Flag.pm
+++ b/extensions/TrackingFlags/lib/Flag.pm
@@ -9,6 +9,7 @@ package Bugzilla::Extension::TrackingFlags::Flag;
 
 use base qw(Bugzilla::Object);
 
+use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/TrackingFlags/lib/Flag/Bug.pm b/extensions/TrackingFlags/lib/Flag/Bug.pm
index 74b2814fa..7be661720 100644
--- a/extensions/TrackingFlags/lib/Flag/Bug.pm
+++ b/extensions/TrackingFlags/lib/Flag/Bug.pm
@@ -9,6 +9,7 @@ package Bugzilla::Extension::TrackingFlags::Flag::Bug;
 
 use base qw(Bugzilla::Object);
 
+use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/TrackingFlags/lib/Flag/Value.pm b/extensions/TrackingFlags/lib/Flag/Value.pm
index 15be61bc7..4f2aacc3a 100644
--- a/extensions/TrackingFlags/lib/Flag/Value.pm
+++ b/extensions/TrackingFlags/lib/Flag/Value.pm
@@ -9,6 +9,7 @@ package Bugzilla::Extension::TrackingFlags::Flag::Value;
 
 use base qw(Bugzilla::Object);
 
+use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/TrackingFlags/lib/Flag/Visibility.pm b/extensions/TrackingFlags/lib/Flag/Visibility.pm
index 7600d71bd..878c16f99 100644
--- a/extensions/TrackingFlags/lib/Flag/Visibility.pm
+++ b/extensions/TrackingFlags/lib/Flag/Visibility.pm
@@ -9,6 +9,7 @@ package Bugzilla::Extension::TrackingFlags::Flag::Visibility;
 
 use base qw(Bugzilla::Object);
 
+use 5.10.1;
 use strict;
 use warnings;