Change private symbol prefix from ‘__’ to ‘_’

73 files changed, 146 insertions, 146 deletions

diff --git a/lib/errors/mlib_setprogname.c b/lib/errors/mlib_setprogname.c
index bfc77b0..415ed64 100644
--- a/lib/errors/mlib_setprogname.c
+++ b/lib/errors/mlib_setprogname.c
@@ -2,11 +2,11 @@
 
 #include "errors.h"
 
-const char *__mlib_errors_progname;
+const char *_mlib_errors_progname;
 
 void
 mlib_setprogname(const char *s)
 {
 	const char *p = strrchr(s, '/');
-	__mlib_errors_progname = p ? p + 1 : s;
+	_mlib_errors_progname = p ? p + 1 : s;
 }
diff --git a/lib/unicode/prop/uprop_get_age.c b/lib/unicode/prop/uprop_get_age.c
index 0c9d6fe..4a67453 100644
--- a/lib/unicode/prop/uprop_get_age.c
+++ b/lib/unicode/prop/uprop_get_age.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/age; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "rune.h"
 #include "unicode/prop.h"
 
@@ -1703,7 +1703,7 @@ static const struct {
 	{RUNE_C(0x0EFFFE), RUNE_C(0x10FFFF), AGE_V2_0},
 };
 
-__MLIB_DEFINE_BSEARCH(enum uprop_age, lookup, AGE_NA)
+_MLIB_DEFINE_BSEARCH(enum uprop_age, lookup, AGE_NA)
 
 enum uprop_age
 uprop_get_age(rune ch)
diff --git a/lib/unicode/prop/uprop_get_bc.c b/lib/unicode/prop/uprop_get_bc.c
index c8b7a35..1de3458 100644
--- a/lib/unicode/prop/uprop_get_bc.c
+++ b/lib/unicode/prop/uprop_get_bc.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bc; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -1529,7 +1529,7 @@ static const struct {
 	{RUNE_C(0x10FFFE), RUNE_C(0x10FFFF), BC_BN},
 };
 
-__MLIB_DEFINE_BSEARCH(enum uprop_bc, lookup, BC_L)
+_MLIB_DEFINE_BSEARCH(enum uprop_bc, lookup, BC_L)
 
 enum uprop_bc
 uprop_get_bc(rune ch)
diff --git a/lib/unicode/prop/uprop_get_blk.c b/lib/unicode/prop/uprop_get_blk.c
index a1a6c39..9bb30a5 100644
--- a/lib/unicode/prop/uprop_get_blk.c
+++ b/lib/unicode/prop/uprop_get_blk.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/blk; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -372,7 +372,7 @@ static const struct {
 	{RUNE_C(0x100000), RUNE_C(0x10FFFF), BLK_SUP_PUA_B},
 };
 
-__MLIB_DEFINE_BSEARCH(enum uprop_blk, lookup, BLK_NB)
+_MLIB_DEFINE_BSEARCH(enum uprop_blk, lookup, BLK_NB)
 
 enum uprop_blk
 uprop_get_blk(rune ch)
diff --git a/lib/unicode/prop/uprop_get_bmg.c b/lib/unicode/prop/uprop_get_bmg.c
index 629e7f1..2242f01 100644
--- a/lib/unicode/prop/uprop_get_bmg.c
+++ b/lib/unicode/prop/uprop_get_bmg.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bmg; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -463,7 +463,7 @@ static const struct {
 	{RUNE_C(0x00FF63), RUNE_C(0x00FF62)},
 };
 
-__MLIB_DEFINE_BSEARCH_KV(rune, lookup, 0)
+_MLIB_DEFINE_BSEARCH_KV(rune, lookup, 0)
 
 rune
 uprop_get_bmg(rune ch)
diff --git a/lib/unicode/prop/uprop_get_bpb.c b/lib/unicode/prop/uprop_get_bpb.c
index 343f71b..2b7eb10 100644
--- a/lib/unicode/prop/uprop_get_bpb.c
+++ b/lib/unicode/prop/uprop_get_bpb.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bpb; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -167,7 +167,7 @@ static const struct {
 	{RUNE_C(0x00FF63), RUNE_C(0x00FF62)},
 };
 
-__MLIB_DEFINE_BSEARCH_KV(rune, lookup, 0)
+_MLIB_DEFINE_BSEARCH_KV(rune, lookup, 0)
 
 rune
 uprop_get_bpb(rune ch)
diff --git a/lib/unicode/prop/uprop_get_bpt.c b/lib/unicode/prop/uprop_get_bpt.c
index 7e8c11a..6de4483 100644
--- a/lib/unicode/prop/uprop_get_bpt.c
+++ b/lib/unicode/prop/uprop_get_bpt.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bpt; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -168,7 +168,7 @@ static const struct {
 	{RUNE_C(0x00FF63), BPT_C},
 };
 
-__MLIB_DEFINE_BSEARCH_KV(enum uprop_bpt, lookup, BPT_N)
+_MLIB_DEFINE_BSEARCH_KV(enum uprop_bpt, lookup, BPT_N)
 
 enum uprop_bpt
 uprop_get_bpt(rune ch)
