Revert "Bug 1283930 - Add Makefile.PL & local/lib/perl5 support to bmo/master + local symlink to data/ directory"

This reverts commit e6bf4cacb10f86077fe898349485f5c7ab9fb4b6.
author: Dylan William Hardison <dylan@hardison.net> 2016-09-12 22:22:17 +0200
committer: Dylan William Hardison <dylan@hardison.net> 2016-09-12 22:22:17 +0200
commit: 14bcdce1dc6029c3676c3640d8148c83c14692e5 (patch)
tree: 99d760e13b687f8111635916d9ed3937bc084c64 /extensions
parent: e6bf4cacb10f86077fe898349485f5c7ab9fb4b6 (diff)
download: bugzilla-14bcdce1dc6029c3676c3640d8148c83c14692e5.tar.gz
bugzilla-14bcdce1dc6029c3676c3640d8148c83c14692e5.tar.xz
201 files changed, 246 insertions, 487 deletions
diff --git a/extensions/AntiSpam/Config.pm b/extensions/AntiSpam/Config.pm
index e16add9b7..92c32f629 100644
--- a/extensions/AntiSpam/Config.pm
+++ b/extensions/AntiSpam/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::AntiSpam;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'AntiSpam';
 use constant REQUIRED_MODULES => [
diff --git a/extensions/AntiSpam/Extension.pm b/extensions/AntiSpam/Extension.pm
index 19eddb4e7..2abba291d 100644
--- a/extensions/AntiSpam/Extension.pm
+++ b/extensions/AntiSpam/Extension.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::AntiSpam;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/AntiSpam/lib/Config.pm b/extensions/AntiSpam/lib/Config.pm
index b6d1234d9..754907d22 100644
--- a/extensions/AntiSpam/lib/Config.pm
+++ b/extensions/AntiSpam/lib/Config.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::AntiSpam::Config;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/Config.pm b/extensions/BMO/Config.pm
index 153af24cb..93445f576 100644
--- a/extensions/BMO/Config.pm
+++ b/extensions/BMO/Config.pm
@@ -20,10 +20,7 @@
 #   Gervase Markham <gerv@gerv.net>
 
 package Bugzilla::Extension::BMO;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'BMO';
 
diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index ac0acd72d..5b87d2e8b 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -22,11 +22,7 @@
 #   Byron Jones <glob@mozilla.com>
 
 package Bugzilla::Extension::BMO;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::BugMail;
diff --git a/extensions/BMO/bin/bug_1022707.pl b/extensions/BMO/bin/bug_1022707.pl
index b0a49aa65..c27757220 100755
--- a/extensions/BMO/bin/bug_1022707.pl
+++ b/extensions/BMO/bin/bug_1022707.pl
@@ -11,7 +11,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 use Bugzilla;
 use Bugzilla::Constants qw( USAGE_MODE_CMDLINE );
diff --git a/extensions/BMO/bin/bug_1093952.pl b/extensions/BMO/bin/bug_1093952.pl
index a784e63a3..55d68b9be 100755
--- a/extensions/BMO/bin/bug_1093952.pl
+++ b/extensions/BMO/bin/bug_1093952.pl
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 use Bugzilla;
 use Bugzilla::Component;
diff --git a/extensions/BMO/bin/bug_1141452.pl b/extensions/BMO/bin/bug_1141452.pl
index d2d260d7b..0d9b891ea 100755
--- a/extensions/BMO/bin/bug_1141452.pl
+++ b/extensions/BMO/bin/bug_1141452.pl
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/BMO/bin/migrate-github-pull-requests.pl b/extensions/BMO/bin/migrate-github-pull-requests.pl
index 11bf8c55f..1d84352a2 100755
--- a/extensions/BMO/bin/migrate-github-pull-requests.pl
+++ b/extensions/BMO/bin/migrate-github-pull-requests.pl
@@ -11,7 +11,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/BMO/lib/Constants.pm b/extensions/BMO/lib/Constants.pm
index 3670cb9a2..c77e14f7b 100644
--- a/extensions/BMO/lib/Constants.pm
+++ b/extensions/BMO/lib/Constants.pm
@@ -6,11 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Constants;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Exporter);
 our @EXPORT = qw(
     REQUEST_MAX_ATTACH_LINES
diff --git a/extensions/BMO/lib/Data.pm b/extensions/BMO/lib/Data.pm
index d4c2e3012..b074cb64a 100644
--- a/extensions/BMO/lib/Data.pm
+++ b/extensions/BMO/lib/Data.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Data;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Exporter);
 use Tie::IxHash;
diff --git a/extensions/BMO/lib/FakeBug.pm b/extensions/BMO/lib/FakeBug.pm
index f84835ddd..6127cb560 100644
--- a/extensions/BMO/lib/FakeBug.pm
+++ b/extensions/BMO/lib/FakeBug.pm
@@ -3,9 +3,7 @@ package Bugzilla::Extension::BMO::FakeBug;
 # hack to allow the bug entry templates to use check_can_change_field to see if
 # various field values should be available to the current user
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use Bugzilla::Bug;
 
diff --git a/extensions/BMO/lib/Reports/Groups.pm b/extensions/BMO/lib/Reports/Groups.pm
index ce7df767c..a4816f914 100644
--- a/extensions/BMO/lib/Reports/Groups.pm
+++ b/extensions/BMO/lib/Reports/Groups.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::Groups;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/Reports/Internship.pm b/extensions/BMO/lib/Reports/Internship.pm
index 2dfa583a6..cad403d09 100644
--- a/extensions/BMO/lib/Reports/Internship.pm
+++ b/extensions/BMO/lib/Reports/Internship.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::Internship;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/Reports/ProductSecurity.pm b/extensions/BMO/lib/Reports/ProductSecurity.pm
index e7ccda171..2324e725a 100644
--- a/extensions/BMO/lib/Reports/ProductSecurity.pm
+++ b/extensions/BMO/lib/Reports/ProductSecurity.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::ProductSecurity;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/Reports/Recruiting.pm b/extensions/BMO/lib/Reports/Recruiting.pm
index 39eb8327d..bd988d9b1 100644
--- a/extensions/BMO/lib/Reports/Recruiting.pm
+++ b/extensions/BMO/lib/Reports/Recruiting.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::Recruiting;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/Reports/ReleaseTracking.pm b/extensions/BMO/lib/Reports/ReleaseTracking.pm
index b6c7c4520..8894a5169 100644
--- a/extensions/BMO/lib/Reports/ReleaseTracking.pm
+++ b/extensions/BMO/lib/Reports/ReleaseTracking.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::ReleaseTracking;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/Reports/Triage.pm b/extensions/BMO/lib/Reports/Triage.pm
index e9a987b54..debb50577 100644
--- a/extensions/BMO/lib/Reports/Triage.pm
+++ b/extensions/BMO/lib/Reports/Triage.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::Triage;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use Bugzilla::Component;
 use Bugzilla::Constants;
diff --git a/extensions/BMO/lib/Reports/UserActivity.pm b/extensions/BMO/lib/Reports/UserActivity.pm
index 8dfe0c5cd..0a8e79e1f 100644
--- a/extensions/BMO/lib/Reports/UserActivity.pm
+++ b/extensions/BMO/lib/Reports/UserActivity.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Reports::UserActivity;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/Util.pm b/extensions/BMO/lib/Util.pm
index dc9c904f9..df781b9d2 100644
--- a/extensions/BMO/lib/Util.pm
+++ b/extensions/BMO/lib/Util.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BMO::Util;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BMO/lib/WebService.pm b/extensions/BMO/lib/WebService.pm
index 6ee7cfa6e..87d45085e 100644
--- a/extensions/BMO/lib/WebService.pm
+++ b/extensions/BMO/lib/WebService.pm
@@ -19,7 +19,6 @@
 
 package Bugzilla::Extension::BMO::WebService;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Bitly/Config.pm b/extensions/Bitly/Config.pm
index a07df0f1b..aff9d4b4b 100644
--- a/extensions/Bitly/Config.pm
+++ b/extensions/Bitly/Config.pm
@@ -6,21 +6,32 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Bitly;
-
-use 5.10.1;
 use strict;
-use warnings;
+
+use Bugzilla::Install::Util qw(vers_cmp);
 
 use constant NAME => 'Bitly';
 
 sub REQUIRED_MODULES {
-    return [
-        {
-            package => 'LWP',
-            module  => 'LWP',
-            version => '5.835',
-        },
-    ];
+    my @required;
+    push @required, {
+        package => 'LWP',
+        module  => 'LWP',
+        version => 5,
+    };
+    # LWP 6 split https support into a separate package
+    if (Bugzilla::Install::Requirements::have_vers({
+        package => 'LWP',
+        module  => 'LWP',
+        version => 6,
+    })) {
+        push @required, {
+            package => 'LWP-Protocol-https',
+            module  => 'LWP::Protocol::https',
+            version => 0
+        };
+    }
+    return \@required;
 }
 
 use constant OPTIONAL_MODULES => [
@@ -31,6 +42,4 @@ use constant OPTIONAL_MODULES => [
     },
 ];
 
-use constant API_VERSION_MAP  => { '1_0' => '1_0' };
-
 __PACKAGE__->NAME;
