#define find_beginning S_find_beginning
#define forbid_setid S_forbid_setid
#define incpush S_incpush
+#define incpush_use_sep S_incpush_use_sep
#define init_interp S_init_interp
#define init_ids S_init_ids
#define init_main_stash S_init_main_stash
#define open_script S_open_script
#define usage S_usage
#endif
-#ifdef DOSUID
-# ifdef IAMSUID
-# else
-# endif
-#else
-# ifndef SETUID_SCRIPTS_ARE_SECURE_NOW
-# endif
+#ifndef SETUID_SCRIPTS_ARE_SECURE_NOW
#endif
-# if defined(IAMSUID)
-#ifdef PERL_CORE
-#define fd_on_nosuid_fs S_fd_on_nosuid_fs
-#endif
-# endif
#ifdef PERL_CORE
#define parse_body S_parse_body
#define run_body S_run_body
#ifdef PERL_CORE
#define find_beginning(a,b) S_find_beginning(aTHX_ a,b)
#define forbid_setid(a,b) S_forbid_setid(aTHX_ a,b)
-#define incpush(a,b,c,d,e,f) S_incpush(aTHX_ a,b,c,d,e,f)
+#define incpush(a,b,c) S_incpush(aTHX_ a,b,c)
+#define incpush_use_sep(a,b,c) S_incpush_use_sep(aTHX_ a,b,c)
#define init_interp() S_init_interp(aTHX)
#define init_ids() S_init_ids(aTHX)
#define init_main_stash() S_init_main_stash(aTHX)
-#define init_perllib() S_init_perllib(aTHX)
+#define init_perllib(a) S_init_perllib(aTHX_ a)
#define init_postdump_symbols(a,b,c) S_init_postdump_symbols(aTHX_ a,b,c)
#define init_predump_symbols() S_init_predump_symbols(aTHX)
#define my_exit_jump() S_my_exit_jump(aTHX)
#define open_script(a,b,c,d) S_open_script(aTHX_ a,b,c,d)
#define usage(a) S_usage(aTHX_ a)
#endif
-#ifdef DOSUID
-# ifdef IAMSUID
-#ifdef PERL_CORE
-#endif
-# else
+#ifndef SETUID_SCRIPTS_ARE_SECURE_NOW
#ifdef PERL_CORE
#endif
-# endif
-#else
-# ifndef SETUID_SCRIPTS_ARE_SECURE_NOW
-#ifdef PERL_CORE
#endif
-# endif
-#endif
-# if defined(IAMSUID)
-#ifdef PERL_CORE
-#define fd_on_nosuid_fs(a) S_fd_on_nosuid_fs(aTHX_ a)
-#endif
-# endif
#ifdef PERL_CORE
#define parse_body(a,b) S_parse_body(aTHX_ a,b)
#define run_body(a) S_run_body(aTHX_ a)
-#define incpush_if_exists(a) S_incpush_if_exists(aTHX_ a)
+#define incpush_if_exists(a,b) S_incpush_if_exists(aTHX_ a,b)
#endif
#endif
#if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)