Update dependencies and remove obsolete VAXC support

p4raw-id: //depot/vmsperl@5432

1 files changed, 168 insertions, 224 deletions

diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index a2b57fa669..eb9d0bd97a 100644
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -1,7 +1,6 @@
 !GROK!THIS!
 # Descrip.MMS for perl5 on VMS
-# Last revised 8-Nov-1999 by Craig Berry craig.berry@metamor.com
-# Revised 18-Oct-1998 by Charles Bailey  bailey@newman.upenn.edu
+# Last revised 01-Mar-2000 by Charles Bailey  bailey@newman.upenn.edu
 #
 #: This file uses MMS syntax, and can be processed using DEC's MMS product,
 #: or the free MMK clone (available by ftp at ftp.spc.edu).  If you want to
@@ -118,16 +117,15 @@ POSIX =
 XTRAOBJS = 
 LIBS1 = $(XTRAOBJS)
 DBGSPECFLAGS = /Show=All
-.ifdef decc
 # Some versions of DECCRTL on AXP have a bug in chdir() which causes the change
 # to persist after the image exits, even when this was not requested, iff
 # SYSNAM is enabled.  This is fixed in CSC Patch # AXPACRT04_061, but turning
 # off SYSNAM for the MM[SK] subprocess doesn't hurt anything, so we do it
 # just in case.
 .first
-	@ Set Process/Privilege=(NoSYSNAM)
 	@ If F$TrnLnm("Sys").eqs."" .and. F$TrnLnm("DECC$System_Include").nes."" Then Define/NoLog SYS DECC$System_Include
 .ifdef __AXP__
+	@ Set Process/Privilege=(NoSYSNAM)
 	@ If F$TrnLnm("Sys").eqs."" .and. F$TrnLnm("DECC$System_Include").eqs."" Then Define/NoLog SYS Sys$Library
 .else
 	@ If F$TrnLnm("Sys").eqs."" .and. F$TrnLnm("DECC$System_Include").eqs."" Then Define/NoLog SYS DECC$Library_Include
@@ -136,16 +134,6 @@ DBGSPECFLAGS = /Show=All
 XTRACCFLAGS = /Include=[]/Standard=Relaxed_ANSI/Prefix=All/Obj=$(OBJVAL)
 XTRADEF =
 POSIX = POSIX
-.else # VAXC
-.first
-	@ If F$TrnLnm("Sys").eqs."" .and. F$TrnLnm("VAXC$Include").eqs."" Then Define/NoLog SYS Sys$Library
-	@ If F$TrnLnm("Sys").eqs."" .and. F$TrnLnm("VAXC$Include").nes."" Then Define/NoLog SYS VAXC$Include
-
-XTRACCFLAGS = /Include=[]/Object=$(O)
-XTRADEF =
-LIBS2 = Sys$Share:VAXCRTL/Shareable
-POSIX =
-.endif
 .endif
 
 
@@ -178,7 +166,7 @@ SOCKLIB = SocketShr/Share
 SOCKC = sockadapt.c
 SOCKH = sockadapt.h
 SOCKARCH = $(ARCHCORE)$(SOCKH)
-SOCKOBJ = sockadapt$(O)
+SOCKO = sockadapt$(O)
 SOCKPM = [.lib]Socket.pm
 .else
 SOCKDEF =
@@ -186,7 +174,7 @@ SOCKLIB =
 SOCKC =
 SOCKH =
 SOCKARCH =
-SOCKOBJ =
+SOCKO =
 SOCKPM =
 .endif
 
@@ -279,44 +267,43 @@ FULLLIBS2 = $(LIBS2)|$(THRLIBS1)|$(THRLIBS2)
 
 c0 = $(MALLOC_C) $(SOCKC) av.c deb.c doio.c doop.c dump.c globals.c gv.c
 c1 = hv.c mg.c miniperlmain.c op.c perl.c perlio.c perly.c pp.c pp_ctl.c