diff --git a/extensions/Bitly/Extension.pm b/extensions/Bitly/Extension.pm
index 82f17bc2a..a368b20fe 100644
--- a/extensions/Bitly/Extension.pm
+++ b/extensions/Bitly/Extension.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Bitly;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Bitly/lib/WebService.pm b/extensions/Bitly/lib/WebService.pm
index b8ada56d2..b47accda6 100644
--- a/extensions/Bitly/lib/WebService.pm
+++ b/extensions/Bitly/lib/WebService.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Bitly::WebService;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BugModal/Config.pm b/extensions/BugModal/Config.pm
index 25a864e6e..a60a99a7a 100644
--- a/extensions/BugModal/Config.pm
+++ b/extensions/BugModal/Config.pm
@@ -6,9 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BugModal;
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'BugModal';
 use constant REQUIRED_MODULES => [ ];
diff --git a/extensions/BugModal/Extension.pm b/extensions/BugModal/Extension.pm
index fb3a69cc7..01faf06d5 100644
--- a/extensions/BugModal/Extension.pm
+++ b/extensions/BugModal/Extension.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::BugModal;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BugModal/lib/ActivityStream.pm b/extensions/BugModal/lib/ActivityStream.pm
index 708c056d4..c9e053934 100644
--- a/extensions/BugModal/lib/ActivityStream.pm
+++ b/extensions/BugModal/lib/ActivityStream.pm
@@ -9,8 +9,6 @@ package Bugzilla::Extension::BugModal::ActivityStream;
 1;
 
 package Bugzilla::Bug;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BugModal/lib/MonkeyPatches.pm b/extensions/BugModal/lib/MonkeyPatches.pm
index 88fce11af..61f945a87 100644
--- a/extensions/BugModal/lib/MonkeyPatches.pm
+++ b/extensions/BugModal/lib/MonkeyPatches.pm
@@ -9,8 +9,6 @@ package Bugzilla::Extension::BugModal::MonkeyPatches;
 1;
 
 package Bugzilla;
-
-use 5.10.1;
 use strict;
 use warnings;
 
@@ -24,8 +22,6 @@ sub treeherder_user {
 }
 
 package Bugzilla::Bug;
-
-use 5.10.1;
 use strict;
 use warnings;
 
@@ -41,8 +37,6 @@ sub active_attachments {
 1;
 
 package Bugzilla::User;
-
-use 5.10.1;
 use strict;
 use warnings;
 
@@ -66,8 +60,6 @@ sub moz_nick {
 1;
 
 package Bugzilla::Attachment;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BugModal/lib/Util.pm b/extensions/BugModal/lib/Util.pm
index 6a453159e..74311197a 100644
--- a/extensions/BugModal/lib/Util.pm
+++ b/extensions/BugModal/lib/Util.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BugModal::Util;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BugModal/lib/WebService.pm b/extensions/BugModal/lib/WebService.pm
index 338129e9b..7a05f263b 100644
--- a/extensions/BugModal/lib/WebService.pm
+++ b/extensions/BugModal/lib/WebService.pm
@@ -6,7 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BugModal::WebService;
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BugmailFilter/Config.pm b/extensions/BugmailFilter/Config.pm
index 5948c3b64..9932afb40 100644
--- a/extensions/BugmailFilter/Config.pm
+++ b/extensions/BugmailFilter/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BugmailFilter;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'BugmailFilter';
 use constant REQUIRED_MODULES => [];
diff --git a/extensions/BugmailFilter/Extension.pm b/extensions/BugmailFilter/Extension.pm
index d4d7bb790..dc38e8577 100644
--- a/extensions/BugmailFilter/Extension.pm
+++ b/extensions/BugmailFilter/Extension.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BugmailFilter;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BugmailFilter/lib/Constants.pm b/extensions/BugmailFilter/lib/Constants.pm
index a6636dda7..20e5480d0 100644
--- a/extensions/BugmailFilter/lib/Constants.pm
+++ b/extensions/BugmailFilter/lib/Constants.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BugmailFilter::Constants;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Exporter);
 
diff --git a/extensions/BugmailFilter/lib/FakeField.pm b/extensions/BugmailFilter/lib/FakeField.pm
index e9f8b1808..88e4ac1ca 100644
--- a/extensions/BugmailFilter/lib/FakeField.pm
+++ b/extensions/BugmailFilter/lib/FakeField.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::BugmailFilter::FakeField;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BugmailFilter/lib/Filter.pm b/extensions/BugmailFilter/lib/Filter.pm
index 7f2f4cb87..d59e19fb7 100644
--- a/extensions/BugmailFilter/lib/Filter.pm
+++ b/extensions/BugmailFilter/lib/Filter.pm
@@ -9,7 +9,6 @@ package Bugzilla::Extension::BugmailFilter::Filter;
 
 use base qw(Bugzilla::Object);
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/BzAPI/Config.pm b/extensions/BzAPI/Config.pm
index bd463b4ba..89b8c1e02 100644
--- a/extensions/BzAPI/Config.pm
+++ b/extensions/BzAPI/Config.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::BzAPI;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'BzAPI';
 
diff --git a/extensions/BzAPI/Extension.pm b/extensions/BzAPI/Extension.pm
index bb9805134..f233b26e4 100644
--- a/extensions/BzAPI/Extension.pm
+++ b/extensions/BzAPI/Extension.pm
@@ -7,10 +7,7 @@
 
 package Bugzilla::Extension::BzAPI;
 
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::Extension::BzAPI::Constants;
diff --git a/extensions/BzAPI/lib/Constants.pm b/extensions/BzAPI/lib/Constants.pm
index fb611aae6..65ae00480 100644
--- a/extensions/BzAPI/lib/Constants.pm
+++ b/extensions/BzAPI/lib/Constants.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::BzAPI::Constants;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Exporter);
 our @EXPORT = qw(
diff --git a/extensions/BzAPI/lib/Resources/Bug.pm b/extensions/BzAPI/lib/Resources/Bug.pm
index f3ff41049..77b567421 100644
--- a/extensions/BzAPI/lib/Resources/Bug.pm
+++ b/extensions/BzAPI/lib/Resources/Bug.pm
@@ -9,7 +9,6 @@ package Bugzilla::Extension::BzAPI::Resources::Bug;
 
 use 5.10.1;
 use strict;
-use warnings;
 
 use Bugzilla::Bug;
 use Bugzilla::Error;
diff --git a/extensions/BzAPI/lib/Resources/Bugzilla.pm b/extensions/BzAPI/lib/Resources/Bugzilla.pm
index f39cd29f3..96b07297e 100644
--- a/extensions/BzAPI/lib/Resources/Bugzilla.pm
+++ b/extensions/BzAPI/lib/Resources/Bugzilla.pm
@@ -9,7 +9,6 @@ package Bugzilla::Extension::BzAPI::Resources::Bugzilla;
 
 use 5.10.1;
 use strict;
-use warnings;
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/extensions/BzAPI/lib/Resources/User.pm b/extensions/BzAPI/lib/Resources/User.pm
index 550a61d28..7fbcdb871 100644
--- a/extensions/BzAPI/lib/Resources/User.pm
+++ b/extensions/BzAPI/lib/Resources/User.pm
@@ -9,7 +9,6 @@ package Bugzilla::Extension::BzAPI::Resources::User;
 
 use 5.10.1;
 use strict;
-use warnings;
 
 use Bugzilla::Extension::BzAPI::Util;
 
diff --git a/extensions/BzAPI/lib/Util.pm b/extensions/BzAPI/lib/Util.pm
index 9760f4b5e..e783a1584 100644
--- a/extensions/BzAPI/lib/Util.pm
+++ b/extensions/BzAPI/lib/Util.pm
@@ -12,7 +12,6 @@
 
 package Bugzilla::Extension::BzAPI::Util;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/ComponentWatching/Config.pm b/extensions/ComponentWatching/Config.pm
index 2014fbbfa..560b5c3c5 100644
--- a/extensions/ComponentWatching/Config.pm
+++ b/extensions/ComponentWatching/Config.pm
@@ -6,11 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::ComponentWatching;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use constant NAME => 'ComponentWatching';
 
 __PACKAGE__->NAME;
diff --git a/extensions/ComponentWatching/Extension.pm b/extensions/ComponentWatching/Extension.pm
index 36dee0e1d..f79b68595 100644
--- a/extensions/ComponentWatching/Extension.pm
+++ b/extensions/ComponentWatching/Extension.pm
@@ -6,11 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::ComponentWatching;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::Constants;
diff --git a/extensions/ContributorEngagement/Config.pm b/extensions/ContributorEngagement/Config.pm
index d48de3bc6..3984dd60e 100644
--- a/extensions/ContributorEngagement/Config.pm
+++ b/extensions/ContributorEngagement/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::ContributorEngagement;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'ContributorEngagement';
 
diff --git a/extensions/ContributorEngagement/Extension.pm b/extensions/ContributorEngagement/Extension.pm
index 949517ecf..def41b6ea 100644
--- a/extensions/ContributorEngagement/Extension.pm
+++ b/extensions/ContributorEngagement/Extension.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::ContributorEngagement;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/ContributorEngagement/lib/Constants.pm b/extensions/ContributorEngagement/lib/Constants.pm
index dd379adcd..0e08c02b8 100644
--- a/extensions/ContributorEngagement/lib/Constants.pm
+++ b/extensions/ContributorEngagement/lib/Constants.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::ContributorEngagement::Constants;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Exporter);
 
diff --git a/extensions/EditComments/Config.pm b/extensions/EditComments/Config.pm
index b95647940..dae675001 100644
--- a/extensions/EditComments/Config.pm
+++ b/extensions/EditComments/Config.pm
@@ -9,10 +9,11 @@ package Bugzilla::Extension::EditComments;
 
 use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'EditComments';
+
 use constant REQUIRED_MODULES => [];
+
 use constant OPTIONAL_MODULES => [];
 
 __PACKAGE__->NAME;
