-#define my_setenv(a,b) Perl_my_setenv(aTHX_ a,b)
-#define my_getenv(a,b) Perl_my_getenv(aTHX_ a,b)
-#endif
-#define my_crypt Perl_my_crypt
-#define my_waitpid Perl_my_waitpid
-#define my_gconvert Perl_my_gconvert
-#define do_rmdir Perl_do_rmdir
-#define kill_file Perl_kill_file
-#define my_mkdir Perl_my_mkdir
-#define my_utime Perl_my_utime
-#define rmsexpand Perl_rmsexpand
-#define rmsexpand_ts Perl_rmsexpand_ts
-#define fileify_dirspec Perl_fileify_dirspec
-#define fileify_dirspec_ts Perl_fileify_dirspec_ts
-#define pathify_dirspec Perl_pathify_dirspec
-#define pathify_dirspec_ts Perl_pathify_dirspec_ts
-#define tounixspec Perl_tounixspec
-#define tounixspec_ts Perl_tounixspec_ts
-#define tovmsspec Perl_tovmsspec
-#define tovmsspec_ts Perl_tovmsspec_ts
-#define tounixpath Perl_tounixpath
-#define tounixpath_ts Perl_tounixpath_ts
-#define tovmspath Perl_tovmspath
-#define tovmspath_ts Perl_tovmspath_ts
-#define vms_image_init Perl_vms_image_init
-#define opendir Perl_opendir
-#define readdir Perl_readdir
-#define telldir Perl_telldir
-#define seekdir Perl_seekdir
-#define closedir Perl_closedir
-#define vmsreaddirversions Perl_vmsreaddirversions
-#define my_gmtime Perl_my_gmtime
-#define my_localtime Perl_my_localtime
-#define my_time Perl_my_time
-#define my_sigemptyset Perl_my_sigemptyset
-#define my_sigfillset Perl_my_sigfillset
-#define my_sigaddset Perl_my_sigaddset
-#define my_sigdelset Perl_my_sigdelset
-#define my_sigismember Perl_my_sigismember
-#define my_sigprocmask Perl_my_sigprocmask
-#define cando_by_name Perl_cando_by_name
-#define flex_fstat Perl_flex_fstat
-#define flex_stat Perl_flex_stat
-#define trim_unixpath Perl_trim_unixpath
-#define my_vfork Perl_my_vfork
-#define vms_do_aexec Perl_vms_do_aexec
-#define vms_do_exec Perl_vms_do_exec
-#define do_aspawn Perl_do_aspawn
-#define do_spawn Perl_do_spawn
-#define my_fwrite Perl_my_fwrite
-#define my_flush Perl_my_flush
-#define my_getpwnam Perl_my_getpwnam
-#define my_getpwuid Perl_my_getpwuid
-#define my_getpwent Perl_my_getpwent
-#define my_endpwent Perl_my_endpwent
-#define my_getlogin Perl_my_getlogin
-#define rmscopy Perl_rmscopy
-#define init_os_extras Perl_init_os_extras
+#define opendir(a) Perl_opendir(aTHX_ a)
+#define rename(a,b) Perl_rename(aTHX_ a,b)
+#define seekdir(a,b) Perl_seekdir(aTHX_ a,b)
+#define readdir(a) Perl_readdir(aTHX_ a)
+#define readdir_r(a,b,c) Perl_readdir_r(aTHX_ a,b,c)
+#endif
+#define closedir(a) Perl_closedir(a)
+#define telldir(a) Perl_telldir(a)
+#define vmsreaddirversions(a,b) Perl_vmsreaddirversions(a,b)
+
+#define cando_by_name(a,b,c) Perl_cando_by_name(aTHX_ a,b,c)
+#define do_rmdir(a) Perl_do_rmdir(aTHX_ a)
+#define fileify_dirspec(a,b) Perl_fileify_dirspec(aTHX_ a,b)
+#define fileify_dirspec(a,b) Perl_fileify_dirspec(aTHX_ a,b)
+#define fileify_dirspec_ts(a,b) Perl_fileify_dirspec_ts(aTHX_ a,b)
+#define fileify_dirspec_ts(a,b) Perl_fileify_dirspec_ts(aTHX_ a,b)
+#define fileify_dirspec_utf8(a,b,c) Perl_fileify_dirspec(aTHX_ a,b,utf8)
+#define fileify_dirspec_utf8_ts(a,b,c) Perl_fileify_dirspec_ts(aTHX_ a,b,utf8)
+#define flex_fstat(a,b) Perl_flex_fstat(aTHX_ a,b)
+#define flex_lstat(a,b) Perl_flex_lstat(aTHX_ a,b)
+#define flex_stat(a,b) Perl_flex_stat(aTHX_ a,b)
+#define init_os_extras Perl_init_os_extras
+#define kill_file(a) Perl_kill_file(aTHX_ a)
+#define my_chdir(a) Perl_my_chdir(aTHX_ a)
+#define my_chmod(a,b) Perl_my_chmod(aTHX_ a,b)
+#define my_crypt(a,b) Perl_my_crypt(aTHX_ a,b)
+#define my_endpwent() Perl_my_endpwent(aTHX)
+#define my_fclose(a) Perl_my_fclose(a)
+#define my_fdopen(a,b) Perl_my_fdopen(a,b)
+#define my_flush(a) Perl_my_flush(aTHX_ a)
+#define my_fwrite(a,b,c,d) Perl_my_fwrite(a,b,c,d)
+#define my_fgetname(a,b) Perl_my_fgetname(a,b)
+#define my_gconvert(a,b,c,d) Perl_my_gconvert(a,b,c,d)
+#define my_getenv(a,b) Perl_my_getenv(aTHX_ a,b)
+#define my_getenv_len(a,b,c) Perl_my_getenv_len(aTHX_ a,b,c)
+#define my_getlogin Perl_my_getlogin
+#define my_getpwent() Perl_my_getpwent(aTHX)
+#define my_getpwnam(a) Perl_my_getpwnam(aTHX_ a)
+#define my_getpwuid(a) Perl_my_getpwuid(aTHX_ a)
+#define my_gmtime(a) Perl_my_gmtime(aTHX_ a)
+#define my_localtime(a) Perl_my_localtime(aTHX_ a)
+#define my_mkdir(a,b) Perl_my_mkdir(aTHX_ a,b)
+#define my_sigemptyset(a) Perl_my_sigemptyset(a)
+#define my_sigfillset(a) Perl_my_sigfillset(a)
+#define my_sigaddset(a,b) Perl_my_sigaddset(a,b)
+#define my_sigdelset(a,b,c) Perl_my_sigdelset(a,b,c)
+#define my_sigismember(a,b) Perl_my_sigismember(a,b)
+#define my_sigprocmask(a,b,c) Perl_my_sigprocmask(a,b,c)
+#ifdef HAS_SYMLINK
+# define my_symlink(a,b) Perl_my_symlink(aTHX_ a,b)
+#endif
+#define my_time(a) Perl_my_time(aTHX_ a)
+#define my_tmpfile Perl_my_tmpfile
+#define my_trnlnm(a,b,c) Perl_my_trnlnm(aTHX_ a,b,c)
+#define my_utime(a,b) Perl_my_utime(aTHX_ a,b)
+#define my_vfork Perl_my_vfork
+#define my_waitpid(a,b,c) Perl_my_waitpid(aTHX_ a,b,c)
+#define pathify_dirspec(a,b) Perl_pathify_dirspec(aTHX a,b)
+#define pathify_dirspec_ts(a,b) Perl_pathify_dirspec_ts(aTHX a,b)
+#define pathify_dirspec_utf8(a,b,c) Perl_pathify_dirspec_utf8(aTHX a,b,c)
+#define pathify_dirspec_utf8_ts(a,b,c) Perl_pathify_dirspec_utf8_ts(aTHX a,b,c)
+#define prime_env_iter Perl_prime_env_iter
+#define rmscopy(a,b,c) Perl_rmscopy(aTHX_ a,b,c)
+#define rmsexpand(a,b,c,d) Perl_rmsexpand_utf8(aTHX_ a,b,c,d,NULL,NULL)
+#define rmsexpand_ts(a,b,c,d) Perl_rmsexpand_utf8_ts(aTHX_ a,b,c,d,NULL,NULL)
+#define rmsexpand_utf8(a,b,c,d,e,f) Perl_rmsexpand_utf8(aTHX_ a,b,c,d,e,f)
+#define rmsexpand_utf8_ts(a,b,c,d,e,f) Perl_rmsexpand_utf8_ts(aTHX_ a,b,c,d,e,f)
+#define tounixpath(a,b) Perl_tounixpath_utf8(aTHX_ a,b,NULL)
+#define tounixpath_ts(a,b) Perl_tounixpath_utf8_ts(aTHX_ a,b,NULL)
+#define tounixpath_utf8(a,b,c) Perl_tounixpath_utf8(aTHX_ a,b,c)
+#define tounixpath_utf8_ts(a,b,c) Perl_tounixpath_utf8_ts(aTHX_ a,b,c)
+#define tounixspec(a,b) Perl_tounixspec_utf8(aTHX_ a,b,NULL)
+#define tounixspec_ts(a,b) Perl_tounixspec_utf8_ts(aTHX_ a,b,NULL)
+#define tounixspec_utf8(a,b,c) Perl_tounixspec_utf8(aTHX_ a,b,c)
+#define tounixspec_utf8_ts(a,b,c) Perl_tounixspec_utf8_ts(aTHX_ a,b,c)
+#define tovmspath(a,b) Perl_tovmspath_utf8(aTHX_ a,b,NULL)
+#define tovmspath_ts(a,b) Perl_tovmspath_utf8_ts(aTHX_ a,b,NULL)
+#define tovmspath_utf8(a,b,c) Perl_tovmspath_utf8(aTHX_ a,b,c)
+#define tovmspath_utf8_ts(a,b,c) Perl_tovmspath_utf8_ts(aTHX_ a,b,c)
+#define tovmsspec(a,b) Perl_tovmsspec_utf8(aTHX_ a,b,NULL)
+#define tovmsspec_ts(a,b) Perl_tovmsspec_utf8_ts(aTHX_ a,b)
+#define tovmsspec_utf8(a,b,c) Perl_tovmsspec_utf8(aTHX_ a,b,c)
+#define tovmsspec_utf8_ts(a,b,c) Perl_tovmsspec_utf8_ts(aTHX_ a,b,c)
+#define trim_unixpath(a,b,c) Perl_trim_unixpath(aTHX_ a,b,c)
+#define vms_do_aexec(a,b,c) Perl_vms_do_aexec(aTHX_ a,b,c)
+#define vms_do_exec(a) Perl_vms_do_exec(aTHX_ a)
+#define vms_case_tolerant(a) Perl_vms_case_tolerant(a)
+#define vms_image_init(a,b) Perl_vms_image_init(a,b)
+#define vms_realname(a,b,c) Perl_vms_realname(aTHX_ a,b,c)
+#define vms_realpath(a,b,c) Perl_vms_realpath(aTHX_ a,b,c)
+#define vmssetenv(a,b,c) Perl_vmssetenv(aTHX_ a,b,c)
+#define vmstrnenv(a,b,c,d,e) Perl_vmstrnenv(a,b,c,d,e)