#define av_make Perl_av_make
#define av_pop Perl_av_pop
#define av_push Perl_av_push
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define av_reify Perl_av_reify
#endif
#define av_shift Perl_av_shift
#define keyword Perl_keyword
#endif
#define leave_scope Perl_leave_scope
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define lex_end Perl_lex_end
+#endif
+#ifdef PERL_CORE
#define lex_start Perl_lex_start
#endif
#define op_null Perl_op_null
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define op_clear Perl_op_clear
#endif
#define op_refcnt_lock Perl_op_refcnt_lock
#endif
#define mess Perl_mess
#define vmess Perl_vmess
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define qerror Perl_qerror
#endif
#define sortsv Perl_sortsv
#define mg_set Perl_mg_set
#define mg_size Perl_mg_size
#define mini_mktime Perl_mini_mktime
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define mod Perl_mod
+#endif
+#ifdef PERL_CORE
#define mode_from_discipline Perl_mode_from_discipline
#endif
#define moreswitches Perl_moreswitches
#define vnewSVpvf Perl_vnewSVpvf
#define newSVrv Perl_newSVrv
#define newSVsv Perl_newSVsv
+#define newSV_type Perl_newSV_type
#define newUNOP Perl_newUNOP
#define newWHENOP Perl_newWHENOP
#define newWHILEOP Perl_newWHILEOP
#define regclass_swash Perl_regclass_swash
#define pregexec Perl_pregexec
#define pregfree Perl_pregfree
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#define reg_temp_copy Perl_reg_temp_copy
+#endif
#define regfree_internal Perl_regfree_internal
#define reg_stringify Perl_reg_stringify
#if defined(USE_ITHREADS)
#define setenv_getix Perl_setenv_getix
#endif
#endif
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define setdefout Perl_setdefout
#endif
#define share_hek Perl_share_hek
#define unpack_str Perl_unpack_str
#define unpackstring Perl_unpackstring
#define unsharepvn Perl_unsharepvn
-#if defined(PERL_CORE) || defined(PERL_EXT)
+#ifdef PERL_CORE
#define unshare_hek Perl_unshare_hek
#endif
#ifdef PERL_MAD
#define uvuni_to_utf8_flags Perl_uvuni_to_utf8_flags
#define pv_uni_display Perl_pv_uni_display
#define sv_uni_display Perl_sv_uni_display
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define vivify_defelem Perl_vivify_defelem
+#endif
+#ifdef PERL_CORE
#define vivify_ref Perl_vivify_ref
#define wait4pid Perl_wait4pid
#define parse_unicode_opts Perl_parse_unicode_opts
#ifdef PERL_CORE
#define write_to_stderr Perl_write_to_stderr
#define yyerror Perl_yyerror
+#endif
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define yylex Perl_yylex
+#endif
+#ifdef PERL_CORE
#define yyparse Perl_yyparse
#define parser_free Perl_parser_free
#define yywarn Perl_yywarn
#define ck_method Perl_ck_method
#define ck_null Perl_ck_null
#define ck_open Perl_ck_open
+#define ck_readline Perl_ck_readline
#define ck_repeat Perl_ck_repeat
#define ck_require Perl_ck_require
#define ck_retarget Perl_ck_retarget
#define ck_method Perl_ck_method
#define ck_null Perl_ck_null
#define ck_open Perl_ck_open
+#define ck_readline Perl_ck_readline
#define ck_repeat Perl_ck_repeat
#define ck_require Perl_ck_require
#define ck_return Perl_ck_return
#define av_make(a,b) Perl_av_make(aTHX_ a,b)
#define av_pop(a) Perl_av_pop(aTHX_ a)
#define av_push(a,b) Perl_av_push(aTHX_ a,b)
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define av_reify(a) Perl_av_reify(aTHX_ a)
#endif
#define av_shift(a) Perl_av_shift(aTHX_ a)
#define keyword(a,b,c) Perl_keyword(aTHX_ a,b,c)
#endif
#define leave_scope(a) Perl_leave_scope(aTHX_ a)
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define lex_end() Perl_lex_end(aTHX)
+#endif
+#ifdef PERL_CORE
#define lex_start(a) Perl_lex_start(aTHX_ a)
#endif
#define op_null(a) Perl_op_null(aTHX_ a)
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define op_clear(a) Perl_op_clear(aTHX_ a)
#endif
#define op_refcnt_lock() Perl_op_refcnt_lock(aTHX)
#endif
#endif
#define vmess(a,b) Perl_vmess(aTHX_ a,b)
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define qerror(a) Perl_qerror(aTHX_ a)
#endif
#define sortsv(a,b,c) Perl_sortsv(aTHX_ a,b,c)
#define mg_set(a) Perl_mg_set(aTHX_ a)
#define mg_size(a) Perl_mg_size(aTHX_ a)
#define mini_mktime(a) Perl_mini_mktime(aTHX_ a)
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define mod(a,b) Perl_mod(aTHX_ a,b)
+#endif
+#ifdef PERL_CORE
#define mode_from_discipline(a) Perl_mode_from_discipline(aTHX_ a)
#endif
#define moreswitches(a) Perl_moreswitches(aTHX_ a)
#define vnewSVpvf(a,b) Perl_vnewSVpvf(aTHX_ a,b)
#define newSVrv(a,b) Perl_newSVrv(aTHX_ a,b)
#define newSVsv(a) Perl_newSVsv(aTHX_ a)
+#define newSV_type(a) Perl_newSV_type(aTHX_ a)
#define newUNOP(a,b,c) Perl_newUNOP(aTHX_ a,b,c)
#define newWHENOP(a,b) Perl_newWHENOP(aTHX_ a,b)
#define newWHILEOP(a,b,c,d,e,f,g,h) Perl_newWHILEOP(aTHX_ a,b,c,d,e,f,g,h)
#define scan_vstring(a,b) Perl_scan_vstring(aTHX_ a,b)
#define scan_version(a,b,c) Perl_scan_version(aTHX_ a,b,c)
#define new_version(a) Perl_new_version(aTHX_ a)
-#define upg_version(a) Perl_upg_version(aTHX_ a)
+#define upg_version(a,b) Perl_upg_version(aTHX_ a,b)
#define vverify(a) Perl_vverify(aTHX_ a)
#define vnumify(a) Perl_vnumify(aTHX_ a)
#define vnormal(a) Perl_vnormal(aTHX_ a)
#define regclass_swash(a,b,c,d,e) Perl_regclass_swash(aTHX_ a,b,c,d,e)
#define pregexec(a,b,c,d,e,f,g) Perl_pregexec(aTHX_ a,b,c,d,e,f,g)
#define pregfree(a) Perl_pregfree(aTHX_ a)
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#define reg_temp_copy(a) Perl_reg_temp_copy(aTHX_ a)
+#endif
#define regfree_internal(a) Perl_regfree_internal(aTHX_ a)
#define reg_stringify(a,b,c,d) Perl_reg_stringify(aTHX_ a,b,c,d)
#if defined(USE_ITHREADS)
#define setenv_getix(a) Perl_setenv_getix(aTHX_ a)
#endif
#endif
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define setdefout(a) Perl_setdefout(aTHX_ a)
#endif
#define share_hek(a,b,c) Perl_share_hek(aTHX_ a,b,c)
#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)
-#if defined(PERL_CORE) || defined(PERL_EXT)
+#ifdef PERL_CORE
#define unshare_hek(a) Perl_unshare_hek(aTHX_ a)
#endif
#ifdef PERL_MAD
#define uvuni_to_utf8_flags(a,b,c) Perl_uvuni_to_utf8_flags(aTHX_ a,b,c)
#define pv_uni_display(a,b,c,d,e) Perl_pv_uni_display(aTHX_ a,b,c,d,e)
#define sv_uni_display(a,b,c,d) Perl_sv_uni_display(aTHX_ a,b,c,d)
-#ifdef PERL_CORE
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define vivify_defelem(a) Perl_vivify_defelem(aTHX_ a)
+#endif
+#ifdef PERL_CORE
#define vivify_ref(a,b) Perl_vivify_ref(aTHX_ a,b)
#define wait4pid(a,b,c) Perl_wait4pid(aTHX_ a,b,c)
#define parse_unicode_opts(a) Perl_parse_unicode_opts(aTHX_ a)
#ifdef PERL_CORE
#define write_to_stderr(a,b) Perl_write_to_stderr(aTHX_ a,b)
#define yyerror(a) Perl_yyerror(aTHX_ a)
+#endif
+#if defined(PERL_CORE) || defined(PERL_EXT)
#define yylex() Perl_yylex(aTHX)
+#endif
+#ifdef PERL_CORE
#define yyparse() Perl_yyparse(aTHX)
#define parser_free(a) Perl_parser_free(aTHX_ a)
#define yywarn(a) Perl_yywarn(aTHX_ a)
#define ck_method(a) Perl_ck_method(aTHX_ a)
#define ck_null(a) Perl_ck_null(aTHX_ a)
#define ck_open(a) Perl_ck_open(aTHX_ a)
+#define ck_readline(a) Perl_ck_readline(aTHX_ a)
#define ck_repeat(a) Perl_ck_repeat(aTHX_ a)
#define ck_require(a) Perl_ck_require(aTHX_ a)
#define ck_retarget(a) Perl_ck_retarget(aTHX_ a)
#endif
#if !defined(HAS_SIGNBIT)
#endif
+#if defined(PERL_CORE) || defined(PERL_EXT)
+#endif
#define ck_anoncode(a) Perl_ck_anoncode(aTHX_ a)
#define ck_bitop(a) Perl_ck_bitop(aTHX_ a)
#define ck_chdir(a) Perl_ck_chdir(aTHX_ a)
#define ck_method(a) Perl_ck_method(aTHX_ a)
#define ck_null(a) Perl_ck_null(aTHX_ a)
#define ck_open(a) Perl_ck_open(aTHX_ a)
+#define ck_readline(a) Perl_ck_readline(aTHX_ a)
#define ck_repeat(a) Perl_ck_repeat(aTHX_ a)
#define ck_require(a) Perl_ck_require(aTHX_ a)
#define ck_return(a) Perl_ck_return(aTHX_ a)