diff --git a/lib/unicode/prop/uprop_get_cf.c b/lib/unicode/prop/uprop_get_cf.c
index 4b0e90b..fecb08f 100644
--- a/lib/unicode/prop/uprop_get_cf.c
+++ b/lib/unicode/prop/uprop_get_cf.c
@@ -1,4 +1,4 @@
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "unicode/prop.h"
 
 #define M(...) ((struct rview)_(__VA_ARGS__))
@@ -114,7 +114,7 @@ static const struct {
 	{0xFB17, /* ﬗ */ _(U'մ', U'խ')},
 };
 
-__MLIB_DEFINE_BSEARCH_KV(struct rview, lookup, M())
+_MLIB_DEFINE_BSEARCH_KV(struct rview, lookup, M())
 
 struct rview
 uprop_get_cf(rune ch, bool az_or_tr)
diff --git a/lib/unicode/prop/uprop_get_dt.c b/lib/unicode/prop/uprop_get_dt.c
index afc3e66..0db4a72 100644
--- a/lib/unicode/prop/uprop_get_dt.c
+++ b/lib/unicode/prop/uprop_get_dt.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/dt; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -821,7 +821,7 @@ static const struct {
 	{RUNE_C(0x02F800), RUNE_C(0x02FA1D), DT_CAN},
 };
 
-__MLIB_DEFINE_BSEARCH(enum uprop_dt, lookup, DT_NONE)
+_MLIB_DEFINE_BSEARCH(enum uprop_dt, lookup, DT_NONE)
 
 enum uprop_dt
 uprop_get_dt(rune ch)
diff --git a/lib/unicode/prop/uprop_get_ea.c b/lib/unicode/prop/uprop_get_ea.c
index 91cafad..07642a7 100644
--- a/lib/unicode/prop/uprop_get_ea.c
+++ b/lib/unicode/prop/uprop_get_ea.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/ea; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -1179,7 +1179,7 @@ static const struct {
 	{RUNE_C(0x100000), RUNE_C(0x10FFFD), EA_A},
 };
 
-__MLIB_DEFINE_BSEARCH(enum uprop_ea, lookup, EA_NA)
+_MLIB_DEFINE_BSEARCH(enum uprop_ea, lookup, EA_NA)
 
 enum uprop_ea
 uprop_get_ea(rune ch)
diff --git a/lib/unicode/prop/uprop_get_gc.c b/lib/unicode/prop/uprop_get_gc.c
index bd7a743..448039f 100644
--- a/lib/unicode/prop/uprop_get_gc.c
+++ b/lib/unicode/prop/uprop_get_gc.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/gc; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -3289,7 +3289,7 @@ static const struct {
 	{RUNE_C(0x100000), RUNE_C(0x10FFFD), GC_CO},
 };
 
-__MLIB_DEFINE_BSEARCH(enum uprop_gc, lookup, GC_CN)
+_MLIB_DEFINE_BSEARCH(enum uprop_gc, lookup, GC_CN)
 
 enum uprop_gc
 uprop_get_gc(rune ch)
diff --git a/lib/unicode/prop/uprop_get_lb.c b/lib/unicode/prop/uprop_get_lb.c
index 67437ad..7c9b34a 100644
--- a/lib/unicode/prop/uprop_get_lb.c
+++ b/lib/unicode/prop/uprop_get_lb.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/lb; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -2852,7 +2852,7 @@ static const struct {
 	{RUNE_C(0x100000), RUNE_C(0x10FFFD), LB_XX},
 };
 
-__MLIB_DEFINE_BSEARCH(enum uprop_lb, lookup, LB_XX)
+_MLIB_DEFINE_BSEARCH(enum uprop_lb, lookup, LB_XX)
 
 enum uprop_lb
 uprop_get_lb(rune ch)
diff --git a/lib/unicode/prop/uprop_get_na1.c b/lib/unicode/prop/uprop_get_na1.c
index b204cce..cd66595 100644
--- a/lib/unicode/prop/uprop_get_na1.c
+++ b/lib/unicode/prop/uprop_get_na1.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/na1; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -1992,7 +1992,7 @@ static const struct {
 	{RUNE_C(0x00FFE4), _('F', 'U', 'L', 'L', 'W', 'I', 'D', 'T', 'H', ' ', 'B', 'R', 'O', 'K', 'E', 'N', ' ', 'V', 'E', 'R', 'T', 'I', 'C', 'A', 'L', ' ', 'B', 'A', 'R')},
 };
 
-__MLIB_DEFINE_BSEARCH_KV(struct u8view, lookup, (struct u8view){})
+_MLIB_DEFINE_BSEARCH_KV(struct u8view, lookup, (struct u8view){})
 
 struct u8view
 uprop_get_na1(rune ch)
