diff --git a/charclass_invlists.inc b/charclass_invlists.inc
index 71cf9a36f2..855ae3d196 100644
--- a/charclass_invlists.inc
+++ b/charclass_invlists.inc
@@ -492662,5 +492662,5 @@ static const U8 WB_dfa_table[] = {
  * 8c30575264b2772c7a69c5bb6069a28f0e0a7a0df735871bde2d99ee674316ac lib/unicore/version
  * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl
  * c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl
- * 33a5e583d836b8bb97b6b1d1c6d1766defe4cbdeb8bcbe865d76f71206762be9 regen/mk_invlists.pl
+ * 20a6e3d507a66f4594586485568134873485b08e23383f3dc4e6b3047569267b regen/mk_invlists.pl
  * ex: set ro ft=c: */
diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl
index 839891fd20..320995ba1d 100644
--- a/lib/unicore/uni_keywords.pl
+++ b/lib/unicore/uni_keywords.pl
@@ -1428,5 +1428,5 @@
 # 8c30575264b2772c7a69c5bb6069a28f0e0a7a0df735871bde2d99ee674316ac lib/unicore/version
 # 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl
 # c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl
-# 33a5e583d836b8bb97b6b1d1c6d1766defe4cbdeb8bcbe865d76f71206762be9 regen/mk_invlists.pl
+# 20a6e3d507a66f4594586485568134873485b08e23383f3dc4e6b3047569267b regen/mk_invlists.pl
 # ex: set ro ft=perl:
diff --git a/regen/mk_invlists.pl b/regen/mk_invlists.pl
index 6578c2d1af..2d4a8ebbf3 100644
--- a/regen/mk_invlists.pl
+++ b/regen/mk_invlists.pl
@@ -348,13 +348,7 @@ sub start_charset_pound_if ($charset, $indent_level=undef) {
             $in_doinit = 1;
             print $fh <<EOF;
 
-#    ifndef DOINIT
-
-EXTCONST $declaration;
-
-#    else
-
-EXTCONST $declaration = {$comment
+EXTCONST $declaration  INIT( {$comment
 EOF
         }
     }
@@ -363,11 +357,12 @@ EOF
 
         # Close out a table started by output_table_header()
 
-        print $fh "};\n";
+        print $fh "}";
         if ($in_doinit) {
-            print $fh "\n#    endif  /* DOINIT */\n\n";
+            print $fh ")";
             $in_doinit = 0;
         }
+        print $fh ";\n";
     }
 } # End closure
 
diff --git a/regexp_constants.h b/regexp_constants.h
index 7424c86dc6..5df5462ef6 100644
--- a/regexp_constants.h
+++ b/regexp_constants.h
@@ -83,5 +83,5 @@
  * 8c30575264b2772c7a69c5bb6069a28f0e0a7a0df735871bde2d99ee674316ac lib/unicore/version
  * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl
  * c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl
- * 33a5e583d836b8bb97b6b1d1c6d1766defe4cbdeb8bcbe865d76f71206762be9 regen/mk_invlists.pl
+ * 20a6e3d507a66f4594586485568134873485b08e23383f3dc4e6b3047569267b regen/mk_invlists.pl
  * ex: set ro ft=c: */
diff --git a/uni_keywords.h b/uni_keywords.h
index b93283f4f8..6e81a518e3 100644
--- a/uni_keywords.h
+++ b/uni_keywords.h
@@ -8175,6 +8175,6 @@ match_uniprop( const unsigned char * const key, const U16 key_len ) {
  * 8c30575264b2772c7a69c5bb6069a28f0e0a7a0df735871bde2d99ee674316ac lib/unicore/version
  * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl
  * c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl
- * 33a5e583d836b8bb97b6b1d1c6d1766defe4cbdeb8bcbe865d76f71206762be9 regen/mk_invlists.pl
+ * 20a6e3d507a66f4594586485568134873485b08e23383f3dc4e6b3047569267b regen/mk_invlists.pl
  * d6987e01ad538d1567394851cf199f99815f7701bebd6092be4bc7a6d8f147c6 regen/mph.pl
  * ex: set ro ft=c: */