5 files changed, 5 insertions, 47 deletions
diff --git a/charclass_invlists.h b/charclass_invlists.h
index ceb6df37c5..2b58f1c7ae 100644
--- a/charclass_invlists.h
+++ b/charclass_invlists.h
@@ -430751,7 +430751,7 @@ static const U8 WB_table[23][23] = {
  * 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt
  * a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt
  * 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt
- * 31d2f39a48fd6624f9fb9c7648daed3ae6f364548d08b65310f136d024be8986 lib/unicore/mktables
+ * c0f1e4ae8c408396e6c5d5433c67dc741137ad8094e3747fac359c6038c760f1 lib/unicore/mktables
  * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version
  * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl
  * 5f8520d3a17ade6317fc0c423f5091470924b1ef425bca0c41ce8e4a9f8460fe regen/mk_PL_charclass.pl
diff --git a/lib/unicore/mktables b/lib/unicore/mktables
index 20131c3383..5f5487ac54 100644
--- a/lib/unicore/mktables
+++ b/lib/unicore/mktables
@@ -33,7 +33,7 @@ use re "/aa";
 
 use feature 'state';
 use feature 'signatures';
-no warnings 'experimental::signatures';
+no warnings qw( experimental::signatures experimental::builtin );
 
 sub DEBUG () { 0 }  # Set to 0 for production; 1 for development
 my $debugging_build = $Config{"ccflags"} =~ /-DDEBUGGING/;
@@ -3354,12 +3354,6 @@ package Multi_Default;
 # defaults, and for all but that final default, an eval string that generates
 # the class that it applies to.
 
-use strict;
-use warnings;
-
-use feature 'signatures';
-no warnings 'experimental::signatures';
-
 {   # Closure
 
     main::setup_package();
@@ -3416,12 +3410,6 @@ package Alias;
 # including some attributes.  Everything is currently setup in the
 # constructor.
 
-use strict;
-use warnings;
-
-use feature 'signatures';
-no warnings 'experimental::signatures';
-
 
 {   # Closure
 
@@ -3493,12 +3481,6 @@ package Range;
 # map to.  Type 0 values have the standardized version of the value stored as
 # well, so as to not have to recalculate it a lot.
 
-use strict;
-use warnings;
-
-use feature 'signatures';
-no warnings 'experimental::signatures';
-
 sub trace { return main::trace(@_); }
 
 {   # Closure
@@ -3605,12 +3587,6 @@ sub trace { return main::trace(@_); }
 
 package _Range_List_Base;
 
-use strict;
-use warnings;
-
-use feature 'signatures';
-no warnings 'experimental::signatures';
-
 # Base class for range lists.  A range list is simply an ordered list of
 # ranges, so that the ranges with the lowest starting numbers are first in it.
 #
@@ -4797,12 +4773,6 @@ sub trace { return main::trace(@_); }
 package Range_List;
 use parent '-norequire', '_Range_List_Base';
 
-use warnings;
-use strict;
-
-use feature 'signatures';
-no warnings 'experimental::signatures';
-
 # A Range_List is a range list for match tables; i.e. the range values are
 # not significant.  Thus a number of operations can be safely added to it,
 # such as inversion, intersection.  Note that union is also an unsafe
@@ -5161,12 +5131,6 @@ sub trace { return main::trace(@_); }
 package Range_Map;
 use parent '-norequire', '_Range_List_Base';
 
-use strict;
-use warnings;
-
-use feature 'signatures';
-no warnings 'experimental::signatures';
-
 # A Range_Map is a range list in which the range values (called maps) are
 # significant, and hence shouldn't be manipulated by our other code, which
 # could be ambiguous or lose things.  For example, in taking the union of two
@@ -5205,12 +5169,6 @@ no warnings 'experimental::signatures';
 
 package _Base_Table;
 
-use strict;
-use warnings;
-
-use feature 'signatures';
-no warnings 'experimental::signatures';
-
 # A table is the basic data structure that gets written out into a file for
 # use by the Perl core.  This is the abstract base class implementing the
 # common elements from the derived ones.  A list of the methods to be
diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl
index 1f79548bf9..18381a966b 100644
--- a/lib/unicore/uni_keywords.pl
+++ b/lib/unicore/uni_keywords.pl
@@ -1319,7 +1319,7 @@
 # 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt
 # a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt
 # 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt
-# 31d2f39a48fd6624f9fb9c7648daed3ae6f364548d08b65310f136d024be8986 lib/unicore/mktables
+# c0f1e4ae8c408396e6c5d5433c67dc741137ad8094e3747fac359c6038c760f1 lib/unicore/mktables
 # c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version
 # 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl
 # 5f8520d3a17ade6317fc0c423f5091470924b1ef425bca0c41ce8e4a9f8460fe regen/mk_PL_charclass.pl
diff --git a/regcharclass.h b/regcharclass.h
index 68e96fe466..e3304c0001 100644
--- a/regcharclass.h
+++ b/regcharclass.h
@@ -3762,7 +3762,7 @@
  * 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt
  * a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt
  * 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt
- * 31d2f39a48fd6624f9fb9c7648daed3ae6f364548d08b65310f136d024be8986 lib/unicore/mktables
+ * c0f1e4ae8c408396e6c5d5433c67dc741137ad8094e3747fac359c6038c760f1 lib/unicore/mktables
  * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version
  * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl
  * 1aa94679c695efd507b7e4491629dba1021b74c21a5324dfd3a582a5d654bd32 regen/regcharclass.pl
diff --git a/uni_keywords.h b/uni_keywords.h
index e1e64f7422..a0715034b4 100644
--- a/uni_keywords.h
+++ b/uni_keywords.h
@@ -7701,7 +7701,7 @@ MPH_VALt match_uniprop( const unsigned char * const key, const U16 key_len ) {
  * 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt
  * a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt
  * 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt
- * 31d2f39a48fd6624f9fb9c7648daed3ae6f364548d08b65310f136d024be8986 lib/unicore/mktables
+ * c0f1e4ae8c408396e6c5d5433c67dc741137ad8094e3747fac359c6038c760f1 lib/unicore/mktables
  * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version
  * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl
  * 5f8520d3a17ade6317fc0c423f5091470924b1ef425bca0c41ce8e4a9f8460fe regen/mk_PL_charclass.pl