diff --git a/lib/unicode/prop/uprop_get_nt.c b/lib/unicode/prop/uprop_get_nt.c
index 70e0055..bbcaa02 100644
--- a/lib/unicode/prop/uprop_get_nt.c
+++ b/lib/unicode/prop/uprop_get_nt.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/nt; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -288,7 +288,7 @@ static const struct {
 	{RUNE_C(0x02F890), RUNE_C(0x02F890), NT_NU},
 };
 
-__MLIB_DEFINE_BSEARCH(enum uprop_nt, lookup, NT_NONE)
+_MLIB_DEFINE_BSEARCH(enum uprop_nt, lookup, NT_NONE)
 
 enum uprop_nt
 uprop_get_nt(rune ch)
diff --git a/lib/unicode/prop/uprop_get_nv.c b/lib/unicode/prop/uprop_get_nv.c
index 73fa482..13ea573 100644
--- a/lib/unicode/prop/uprop_get_nv.c
+++ b/lib/unicode/prop/uprop_get_nv.c
@@ -2,7 +2,7 @@
 
 #include <float.h>
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -1954,7 +1954,7 @@ static const struct {
 	{RUNE_C(0x02F890), 9},
 };
 
-__MLIB_DEFINE_BSEARCH_KV(double, lookup, NAN)
+_MLIB_DEFINE_BSEARCH_KV(double, lookup, NAN)
 
 double
 uprop_get_nv(rune ch)
diff --git a/lib/unicode/prop/uprop_get_sc.c b/lib/unicode/prop/uprop_get_sc.c
index 531c0c7..16bbdd8 100644
--- a/lib/unicode/prop/uprop_get_sc.c
+++ b/lib/unicode/prop/uprop_get_sc.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/sc; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -986,7 +986,7 @@ static const struct {
 	{RUNE_C(0x0E0100), RUNE_C(0x0E01EF), SC_ZINH},
 };
 
-__MLIB_DEFINE_BSEARCH(enum uprop_sc, lookup, SC_ZZZZ)
+_MLIB_DEFINE_BSEARCH(enum uprop_sc, lookup, SC_ZZZZ)
 
 enum uprop_sc
 uprop_get_sc(rune ch)
diff --git a/lib/unicode/prop/uprop_get_scf.c b/lib/unicode/prop/uprop_get_scf.c
index 88ecf4e..daffc02 100644
--- a/lib/unicode/prop/uprop_get_scf.c
+++ b/lib/unicode/prop/uprop_get_scf.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/scf; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -1445,7 +1445,7 @@ static const struct {
 	{RUNE_C(0x01E921), RUNE_C(0x01E943)},
 };
 
-__MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch)
+_MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch)
 
 rune
 uprop_get_scf(rune ch, bool az_or_tr)
diff --git a/lib/unicode/prop/uprop_get_slc.c b/lib/unicode/prop/uprop_get_slc.c
index 40e7d84..eec3088 100644
--- a/lib/unicode/prop/uprop_get_slc.c
+++ b/lib/unicode/prop/uprop_get_slc.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/slc; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -1422,7 +1422,7 @@ static const struct {
 	{RUNE_C(0x01E921), RUNE_C(0x01E943)},
 };
 
-__MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch)
+_MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch)
 
 rune
 uprop_get_slc(rune ch)
diff --git a/lib/unicode/prop/uprop_get_stc.c b/lib/unicode/prop/uprop_get_stc.c
index 8eead56..4f34472 100644
--- a/lib/unicode/prop/uprop_get_stc.c
+++ b/lib/unicode/prop/uprop_get_stc.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/stc; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -18,7 +18,7 @@ static const struct {
 	{RUNE_C(0x0001F3), RUNE_C(0x0001F2)},
 };
 
-__MLIB_DEFINE_BSEARCH_KV(rune, lookup, uprop_get_suc(ch))
+_MLIB_DEFINE_BSEARCH_KV(rune, lookup, uprop_get_suc(ch))
 
 rune
 uprop_get_stc(rune ch)
diff --git a/lib/unicode/prop/uprop_get_suc.c b/lib/unicode/prop/uprop_get_suc.c
index 652ca11..579b78c 100644
--- a/lib/unicode/prop/uprop_get_suc.c
+++ b/lib/unicode/prop/uprop_get_suc.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/suc; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -1437,7 +1437,7 @@ static const struct {
 	{RUNE_C(0x01E943), RUNE_C(0x01E921)},
 };
 
-__MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch)
+_MLIB_DEFINE_BSEARCH_KV(rune, lookup, ch)
 
 rune
 uprop_get_suc(rune ch)
diff --git a/lib/unicode/prop/uprop_get_tc.c b/lib/unicode/prop/uprop_get_tc.c
index 029ef51..442db6e 100644
--- a/lib/unicode/prop/uprop_get_tc.c
+++ b/lib/unicode/prop/uprop_get_tc.c
@@ -1,4 +1,4 @@
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "unicode/prop.h"
 
 #define M(...) ((struct rview)_(__VA_ARGS__))
@@ -59,7 +59,7 @@ static const struct {
 	{0xFB17 /* ﬗ */, _(U'Մ', U'խ')},
 };
 