-c2 = pp_hot.c pp_sys.c regcomp.c regexec.c run.c scope.c sockadapt.c sv.c
-c3 = taint.c toke.c universal.c utf8.c util.c vms.c
+c2 = pp_hot.c pp_sys.c regcomp.c regexec.c run.c scope.c sv.c taint.c
+c3 = toke.c universal.c utf8.c util.c vms.c xsutils.c
 c = $(c0) $(c1) $(c2) $(c3)
 
-obj0 = $(MALLOC_O) $(SOCKOBJ) av$(O) deb$(O) doio$(O) doop$(O) dump$(O)
+obj0 = $(MALLOC_O) $(SOCKO) av$(O) deb$(O) doio$(O) doop$(O) dump$(O)
 obj1 = globals$(O) gv$(O) hv$(O) mg$(O) miniperlmain$(O) op$(O) perl$(O)
-obj2 = perlio$(O) perly$(O) pp$(O) pp_ctl$(O) pp_hot$(O) pp_sys$(O) 
-obj3 = regcomp$(O) regexec$(O) run$(O) scope$(O) sockadapt$(O) sv$(O)
-obj4 = taint$(O) toke$(O) universal$(O) utf8$(O) util$(O) vms$(O) xsutils$(O)
+obj2 = perlio$(O) perly$(O) pp$(O) pp_ctl$(O) pp_hot$(O) pp_sys$(O) regcomp$(O)
+obj3 = regexec$(O) run$(O) scope$(O) sv$(O) taint$(O) toke$(O) universal$(O)
+obj4 = utf8$(O) util$(O) vms$(O) xsutils$(O)
 obj = $(obj0) $(obj1) $(obj2) $(obj3) $(obj4)
 
-h0 = $(SOCKH) $(THREADH) av.h cc_runtime.h config.h cop.h cv.h embed.h
-h1 = embedvar.h extern.h form.h gv.h handy.h hv.h intern.h intrpvar.h
-h2 = iperlsys.h mg.h nostdio.h objxsub.h op.h opcode.h opnames.h
-h3 = patchlevel.h perl.h perlio.h perlsdio.h perlvars.h perly.h pp.h
-h4 = pp_proto.h proto.h regexp.h scope.h sv.h thrdvar.h thread.h utf8.h
-h5 = util.h vmsish.h warnings.h xsub.h
-h6 = regcomp.h regcomp.h
-h7 = keywords.h
-h = $(h0) $(h1) $(h2) $(h3) $(h4) $(h5)
-allh = $(h) $(h6) $(h7)
-
-ac0 = $(SOCKARCH) $(ARCHCORE)av.h $(ARCHCORE)cc_runtime.h
+h0 = av.h cc_runtime.h config.h cop.h cv.h embed.h embedvar.h
+h1 = extern.h form.h gv.h handy.h hv.h intern.h intrpvar.h
+h2 = iperlsys.h keywords.h mg.h nostdio.h objxsub.h op.h opcode.h opnames.h
+h3 = patchlevel.h perl.h perlapi.h perlio.h perlsdio.h perlvars.h perly.h
+h4 = pp.h pp_proto.h proto.h regcomp.h regexp.h regnodes.h scope.h
+h5 = sv.h thrdvar.h thread.h utf8.h util.h vmsish.h warnings.h
+h6 = xsub.h $(SOCKH) $(THREADH)
+h = $(h0) $(h1) $(h2) $(h3) $(h4) $(h5) $(h6)
+
+ac0 = $(ARCHCORE)$(sockh) $(ARCHCORE)av.h $(ARCHCORE)cc_runtime.h
 ac1 = $(ARCHCORE)config.h $(ARCHCORE)cop.h $(ARCHCORE)cv.h $(ARCHCORE)embed.h
 ac2 = $(ARCHCORE)embedvar.h $(ARCHCORE)extern.h $(acth)
 ac3 = $(ARCHCORE)form.h $(ARCHCORE)gv.h $(ARCHCORE)handy.h $(ARCHCORE)hv.h
 ac4 = $(ARCHCORE)intern.h $(ARCHCORE)intrpvar.h $(ARCHCORE)iperlsys.h
 ac5 = $(ARCHCORE)keywords.h $(ARCHCORE)mg.h $(ARCHCORE)nostdio.h