diff --git a/extensions/EditComments/Extension.pm b/extensions/EditComments/Extension.pm
index 1dc22a85e..fef1b7693 100644
--- a/extensions/EditComments/Extension.pm
+++ b/extensions/EditComments/Extension.pm
@@ -9,7 +9,6 @@ package Bugzilla::Extension::EditComments;
 
 use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Bugzilla::Extension);
 
diff --git a/extensions/EditComments/lib/WebService.pm b/extensions/EditComments/lib/WebService.pm
index 6969ca742..2621e5f4a 100644
--- a/extensions/EditComments/lib/WebService.pm
+++ b/extensions/EditComments/lib/WebService.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::EditComments::WebService;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/EditTable/Config.pm b/extensions/EditTable/Config.pm
index b9bd003b2..d601951a4 100644
--- a/extensions/EditTable/Config.pm
+++ b/extensions/EditTable/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::EditTable;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'EditTable';
 use constant REQUIRED_MODULES => [];
diff --git a/extensions/EditTable/Extension.pm b/extensions/EditTable/Extension.pm
index 1eb0d82f9..d353513e1 100644
--- a/extensions/EditTable/Extension.pm
+++ b/extensions/EditTable/Extension.pm
@@ -16,7 +16,6 @@
 
 package Bugzilla::Extension::EditTable;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Ember/Config.pm b/extensions/Ember/Config.pm
index 5ceb98ec1..e3405146d 100644
--- a/extensions/Ember/Config.pm
+++ b/extensions/Ember/Config.pm
@@ -9,7 +9,6 @@ package Bugzilla::Extension::Ember;
 
 use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'Ember';
 
diff --git a/extensions/Ember/Extension.pm b/extensions/Ember/Extension.pm
index 8bb558c6f..1c8b8b4e9 100644
--- a/extensions/Ember/Extension.pm
+++ b/extensions/Ember/Extension.pm
@@ -9,8 +9,6 @@ package Bugzilla::Extension::Ember;
 
 use 5.10.1;
 use strict;
-use warnings;
-
 use parent qw(Bugzilla::Extension);
 
 our $VERSION = '0.01';
