#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 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 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 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