-ac6 = $(ARCHCORE)op.h $(ARCHCORE)opcode.h $(ARCHCORE)patchlevel.h
-ac7 = $(ARCHCORE)perl.h $(ARCHCORE)perlio.h $(ARCHCORE)perlsdio.h
-ac8 = $(ARCHCORE)perlvars.h $(ARCHCORE)perly.h $(ARCHCORE)pp.h
-ac9 = $(ARCHCORE)pp_proto.h $(ARCHCORE)proto.h $(ARCHCORE)regcomp.h
-ac10 = $(ARCHCORE)regexp.h $(ARCHCORE)regnodes.h $(ARCHCORE)scope.h
-ac11 = $(ARCHCORE)sv.h $(ARCHCORE)thrdvar.h $(ARCHCORE)opnames.h
-ac12 = $(ARCHCORE)thread.h $(ARCHCORE)utf8.h $(ARCHCORE)util.h
-ac13 = $(ARCHCORE)vmsish.h $(ARCHCORE)warnings.h $(ARCHCORE)xsub.h
-ac14 = $(ARCHCORE)perlshr_attr.opt $(ARCHCORE)perlshr_bld.opt
-ac = $(ac0) $(ac1) $(ac2) $(ac3) $(ac4) $(ac5) $(ac6) $(ac7) $(ac8) $(ac9) $(ac10) $(ac11) $(ac12) $(ac13) $(ac14)
+ac6 = $(ARCHCORE)objxsub.h $(ARCHCORE)op.h $(ARCHCORE)opcode.h
+ac7 = $(ARCHCORE)opnames.h $(ARCHCORE)patchlevel.h $(ARCHCORE)perl.h
+ac8 = $(ARCHCORE)perlapi.h $(ARCHCORE)perlio.h $(ARCHCORE)perlsdio.h
+ac9 = $(ARCHCORE)perlvars.h $(ARCHCORE)perly.h $(ARCHCORE)pp.h
+ac10 = $(ARCHCORE)pp_proto.h $(ARCHCORE)proto.h $(ARCHCORE)regcomp.h
+ac11 = $(ARCHCORE)regexp.h $(ARCHCORE)regnodes.h $(ARCHCORE)scope.h
+ac12 = $(ARCHCORE)sv.h $(ARCHCORE)thrdvar.h $(SOCKARCH)
+ac13 = $(ARCHCORE)thread.h $(ARCHCORE)utf8.h $(ARCHCORE)util.h
+ac14 = $(ARCHCORE)vmsish.h $(ARCHCORE)warnings.h $(ARCHCORE)xsub.h
+acopt = $(ARCHCORE)perlshr_attr.opt $(ARCHCORE)$(DBG)perlshr_bld.opt
+ac = $(ac0) $(ac1) $(ac2) $(ac3) $(ac4) $(ac5) $(ac6) $(ac7) $(ac8) $(ac9) $(ac10) $(ac11) $(ac12) $(ac13) $(ac14) $(acopt)
 
 CRTL = []crtl.opt
 CRTLOPTS =,$(CRTL)/Options
@@ -365,18 +352,31 @@ podxform : [.lib.pod]pod2text.com [.lib.pod]pod2html.com [.lib.pod]pod2latex.com
 x2p : [.x2p]a2p$(E) [.x2p]s2p.com [.x2p]find2perl.com 
 	@ $(NOOP)
 