diff --git a/extensions/Example/Config.pm b/extensions/Example/Config.pm
index e7782ef6c..378db359d 100644
--- a/extensions/Example/Config.pm
+++ b/extensions/Example/Config.pm
@@ -1,16 +1,26 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# -*- Mode: perl; indent-tabs-mode: nil -*-
 #
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Bug Tracking System.
+#
+# The Initial Developer of the Original Code is Everything Solved, Inc.
+# Portions created by the Initial Developers are Copyright (C) 2009 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Max Kanat-Alexander <mkanat@bugzilla.org>
 
 package Bugzilla::Extension::Example;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use constant NAME => 'Example';
 use constant REQUIRED_MODULES => [
     {
diff --git a/extensions/Example/Extension.pm b/extensions/Example/Extension.pm
index a8cf8189f..4fd2d987f 100644
--- a/extensions/Example/Extension.pm
+++ b/extensions/Example/Extension.pm
@@ -1,14 +1,27 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# -*- Mode: perl; indent-tabs-mode: nil -*-
 #
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Bug Tracking System.
+#
+# The Initial Developer of the Original Code is Everything Solved, Inc.
+# Portions created by the Initial Developers are Copyright (C) 2009 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Max Kanat-Alexander <mkanat@bugzilla.org>
+#   Frédéric Buclin <LpSolit@gmail.com>
 
 package Bugzilla::Extension::Example;
-use 5.10.1;
 use strict;
-use warnings;
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::Constants;
diff --git a/extensions/Example/lib/Auth/Login.pm b/extensions/Example/lib/Auth/Login.pm
index 376fe21a8..9f4f37dc3 100644
--- a/extensions/Example/lib/Auth/Login.pm
+++ b/extensions/Example/lib/Auth/Login.pm
@@ -1,14 +1,25 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# -*- Mode: perl; indent-tabs-mode: nil -*-
 #
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Example Plugin.
+#
+# The Initial Developer of the Original Code is Canonical Ltd.
+# Portions created by Canonical are Copyright (C) 2008 Canonical Ltd.
+# All Rights Reserved.
+#
+# Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
 
 package Bugzilla::Extension::Example::Auth::Login;
-use 5.10.1;
 use strict;
-use warnings;
 use base qw(Bugzilla::Auth::Login);
 use constant user_can_create_account => 0;
 use Bugzilla::Constants;
diff --git a/extensions/Example/lib/Auth/Verify.pm b/extensions/Example/lib/Auth/Verify.pm
index cac6d1019..0141a0d6a 100644
--- a/extensions/Example/lib/Auth/Verify.pm
+++ b/extensions/Example/lib/Auth/Verify.pm
@@ -1,14 +1,25 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# -*- Mode: perl; indent-tabs-mode: nil -*-
 #
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Example Plugin.
+#
+# The Initial Developer of the Original Code is Canonical Ltd.
+# Portions created by Canonical are Copyright (C) 2008 Canonical Ltd.
+# All Rights Reserved.
+#
+# Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
 
 package Bugzilla::Extension::Example::Auth::Verify;
-use 5.10.1;
 use strict;
-use warnings;
 use base qw(Bugzilla::Auth::Verify);
 use Bugzilla::Constants;
 
diff --git a/extensions/Example/lib/Config.pm b/extensions/Example/lib/Config.pm
index fac0046af..75db22957 100644
--- a/extensions/Example/lib/Config.pm
+++ b/extensions/Example/lib/Config.pm
@@ -1,13 +1,25 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# -*- Mode: perl; indent-tabs-mode: nil -*-
 #
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Example Plugin.
+#
+# The Initial Developer of the Original Code is Canonical Ltd.
+# Portions created by Canonical Ltd. are Copyright (C) 2008
+# Canonical Ltd. All Rights Reserved.
+#
+# Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
+#                 Bradley Baetz <bbaetz@acm.org>
 
 package Bugzilla::Extension::Example::Config;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Example/lib/Util.pm b/extensions/Example/lib/Util.pm
index ccc349c9c..596f048e9 100644
--- a/extensions/Example/lib/Util.pm
+++ b/extensions/Example/lib/Util.pm
@@ -1,13 +1,24 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# -*- Mode: perl; indent-tabs-mode: nil -*-
 #
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Bug Tracking System.
+#
+# The Initial Developer of the Original Code is Everything Solved, Inc.
+# Portions created by Everything Solved, Inc. are Copyright (C) 2009 
+# Everything Solved, Inc. All Rights Reserved.
+#
+# Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
 
 package Bugzilla::Extension::Example::Util;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Example/lib/WebService.pm b/extensions/Example/lib/WebService.pm
index 7b1940462..bb83436e3 100644
--- a/extensions/Example/lib/WebService.pm
+++ b/extensions/Example/lib/WebService.pm
@@ -1,13 +1,24 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# -*- Mode: perl; indent-tabs-mode: nil -*-
 #
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Bug Tracking System.
+#
+# The Initial Developer of the Original Code is Everything Solved, Inc.
+# Portions created by Everything Solved, Inc. are Copyright (C) 2007 
+# Everything Solved, Inc. All Rights Reserved.
+#
+# Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
 
 package Bugzilla::Extension::Example::WebService;
-
-use 5.10.1;
 use strict;
 use warnings;
 use base qw(Bugzilla::WebService);
diff --git a/extensions/FlagDefaultRequestee/Config.pm b/extensions/FlagDefaultRequestee/Config.pm
index dc4fb1353..70c5ca33a 100644
--- a/extensions/FlagDefaultRequestee/Config.pm
+++ b/extensions/FlagDefaultRequestee/Config.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::FlagDefaultRequestee;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'FlagDefaultRequestee';
 
diff --git a/extensions/FlagDefaultRequestee/Extension.pm b/extensions/FlagDefaultRequestee/Extension.pm
index f599feac2..958a1bb85 100644
--- a/extensions/FlagDefaultRequestee/Extension.pm
+++ b/extensions/FlagDefaultRequestee/Extension.pm
@@ -7,10 +7,7 @@
 
 package Bugzilla::Extension::FlagDefaultRequestee;
 
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::Error;
diff --git a/extensions/FlagDefaultRequestee/lib/Constants.pm b/extensions/FlagDefaultRequestee/lib/Constants.pm
index fd7298484..467028423 100644
--- a/extensions/FlagDefaultRequestee/lib/Constants.pm
+++ b/extensions/FlagDefaultRequestee/lib/Constants.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::FlagDefaultRequestee::Constants;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Exporter);
 
diff --git a/extensions/FlagTypeComment/Config.pm b/extensions/FlagTypeComment/Config.pm
index 590ef4555..e20be10e3 100644
--- a/extensions/FlagTypeComment/Config.pm
+++ b/extensions/FlagTypeComment/Config.pm
@@ -19,10 +19,7 @@
 #   byron jones <glob@mozilla.com>
 
 package Bugzilla::Extension::FlagTypeComment;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'FlagTypeComment';
 
diff --git a/extensions/FlagTypeComment/Extension.pm b/extensions/FlagTypeComment/Extension.pm
index 34cd4c460..8da6101ad 100644
--- a/extensions/FlagTypeComment/Extension.pm
+++ b/extensions/FlagTypeComment/Extension.pm
@@ -19,11 +19,7 @@
 #   byron jones <glob@mozilla.com>
 
 package Bugzilla::Extension::FlagTypeComment;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::Extension::FlagTypeComment::Constants;
diff --git a/extensions/FlagTypeComment/lib/Constants.pm b/extensions/FlagTypeComment/lib/Constants.pm
index dcac4976a..e1a99e5b3 100644
--- a/extensions/FlagTypeComment/lib/Constants.pm
+++ b/extensions/FlagTypeComment/lib/Constants.pm
@@ -19,10 +19,7 @@
 #   byron jones <glob@mozilla.com>
 
 package Bugzilla::Extension::FlagTypeComment::Constants;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Exporter);
 our @EXPORT = qw(
diff --git a/extensions/GitHubAuth/Config.pm b/extensions/GitHubAuth/Config.pm
index 1f64ee8a6..88186a91e 100644
--- a/extensions/GitHubAuth/Config.pm
+++ b/extensions/GitHubAuth/Config.pm
@@ -9,7 +9,6 @@ package Bugzilla::Extension::GitHubAuth;
 
 use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'GitHubAuth';
 
diff --git a/extensions/GitHubAuth/Extension.pm b/extensions/GitHubAuth/Extension.pm
index 24a7cf2f1..b813689cd 100644
--- a/extensions/GitHubAuth/Extension.pm
+++ b/extensions/GitHubAuth/Extension.pm
@@ -9,8 +9,6 @@ package Bugzilla::Extension::GitHubAuth;
 
 use 5.10.1;
 use strict;
-use warnings;
-
 use parent qw(Bugzilla::Extension);
 
 use Bugzilla::Extension::GitHubAuth::Client;
diff --git a/extensions/GitHubAuth/lib/Client.pm b/extensions/GitHubAuth/lib/Client.pm
index 46c070856..77c8a6c61 100644
--- a/extensions/GitHubAuth/lib/Client.pm
+++ b/extensions/GitHubAuth/lib/Client.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::GitHubAuth::Client;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/GitHubAuth/lib/Client/Error.pm b/extensions/GitHubAuth/lib/Client/Error.pm
index adb6ec07b..358df6938 100644
--- a/extensions/GitHubAuth/lib/Client/Error.pm
+++ b/extensions/GitHubAuth/lib/Client/Error.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::GitHubAuth::Client::Error;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/GitHubAuth/lib/Config.pm b/extensions/GitHubAuth/lib/Config.pm
index 0c8874129..0dc78531b 100644
--- a/extensions/GitHubAuth/lib/Config.pm
+++ b/extensions/GitHubAuth/lib/Config.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::GitHubAuth::Config;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/GitHubAuth/lib/Login.pm b/extensions/GitHubAuth/lib/Login.pm
index 3f81467d0..f1effb4e1 100644
--- a/extensions/GitHubAuth/lib/Login.pm
+++ b/extensions/GitHubAuth/lib/Login.pm
@@ -6,11 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::GitHubAuth::Login;
-
-use 5.10.1;
 use strict;
 use warnings;
-
 use base qw(Bugzilla::Auth::Login);
 use fields qw(github_failure);
 
diff --git a/extensions/GitHubAuth/lib/Verify.pm b/extensions/GitHubAuth/lib/Verify.pm
index f399af02e..ee66c8904 100644
--- a/extensions/GitHubAuth/lib/Verify.pm
+++ b/extensions/GitHubAuth/lib/Verify.pm
@@ -6,11 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::GitHubAuth::Verify;
-
-use 5.10.1;
 use strict;
 use warnings;
-
 use base qw(Bugzilla::Auth::Verify);
 
 use Bugzilla::Constants qw( AUTH_NO_SUCH_USER );
diff --git a/extensions/Gravatar/Config.pm b/extensions/Gravatar/Config.pm
index e0c684c9b..e15a41ee8 100644
--- a/extensions/Gravatar/Config.pm
+++ b/extensions/Gravatar/Config.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::Gravatar;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'Gravatar';
 use constant REQUIRED_MODULES => [];
diff --git a/extensions/Gravatar/Extension.pm b/extensions/Gravatar/Extension.pm
index 97cf23b00..06e98fb78 100644
--- a/extensions/Gravatar/Extension.pm
+++ b/extensions/Gravatar/Extension.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Gravatar;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Gravatar/lib/Data.pm b/extensions/Gravatar/lib/Data.pm
index 763dba85b..feff503e3 100644
--- a/extensions/Gravatar/lib/Data.pm
+++ b/extensions/Gravatar/lib/Data.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Gravatar::Data;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use base 'Exporter';
 our @EXPORT_OK = qw(
diff --git a/extensions/GuidedBugEntry/Config.pm b/extensions/GuidedBugEntry/Config.pm
index 316fc6cdc..e4bc9c70b 100644
--- a/extensions/GuidedBugEntry/Config.pm
+++ b/extensions/GuidedBugEntry/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::GuidedBugEntry;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'GuidedBugEntry';
 
diff --git a/extensions/GuidedBugEntry/Extension.pm b/extensions/GuidedBugEntry/Extension.pm
index 2d58d506a..3f739d9fe 100644
--- a/extensions/GuidedBugEntry/Extension.pm
+++ b/extensions/GuidedBugEntry/Extension.pm
@@ -6,11 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::GuidedBugEntry;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::Token;
diff --git a/extensions/InlineHistory/Config.pm b/extensions/InlineHistory/Config.pm
index 56197487b..3834bd81d 100644
--- a/extensions/InlineHistory/Config.pm
+++ b/extensions/InlineHistory/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::InlineHistory;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'InlineHistory';
 
diff --git a/extensions/InlineHistory/Extension.pm b/extensions/InlineHistory/Extension.pm
index fb4a8f98f..d563bede8 100644
--- a/extensions/InlineHistory/Extension.pm
+++ b/extensions/InlineHistory/Extension.pm
@@ -6,11 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::InlineHistory;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::User::Setting;
diff --git a/extensions/LastResolved/Config.pm b/extensions/LastResolved/Config.pm
index 8fd8f106f..f763167e2 100644
--- a/extensions/LastResolved/Config.pm
+++ b/extensions/LastResolved/Config.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::LastResolved;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'LastResolved';
 
diff --git a/extensions/LastResolved/Extension.pm b/extensions/LastResolved/Extension.pm
index 0c3741b84..ad0519387 100644
--- a/extensions/LastResolved/Extension.pm
+++ b/extensions/LastResolved/Extension.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::LastResolved;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Bugzilla::Extension);
 
diff --git a/extensions/LimitedEmail/Config.pm b/extensions/LimitedEmail/Config.pm
index 94b9b10eb..ea05f363c 100644
--- a/extensions/LimitedEmail/Config.pm
+++ b/extensions/LimitedEmail/Config.pm
@@ -7,10 +7,7 @@
 
 package Bugzilla::Extension::LimitedEmail;
 
-use 5.10.1;
 use strict;
-use warnings;
-
 use constant NAME => 'LimitedEmail';
 use constant REQUIRED_MODULES => [ ];
 use constant OPTIONAL_MODULES => [ ];
diff --git a/extensions/LimitedEmail/Extension.pm b/extensions/LimitedEmail/Extension.pm
index 9b504db91..35cc83567 100644
--- a/extensions/LimitedEmail/Extension.pm
+++ b/extensions/LimitedEmail/Extension.pm
@@ -6,11 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::LimitedEmail;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 our $VERSION = '2';
diff --git a/extensions/MozProjectReview/Config.pm b/extensions/MozProjectReview/Config.pm
index 1a5e14f3d..5a9d2b730 100644
--- a/extensions/MozProjectReview/Config.pm
+++ b/extensions/MozProjectReview/Config.pm
@@ -6,9 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 package Bugzilla::Extension::MozProjectReview;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'MozProjectReview';
 
diff --git a/extensions/MozProjectReview/Extension.pm b/extensions/MozProjectReview/Extension.pm
index fcad6916c..7229f5d4d 100644
--- a/extensions/MozProjectReview/Extension.pm
+++ b/extensions/MozProjectReview/Extension.pm
@@ -6,9 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 package Bugzilla::Extension::MozProjectReview;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Bugzilla::Extension);
 
diff --git a/extensions/MozReview/Config.pm b/extensions/MozReview/Config.pm
index 34d98907c..44d8dd2ff 100644
--- a/extensions/MozReview/Config.pm
+++ b/extensions/MozReview/Config.pm
@@ -9,7 +9,6 @@ package Bugzilla::Extension::MozReview;
 
 use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'MozReview';
 
diff --git a/extensions/MozReview/bin/add-mozreview-children.pl b/extensions/MozReview/bin/add-mozreview-children.pl
index f92c2a19b..a63966a62 100755
--- a/extensions/MozReview/bin/add-mozreview-children.pl
+++ b/extensions/MozReview/bin/add-mozreview-children.pl
@@ -15,7 +15,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/MozReview/lib/Config.pm b/extensions/MozReview/lib/Config.pm
index e0d6377d8..ab6b8c7c3 100644
--- a/extensions/MozReview/lib/Config.pm
+++ b/extensions/MozReview/lib/Config.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::MozReview::Config;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/MozReview/lib/WebService.pm b/extensions/MozReview/lib/WebService.pm
index c6916d1fa..8f9d3215b 100644
--- a/extensions/MozReview/lib/WebService.pm
+++ b/extensions/MozReview/lib/WebService.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::MozReview::WebService;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/MyDashboard/Config.pm b/extensions/MyDashboard/Config.pm
index 05f3ec416..7c14936ff 100644
--- a/extensions/MyDashboard/Config.pm
+++ b/extensions/MyDashboard/Config.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::MyDashboard;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'MyDashboard';
 
diff --git a/extensions/MyDashboard/Extension.pm b/extensions/MyDashboard/Extension.pm
index 5278cfaa4..97b1d9d14 100644
--- a/extensions/MyDashboard/Extension.pm
+++ b/extensions/MyDashboard/Extension.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::MyDashboard;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Bugzilla::Extension);
 