-__MLIB_DEFINE_BSEARCH_KV(struct rview, lookup, M(ch))
+_MLIB_DEFINE_BSEARCH_KV(struct rview, lookup, M(ch))
 
 struct rview
 uprop_get_tc(rune ch, struct tcctx ctx)
diff --git a/lib/unicode/prop/uprop_get_uc.c b/lib/unicode/prop/uprop_get_uc.c
index 69435b8..ecb0883 100644
--- a/lib/unicode/prop/uprop_get_uc.c
+++ b/lib/unicode/prop/uprop_get_uc.c
@@ -1,4 +1,4 @@
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "macros.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -114,7 +114,7 @@ static const struct {
 	{0xFB17, /* ﬗ */ _(U'Մ', U'Խ')},
 };
 
-__MLIB_DEFINE_BSEARCH_KV(struct rview, lookup, M(ch))
+_MLIB_DEFINE_BSEARCH_KV(struct rview, lookup, M(ch))
 
 struct rview
 uprop_get_uc(rune ch, struct ucctx ctx)
diff --git a/lib/unicode/prop/uprop_is_ahex.c b/lib/unicode/prop/uprop_is_ahex.c
index 21dcd97..81465b1 100644
--- a/lib/unicode/prop/uprop_is_ahex.c
+++ b/lib/unicode/prop/uprop_is_ahex.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
diff --git a/lib/unicode/prop/uprop_is_alpha.c b/lib/unicode/prop/uprop_is_alpha.c
index f5328b4..6fcd435 100644
--- a/lib/unicode/prop/uprop_is_alpha.c
+++ b/lib/unicode/prop/uprop_is_alpha.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -745,7 +745,7 @@ static const struct {
 	{RUNE_C(0x031350), RUNE_C(0x0323AF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_alpha(rune ch)
diff --git a/lib/unicode/prop/uprop_is_bidi_c.c b/lib/unicode/prop/uprop_is_bidi_c.c
index 962c219..409c20e 100644
--- a/lib/unicode/prop/uprop_is_bidi_c.c
+++ b/lib/unicode/prop/uprop_is_bidi_c.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -16,7 +16,7 @@ static const struct {
 	{RUNE_C(0x002066), RUNE_C(0x002069)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_bidi_c(rune ch)
diff --git a/lib/unicode/prop/uprop_is_bidi_m.c b/lib/unicode/prop/uprop_is_bidi_m.c
index f415fce..9ffd897 100644
--- a/lib/unicode/prop/uprop_is_bidi_m.c
+++ b/lib/unicode/prop/uprop_is_bidi_m.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -124,7 +124,7 @@ static const struct {
 	{RUNE_C(0x01D7C3), RUNE_C(0x01D7C3)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_bidi_m(rune ch)
diff --git a/lib/unicode/prop/uprop_is_cased.c b/lib/unicode/prop/uprop_is_cased.c
index ee0b288..59a5b8d 100644
--- a/lib/unicode/prop/uprop_is_cased.c
+++ b/lib/unicode/prop/uprop_is_cased.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -169,7 +169,7 @@ static const struct {
 	{RUNE_C(0x01F170), RUNE_C(0x01F189)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_cased(rune ch)
diff --git a/lib/unicode/prop/uprop_is_ci.c b/lib/unicode/prop/uprop_is_ci.c
index 43f0e11..33eff8d 100644
--- a/lib/unicode/prop/uprop_is_ci.c
+++ b/lib/unicode/prop/uprop_is_ci.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -446,7 +446,7 @@ static const struct {
 	{RUNE_C(0x0E0100), RUNE_C(0x0E01EF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_ci(rune ch)
diff --git a/lib/unicode/prop/uprop_is_cwcf.c b/lib/unicode/prop/uprop_is_cwcf.c
index beefb71..809e4c5 100644
--- a/lib/unicode/prop/uprop_is_cwcf.c
+++ b/lib/unicode/prop/uprop_is_cwcf.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -637,7 +637,7 @@ static const struct {
 	{RUNE_C(0x01E900), RUNE_C(0x01E921)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_cwcf(rune ch)
diff --git a/lib/unicode/prop/uprop_is_cwcm.c b/lib/unicode/prop/uprop_is_cwcm.c
index b031ce3..9f67ba6 100644
--- a/lib/unicode/prop/uprop_is_cwcm.c
+++ b/lib/unicode/prop/uprop_is_cwcm.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -145,7 +145,7 @@ static const struct {
 	{RUNE_C(0x01E900), RUNE_C(0x01E943)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_cwcm(rune ch)
diff --git a/lib/unicode/prop/uprop_is_cwkcf.c b/lib/unicode/prop/uprop_is_cwkcf.c
index 33a7c48..c93ff02 100644
--- a/lib/unicode/prop/uprop_is_cwkcf.c
+++ b/lib/unicode/prop/uprop_is_cwkcf.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -847,7 +847,7 @@ static const struct {
 	{RUNE_C(0x0E0000), RUNE_C(0x0E0FFF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_cwkcf(rune ch)
diff --git a/lib/unicode/prop/uprop_is_cwl.c b/lib/unicode/prop/uprop_is_cwl.c
index 5232692..82152a2 100644
--- a/lib/unicode/prop/uprop_is_cwl.c
+++ b/lib/unicode/prop/uprop_is_cwl.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -625,7 +625,7 @@ static const struct {
 	{RUNE_C(0x01E900), RUNE_C(0x01E921)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_cwl(rune ch)
diff --git a/lib/unicode/prop/uprop_is_cwt.c b/lib/unicode/prop/uprop_is_cwt.c
index 1b32828..8ea2110 100644
--- a/lib/unicode/prop/uprop_is_cwt.c
+++ b/lib/unicode/prop/uprop_is_cwt.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -641,7 +641,7 @@ static const struct {
 	{RUNE_C(0x01E922), RUNE_C(0x01E943)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_cwt(rune ch)
diff --git a/lib/unicode/prop/uprop_is_cwu.c b/lib/unicode/prop/uprop_is_cwu.c
index 27bf088..2b32787 100644
--- a/lib/unicode/prop/uprop_is_cwu.c
+++ b/lib/unicode/prop/uprop_is_cwu.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -642,7 +642,7 @@ static const struct {
 	{RUNE_C(0x01E922), RUNE_C(0x01E943)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_cwu(rune ch)
diff --git a/lib/unicode/prop/uprop_is_dash.c b/lib/unicode/prop/uprop_is_dash.c
index 7b326f7..e49b04a 100644
--- a/lib/unicode/prop/uprop_is_dash.c
+++ b/lib/unicode/prop/uprop_is_dash.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -41,7 +41,7 @@ static const struct {
 	{RUNE_C(0x010EAD), RUNE_C(0x010EAD)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_dash(rune ch)
diff --git a/lib/unicode/prop/uprop_is_dep.c b/lib/unicode/prop/uprop_is_dep.c
index aed1401..d696c07 100644
--- a/lib/unicode/prop/uprop_is_dep.c
+++ b/lib/unicode/prop/uprop_is_dep.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -20,7 +20,7 @@ static const struct {
 	{RUNE_C(0x0E0001), RUNE_C(0x0E0001)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_dep(rune ch)
diff --git a/lib/unicode/prop/uprop_is_di.c b/lib/unicode/prop/uprop_is_di.c
index c4dc596..585ce4f 100644
--- a/lib/unicode/prop/uprop_is_di.c
+++ b/lib/unicode/prop/uprop_is_di.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -35,7 +35,7 @@ static const struct {
 	{RUNE_C(0x0E0000), RUNE_C(0x0E0FFF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_di(rune ch)
diff --git a/lib/unicode/prop/uprop_is_dia.c b/lib/unicode/prop/uprop_is_dia.c
index 3d0a783..f900d3e 100644
--- a/lib/unicode/prop/uprop_is_dia.c
+++ b/lib/unicode/prop/uprop_is_dia.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -208,7 +208,7 @@ static const struct {
 	{RUNE_C(0x01E948), RUNE_C(0x01E94A)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_dia(rune ch)
diff --git a/lib/unicode/prop/uprop_is_ebase.c b/lib/unicode/prop/uprop_is_ebase.c
index 99da199..912671a 100644
--- a/lib/unicode/prop/uprop_is_ebase.c
+++ b/lib/unicode/prop/uprop_is_ebase.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -52,7 +52,7 @@ static const struct {
 	{RUNE_C(0x01FAF0), RUNE_C(0x01FAF8)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_ebase(rune ch)
diff --git a/lib/unicode/prop/uprop_is_ecomp.c b/lib/unicode/prop/uprop_is_ecomp.c
index aa61aa3..b4e5a5a 100644
--- a/lib/unicode/prop/uprop_is_ecomp.c
+++ b/lib/unicode/prop/uprop_is_ecomp.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -26,7 +26,7 @@ static const struct {
 	{RUNE_C(0x0E0020), RUNE_C(0x0E007F)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_ecomp(rune ch)
diff --git a/lib/unicode/prop/uprop_is_emod.c b/lib/unicode/prop/uprop_is_emod.c
index b560ed9..7b50fc8 100644
--- a/lib/unicode/prop/uprop_is_emod.c
+++ b/lib/unicode/prop/uprop_is_emod.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -13,7 +13,7 @@ static const struct {
 	{RUNE_C(0x01F3FB), RUNE_C(0x01F3FF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_emod(rune ch)
diff --git a/lib/unicode/prop/uprop_is_emoji.c b/lib/unicode/prop/uprop_is_emoji.c
index d689b14..42aed21 100644
--- a/lib/unicode/prop/uprop_is_emoji.c
+++ b/lib/unicode/prop/uprop_is_emoji.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -165,7 +165,7 @@ static const struct {
 	{RUNE_C(0x01FAF0), RUNE_C(0x01FAF8)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_emoji(rune ch)
diff --git a/lib/unicode/prop/uprop_is_epres.c b/lib/unicode/prop/uprop_is_epres.c
index 45959db..cfd4b4b 100644
--- a/lib/unicode/prop/uprop_is_epres.c
+++ b/lib/unicode/prop/uprop_is_epres.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -93,7 +93,7 @@ static const struct {
 	{RUNE_C(0x01FAF0), RUNE_C(0x01FAF8)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_epres(rune ch)
diff --git a/lib/unicode/prop/uprop_is_ext.c b/lib/unicode/prop/uprop_is_ext.c
index 09d5366..b779cb7 100644
--- a/lib/unicode/prop/uprop_is_ext.c
+++ b/lib/unicode/prop/uprop_is_ext.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -51,7 +51,7 @@ static const struct {
 	{RUNE_C(0x01E944), RUNE_C(0x01E946)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_ext(rune ch)
diff --git a/lib/unicode/prop/uprop_is_extpic.c b/lib/unicode/prop/uprop_is_extpic.c
index 06075e7..c69f04b 100644
--- a/lib/unicode/prop/uprop_is_extpic.c
+++ b/lib/unicode/prop/uprop_is_extpic.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -95,7 +95,7 @@ static const struct {
 	{RUNE_C(0x01FC00), RUNE_C(0x01FFFD)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_extpic(rune ch)
diff --git a/lib/unicode/prop/uprop_is_gr_base.c b/lib/unicode/prop/uprop_is_gr_base.c
index e76ed48..22666d6 100644
--- a/lib/unicode/prop/uprop_is_gr_base.c
+++ b/lib/unicode/prop/uprop_is_gr_base.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -892,7 +892,7 @@ static const struct {
 	{RUNE_C(0x031350), RUNE_C(0x0323AF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_gr_base(rune ch)
diff --git a/lib/unicode/prop/uprop_is_gr_ext.c b/lib/unicode/prop/uprop_is_gr_ext.c
index d0b0d93..2889b07 100644
--- a/lib/unicode/prop/uprop_is_gr_ext.c
+++ b/lib/unicode/prop/uprop_is_gr_ext.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -375,7 +375,7 @@ static const struct {
 	{RUNE_C(0x0E0100), RUNE_C(0x0E01EF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_gr_ext(rune ch)
diff --git a/lib/unicode/prop/uprop_is_hex.c b/lib/unicode/prop/uprop_is_hex.c
index c2e6793..c303e69 100644
--- a/lib/unicode/prop/uprop_is_hex.c
+++ b/lib/unicode/prop/uprop_is_hex.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -22,7 +22,7 @@ static const struct {
 	{RUNE_C(0x00FF41), RUNE_C(0x00FF46)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_hex(rune ch)
diff --git a/lib/unicode/prop/uprop_is_id_compat_math_continue.c b/lib/unicode/prop/uprop_is_id_compat_math_continue.c
index 2cde8a1..51cd8e0 100644
--- a/lib/unicode/prop/uprop_is_id_compat_math_continue.c
+++ b/lib/unicode/prop/uprop_is_id_compat_math_continue.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -35,7 +35,7 @@ static const struct {
 	{RUNE_C(0x01D7C3), RUNE_C(0x01D7C3)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_id_compat_math_continue(rune ch)
diff --git a/lib/unicode/prop/uprop_is_id_compat_math_start.c b/lib/unicode/prop/uprop_is_id_compat_math_start.c
index e89ef5d..9da9cdf 100644
--- a/lib/unicode/prop/uprop_is_id_compat_math_start.c
+++ b/lib/unicode/prop/uprop_is_id_compat_math_start.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -25,7 +25,7 @@ static const struct {
 	{RUNE_C(0x01D7C3), RUNE_C(0x01D7C3)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_id_compat_math_start(rune ch)
diff --git a/lib/unicode/prop/uprop_is_idc.c b/lib/unicode/prop/uprop_is_idc.c
index f02ad69..3b79afd 100644
--- a/lib/unicode/prop/uprop_is_idc.c
+++ b/lib/unicode/prop/uprop_is_idc.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -778,7 +778,7 @@ static const struct {
 	{RUNE_C(0x0E0100), RUNE_C(0x0E01EF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_idc(rune ch)
diff --git a/lib/unicode/prop/uprop_is_ideo.c b/lib/unicode/prop/uprop_is_ideo.c
index 54b535c..611a77a 100644
--- a/lib/unicode/prop/uprop_is_ideo.c
+++ b/lib/unicode/prop/uprop_is_ideo.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -33,7 +33,7 @@ static const struct {
 	{RUNE_C(0x031350), RUNE_C(0x0323AF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_ideo(rune ch)
diff --git a/lib/unicode/prop/uprop_is_ids.c b/lib/unicode/prop/uprop_is_ids.c
index 0730213..a0ba82a 100644
--- a/lib/unicode/prop/uprop_is_ids.c
+++ b/lib/unicode/prop/uprop_is_ids.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -672,7 +672,7 @@ static const struct {
 	{RUNE_C(0x031350), RUNE_C(0x0323AF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_ids(rune ch)
diff --git a/lib/unicode/prop/uprop_is_idsb.c b/lib/unicode/prop/uprop_is_idsb.c
index 4ce977c..ebbfdfe 100644
--- a/lib/unicode/prop/uprop_is_idsb.c
+++ b/lib/unicode/prop/uprop_is_idsb.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -15,7 +15,7 @@ static const struct {
 	{RUNE_C(0x0031EF), RUNE_C(0x0031EF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_idsb(rune ch)
diff --git a/lib/unicode/prop/uprop_is_incb.c b/lib/unicode/prop/uprop_is_incb.c
index 622b9ac..d9e01c8 100644
--- a/lib/unicode/prop/uprop_is_incb.c
+++ b/lib/unicode/prop/uprop_is_incb.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -212,7 +212,7 @@ static const struct {
 	{RUNE_C(0x01E944), RUNE_C(0x01E94A)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_incb(rune ch)
diff --git a/lib/unicode/prop/uprop_is_loe.c b/lib/unicode/prop/uprop_is_loe.c
index 699b100..625b0f6 100644
--- a/lib/unicode/prop/uprop_is_loe.c
+++ b/lib/unicode/prop/uprop_is_loe.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -19,7 +19,7 @@ static const struct {
 	{RUNE_C(0x00AABB), RUNE_C(0x00AABC)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_loe(rune ch)
diff --git a/lib/unicode/prop/uprop_is_lower.c b/lib/unicode/prop/uprop_is_lower.c
index 3d3f6a9..474ae32 100644
--- a/lib/unicode/prop/uprop_is_lower.c
+++ b/lib/unicode/prop/uprop_is_lower.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -684,7 +684,7 @@ static const struct {
 	{RUNE_C(0x01E922), RUNE_C(0x01E943)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_lower(rune ch)
diff --git a/lib/unicode/prop/uprop_is_math.c b/lib/unicode/prop/uprop_is_math.c
index d53d487..ca2318b 100644
--- a/lib/unicode/prop/uprop_is_math.c
+++ b/lib/unicode/prop/uprop_is_math.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -148,7 +148,7 @@ static const struct {
 	{RUNE_C(0x01EEF0), RUNE_C(0x01EEF1)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_math(rune ch)
diff --git a/lib/unicode/prop/uprop_is_pat_syn.c b/lib/unicode/prop/uprop_is_pat_syn.c
index cab14e8..c2beece 100644
--- a/lib/unicode/prop/uprop_is_pat_syn.c
+++ b/lib/unicode/prop/uprop_is_pat_syn.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -32,7 +32,7 @@ static const struct {
 	{RUNE_C(0x00FE45), RUNE_C(0x00FE46)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_pat_syn(rune ch)
diff --git a/lib/unicode/prop/uprop_is_pat_ws.c b/lib/unicode/prop/uprop_is_pat_ws.c
index fe2f462..8f701b5 100644
--- a/lib/unicode/prop/uprop_is_pat_ws.c
+++ b/lib/unicode/prop/uprop_is_pat_ws.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -21,7 +21,7 @@ static const struct {
 	{RUNE_C(0x002028), RUNE_C(0x002029)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_pat_ws(rune ch)
diff --git a/lib/unicode/prop/uprop_is_pcm.c b/lib/unicode/prop/uprop_is_pcm.c
index eb28cbb..b1c243f 100644
--- a/lib/unicode/prop/uprop_is_pcm.c
+++ b/lib/unicode/prop/uprop_is_pcm.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -19,7 +19,7 @@ static const struct {
 	{RUNE_C(0x0110CD), RUNE_C(0x0110CD)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_pcm(rune ch)
diff --git a/lib/unicode/prop/uprop_is_qmark.c b/lib/unicode/prop/uprop_is_qmark.c
index 44925e5..c62e106 100644
--- a/lib/unicode/prop/uprop_is_qmark.c
+++ b/lib/unicode/prop/uprop_is_qmark.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -28,7 +28,7 @@ static const struct {
 	{RUNE_C(0x00FF62), RUNE_C(0x00FF63)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_qmark(rune ch)
diff --git a/lib/unicode/prop/uprop_is_radical.c b/lib/unicode/prop/uprop_is_radical.c
index ff4a376..028a64a 100644
--- a/lib/unicode/prop/uprop_is_radical.c
+++ b/lib/unicode/prop/uprop_is_radical.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -15,7 +15,7 @@ static const struct {
 	{RUNE_C(0x002F00), RUNE_C(0x002FD5)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_radical(rune ch)
diff --git a/lib/unicode/prop/uprop_is_sd.c b/lib/unicode/prop/uprop_is_sd.c
index e547820..0cbcb5c 100644
--- a/lib/unicode/prop/uprop_is_sd.c
+++ b/lib/unicode/prop/uprop_is_sd.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -52,7 +52,7 @@ static const struct {
 	{RUNE_C(0x01E068), RUNE_C(0x01E068)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_sd(rune ch)
diff --git a/lib/unicode/prop/uprop_is_sterm.c b/lib/unicode/prop/uprop_is_sterm.c
index a375061..90966c4 100644
--- a/lib/unicode/prop/uprop_is_sterm.c
+++ b/lib/unicode/prop/uprop_is_sterm.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -97,7 +97,7 @@ static const struct {
 	{RUNE_C(0x01DA88), RUNE_C(0x01DA88)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_sterm(rune ch)
diff --git a/lib/unicode/prop/uprop_is_term.c b/lib/unicode/prop/uprop_is_term.c
index 4789e1a..1475fbc 100644
--- a/lib/unicode/prop/uprop_is_term.c
+++ b/lib/unicode/prop/uprop_is_term.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -122,7 +122,7 @@ static const struct {
 	{RUNE_C(0x01DA87), RUNE_C(0x01DA8A)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_term(rune ch)
diff --git a/lib/unicode/prop/uprop_is_uideo.c b/lib/unicode/prop/uprop_is_uideo.c
index d90cfea..a178b69 100644
--- a/lib/unicode/prop/uprop_is_uideo.c
+++ b/lib/unicode/prop/uprop_is_uideo.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -29,7 +29,7 @@ static const struct {
 	{RUNE_C(0x031350), RUNE_C(0x0323AF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_uideo(rune ch)
diff --git a/lib/unicode/prop/uprop_is_upper.c b/lib/unicode/prop/uprop_is_upper.c
index a5ceee0..1ed0436 100644
--- a/lib/unicode/prop/uprop_is_upper.c
+++ b/lib/unicode/prop/uprop_is_upper.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -667,7 +667,7 @@ static const struct {
 	{RUNE_C(0x01F170), RUNE_C(0x01F189)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_upper(rune ch)
diff --git a/lib/unicode/prop/uprop_is_vs.c b/lib/unicode/prop/uprop_is_vs.c
index 25751aa..3133d6b 100644
--- a/lib/unicode/prop/uprop_is_vs.c
+++ b/lib/unicode/prop/uprop_is_vs.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -16,7 +16,7 @@ static const struct {
 	{RUNE_C(0x0E0100), RUNE_C(0x0E01EF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_vs(rune ch)
diff --git a/lib/unicode/prop/uprop_is_wspace.c b/lib/unicode/prop/uprop_is_wspace.c
index 3306eec..c4644a2 100644
--- a/lib/unicode/prop/uprop_is_wspace.c
+++ b/lib/unicode/prop/uprop_is_wspace.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -25,7 +25,7 @@ static const struct {
 	{RUNE_C(0x003000), RUNE_C(0x003000)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_wspace(rune ch)
diff --git a/lib/unicode/prop/uprop_is_xidc.c b/lib/unicode/prop/uprop_is_xidc.c
index 2aa4033..5503caa 100644
--- a/lib/unicode/prop/uprop_is_xidc.c
+++ b/lib/unicode/prop/uprop_is_xidc.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -785,7 +785,7 @@ static const struct {
 	{RUNE_C(0x0E0100), RUNE_C(0x0E01EF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_xidc(rune ch)
diff --git a/lib/unicode/prop/uprop_is_xids.c b/lib/unicode/prop/uprop_is_xids.c
index 4ee559e..3b29835 100644
--- a/lib/unicode/prop/uprop_is_xids.c
+++ b/lib/unicode/prop/uprop_is_xids.c
@@ -1,6 +1,6 @@
 /* This file is autogenerated by gen/prop/bool-props; DO NOT EDIT. */
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "bitset.h"
 #include "rune.h"
 #include "unicode/prop.h"
@@ -679,7 +679,7 @@ static const struct {
 	{RUNE_C(0x031350), RUNE_C(0x0323AF)},
 };
 
-__MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
+_MLIB_DEFINE_BSEARCH_CONTAINS(lookup)
 
 bool
 uprop_is_xids(rune ch)
diff --git a/lib/unicode/string/u8gnext.c b/lib/unicode/string/u8gnext.c
index 9824abb..a050bd5 100644
--- a/lib/unicode/string/u8gnext.c
+++ b/lib/unicode/string/u8gnext.c
@@ -1,8 +1,8 @@
 #include <stddef.h>
 
-#include "__bsearch.h"
+#include "_bsearch.h"
 #include "mbstring.h"
-#include "unicode/__gbrk.h"
+#include "unicode/_gbrk.h"
 #include "unicode/string.h"
 
 struct gbrk_state {
@@ -17,7 +17,7 @@ struct gbrk_state {
 
 static bool u8isgbrk(rune, rune, struct gbrk_state *);
 
-__MLIB_DEFINE_BSEARCH(gbrk_prop, gbrk_prop_tbl, GBP_OTHER)
+_MLIB_DEFINE_BSEARCH(gbrk_prop, gbrk_prop_tbl, GBP_OTHER)
 
 size_t
 u8gnext(struct u8view *g, const char8_t **s, size_t *n)