-pod1 = [.lib.pod]perl.pod [.lib.pod]perl5004delta.pod [.lib.pod]perl5005delta.pod [.lib.pod]perlapi.pod [.lib.pod]perlapio.pod [.lib.pod]perlbook.pod 
-pod2 = [.lib.pod]perlbot.pod [.lib.pod]perlcall.pod [.lib.pod]perlcompile.pod [.lib.pod]perldata.pod [.lib.pod]perldbmfilter.pod [.lib.pod]perldebug.pod [.lib.pod]perldelta.pod 
-pod3 = [.lib.pod]perldiag.pod [.lib.pod]perldsc.pod [.lib.pod]perlembed.pod [.lib.pod]perlfork.pod [.lib.pod]perlform.pod [.lib.pod]perlfunc.pod 
-pod4 = [.lib.pod]perlguts.pod [.lib.pod]perlhack.pod [.lib.pod]perlhist.pod [.lib.pod]perlipc.pod [.lib.pod]perllexwarn.pod [.lib.pod]perllocale.pod [.lib.pod]perllol.pod 
-pod5 = [.lib.pod]perlmod.pod [.lib.pod]perlmodinstall.pod [.lib.pod]perlmodlib.pod [.lib.pod]perlobj.pod [.lib.pod]perlop.pod [.lib.pod]perlopentut.pod [.lib.pod]perlpod.pod 
-pod6 = [.lib.pod]perlport.pod [.lib.pod]perlre.pod [.lib.pod]perlref.pod [.lib.pod]perlreftut.pod [.lib.pod]perlrun.pod [.lib.pod]perlsec.pod 
-pod7 = [.lib.pod]perlstyle.pod [.lib.pod]perlsub.pod [.lib.pod]perlsyn.pod [.lib.pod]perltie.pod [.lib.pod]perltoc.pod [.lib.pod]perltodo.pod 
-pod8 = [.lib.pod]perltoot.pod [.lib.pod]perltootc.pod [.lib.pod]perltrap.pod [.lib.pod]perlunicode.pod [.lib.pod]perlvar.pod [.lib.pod]perlxs.pod [.lib.pod]perlxstut.pod
-pod9 = [.lib.pod]perlfaq.pod [.lib.pod]perlfaq1.pod [.lib.pod]perlfaq2.pod [.lib.pod]perlfaq3.pod [.lib.pod]perlfaq4.pod [.lib.pod]perlfaq5.pod
-pod10 = [.lib.pod]perlfaq6.pod [.lib.pod]perlfaq7.pod [.lib.pod]perlfaq8.pod [.lib.pod]perlfaq9.pod
-
-perlpods : $(pod1) $(pod2) $(pod3) $(pod4) $(pod5) $(pod6) $(pod7) $(pod8) $(pod9) $(pod10) [.lib.pod]perlvms.pod
+pod0 = [.lib.pod]perl.pod [.lib.pod]perl5004delta.pod [.lib.pod]perl5005delta.pod
+pod1 = [.lib.pod]perlapi.pod [.lib.pod]perlapio.pod [.lib.pod]perlbook.pod
+pod2 = [.lib.pod]perlbot.pod [.lib.pod]perlcall.pod [.lib.pod]perlcompile.pod
+pod3 = [.lib.pod]perldata.pod [.lib.pod]perldbmfilter.pod [.lib.pod]perldebug.pod
+pod4 = [.lib.pod]perldelta.pod [.lib.pod]perldiag.pod [.lib.pod]perldsc.pod
+pod5 = [.lib.pod]perlembed.pod [.lib.pod]perlfaq.pod [.lib.pod]perlfaq1.pod
+pod6 = [.lib.pod]perlfaq2.pod [.lib.pod]perlfaq3.pod [.lib.pod]perlfaq4.pod
+pod7 = [.lib.pod]perlfaq5.pod [.lib.pod]perlfaq6.pod [.lib.pod]perlfaq7.pod
+pod8 = [.lib.pod]perlfaq8.pod [.lib.pod]perlfaq9.pod [.lib.pod]perlfilter.pod
+pod9 = [.lib.pod]perlfork.pod [.lib.pod]perlform.pod [.lib.pod]perlfunc.pod
+pod10 = [.lib.pod]perlguts.pod [.lib.pod]perlhack.pod [.lib.pod]perlhist.pod
+pod11 = [.lib.pod]perlintern.pod [.lib.pod]perlipc.pod [.lib.pod]perllexwarn.pod
+pod12 = [.lib.pod]perllocale.pod [.lib.pod]perllol.pod [.lib.pod]perlmod.pod
+pod13 = [.lib.pod]perlmodinstall.pod [.lib.pod]perlmodlib.pod [.lib.pod]perlobj.pod
+pod14 = [.lib.pod]perlop.pod [.lib.pod]perlopentut.pod [.lib.pod]perlpod.pod
+pod15 = [.lib.pod]perlport.pod [.lib.pod]perlre.pod [.lib.pod]perlref.pod
+pod16 = [.lib.pod]perlreftut.pod [.lib.pod]perlrun.pod [.lib.pod]perlsec.pod
+pod17 = [.lib.pod]perlstyle.pod [.lib.pod]perlsub.pod [.lib.pod]perlsyn.pod
+pod18 = [.lib.pod]perlthrtut.pod [.lib.pod]perltie.pod [.lib.pod]perltoc.pod
+pod19 = [.lib.pod]perltodo.pod [.lib.pod]perltoot.pod [.lib.pod]perltootc.pod
+pod20 = [.lib.pod]perltrap.pod [.lib.pod]perlunicode.pod [.lib.pod]perlvar.pod
+pod21 = [.lib.pod]perlxs.pod [.lib.pod]perlxstut.pod [.lib.pod]win32.pod [.lib.pod]perlvms.pod
+pod = $(pod0) $(pod1) $(pod2) $(pod3) $(pod4) $(pod5) $(pod6) $(pod7) $(pod8) $(pod9) $(pod10) $(pod11) $(pod12) $(pod13) $(pod14) $(pod15) $(pod16) $(pod17) $(pod18) $(pod19) $(pod20) $(pod21)
+
+perlpods : $(pod)
 	@ $(NOOP)
 
 archcorefiles : $(ac) $(acth) $(ARCHAUTO)time.stamp
