#define newSLICEOP Perl_newSLICEOP
#define newSTATEOP Perl_newSTATEOP
#define newSUB Perl_newSUB
+#define newXS_flags Perl_newXS_flags
#define newXS Perl_newXS
#define newAV Perl_newAV
#define newAVREF Perl_newAVREF
#define unpack_str Perl_unpack_str
#define unpackstring Perl_unpackstring
#define unsharepvn Perl_unsharepvn
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define unshare_hek Perl_unshare_hek
#endif
#ifdef PERL_MAD
#define need_utf8 S_need_utf8
#define first_symbol S_first_symbol
#define sv_exp_grow S_sv_exp_grow
+#define bytes_to_uni S_bytes_to_uni
#endif
#endif
#if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT)
#define reg_node S_reg_node
#define regpiece S_regpiece
#define reginsert S_reginsert
-#define regoptail S_regoptail
#define regtail S_regtail
#define regwhite S_regwhite
#define nextchar S_nextchar
#define deb_curcv S_deb_curcv
#define debprof S_debprof
#define sequence S_sequence
+#define sequence_tail S_sequence_tail
#define sequence_num S_sequence_num
#define pm_description S_pm_description
#endif
# if defined(DEBUGGING)
#ifdef PERL_CORE
#define tokereport S_tokereport
+#define printbuf S_printbuf
#endif
# endif
#endif
#define gv_fetchpv(a,b,c) Perl_gv_fetchpv(aTHX_ a,b,c)
#define gv_fullname(a,b) Perl_gv_fullname(aTHX_ a,b)
#define gv_fullname4(a,b,c,d) Perl_gv_fullname4(aTHX_ a,b,c,d)
+#ifdef PERL_CORE
+#endif
#define gv_init(a,b,c,d,e) Perl_gv_init(aTHX_ a,b,c,d,e)
#define gv_name_set(a,b,c,d) Perl_gv_name_set(aTHX_ a,b,c,d)
#define gv_stashpv(a,b) Perl_gv_stashpv(aTHX_ a,b)
#define newSLICEOP(a,b,c) Perl_newSLICEOP(aTHX_ a,b,c)
#define newSTATEOP(a,b,c) Perl_newSTATEOP(aTHX_ a,b,c)
#define newSUB(a,b,c,d) Perl_newSUB(aTHX_ a,b,c,d)
+#define newXS_flags(a,b,c,d,e) Perl_newXS_flags(aTHX_ a,b,c,d,e)
#define newXS(a,b,c) Perl_newXS(aTHX_ a,b,c)
#define newAV() Perl_newAV(aTHX)
#define newAVREF(a) Perl_newAVREF(aTHX_ a)
#define unpack_str(a,b,c,d,e,f,g,h) Perl_unpack_str(aTHX_ a,b,c,d,e,f,g,h)
#define unpackstring(a,b,c,d,e) Perl_unpackstring(aTHX_ a,b,c,d,e)
#define unsharepvn(a,b,c) Perl_unsharepvn(aTHX_ a,b,c)
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define unshare_hek(a) Perl_unshare_hek(aTHX_ a)
#endif
#ifdef PERL_MAD
#define need_utf8 S_need_utf8
#define first_symbol S_first_symbol
#define sv_exp_grow(a,b) S_sv_exp_grow(aTHX_ a,b)
+#define bytes_to_uni(a,b,c) S_bytes_to_uni(aTHX_ a,b,c)
#endif
#endif
#if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT)
#define reganode(a,b,c) S_reganode(aTHX_ a,b,c)
#define regatom(a,b) S_regatom(aTHX_ a,b)
#define regbranch(a,b,c) S_regbranch(aTHX_ a,b,c)
-#define reguni(a,b,c,d) S_reguni(aTHX_ a,b,c,d)
+#define reguni(a,b,c) S_reguni(aTHX_ a,b,c)
#define regclass(a) S_regclass(aTHX_ a)
#define regcurly S_regcurly
#define reg_node(a,b) S_reg_node(aTHX_ a,b)
#define regpiece(a,b) S_regpiece(aTHX_ a,b)
#define reginsert(a,b,c) S_reginsert(aTHX_ a,b,c)
-#define regoptail(a,b,c) S_regoptail(aTHX_ a,b,c)
#define regtail(a,b,c) S_regtail(aTHX_ a,b,c)
#define regwhite S_regwhite
#define nextchar(a) S_nextchar(aTHX_ a)
#define deb_curcv(a) S_deb_curcv(aTHX_ a)
#define debprof(a) S_debprof(aTHX_ a)
#define sequence(a) S_sequence(aTHX_ a)
+#define sequence_tail(a) S_sequence_tail(aTHX_ a)
#define sequence_num(a) S_sequence_num(aTHX_ a)
#define pm_description(a) S_pm_description(aTHX_ a)
#endif
# if defined(DEBUGGING)
#ifdef PERL_CORE
#define tokereport(a) S_tokereport(aTHX_ a)
+#define printbuf(a,b) S_printbuf(aTHX_ a,b)
#endif
# endif
#endif
#ifdef PERL_CORE
#define pad_new(a) Perl_pad_new(aTHX_ a)
#define pad_undef(a) Perl_pad_undef(aTHX_ a)
-#define pad_add_name(a,b,c,d) Perl_pad_add_name(aTHX_ a,b,c,d)
+#define pad_add_name(a,b,c,d,e) Perl_pad_add_name(aTHX_ a,b,c,d,e)
#define pad_add_anon(a,b) Perl_pad_add_anon(aTHX_ a,b)
#define pad_check_dup(a,b,c) Perl_pad_check_dup(aTHX_ a,b,c)
#endif