diff --git a/extensions/MyDashboard/lib/BugInterest.pm b/extensions/MyDashboard/lib/BugInterest.pm
index cf33900c5..4f14eb4fd 100644
--- a/extensions/MyDashboard/lib/BugInterest.pm
+++ b/extensions/MyDashboard/lib/BugInterest.pm
@@ -9,7 +9,6 @@ package Bugzilla::Extension::MyDashboard::BugInterest;
 
 use 5.10.1;
 use strict;
-use warnings;
 
 use parent qw(Bugzilla::Object);
 
diff --git a/extensions/MyDashboard/lib/Queries.pm b/extensions/MyDashboard/lib/Queries.pm
index d77be7da4..199e8eb46 100644
--- a/extensions/MyDashboard/lib/Queries.pm
+++ b/extensions/MyDashboard/lib/Queries.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::MyDashboard::Queries;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use Bugzilla;
 use Bugzilla::Bug;
diff --git a/extensions/MyDashboard/lib/Util.pm b/extensions/MyDashboard/lib/Util.pm
index 77d9505cb..fa7cf83b0 100644
--- a/extensions/MyDashboard/lib/Util.pm
+++ b/extensions/MyDashboard/lib/Util.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::MyDashboard::Util;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use Bugzilla::CGI;
 use Bugzilla::Search;
diff --git a/extensions/MyDashboard/lib/WebService.pm b/extensions/MyDashboard/lib/WebService.pm
index 7e5ce05cf..c93553146 100644
--- a/extensions/MyDashboard/lib/WebService.pm
+++ b/extensions/MyDashboard/lib/WebService.pm
@@ -6,7 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 package Bugzilla::Extension::MyDashboard::WebService;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Needinfo/Config.pm b/extensions/Needinfo/Config.pm
index d523d9d78..86c99ec59 100644
--- a/extensions/Needinfo/Config.pm
+++ b/extensions/Needinfo/Config.pm
@@ -5,10 +5,7 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 package Bugzilla::Extension::Needinfo;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'Needinfo';
 
diff --git a/extensions/Needinfo/Extension.pm b/extensions/Needinfo/Extension.pm
index cb897e72e..a85bad5c6 100644
--- a/extensions/Needinfo/Extension.pm
+++ b/extensions/Needinfo/Extension.pm
@@ -6,9 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 package Bugzilla::Extension::Needinfo;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Bugzilla::Extension);
 
diff --git a/extensions/OpenGraph/Config.pm b/extensions/OpenGraph/Config.pm
index 92d0a89bc..9204db234 100644
--- a/extensions/OpenGraph/Config.pm
+++ b/extensions/OpenGraph/Config.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::OpenGraph;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'OpenGraph';
 use constant REQUIRED_MODULES => [ ];
diff --git a/extensions/OpenGraph/Extension.pm b/extensions/OpenGraph/Extension.pm
index 18ee2c22f..f278a8958 100644
--- a/extensions/OpenGraph/Extension.pm
+++ b/extensions/OpenGraph/Extension.pm
@@ -7,11 +7,7 @@
 
 package Bugzilla::Extension::OpenGraph;
 
-use 5.10.1;
 use strict;
-use warnings;
-
-use lib qw(. lib local/lib/perl5);
 
 use base qw(Bugzilla::Extension);
 
diff --git a/extensions/OrangeFactor/Config.pm b/extensions/OrangeFactor/Config.pm
index 18c6be1cd..9fb0d74ef 100644
--- a/extensions/OrangeFactor/Config.pm
+++ b/extensions/OrangeFactor/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::OrangeFactor;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'OrangeFactor';
 
diff --git a/extensions/OrangeFactor/Extension.pm b/extensions/OrangeFactor/Extension.pm
index ab2f1d749..5e9698718 100644
--- a/extensions/OrangeFactor/Extension.pm
+++ b/extensions/OrangeFactor/Extension.pm
@@ -6,11 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::OrangeFactor;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::User::Setting;
diff --git a/extensions/Persona/Config.pm b/extensions/Persona/Config.pm
index a839b38ab..8709655d1 100644
--- a/extensions/Persona/Config.pm
+++ b/extensions/Persona/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Persona;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'Persona';
 
diff --git a/extensions/Persona/Extension.pm b/extensions/Persona/Extension.pm
index 61e222f53..2c8e46add 100644
--- a/extensions/Persona/Extension.pm
+++ b/extensions/Persona/Extension.pm
@@ -6,11 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Persona;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::Config qw(SetParam write_params);
diff --git a/extensions/Persona/lib/Config.pm b/extensions/Persona/lib/Config.pm
index ae40fd94a..9c483cb51 100644
--- a/extensions/Persona/lib/Config.pm
+++ b/extensions/Persona/lib/Config.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Persona::Config;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Persona/lib/Login.pm b/extensions/Persona/lib/Login.pm
index b9ba97a7e..c2f8caf2b 100644
--- a/extensions/Persona/lib/Login.pm
+++ b/extensions/Persona/lib/Login.pm
@@ -6,11 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Persona::Login;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Auth::Login);
 
 use Bugzilla::Constants;
diff --git a/extensions/ProdCompSearch/Config.pm b/extensions/ProdCompSearch/Config.pm
index 9631de570..c28b6d8f6 100644
--- a/extensions/ProdCompSearch/Config.pm
+++ b/extensions/ProdCompSearch/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::ProdCompSearch;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'ProdCompSearch';
 use constant REQUIRED_MODULES => [];
diff --git a/extensions/ProdCompSearch/Extension.pm b/extensions/ProdCompSearch/Extension.pm
index ae507a7d6..a5955fd8b 100644
--- a/extensions/ProdCompSearch/Extension.pm
+++ b/extensions/ProdCompSearch/Extension.pm
@@ -6,11 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::ProdCompSearch;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 our $VERSION = '1';
diff --git a/extensions/ProdCompSearch/lib/WebService.pm b/extensions/ProdCompSearch/lib/WebService.pm
index b173137dd..521d1588f 100644
--- a/extensions/ProdCompSearch/lib/WebService.pm
+++ b/extensions/ProdCompSearch/lib/WebService.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::ProdCompSearch::WebService;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/ProductDashboard/Config.pm b/extensions/ProductDashboard/Config.pm
index 88ccdc784..3a4654974 100644
--- a/extensions/ProductDashboard/Config.pm
+++ b/extensions/ProductDashboard/Config.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::ProductDashboard;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'ProductDashboard';
 
diff --git a/extensions/ProductDashboard/Extension.pm b/extensions/ProductDashboard/Extension.pm
index 18157c1fe..cc80fa449 100644
--- a/extensions/ProductDashboard/Extension.pm
+++ b/extensions/ProductDashboard/Extension.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::ProductDashboard;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Bugzilla::Extension);
 