@@ -589,267 +589,205 @@ preplibrary : $(MINIPERL_EXE) $(LIBPREREQ) $(SOCKPM)
 
 [.lib.pod]perl.pod : [.pod]perl.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perl5004delta.pod : [.pod]perl5004delta.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perl5005delta.pod : [.pod]perl5005delta.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlapi.pod : [.pod]perlapi.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlapio.pod : [.pod]perlapio.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlbook.pod : [.pod]perlbook.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlbot.pod : [.pod]perlbot.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlcall.pod : [.pod]perlcall.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlcompile.pod : [.pod]perlcompile.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perldata.pod : [.pod]perldata.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perldbmfilter.pod : [.pod]perldbmfilter.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perldebug.pod : [.pod]perldebug.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perldelta.pod : [.pod]perldelta.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perldiag.pod : [.pod]perldiag.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perldsc.pod : [.pod]perldsc.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlembed.pod : [.pod]perlembed.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfaq.pod : [.pod]perlfaq.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfaq1.pod : [.pod]perlfaq1.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfaq2.pod : [.pod]perlfaq2.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfaq3.pod : [.pod]perlfaq3.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfaq4.pod : [.pod]perlfaq4.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfaq5.pod : [.pod]perlfaq5.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfaq6.pod : [.pod]perlfaq6.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfaq7.pod : [.pod]perlfaq7.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfaq8.pod : [.pod]perlfaq8.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfaq9.pod : [.pod]perlfaq9.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfilter.pod : [.pod]perlfilter.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfork.pod : [.pod]perlfork.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlform.pod : [.pod]perlform.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlfunc.pod : [.pod]perlfunc.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlguts.pod : [.pod]perlguts.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlhack.pod : [.pod]perlhack.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlhist.pod : [.pod]perlhist.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlintern.pod : [.pod]perlintern.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlipc.pod : [.pod]perlipc.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perllexwarn.pod : [.pod]perllexwarn.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perllocale.pod : [.pod]perllocale.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perllol.pod : [.pod]perllol.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlmod.pod : [.pod]perlmod.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlmodinstall.pod : [.pod]perlmodinstall.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlmodlib.pod : [.pod]perlmodlib.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlobj.pod : [.pod]perlobj.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlop.pod : [.pod]perlop.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlopentut.pod : [.pod]perlopentut.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlpod.pod : [.pod]perlpod.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlport.pod : [.pod]perlport.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlre.pod : [.pod]perlre.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlref.pod : [.pod]perlref.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlreftut.pod : [.pod]perlreftut.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlrun.pod : [.pod]perlrun.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlsec.pod : [.pod]perlsec.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlstyle.pod : [.pod]perlstyle.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlsub.pod : [.pod]perlsub.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlsyn.pod : [.pod]perlsyn.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlthrtut.pod : [.pod]perlthrtut.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perltie.pod : [.pod]perltie.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perltoc.pod : [.pod]perltoc.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perltodo.pod : [.pod]perltodo.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perltoot.pod : [.pod]perltoot.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perltootc.pod : [.pod]perltootc.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perltrap.pod : [.pod]perltrap.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
-[.lib.pod]perlvar.pod : [.pod]perlvar.pod
-	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlunicode.pod : [.pod]perlunicode.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
+[.lib.pod]perlvar.pod : [.pod]perlvar.pod
+	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlxs.pod : [.pod]perlxs.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlxstut.pod : [.pod]perlxstut.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
-
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
+[.lib.pod]win32.pod : [.pod]win32.pod
+	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 [.lib.pod]perlvms.pod : [.vms]perlvms.pod
 	@ If F$Search("[.lib]pod.dir").eqs."" Then Create/Directory [.lib.pod]
-	@ Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 
 install.html : []perl_setup.com installhtml. install $(perlpods)
 	@ @perl_setup
@@ -873,7 +811,7 @@ printconfig :
 
 vmsish.h : $(SOCKH)
 
-$(SOCKOBJ) : $(SOCKC) EXTERN.h perl.h config.h embed.h perlsdio.h handy.h vmsish.h regexp.h sv.h util.h form.h gv.h cv.h opcode.h opnames.h op.h cop.h av.h hv.h mg.h scope.h perly.h thread.h pp.h proto.h embedvar.h perlvars.h thrdvar.h intrpvar.h perlio.h
+$(SOCKO) : $(SOCKC) EXTERN.h perl.h config.h embed.h perlsdio.h handy.h vmsish.h regexp.h sv.h util.h form.h gv.h cv.h opcode.h opnames.h op.h cop.h av.h hv.h mg.h scope.h perly.h thread.h pp.h proto.h embedvar.h perlvars.h thrdvar.h intrpvar.h perlio.h
 
 $(SOCKC) : [.vms]$(SOCKC)
 	Copy/Log/NoConfirm [.vms]$(SOCKC) []$(SOCKC)
@@ -919,7 +857,7 @@ perly.h : [.vms]perly_h.vms
 
 .ifdef LINK_ONLY
 .else
-perly$(O) : perly.c, perly.h, $(allh)
+perly$(O) : perly.c, perly.h, $(h)
 .endif
 
 [.t.lib]vmsfspec.t : [.vms.ext]filespec.t
@@ -953,7 +891,7 @@ archify : all
 # CORE subset for MakeMaker, so we can build Perl without sources
 # Should move to VMS installperl when we get one
 .ifdef SOCKET
-$(ARCHCORE)$(sockh) : $(sockh)
+$(SOCKARCH) : $(SOCKH)
 	@ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 .endif
@@ -1016,6 +954,9 @@ $(ARCHCORE)mg.h : mg.h
 $(ARCHCORE)nostdio.h : nostdio.h
 	@ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
+$(ARCHCORE)objxsub.h : objxsub.h
+	@ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 $(ARCHCORE)op.h : op.h
 	@ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
@@ -1031,6 +972,9 @@ $(ARCHCORE)patchlevel.h : patchlevel.h
 $(ARCHCORE)perl.h : perl.h
 	@ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