diff --git a/extensions/ProductDashboard/lib/Queries.pm b/extensions/ProductDashboard/lib/Queries.pm
index 8c9d5bd92..ec27d3c6c 100644
--- a/extensions/ProductDashboard/lib/Queries.pm
+++ b/extensions/ProductDashboard/lib/Queries.pm
@@ -6,9 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 package Bugzilla::Extension::ProductDashboard::Queries;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Exporter);
 @Bugzilla::Extension::ProductDashboard::Queries::EXPORT = qw(
diff --git a/extensions/ProductDashboard/lib/Util.pm b/extensions/ProductDashboard/lib/Util.pm
index f02f033b2..5d9c161ef 100644
--- a/extensions/ProductDashboard/lib/Util.pm
+++ b/extensions/ProductDashboard/lib/Util.pm
@@ -6,9 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 package Bugzilla::Extension::ProductDashboard::Util;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Exporter);
 @Bugzilla::Extension::ProductDashboard::Util::EXPORT = qw(
diff --git a/extensions/Profanivore/Config.pm b/extensions/Profanivore/Config.pm
index 311400d16..354325c58 100644
--- a/extensions/Profanivore/Config.pm
+++ b/extensions/Profanivore/Config.pm
@@ -20,10 +20,7 @@
 #   Gervase Markham <gerv@gerv.net>
 
 package Bugzilla::Extension::Profanivore;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'Profanivore';
 
diff --git a/extensions/Profanivore/Extension.pm b/extensions/Profanivore/Extension.pm
index 76d30e982..49b2f61c3 100644
--- a/extensions/Profanivore/Extension.pm
+++ b/extensions/Profanivore/Extension.pm
@@ -20,11 +20,7 @@
 #   Gervase Markham <gerv@gerv.net>
 
 package Bugzilla::Extension::Profanivore;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Email::MIME::ContentType qw(parse_content_type);
diff --git a/extensions/Push/Config.pm b/extensions/Push/Config.pm
index 860e31a23..11e3502fd 100644
--- a/extensions/Push/Config.pm
+++ b/extensions/Push/Config.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::Push;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'Push';
 
diff --git a/extensions/Push/Extension.pm b/extensions/Push/Extension.pm
index f682dea35..1d6ec5b62 100644
--- a/extensions/Push/Extension.pm
+++ b/extensions/Push/Extension.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/bin/bugzilla-pushd.pl b/extensions/Push/bin/bugzilla-pushd.pl
index 8e92381f3..f048df157 100755
--- a/extensions/Push/bin/bugzilla-pushd.pl
+++ b/extensions/Push/bin/bugzilla-pushd.pl
@@ -10,8 +10,10 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use FindBin '$RealBin';
+use lib "$RealBin/../../..";
+use lib "$RealBin/../../../lib";
+use lib "$RealBin/../lib";
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/Push/bin/nagios_push_checker.pl b/extensions/Push/bin/nagios_push_checker.pl
index 092a9da8f..f022f584d 100755
--- a/extensions/Push/bin/nagios_push_checker.pl
+++ b/extensions/Push/bin/nagios_push_checker.pl
@@ -10,8 +10,10 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use FindBin '$RealBin';
+use lib "$RealBin/../../..";
+use lib "$RealBin/../../../lib";
+use lib "$RealBin/../lib";
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/extensions/Push/lib/Admin.pm b/extensions/Push/lib/Admin.pm
index fa65e0d69..5b0bb8e70 100644
--- a/extensions/Push/lib/Admin.pm
+++ b/extensions/Push/lib/Admin.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Admin;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/BacklogMessage.pm b/extensions/Push/lib/BacklogMessage.pm
index 28b17bae3..cd40ebefb 100644
--- a/extensions/Push/lib/BacklogMessage.pm
+++ b/extensions/Push/lib/BacklogMessage.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::BacklogMessage;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/BacklogQueue.pm b/extensions/Push/lib/BacklogQueue.pm
index a7200c688..79b9b72ee 100644
--- a/extensions/Push/lib/BacklogQueue.pm
+++ b/extensions/Push/lib/BacklogQueue.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::BacklogQueue;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Backoff.pm b/extensions/Push/lib/Backoff.pm
index f0116a2a7..55552e5e1 100644
--- a/extensions/Push/lib/Backoff.pm
+++ b/extensions/Push/lib/Backoff.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Backoff;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Config.pm b/extensions/Push/lib/Config.pm
index 337c2696d..7033b4195 100644
--- a/extensions/Push/lib/Config.pm
+++ b/extensions/Push/lib/Config.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Config;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector.disabled/AMQP.pm b/extensions/Push/lib/Connector.disabled/AMQP.pm
index f712ee890..7b7d4aa72 100644
--- a/extensions/Push/lib/Connector.disabled/AMQP.pm
+++ b/extensions/Push/lib/Connector.disabled/AMQP.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::AMQP;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector.disabled/ServiceNow.pm b/extensions/Push/lib/Connector.disabled/ServiceNow.pm
index a6d84cbe0..832cc9262 100644
--- a/extensions/Push/lib/Connector.disabled/ServiceNow.pm
+++ b/extensions/Push/lib/Connector.disabled/ServiceNow.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::ServiceNow;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector/Aha.pm b/extensions/Push/lib/Connector/Aha.pm
index e85b5fadf..b64610e03 100644
--- a/extensions/Push/lib/Connector/Aha.pm
+++ b/extensions/Push/lib/Connector/Aha.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::Aha;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector/Base.pm b/extensions/Push/lib/Connector/Base.pm
index ee41bd160..290ea9740 100644
--- a/extensions/Push/lib/Connector/Base.pm
+++ b/extensions/Push/lib/Connector/Base.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::Base;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector/File.pm b/extensions/Push/lib/Connector/File.pm
index ae249ffe5..563a78567 100644
--- a/extensions/Push/lib/Connector/File.pm
+++ b/extensions/Push/lib/Connector/File.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::File;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector/ReviewBoard.pm b/extensions/Push/lib/Connector/ReviewBoard.pm
index 1c657a728..97f489826 100644
--- a/extensions/Push/lib/Connector/ReviewBoard.pm
+++ b/extensions/Push/lib/Connector/ReviewBoard.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::ReviewBoard;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector/Spark.pm b/extensions/Push/lib/Connector/Spark.pm
index 3194bd3ab..a65567916 100644
--- a/extensions/Push/lib/Connector/Spark.pm
+++ b/extensions/Push/lib/Connector/Spark.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::Spark;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connector/TCL.pm b/extensions/Push/lib/Connector/TCL.pm
index f5b430e47..25e5750dc 100644
--- a/extensions/Push/lib/Connector/TCL.pm
+++ b/extensions/Push/lib/Connector/TCL.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connector::TCL;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Connectors.pm b/extensions/Push/lib/Connectors.pm
index 75a5083ff..026d3f7f1 100644
--- a/extensions/Push/lib/Connectors.pm
+++ b/extensions/Push/lib/Connectors.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Connectors;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Constants.pm b/extensions/Push/lib/Constants.pm
index 09c5e464c..18b12d511 100644
--- a/extensions/Push/lib/Constants.pm
+++ b/extensions/Push/lib/Constants.pm
@@ -7,10 +7,7 @@
 
 package Bugzilla::Extension::Push::Constants;
 
-use 5.10.1;
 use strict;
-use warnings;
-
 use base 'Exporter';
 
 our @EXPORT = qw(
diff --git a/extensions/Push/lib/Daemon.pm b/extensions/Push/lib/Daemon.pm
index 7f2459a95..c8472e450 100644
--- a/extensions/Push/lib/Daemon.pm
+++ b/extensions/Push/lib/Daemon.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Daemon;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Log.pm b/extensions/Push/lib/Log.pm
index 8a35a6cf5..6faabea97 100644
--- a/extensions/Push/lib/Log.pm
+++ b/extensions/Push/lib/Log.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Log;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/LogEntry.pm b/extensions/Push/lib/LogEntry.pm
index f4e894b94..848df0480 100644
--- a/extensions/Push/lib/LogEntry.pm
+++ b/extensions/Push/lib/LogEntry.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::LogEntry;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Logger.pm b/extensions/Push/lib/Logger.pm
index 833cb3b19..9824f3476 100644
--- a/extensions/Push/lib/Logger.pm
+++ b/extensions/Push/lib/Logger.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Logger;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Message.pm b/extensions/Push/lib/Message.pm
index 1beb18ef0..6d2ed2531 100644
--- a/extensions/Push/lib/Message.pm
+++ b/extensions/Push/lib/Message.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Message;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Option.pm b/extensions/Push/lib/Option.pm
index a08e4c11d..25d529f98 100644
--- a/extensions/Push/lib/Option.pm
+++ b/extensions/Push/lib/Option.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Option;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Push.pm b/extensions/Push/lib/Push.pm
index 45b9b05dd..aaac0bbd6 100644
--- a/extensions/Push/lib/Push.pm
+++ b/extensions/Push/lib/Push.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Push;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Queue.pm b/extensions/Push/lib/Queue.pm
index 3ee0321d9..d89cb23c3 100644
--- a/extensions/Push/lib/Queue.pm
+++ b/extensions/Push/lib/Queue.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Queue;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Serialise.pm b/extensions/Push/lib/Serialise.pm
index bb6834c13..94f33c754 100644
--- a/extensions/Push/lib/Serialise.pm
+++ b/extensions/Push/lib/Serialise.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Serialise;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Push/lib/Util.pm b/extensions/Push/lib/Util.pm
index bda6331bf..f52db6936 100644
--- a/extensions/Push/lib/Util.pm
+++ b/extensions/Push/lib/Util.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Push::Util;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/REMO/Config.pm b/extensions/REMO/Config.pm
index 3317ebc05..625e2afd9 100644
--- a/extensions/REMO/Config.pm
+++ b/extensions/REMO/Config.pm
@@ -21,10 +21,7 @@
 #   David Lawrence <dkl@mozilla.com>
 
 package Bugzilla::Extension::REMO;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'REMO';
 
diff --git a/extensions/REMO/Extension.pm b/extensions/REMO/Extension.pm
index 695f126f8..9f83f7065 100644
--- a/extensions/REMO/Extension.pm
+++ b/extensions/REMO/Extension.pm
@@ -21,11 +21,7 @@
 #   David Lawrence <dkl@mozilla.com>
 
 package Bugzilla::Extension::REMO;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::Constants;
diff --git a/extensions/RequestNagger/Config.pm b/extensions/RequestNagger/Config.pm
index a338cd441..6b9488c80 100644
--- a/extensions/RequestNagger/Config.pm
+++ b/extensions/RequestNagger/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::RequestNagger;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'RequestNagger';
 use constant REQUIRED_MODULES => [ ];
diff --git a/extensions/RequestNagger/Extension.pm b/extensions/RequestNagger/Extension.pm
index 65f5e6b84..63d79040e 100644
--- a/extensions/RequestNagger/Extension.pm
+++ b/extensions/RequestNagger/Extension.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::RequestNagger;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/RequestNagger/bin/send-request-nags.pl b/extensions/RequestNagger/bin/send-request-nags.pl
index b3c654956..03ff8b4ea 100755
--- a/extensions/RequestNagger/bin/send-request-nags.pl
+++ b/extensions/RequestNagger/bin/send-request-nags.pl
@@ -11,7 +11,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/RequestNagger/lib/Bug.pm b/extensions/RequestNagger/lib/Bug.pm
index 974a688ea..bd5bb7fd7 100644
--- a/extensions/RequestNagger/lib/Bug.pm
+++ b/extensions/RequestNagger/lib/Bug.pm
@@ -7,10 +7,7 @@
 
 package Bugzilla::Extension::RequestNagger::Bug;
 
-use 5.10.1;
 use strict;
-use warnings;
-
 use parent qw(Bugzilla::Bug);
 use feature 'state';
 
diff --git a/extensions/RequestNagger/lib/Constants.pm b/extensions/RequestNagger/lib/Constants.pm
index bc6cf3371..435c0b167 100644
--- a/extensions/RequestNagger/lib/Constants.pm
+++ b/extensions/RequestNagger/lib/Constants.pm
@@ -7,10 +7,7 @@
 
 package Bugzilla::Extension::RequestNagger::Constants;
 
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Exporter);
 
 our @EXPORT = qw(
diff --git a/extensions/RequestNagger/lib/Settings.pm b/extensions/RequestNagger/lib/Settings.pm
index 393d224ba..5407eac1d 100644
--- a/extensions/RequestNagger/lib/Settings.pm
+++ b/extensions/RequestNagger/lib/Settings.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::RequestNagger::Settings;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/RestrictComments/Config.pm b/extensions/RestrictComments/Config.pm
index be703bed7..bef472cc1 100644
--- a/extensions/RestrictComments/Config.pm
+++ b/extensions/RestrictComments/Config.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::RestrictComments;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'RestrictComments';
 use constant REQUIRED_MODULES => [];
diff --git a/extensions/RestrictComments/Extension.pm b/extensions/RestrictComments/Extension.pm
index 213a1c44a..61a4912b3 100644
--- a/extensions/RestrictComments/Extension.pm
+++ b/extensions/RestrictComments/Extension.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::RestrictComments;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/RestrictComments/lib/Config.pm b/extensions/RestrictComments/lib/Config.pm
index 55cf11187..33607e680 100644
--- a/extensions/RestrictComments/lib/Config.pm
+++ b/extensions/RestrictComments/lib/Config.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::RestrictComments::Config;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Review/Config.pm b/extensions/Review/Config.pm
index ea7e8a725..f7da458af 100644
--- a/extensions/Review/Config.pm
+++ b/extensions/Review/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Review;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'Review';
 use constant REQUIRED_MODULES => [];
diff --git a/extensions/Review/Extension.pm b/extensions/Review/Extension.pm
index db2b475a1..4fd965b4c 100644
--- a/extensions/Review/Extension.pm
+++ b/extensions/Review/Extension.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Review;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Review/bin/migrate_mentor_from_whiteboard.pl b/extensions/Review/bin/migrate_mentor_from_whiteboard.pl
index ff109a5af..8d34963ec 100755
--- a/extensions/Review/bin/migrate_mentor_from_whiteboard.pl
+++ b/extensions/Review/bin/migrate_mentor_from_whiteboard.pl
@@ -13,7 +13,7 @@ use warnings;
 $| = 1;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/Review/bin/review_requests_rebuild.pl b/extensions/Review/bin/review_requests_rebuild.pl
index 6574f3dbe..04f8b1042 100755
--- a/extensions/Review/bin/review_requests_rebuild.pl
+++ b/extensions/Review/bin/review_requests_rebuild.pl
@@ -11,8 +11,8 @@ use strict;
 use warnings;
 $| = 1;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use FindBin qw($Bin);
+use lib "$Bin/../../..";
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/Review/lib/FlagStateActivity.pm b/extensions/Review/lib/FlagStateActivity.pm
index 35da42351..46e9300a5 100644
--- a/extensions/Review/lib/FlagStateActivity.pm
+++ b/extensions/Review/lib/FlagStateActivity.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Review::FlagStateActivity;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Review/lib/Util.pm b/extensions/Review/lib/Util.pm
index a8744079d..c00e31b6b 100644
--- a/extensions/Review/lib/Util.pm
+++ b/extensions/Review/lib/Util.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Review::Util;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Review/lib/WebService.pm b/extensions/Review/lib/WebService.pm
index ea8910d50..c4421aca1 100644
--- a/extensions/Review/lib/WebService.pm
+++ b/extensions/Review/lib/WebService.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Review::WebService;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/SecureMail/Config.pm b/extensions/SecureMail/Config.pm
index 8d877a253..f1975c1c1 100644
--- a/extensions/SecureMail/Config.pm
+++ b/extensions/SecureMail/Config.pm
@@ -20,10 +20,7 @@
 #                 Gervase Markham <gerv@gerv.net>
 
 package Bugzilla::Extension::SecureMail;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'SecureMail';
 
diff --git a/extensions/SecureMail/Extension.pm b/extensions/SecureMail/Extension.pm
index e62938dc7..3b03f33a6 100644
--- a/extensions/SecureMail/Extension.pm
+++ b/extensions/SecureMail/Extension.pm
@@ -20,11 +20,7 @@
 #                 Gervase Markham <gerv@gerv.net>
 
 package Bugzilla::Extension::SecureMail;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::Attachment;
diff --git a/extensions/SiteMapIndex/Config.pm b/extensions/SiteMapIndex/Config.pm
index 980938503..e10d6ec8b 100644
--- a/extensions/SiteMapIndex/Config.pm
+++ b/extensions/SiteMapIndex/Config.pm
@@ -21,10 +21,7 @@
 #   Dave Lawrence <dkl@mozilla.com>
 
 package Bugzilla::Extension::SiteMapIndex;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'SiteMapIndex';
 
diff --git a/extensions/SiteMapIndex/Extension.pm b/extensions/SiteMapIndex/Extension.pm
index 901b80092..77fb6b54c 100644
--- a/extensions/SiteMapIndex/Extension.pm
+++ b/extensions/SiteMapIndex/Extension.pm
@@ -21,11 +21,7 @@
 #   Dave Lawrence <dkl@mozilla.com>
 
 package Bugzilla::Extension::SiteMapIndex;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 our $VERSION = '1.0';
diff --git a/extensions/SiteMapIndex/lib/Constants.pm b/extensions/SiteMapIndex/lib/Constants.pm
index 12f11597e..fce858121 100644
--- a/extensions/SiteMapIndex/lib/Constants.pm
+++ b/extensions/SiteMapIndex/lib/Constants.pm
@@ -20,11 +20,7 @@
 #   Max Kanat-Alexander <mkanat@bugzilla.org>
 
 package Bugzilla::Extension::SiteMapIndex::Constants;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Exporter);
 our @EXPORT = qw(
     SITEMAP_AGE
diff --git a/extensions/SiteMapIndex/lib/Util.pm b/extensions/SiteMapIndex/lib/Util.pm
index 38fe1cf80..5c02a5989 100644
--- a/extensions/SiteMapIndex/lib/Util.pm
+++ b/extensions/SiteMapIndex/lib/Util.pm
@@ -21,11 +21,7 @@
 #   Dave Lawrence <dkl@mozilla.com>
 
 package Bugzilla::Extension::SiteMapIndex::Util;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Exporter);
 our @EXPORT = qw(
     generate_sitemap 
diff --git a/extensions/Splinter/Config.pm b/extensions/Splinter/Config.pm
index 7c013bc6f..d36a28922 100644
--- a/extensions/Splinter/Config.pm
+++ b/extensions/Splinter/Config.pm
@@ -1,9 +1,5 @@
 package Bugzilla::Extension::Splinter;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use constant NAME => 'Splinter';
 
 __PACKAGE__->NAME;
diff --git a/extensions/Splinter/Extension.pm b/extensions/Splinter/Extension.pm
index e0f42b8d0..42a18d912 100644
--- a/extensions/Splinter/Extension.pm
+++ b/extensions/Splinter/Extension.pm
@@ -7,9 +7,7 @@
 
 package Bugzilla::Extension::Splinter;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use base qw(Bugzilla::Extension);
 
diff --git a/extensions/Splinter/lib/Config.pm b/extensions/Splinter/lib/Config.pm
index fb3c16074..95b9f5dfa 100644
--- a/extensions/Splinter/lib/Config.pm
+++ b/extensions/Splinter/lib/Config.pm
@@ -22,7 +22,6 @@
 
 package Bugzilla::Extension::Splinter::Config;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Splinter/lib/Util.pm b/extensions/Splinter/lib/Util.pm
index a24881c1d..6421d2f0b 100644
--- a/extensions/Splinter/lib/Util.pm
+++ b/extensions/Splinter/lib/Util.pm
@@ -21,9 +21,7 @@
 
 package Bugzilla::Extension::Splinter::Util;
 
-use 5.10.1;
 use strict;
-use warnings;
 
 use Bugzilla;
 use Bugzilla::Util;
diff --git a/extensions/TagNewUsers/Config.pm b/extensions/TagNewUsers/Config.pm
index c791e3a07..c2330afc8 100644
--- a/extensions/TagNewUsers/Config.pm
+++ b/extensions/TagNewUsers/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::TagNewUsers;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'TagNewUsers';
 use constant REQUIRED_MODULES => [ ];
diff --git a/extensions/TagNewUsers/Extension.pm b/extensions/TagNewUsers/Extension.pm
index b94873979..e4a62dac8 100644
--- a/extensions/TagNewUsers/Extension.pm
+++ b/extensions/TagNewUsers/Extension.pm
@@ -6,18 +6,12 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::TagNewUsers;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
-
 use Bugzilla::Field;
 use Bugzilla::User;
 use Bugzilla::Install::Util qw(indicate_progress);
 use Bugzilla::WebService::Util qw(filter_wants);
-
 use Date::Parse;
 use Scalar::Util qw(blessed);
 
diff --git a/extensions/TrackingFlags/Config.pm b/extensions/TrackingFlags/Config.pm
index d0bc5ca20..1854cb9fd 100644
--- a/extensions/TrackingFlags/Config.pm
+++ b/extensions/TrackingFlags/Config.pm
@@ -6,10 +6,7 @@
 # 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 5f6715fc8..08e7968a0 100644
--- a/extensions/TrackingFlags/Extension.pm
+++ b/extensions/TrackingFlags/Extension.pm
@@ -7,9 +7,7 @@
 
 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 8f48a671a..2531228de 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/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/TrackingFlags/bin/bulk_flag_clear.pl b/extensions/TrackingFlags/bin/bulk_flag_clear.pl
index 6b05a50a3..1eff355fe 100755
--- a/extensions/TrackingFlags/bin/bulk_flag_clear.pl
+++ b/extensions/TrackingFlags/bin/bulk_flag_clear.pl
@@ -9,8 +9,10 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use FindBin '$RealBin';
+use lib "$RealBin/../../..";
+use lib "$RealBin/../../../lib";
+use lib "$RealBin/../lib";
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/TrackingFlags/bin/migrate_tracking_flags.pl b/extensions/TrackingFlags/bin/migrate_tracking_flags.pl
index bca03f9f9..06b3596c4 100755
--- a/extensions/TrackingFlags/bin/migrate_tracking_flags.pl
+++ b/extensions/TrackingFlags/bin/migrate_tracking_flags.pl
@@ -12,8 +12,10 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use FindBin '$RealBin';
+use lib "$RealBin/../../..";
+use lib "$RealBin/../../../lib";
+use lib "$RealBin/../lib";
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/TrackingFlags/lib/Admin.pm b/extensions/TrackingFlags/lib/Admin.pm
index 50a0e0a61..1adcad241 100644
--- a/extensions/TrackingFlags/lib/Admin.pm
+++ b/extensions/TrackingFlags/lib/Admin.pm
@@ -7,7 +7,6 @@
 
 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 00827aa7a..0b1ae3a1a 100644
--- a/extensions/TrackingFlags/lib/Constants.pm
+++ b/extensions/TrackingFlags/lib/Constants.pm
@@ -7,10 +7,7 @@
 
 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 82c0314e3..7b6effa98 100644
--- a/extensions/TrackingFlags/lib/Flag.pm
+++ b/extensions/TrackingFlags/lib/Flag.pm
@@ -9,7 +9,6 @@ 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 7be661720..74b2814fa 100644
--- a/extensions/TrackingFlags/lib/Flag/Bug.pm
+++ b/extensions/TrackingFlags/lib/Flag/Bug.pm
@@ -9,7 +9,6 @@ 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 4f2aacc3a..15be61bc7 100644
--- a/extensions/TrackingFlags/lib/Flag/Value.pm
+++ b/extensions/TrackingFlags/lib/Flag/Value.pm
@@ -9,7 +9,6 @@ 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 878c16f99..7600d71bd 100644
--- a/extensions/TrackingFlags/lib/Flag/Visibility.pm
+++ b/extensions/TrackingFlags/lib/Flag/Visibility.pm
@@ -9,7 +9,6 @@ package Bugzilla::Extension::TrackingFlags::Flag::Visibility;
 
 use base qw(Bugzilla::Object);
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/TypeSniffer/Config.pm b/extensions/TypeSniffer/Config.pm
index 4545f69f6..6ad03b362 100644
--- a/extensions/TypeSniffer/Config.pm
+++ b/extensions/TypeSniffer/Config.pm
@@ -20,10 +20,7 @@
 #   Gervase Markham <gerv@mozilla.org>
 
 package Bugzilla::Extension::TypeSniffer;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'TypeSniffer';
 
diff --git a/extensions/TypeSniffer/Extension.pm b/extensions/TypeSniffer/Extension.pm
index 6c34cb169..c593b76e8 100644
--- a/extensions/TypeSniffer/Extension.pm
+++ b/extensions/TypeSniffer/Extension.pm
@@ -20,11 +20,7 @@
 #   Gervase Markham <gerv@mozilla.org>
 
 package Bugzilla::Extension::TypeSniffer;
-
-use 5.10.1;
 use strict;
-use warnings;
-
 use base qw(Bugzilla::Extension);
 
 use File::MimeInfo::Magic;
diff --git a/extensions/UserProfile/Config.pm b/extensions/UserProfile/Config.pm
index 99fae1610..99dca9e02 100644
--- a/extensions/UserProfile/Config.pm
+++ b/extensions/UserProfile/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::UserProfile;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'UserProfile';
 use constant REQUIRED_MODULES => [ ];
diff --git a/extensions/UserProfile/Extension.pm b/extensions/UserProfile/Extension.pm
index 079f7a948..2c17a2d9f 100644
--- a/extensions/UserProfile/Extension.pm
+++ b/extensions/UserProfile/Extension.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::UserProfile;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/UserProfile/bin/migrate.pl b/extensions/UserProfile/bin/migrate.pl
index 2cde3ce2c..147edef9c 100755
--- a/extensions/UserProfile/bin/migrate.pl
+++ b/extensions/UserProfile/bin/migrate.pl
@@ -11,8 +11,8 @@ use strict;
 use warnings;
 $| = 1;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use FindBin qw($Bin);
+use lib "$Bin/../../..";
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/UserProfile/bin/update.pl b/extensions/UserProfile/bin/update.pl
index af9a81774..2a4997aee 100755
--- a/extensions/UserProfile/bin/update.pl
+++ b/extensions/UserProfile/bin/update.pl
@@ -10,8 +10,8 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use FindBin qw($Bin);
+use lib "$Bin/../../..";
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/UserProfile/lib/Util.pm b/extensions/UserProfile/lib/Util.pm
index 509b131c1..71d0e6501 100644
--- a/extensions/UserProfile/lib/Util.pm
+++ b/extensions/UserProfile/lib/Util.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::UserProfile::Util;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/UserStory/Config.pm b/extensions/UserStory/Config.pm
index 8668deaa7..8649c71cf 100644
--- a/extensions/UserStory/Config.pm
+++ b/extensions/UserStory/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::UserStory;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'UserStory';
 use constant REQUIRED_MODULES => [
diff --git a/extensions/UserStory/Extension.pm b/extensions/UserStory/Extension.pm
index f9fdb3f29..2053a0097 100644
--- a/extensions/UserStory/Extension.pm
+++ b/extensions/UserStory/Extension.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::UserStory;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/UserStory/lib/Constants.pm b/extensions/UserStory/lib/Constants.pm
index 6a1c0c449..d09b28fef 100644
--- a/extensions/UserStory/lib/Constants.pm
+++ b/extensions/UserStory/lib/Constants.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::UserStory::Constants;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Voting/Config.pm b/extensions/Voting/Config.pm
index 97c44933e..438f1e054 100644
--- a/extensions/Voting/Config.pm
+++ b/extensions/Voting/Config.pm
@@ -1,15 +1,26 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# -*- Mode: perl; indent-tabs-mode: nil -*-
 #
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Bug Tracking System.
+#
+# The Initial Developer of the Original Code is Frédéric Buclin.
+# Portions created by the Initial Developer is Copyright (C) 2012 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Frédéric Buclin <LpSolit@gmail.com>
 
 package Bugzilla::Extension::Voting;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'Voting';
 
diff --git a/extensions/Voting/Extension.pm b/extensions/Voting/Extension.pm
index 25266778c..39ed7c4b4 100644
--- a/extensions/Voting/Extension.pm
+++ b/extensions/Voting/Extension.pm
@@ -1,14 +1,31 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# -*- Mode: perl; indent-tabs-mode: nil -*-
 #
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Bug Tracking System.
+#
+# The Initial Developer of the Original Code is Netscape Communications
+# Corporation. Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): Terry Weissman <terry@mozilla.org>
+#                 Stephan Niemz  <st.n@gmx.net>
+#                 Christopher Aillon <christopher@aillon.com>
+#                 Gervase Markham <gerv@gerv.net>
+#                 Frédéric Buclin <LpSolit@gmail.com>
+#                 Max Kanat-Alexander <mkanat@bugzilla.org>
 
 package Bugzilla::Extension::Voting;
-use 5.10.1;
 use strict;
-use warnings;
 use base qw(Bugzilla::Extension);
 
 use Bugzilla::Bug;
diff --git a/extensions/ZPushNotify/Config.pm b/extensions/ZPushNotify/Config.pm
index 1a31285e2..e65169d41 100644
--- a/extensions/ZPushNotify/Config.pm
+++ b/extensions/ZPushNotify/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::ZPushNotify;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'ZPushNotify';
 use constant REQUIRED_MODULES => [];
diff --git a/extensions/ZPushNotify/Extension.pm b/extensions/ZPushNotify/Extension.pm
index df3ab8f46..2b6c1aeaa 100644
--- a/extensions/ZPushNotify/Extension.pm
+++ b/extensions/ZPushNotify/Extension.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::ZPushNotify;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/create.pl b/extensions/create.pl
index 80fc49448..1b54e6b33 100755
--- a/extensions/create.pl
+++ b/extensions/create.pl
@@ -1,20 +1,26 @@
-#!/usr/bin/perl
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#!/usr/bin/perl -w
 #
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Bug Tracking System.
+#
+# The Initial Developer of the Original Code is Everything Solved, Inc.
+# Portions created by the Initial Developer are Copyright (C) 2009 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Max Kanat-Alexander <mkanat@bugzilla.org>
 
-use 5.10.1;
 use strict;
-use warnings;
-
-use File::Basename;
-BEGIN { chdir dirname($0); }
-
-use lib qw(.. ../lib ../local/lib/perl5);
-
+use lib qw(. lib);
 use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Error;
author	Dylan William Hardison <dylan@hardison.net>	2016-09-12 22:22:17 +0200
committer	Dylan William Hardison <dylan@hardison.net>	2016-09-12 22:22:17 +0200
commit	14bcdce1dc6029c3676c3640d8148c83c14692e5 (patch)
tree	99d760e13b687f8111635916d9ed3937bc084c64 /extensions
parent	e6bf4cacb10f86077fe898349485f5c7ab9fb4b6 (diff)
download	bugzilla-14bcdce1dc6029c3676c3640d8148c83c14692e5.tar.gz bugzilla-14bcdce1dc6029c3676c3640d8148c83c14692e5.tar.xz