+$(ARCHCORE)perlapi.h : perlapi.h
+	@ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
+	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
 $(ARCHCORE)perlio.h : perlio.h
 	@ If F$Search("$(ARCHDIR)CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log $(MMS$SOURCE) $(MMS$TARGET)
@@ -1109,70 +1053,70 @@ $(ARCHAUTO)time.stamp :
 #	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
 # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
 .ifdef SOCKET
-$(SOCKOBJ) : $(SOCKC) $(h)
+$(SOCKO) : $(SOCKC) extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
 .endif
-av$(O) : av.c $(h)
+av$(O) : av.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-deb$(O) : deb.c $(h)
+deb$(O) : deb.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-doio$(O) : doio.c $(h)
+doio$(O) : doio.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-doop$(O) : doop.c $(h)
+doop$(O) : doop.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-dump$(O) : dump.c $(h) $(h6)
+dump$(O) : dump.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h regcomp.h regnodes.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-globals$(O) : globals.c $(h)
+globals$(O) : globals.c intern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h perlapi.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-gv$(O) : gv.c $(h)
+gv$(O) : gv.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-hv$(O) : hv.c $(h)
+hv$(O) : hv.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-mg$(O) : mg.c $(h)
+mg$(O) : mg.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-miniperlmain$(O) : miniperlmain.c $(h)
+miniperlmain$(O) : miniperlmain.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-op$(O) : op.c $(h)
+op$(O) : op.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h keywords.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-perl$(O) : perl.c $(h)
+perl$(O) : perl.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h patchlevel.h intrpvar.h thrdvar.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-perlio$(O) : perlio.c $(h)
+perlio$(O) : perlio.c config.h extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-perlmain$(O) : perlmain.c $(h)
+perlmain$(O) : perlmain.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-perly$(O) : perly.c $(h)
+perly$(O) : perly.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-pp$(O) : pp.c $(h)
+pp$(O) : pp.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-pp_ctl$(O) : pp_ctl.c $(h)
+pp_ctl$(O) : pp_ctl.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-pp_hot$(O) : pp_hot.c $(h)
+pp_hot$(O) : pp_hot.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-pp_sys$(O) : pp_sys.c $(h)
+pp_sys$(O) : pp_sys.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-regcomp$(O) : regcomp.c $(h) $(h6)
+regcomp$(O) : regcomp.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h intern.h regcomp.h regnodes.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-regexec$(O) : regexec.c $(h) $(h6)
+regexec$(O) : regexec.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h regcomp.h regnodes.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-run$(O) : run.c $(h)
+run$(O) : run.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-scope$(O) : scope.c $(h)
+scope$(O) : scope.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-sv$(O) : sv.c $(h)
+sv$(O) : sv.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-taint$(O) : taint.c $(h)
+taint$(O) : taint.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-toke$(O) : toke.c $(h) $(h7)
+toke$(O) : toke.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h keywords.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-universal$(O) : universal.c $(h)
+universal$(O) : universal.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h xsub.h perlapi.h objxsub.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-utf8$(O) : utf8.c $(h)
+utf8$(O) : utf8.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-util$(O) : util.c $(h)
+util$(O) : util.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-vms$(O) : vms.c $(h)
+vms$(O) : vms.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
-xsutils$(O) : xsutils.c $(h)
+xsutils$(O) : xsutils.c extern.h perl.h config.h embed.h handy.h vmsish.h $(SOCKH) iperlsys.h perlsdio.h perl.h regexp.h sv.h util.h form.h gv.h cv.h opnames.h op.h cop.h av.h hv.h mg.h scope.h warnings.h utf8.h perly.h thread.h pp.h proto.h pp_proto.h opcode.h embedvar.h intrpvar.h thrdvar.h perlvars.h patchlevel.h xsub.h perlapi.h objxsub.h
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
 
 [.x2p]hash$(O) : [.x2p]hash.c [.x2p]EXTERN.h [.x2p]a2p.h [.x2p]hash.h [.x2p]str.h [.x2p]util.h config.h handy.h vmsish.h $(SOCKH)