Rename gc.h to gcdata.h to avoid conflict with Boehm GC system include file, and adjust sources.

Remove duplicate external function definitions from gcdata.h renamed: inc/gc.h -> inc/gcdata.h modified: src/array2.c modified: src/array4.c modified: src/array6.c modified: src/asmbbt.c modified: src/asmbitblt.c modified: src/bbtsub.c modified: src/car-cdr.c modified: src/conspage.c modified: src/fvar.c modified: src/gc.c modified: src/gcarray.c modified: src/gccode.c modified: src/gcfinal.c modified: src/gchtfind.c modified: src/gcmain3.c modified: src/gcoflow.c modified: src/gcr.c modified: src/gcrcell.c modified: src/gcscan.c modified: src/gvar2.c modified: src/initsout.c modified: src/loopsops.c modified: src/mkcell.c modified: src/rplcons.c modified: src/storage.c modified: src/xc.c modified: src/z2.c
2026-01-26 03:51:32 +00:00 · 2020-09-05 16:24:55 -07:00
parent e51a2e2b16
commit cfc0046675
88 changed files with 142 additions and 147 deletions
--- a/bin/dosmkfil
+++ b/bin/dosmkfil
@@ -20,7 +20,7 @@ SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c         gcrcell.c llstk.
 OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj         gcr.obj  gcrcell.obj llstk.obj  gcscan.obj loopsops.obj storage.obj     allocmds.obj dir.obj gvar2.obj lowlev1.obj      subr.obj arith2.obj hacks.obj lowlev2.obj       subr0374.obj arith3.obj doscomm.obj     hardrtn.obj lsthandl.obj sxhash.obj arith4.obj  draw.obj main.obj testtool.obj array.obj        dsk.obj inet.obj misc7.obj timer.obj    array2.obj dspif.obj initdsp.obj miscn.obj      typeof.obj array3.obj initkbd.obj ubf1.obj      array4.obj dspsubrs.obj initsout.obj    mkatom.obj ubf2.obj array5.obj eqf.obj  intcall.obj mkcell.obj ubf3.obj array6.obj      ether.obj ufn.obj atom.obj      findkey.obj kbdsubrs.obj mouseif.obj ufs.obj    bbtsub.obj foreign.obj keyevent.obj     unixcomm.obj bin.obj fp.obj keylib.obj  binds.obj fvar.obj mvs.obj      unwind.obj bitblt.obj gc.obj    uraid.obj blt.obj gc2.obj       kprint.obj osmsg.obj usrsubr.obj byteswap.obj   gcarray.obj perrno.obj uutils.obj       carcdr.obj asmbbt.obj gccode.obj        vars3.obj gcfinal.obj ldsout.obj        return.obj vmemsave.obj chardev.obj     gchtfind.obj lineblt8.obj rpc.obj xc.obj        common.obj gcmain3.obj lisp2c.obj rplcons.obj   z2.obj  vdate.obj $(KEY) $(COLORFILES) $(ARCHFILES) $(LPFILES)


-HFILES = address.h adr68k.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h fp.h gc.h hdw_conf.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h mouseif.h my.h  opcodes.h osmsg.h pilotbbt.h print.h profile.h  return.h stack.h stream.h subrs.h sysatms.h timeout.h   tos1defs.h tosfns.h tosret.h vmemsave.h         xdefs.h xbitmaps.h xkeymap.h
+HFILES = address.h adr68k.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h fp.h gcdata.h hdw_conf.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h mouseif.h my.h  opcodes.h osmsg.h pilotbbt.h print.h profile.h  return.h stack.h stream.h subrs.h sysatms.h timeout.h   tos1defs.h tosfns.h tosret.h vmemsave.h         xdefs.h xbitmaps.h xkeymap.h



--- a/bin/makefile-ISC.i386-x
+++ b/bin/makefile-ISC.i386-x
@@ -54,7 +54,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 	 $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h  $(INCDIR)dbprint.h\
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-aix.ps2-x
+++ b/bin/makefile-aix.ps2-x
@@ -54,7 +54,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 	 $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h  $(INCDIR)dbprint.h\
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-aix.rs6000-x
+++ b/bin/makefile-aix.rs6000-x
@@ -58,7 +58,7 @@ default	: ../$(OSARCHNAME)/lde
 $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-darwin.386-x
+++ b/bin/makefile-darwin.386-x
@@ -46,7 +46,7 @@ $(OBJECTDIR)xc.o:      $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	$(INCDIR)address.h \
 	$(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	$(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	$(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	$(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	$(INCDIR)arith.h $(INCDIR)stream.h \
 	$(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	$(INCDIR)tosfns.h  $(INCDIR)inlineC.h
--- a/bin/makefile-darwin.x86_64-x
+++ b/bin/makefile-darwin.x86_64-x
@@ -46,7 +46,7 @@ $(OBJECTDIR)xc.o:      $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	$(INCDIR)address.h \
 	$(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	$(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	$(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	$(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	$(INCDIR)arith.h $(INCDIR)stream.h \
 	$(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	$(INCDIR)tosfns.h  $(INCDIR)inlineC.h
--- a/bin/makefile-domain.mc68020-x
+++ b/bin/makefile-domain.mc68020-x
@@ -63,7 +63,7 @@ default	: ../$(OSARCHNAME)/lde # ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-dos
+++ b/bin/makefile-dos
@@ -20,7 +20,7 @@ SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c         gcrcell.c llstk.
 OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj         gcr.obj  gcrcell.obj llstk.obj  gcscan.obj loopsops.obj storage.obj     allocmds.obj dir.obj gvar2.obj lowlev1.obj      subr.obj arith2.obj hacks.obj lowlev2.obj       subr0374.obj arith3.obj doscomm.obj     hardrtn.obj lsthandl.obj sxhash.obj arith4.obj  draw.obj main.obj testtool.obj array.obj        dsk.obj inet.obj misc7.obj timer.obj    array2.obj dspif.obj initdsp.obj miscn.obj      typeof.obj array3.obj initkbd.obj ubf1.obj      array4.obj dspsubrs.obj initsout.obj    mkatom.obj ubf2.obj array5.obj eqf.obj  intcall.obj mkcell.obj ubf3.obj array6.obj      ether.obj ufn.obj atom.obj      findkey.obj kbdsubrs.obj mouseif.obj ufs.obj    bbtsub.obj foreign.obj keyevent.obj     unixcomm.obj bin.obj fp.obj keylib.obj  binds.obj fvar.obj mvs.obj      unwind.obj bitblt.obj gc.obj    uraid.obj blt.obj gc2.obj       kprint.obj osmsg.obj usrsubr.obj byteswap.obj   gcarray.obj perrno.obj uutils.obj       carcdr.obj asmbbt.obj gccode.obj        vars3.obj gcfinal.obj ldsout.obj        return.obj vmemsave.obj chardev.obj     gchtfind.obj lineblt8.obj rpc.obj xc.obj        common.obj gcmain3.obj lisp2c.obj rplcons.obj   z2.obj  vdate.obj $(KEY) $(COLORFILES) $(ARCHFILES) $(LPFILES)


-HFILES = address.h adr68k.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h fp.h gc.h hdw_conf.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h mouseif.h my.h  opcodes.h osmsg.h pilotbbt.h print.h profile.h  return.h stack.h stream.h subrs.h sysatms.h timeout.h   tos1defs.h tosfns.h tosret.h vmemsave.h         xdefs.h xbitmaps.h xkeymap.h
+HFILES = address.h adr68k.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h fp.h gcdata.h hdw_conf.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h mouseif.h my.h  opcodes.h osmsg.h pilotbbt.h print.h profile.h  return.h stack.h stream.h subrs.h sysatms.h timeout.h   tos1defs.h tosfns.h tosret.h vmemsave.h         xdefs.h xbitmaps.h xkeymap.h



--- a/bin/makefile-freebsd.386-x
+++ b/bin/makefile-freebsd.386-x
@@ -43,7 +43,7 @@ default	: ../$(OSARCHNAME)/lde
 #$(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 #	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 #	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-#	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+#	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 #	 $(INCDIR)arith.h $(INCDIR)stream.h \
 #	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 #	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -96,7 +96,7 @@ $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	 $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-hpux.hp9000-x
+++ b/bin/makefile-hpux.hp9000-x
@@ -79,7 +79,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-init.386
+++ b/bin/makefile-init.386
@@ -45,7 +45,7 @@ $(OBJECTDIR)xc.o:      $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	$(INCDIR)address.h \
 	$(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	$(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	$(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	$(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	$(INCDIR)arith.h $(INCDIR)stream.h \
 	$(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	$(INCDIR)tosfns.h  $(INCDIR)inlineC.h
--- a/bin/makefile-init.sgi
+++ b/bin/makefile-init.sgi
@@ -76,7 +76,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -86,7 +86,7 @@ $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDI
 #$(OBJECTDIR)xc.o:	$(SRCDIR)xc.i $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 #	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 #	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-#	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+#	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 #	 $(INCDIR)arith.h $(INCDIR)stream.h \
 #	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 #	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-init.sparc
+++ b/bin/makefile-init.sparc
@@ -94,7 +94,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -104,7 +104,7 @@ $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDI
 #$(OBJECTDIR)xc.o:	$(SRCDIR)xc.i $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 #	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 #	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-#	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+#	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 #	 $(INCDIR)arith.h $(INCDIR)stream.h \
 #	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 #	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-init.sparc-multi
+++ b/bin/makefile-init.sparc-multi
@@ -39,7 +39,7 @@ default: ../$(OSARCHNAME)/$(LDENAME)
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -92,7 +92,7 @@ $(OBJECTDIR)xc.s3:	$(OBJECTDIR)xc.s2 $(INLINE)
 $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-irix.sgi-x
+++ b/bin/makefile-irix.sgi-x
@@ -88,7 +88,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -98,7 +98,7 @@ $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDI
 #$(OBJECTDIR)xc.o:	$(SRCDIR)xc.i $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 #	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 #	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-#	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+#	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 #	 $(INCDIR)arith.h $(INCDIR)stream.h \
 #	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 #	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-linux.386-x
+++ b/bin/makefile-linux.386-x
@@ -43,7 +43,7 @@ default	: ../$(OSARCHNAME)/lde
 #$(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 #	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 #	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-#	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+#	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 #	 $(INCDIR)arith.h $(INCDIR)stream.h \
 #	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 #	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -96,7 +96,7 @@ $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	 $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-linux.armv7l-x
+++ b/bin/makefile-linux.armv7l-x
@@ -43,7 +43,7 @@ default	: ../$(OSARCHNAME)/lde
 #$(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 #	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 #	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-#	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+#	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 #	 $(INCDIR)arith.h $(INCDIR)stream.h \
 #	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 #	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -96,7 +96,7 @@ $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	 $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-linux.x86_64-x
+++ b/bin/makefile-linux.x86_64-x
@@ -44,7 +44,7 @@ default	: ../$(OSARCHNAME)/lde
 #$(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 #	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 #	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-#	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+#	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 #	 $(INCDIR)arith.h $(INCDIR)stream.h \
 #	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 #	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -97,7 +97,7 @@ $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	 $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-osf1.dec-x
+++ b/bin/makefile-osf1.dec-x
@@ -59,7 +59,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-riscos.mips-x
+++ b/bin/makefile-riscos.mips-x
@@ -71,7 +71,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos3.mc68020
+++ b/bin/makefile-sunos3.mc68020
@@ -20,7 +20,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 	 $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos3.mc68020-multi
+++ b/bin/makefile-sunos3.mc68020-multi
@@ -26,7 +26,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 	 $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncallmacro.h  $(INCDIR)inlinedefsC.h   \
--- a/bin/makefile-sunos3.mc68020-x
+++ b/bin/makefile-sunos3.mc68020-x
@@ -48,7 +48,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 	 $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos3.sparc
+++ b/bin/makefile-sunos3.sparc
@@ -22,7 +22,7 @@ default	: $(OBJECTDIR)lde $(OBJECTDIR)ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.1.i386
+++ b/bin/makefile-sunos4.1.i386
@@ -21,7 +21,7 @@ default	: $(OBJECTDIR)lde $(OBJECTDIR)ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h  $(INCDIR)dbprint.h\
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncallmacro.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.1.i386-multi
+++ b/bin/makefile-sunos4.1.i386-multi
@@ -23,7 +23,7 @@ default	: $(OBJECTDIR)lde $(OBJECTDIR)ldeether
 $(OBJECTDIR)xc.s:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h  $(INCDIR)dbprint.h\
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.1.mc68020
+++ b/bin/makefile-sunos4.1.mc68020
@@ -25,7 +25,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 	 $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.1.mc68020-multi
+++ b/bin/makefile-sunos4.1.mc68020-multi
@@ -26,7 +26,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 	 $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.1.mc68020-x
+++ b/bin/makefile-sunos4.1.mc68020-x
@@ -53,7 +53,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 	 $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.1.sparc
+++ b/bin/makefile-sunos4.1.sparc
@@ -28,7 +28,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.1.sparc-color
+++ b/bin/makefile-sunos4.1.sparc-color
@@ -26,7 +26,7 @@ default	: $(OBJECTDIR)lde $(OBJECTDIR)Cldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.1.sparc-multi
+++ b/bin/makefile-sunos4.1.sparc-multi
@@ -34,7 +34,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.1.sparc-x
+++ b/bin/makefile-sunos4.1.sparc-x
@@ -63,7 +63,7 @@ default:	../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -114,7 +114,7 @@ $(OBJECTDIR)xc.o: $(OBJECTDIR)xc.s3
 #$(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  #$(INCDIR)address.h \
 #	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 #	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-#	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+#	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 #	 $(INCDIR)arith.h $(INCDIR)stream.h \
 #	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 #	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h
--- a/bin/makefile-sunos4.i386
+++ b/bin/makefile-sunos4.i386
@@ -21,7 +21,7 @@ default	: $(OBJECTDIR)lde $(OBJECTDIR)ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h  $(INCDIR)dbprint.h\
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncallmacro.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.i386-multi
+++ b/bin/makefile-sunos4.i386-multi
@@ -25,7 +25,7 @@ default	: $(OBJECTDIR)lde $(OBJECTDIR)ldeether
 $(OBJECTDIR)xc.s:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h  $(INCDIR)dbprint.h\
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.mc68020
+++ b/bin/makefile-sunos4.mc68020
@@ -25,7 +25,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 	 $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.mc68020-multi
+++ b/bin/makefile-sunos4.mc68020-multi
@@ -26,7 +26,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 	 $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.mc68020-x
+++ b/bin/makefile-sunos4.mc68020-x
@@ -54,7 +54,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 	 $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.sparc
+++ b/bin/makefile-sunos4.sparc
@@ -64,7 +64,7 @@ default	: $(OBJECTDIR)lde $(OBJECTDIR)ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -117,7 +117,7 @@ $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	 $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-sunos4.sparc%
+++ b/bin/makefile-sunos4.sparc%
@@ -35,7 +35,7 @@ default	: $(OBJECTDIR)lde $(OBJECTDIR)ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -88,7 +88,7 @@ $(OBJECTDIR)xc.o: $(OBJECTDIR)xc.s3
 	 $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-sunos4.sparc-3
+++ b/bin/makefile-sunos4.sparc-3
@@ -34,7 +34,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.sparc-color
+++ b/bin/makefile-sunos4.sparc-color
@@ -24,7 +24,7 @@ default	: $(OBJECTDIR)lde $(OBJECTDIR)Cldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.sparc-multi
+++ b/bin/makefile-sunos4.sparc-multi
@@ -68,7 +68,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -122,7 +122,7 @@ $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	 $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-sunos4.sparc-multi%
+++ b/bin/makefile-sunos4.sparc-multi%
@@ -37,7 +37,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -91,7 +91,7 @@ $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	 $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-sunos4.sparc-multi-3
+++ b/bin/makefile-sunos4.sparc-multi-3
@@ -34,7 +34,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
@@ -87,7 +87,7 @@ $(OBJECTDIR)xc.o: $(OBJECTDIR)xc.s3
 #$(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h#  $(INCDIR)address.h \
 #	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 #	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-#	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+#	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 #	 $(INCDIR)arith.h $(INCDIR)stream.h \
 #	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 #	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-sunos4.sparc-x
+++ b/bin/makefile-sunos4.sparc-x
@@ -67,7 +67,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -120,7 +120,7 @@ $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	 $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   
--- a/bin/makefile-sunos4.sparc-x%
+++ b/bin/makefile-sunos4.sparc-x%
@@ -59,7 +59,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos4.sparc-x-3
+++ b/bin/makefile-sunos4.sparc-x-3
@@ -51,7 +51,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile-sunos5.386-x
+++ b/bin/makefile-sunos5.386-x
@@ -78,7 +78,7 @@ $(OBJECTDIR)xc.o:      $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	$(INCDIR)address.h \
 	$(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	$(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	$(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	$(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	$(INCDIR)arith.h $(INCDIR)stream.h \
 	$(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	$(INCDIR)tosfns.h  $(INCDIR)inlineC.h
--- a/bin/makefile-sunos5.i386-x
+++ b/bin/makefile-sunos5.i386-x
@@ -76,7 +76,7 @@ default:	../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -127,7 +127,7 @@ $(OBJECTDIR)xc.s3:	$(OBJECTDIR)xc.s2 $(INLINE)
 $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h
--- a/bin/makefile-sunos5.sparc-x
+++ b/bin/makefile-sunos5.sparc-x
@@ -85,7 +85,7 @@ default:	../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.i:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
@@ -136,7 +136,7 @@ $(OBJECTDIR)xc.s3:	$(OBJECTDIR)xc.s2 $(INLINE)
 $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h
--- a/bin/makefile-tail
+++ b/bin/makefile-tail
@@ -24,7 +24,7 @@
 #		 $(INCDIR)lispemul.h $(INCDIR)version.h \
 #		 $(INCDIR)lspglob.h  $(INCDIR)adr68k.h \
 #		 $(INCDIR)stack.h  $(INCDIR)emlglob.h  $(INCDIR)lispmap.h \
-#		 $(INCDIR)gc.h
+#		 $(INCDIR)gcdata.h
 #		$(CC) $(RFLAGS) $(SRCDIR)<<file-name>>.c $(INLINE) -o $(OBJECTDIR)<<file-name>>.o

 # to build sysouts on the sun, you must do the following:
@@ -335,7 +335,7 @@ $(OBJECTDIR)bbtsub.o :  $(SRCDIR)bbtsub.c $(INCDIR)bbtsub.h $(REQUIRED-INCS) $(I
 	 $(INCDIR)emlglob.h  $(INCDIR)adr68k.h  $(INCDIR)address.h \
 	 $(INCDIR)pilotbbt.h  $(INCDIR)display.h $(INCDIR)dspdata.h \
 	 $(INCDIR)bitblt.h $(INCDIR)bb.h $(INCDIR)dbprint.h \
-	 $(INCDIR)stack.h $(INCDIR)cell.h $(INCDIR)gc.h $(INCDIR)arith.h $(INCDIR)fp.h
+	 $(INCDIR)stack.h $(INCDIR)cell.h $(INCDIR)gcdata.h $(INCDIR)arith.h $(INCDIR)fp.h
 	$(CC) $(RFLAGS) $(SRCDIR)bbtsub.c $(INLINE) -o $(OBJECTDIR)bbtsub$(OEXT)

 $(OBJECTDIR)blt.o :  $(SRCDIR)blt.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  $(INCDIR)address.h  \
@@ -350,7 +350,7 @@ $(OBJECTDIR)byteswap.o: $(SRCDIR)byteswap.c  $(REQUIRED-INCS) $(INLINE)
 $(OBJECTDIR)car-cdr.o :  $(SRCDIR)car-cdr.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)emlglob.h  $(INCDIR)lspglob.h  \
 	 $(INCDIR)lsptypes.h  $(INCDIR)address.h  $(INCDIR)adr68k.h \
-	 $(INCDIR)gc.h  $(INCDIR)cell.h
+	 $(INCDIR)gcdata.h  $(INCDIR)cell.h
 	$(CC) $(RFLAGS) $(SRCDIR)car-cdr.c $(INLINE) -o $(OBJECTDIR)car-cdr$(OEXT)

 $(OBJECTDIR)chardev.o :  $(SRCDIR)chardev.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
@@ -388,13 +388,13 @@ $(OBJECTDIR)common.o :  $(SRCDIR)common.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h
 $(OBJECTDIR)conspage.o :  $(SRCDIR)conspage.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)address.h  $(INCDIR)adr68k.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)cell.h  $(INCDIR)lispmap.h \
-	 $(INCDIR)gc.h  $(INCDIR)lspglob.h
+	 $(INCDIR)gcdata.h  $(INCDIR)lspglob.h
 	$(CC) $(RFLAGS) $(SRCDIR)conspage.c $(INLINE) -o $(OBJECTDIR)conspage$(OEXT)

 $(OBJECTDIR)mkcell.o :  $(SRCDIR)mkcell.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lispmap.h  $(INCDIR)emlglob.h \
 	 $(INCDIR)lspglob.h  $(INCDIR)lsptypes.h  $(INCDIR)address.h \
-	 $(INCDIR)adr68k.h  $(INCDIR)cell.h  $(INCDIR)gc.h
+	 $(INCDIR)adr68k.h  $(INCDIR)cell.h  $(INCDIR)gcdata.h
 	$(CC) $(RFLAGS) $(SRCDIR)mkcell.c $(INLINE) -o $(OBJECTDIR)mkcell$(OEXT)

 $(OBJECTDIR)draw.o :  $(SRCDIR)draw.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
@@ -407,7 +407,7 @@ $(OBJECTDIR)z2.o :  $(SRCDIR)z2.c  $(REQUIRED-INCS)  \
 	 $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lispmap.h  $(INCDIR)lsptypes.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)cell.h  $(INCDIR)stack.h \
-	 $(INCDIR)gc.h  $(INCDIR)my.h
+	 $(INCDIR)gcdata.h  $(INCDIR)my.h
 	$(CC) $(RFLAGS) $(SRCDIR)z2.c $(INLINE) -o $(OBJECTDIR)z2$(OEXT)

 $(OBJECTDIR)eqf.o :  $(SRCDIR)eqf.c  $(REQUIRED-INCS)  $(INCDIR)fp.h \
@@ -494,10 +494,10 @@ $(OBJECTDIR)dir.o :  $(SRCDIR)dir.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 $(OBJECTDIR)fvar.o :  $(SRCDIR)fvar.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lspglob.h  $(INCDIR)adr68k.h \
 	 $(INCDIR)stack.h  $(INCDIR)emlglob.h  $(INCDIR)lispmap.h \
-	 $(INCDIR)gc.h $(INCDIR)lsptypes.h
+	 $(INCDIR)gcdata.h $(INCDIR)lsptypes.h
 	$(CC) $(DISPRFLAGS) $(SRCDIR)fvar.c $(INLINE) -o $(OBJECTDIR)fvar$(OEXT)

-$(OBJECTDIR)gc.o :  $(SRCDIR)gc.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  $(INCDIR)gc.h  \
+$(OBJECTDIR)gc.o :  $(SRCDIR)gc.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)emlglob.h
 	$(CC) $(RFLAGS) $(SRCDIR)gc.c $(INLINE) -o $(OBJECTDIR)gc$(OEXT)
@@ -511,25 +511,25 @@ $(OBJECTDIR)gc2.o :  $(SRCDIR)gc2.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  $(INC
 $(OBJECTDIR)gcarray.o :  $(SRCDIR)gcarray.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lsptypes.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)lspglob.h  $(INCDIR)stack.h \
-	 $(INCDIR)cell.h  $(INCDIR)ifpage.h  $(INCDIR)gc.h \
+	 $(INCDIR)cell.h  $(INCDIR)ifpage.h  $(INCDIR)gcdata.h \
 	 $(INCDIR)array.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcarray.c $(INLINE) -o $(OBJECTDIR)gcarray$(OEXT)

 $(OBJECTDIR)gcfinal.o :  $(SRCDIR)gcfinal.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lsptypes.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)lspglob.h  $(INCDIR)stack.h \
-	 $(INCDIR)cell.h  $(INCDIR)ifpage.h  $(INCDIR)gc.h \
+	 $(INCDIR)cell.h  $(INCDIR)ifpage.h  $(INCDIR)gcdata.h \
 	 $(INCDIR)array.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcfinal.c $(INLINE) -o $(OBJECTDIR)gcfinal$(OEXT)

 $(OBJECTDIR)gcoflow.o :  $(SRCDIR)gcoflow.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lsptypes.h  $(INCDIR)address.h \
-	 $(INCDIR)adr68k.h  $(INCDIR)lspglob.h  $(INCDIR)gc.h
+	 $(INCDIR)adr68k.h  $(INCDIR)lspglob.h  $(INCDIR)gcdata.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcoflow.c $(INLINE) -o $(OBJECTDIR)gcoflow$(OEXT)

 $(OBJECTDIR)gchtfind.o :  $(SRCDIR)gchtfind.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lsptypes.h  $(INCDIR)address.h \
-	 $(INCDIR)adr68k.h  $(INCDIR)lspglob.h  $(INCDIR)gc.h \
+	 $(INCDIR)adr68k.h  $(INCDIR)lspglob.h  $(INCDIR)gcdata.h \
 	 $(INCDIR)lispmap.h  $(INCDIR)cell.h
 	$(CC) $(RFLAGS) $(SRCDIR)gchtfind.c $(INLINE) -o $(OBJECTDIR)gchtfind$(OEXT)

@@ -537,35 +537,35 @@ $(OBJECTDIR)gcmain3.o :  $(SRCDIR)gcmain3.c  $(REQUIRED-INCS) $(INCDIR)lispemul.
 	 $(INCDIR)lsptypes.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)lspglob.h  $(INCDIR)emlglob.h \
 	 $(INCDIR)stack.h  $(INCDIR)cell.h  $(INCDIR)ifpage.h \
-	 $(INCDIR)gc.h
+	 $(INCDIR)gcdata.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcmain3.c $(INLINE) -o $(OBJECTDIR)gcmain3$(OEXT)

 $(OBJECTDIR)gcr.o :  $(SRCDIR)gcr.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)emlglob.h  $(INCDIR)lsptypes.h \
 	 $(INCDIR)address.h  $(INCDIR)adr68k.h  $(INCDIR)lspglob.h \
-	 $(INCDIR)stack.h  $(INCDIR)gc.h
+	 $(INCDIR)stack.h  $(INCDIR)gcdata.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcr.c $(INLINE) -o $(OBJECTDIR)gcr$(OEXT)

 $(OBJECTDIR)gcrcell.o :  $(SRCDIR)gcrcell.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lsptypes.h  $(INCDIR)address.h $(INCDIR)dbprint.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)lspglob.h  $(INCDIR)stack.h \
-	 $(INCDIR)cell.h  $(INCDIR)ifpage.h  $(INCDIR)gc.h
+	 $(INCDIR)cell.h  $(INCDIR)ifpage.h  $(INCDIR)gcdata.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcrcell.c $(INLINE) -o $(OBJECTDIR)gcrcell$(OEXT)

 $(OBJECTDIR)gccode.o :  $(SRCDIR)gccode.c  $(REQUIRED-INCS) \
 	 $(INCDIR)lispemul.h  $(INCDIR)lsptypes.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)lspglob.h  $(INCDIR)lispmap.h \
 	 $(INCDIR)stack.h  $(INCDIR)cell.h  $(INCDIR)ifpage.h \
-	 $(INCDIR)gc.h  $(INCDIR)array.h
+	 $(INCDIR)gcdata.h  $(INCDIR)array.h
 	$(CC) $(RFLAGS) $(SRCDIR)gccode.c $(INLINE) -o $(OBJECTDIR)gccode$(OEXT)

 $(OBJECTDIR)gcscan.o :  $(SRCDIR)gcscan.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
-	 $(INCDIR)lspglob.h  $(INCDIR)gc.h $(INCDIR)lsptypes.h
+	 $(INCDIR)lspglob.h  $(INCDIR)gcdata.h $(INCDIR)lsptypes.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcscan.c $(INLINE) -o $(OBJECTDIR)gcscan$(OEXT)

 $(OBJECTDIR)gvar2.o :  $(SRCDIR)gvar2.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lspglob.h  $(INCDIR)adr68k.h \
-	 $(INCDIR)gc.h  $(INCDIR)emlglob.h $(INCDIR)cell.h $(INCDIR)lsptypes.h
+	 $(INCDIR)gcdata.h  $(INCDIR)emlglob.h $(INCDIR)cell.h $(INCDIR)lsptypes.h
 	$(CC) $(RFLAGS) $(SRCDIR)gvar2.c $(INLINE) -o $(OBJECTDIR)gvar2$(OEXT)

 $(OBJECTDIR)hardrtn.o :  $(SRCDIR)hardrtn.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
@@ -596,7 +596,7 @@ $(OBJECTDIR)initsout.o :  $(SRCDIR)initsout.c  $(REQUIRED-INCS) $(INCDIR)hdw_con
 	 $(INCDIR)lispemul.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)adr68k.h \
 	 $(INCDIR)ifpage.h  $(INCDIR)iopage.h  $(INCDIR)cell.h \
-	 $(INCDIR)gc.h
+	 $(INCDIR)gcdata.h
 	$(CC) $(RFLAGS) $(SRCDIR)initsout.c $(INLINE) -o $(OBJECTDIR)initsout$(OEXT)

 $(OBJECTDIR)kbdsubrs.o :  $(SRCDIR)kbdsubrs.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h
@@ -688,7 +688,7 @@ $(OBJECTDIR)return.o :  $(SRCDIR)return.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h
 $(OBJECTDIR)rplcons.o :  $(SRCDIR)rplcons.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)emlglob.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)address.h  $(INCDIR)adr68k.h \
-	 $(INCDIR)gc.h  $(INCDIR)cell.h
+	 $(INCDIR)gcdata.h  $(INCDIR)cell.h
 	$(CC) $(RFLAGS) $(SRCDIR)rplcons.c $(INLINE) -o $(OBJECTDIR)rplcons$(OEXT)

 $(OBJECTDIR)rs232c.o :  $(SRCDIR)rs232c.c  $(REQUIRED-INCS) $(INCDIR)rs232c.h
--- a/bin/makefile-ultrix.dec3100-x
+++ b/bin/makefile-ultrix.dec3100-x
@@ -57,7 +57,7 @@ default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
 $(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h \
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
 	 $(INCDIR)tosfns.h  $(INCDIR)inlineC.h   \
--- a/bin/makefile.dos
+++ b/bin/makefile.dos
@@ -20,7 +20,7 @@ SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c         gcrcell.c llstk.
 OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj         gcr.obj  gcrcell.obj llstk.obj  gcscan.obj loopsops.obj storage.obj     allocmds.obj dir.obj gvar2.obj lowlev1.obj      subr.obj arith2.obj hacks.obj lowlev2.obj       subr0374.obj arith3.obj doscomm.obj     hardrtn.obj lsthandl.obj sxhash.obj arith4.obj  draw.obj main.obj testtool.obj array.obj        dsk.obj inet.obj misc7.obj timer.obj    array2.obj dspif.obj initdsp.obj miscn.obj      typeof.obj array3.obj initkbd.obj ubf1.obj      array4.obj dspsubrs.obj initsout.obj    mkatom.obj ubf2.obj array5.obj eqf.obj  intcall.obj mkcell.obj ubf3.obj array6.obj      ether.obj ufn.obj atom.obj      findkey.obj kbdsubrs.obj mouseif.obj ufs.obj    bbtsub.obj foreign.obj keyevent.obj     unixcomm.obj bin.obj fp.obj keylib.obj  binds.obj fvar.obj mvs.obj      unwind.obj bitblt.obj gc.obj    uraid.obj blt.obj gc2.obj       kprint.obj osmsg.obj usrsubr.obj byteswap.obj   gcarray.obj perrno.obj uutils.obj       carcdr.obj asmbbt.obj gccode.obj        vars3.obj gcfinal.obj ldsout.obj        return.obj vmemsave.obj chardev.obj     gchtfind.obj lineblt8.obj rpc.obj xc.obj        common.obj gcmain3.obj lisp2c.obj rplcons.obj   z2.obj  vdate.obj $(KEY) $(COLORFILES) $(ARCHFILES) $(LPFILES)


-HFILES = address.h adr68k.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h fp.h gc.h hdw_conf.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h mouseif.h my.h  opcodes.h osmsg.h pilotbbt.h print.h profile.h  return.h stack.h stream.h subrs.h sysatms.h timeout.h   tos1defs.h tosfns.h tosret.h vmemsave.h         xdefs.h xbitmaps.h xkeymap.h
+HFILES = address.h adr68k.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h fp.h gcdata.h hdw_conf.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h mouseif.h my.h  opcodes.h osmsg.h pilotbbt.h print.h profile.h  return.h stack.h stream.h subrs.h sysatms.h timeout.h   tos1defs.h tosfns.h tosret.h vmemsave.h         xdefs.h xbitmaps.h xkeymap.h



--- a/bin/makeisc
+++ b/bin/makeisc
@@ -90,7 +90,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 	 $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gc.h  \
+	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)arith.h $(INCDIR)stream.h  $(INCDIR)dbprint.h\
 	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
 	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
@@ -114,7 +114,7 @@ $(OBJECTDIR)xc.o :  $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  \
 #		 $(INCDIR)lispemul.h  \
 #		 $(INCDIR)lispglobal.h  $(INCDIR)address68k.h \
 #		 $(INCDIR)stack.h  $(INCDIR)emulglobal.h  $(INCDIR)lispmap.h \
-#		 $(INCDIR)gc.h
+#		 $(INCDIR)gcdata.h
 #		$(CC) $(RFLAGS) $(SRCDIR)<<file-name>>.c $(INLINE) -o $(OBJECTDIR)<<file-name>>.o

 # to build sysouts on the sun, you must do the following:
@@ -416,7 +416,7 @@ $(OBJECTDIR)bitbltsub.o :  $(SRCDIR)bitbltsub.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)emulglobal.h  $(INCDIR)address68k.h  $(INCDIR)address.h \
 	 $(INCDIR)pilotbbt.h  $(INCDIR)display.h $(INCDIR)displaydata.h \
 	 $(INCDIR)bitblt.h $(INCDIR)bb.h $(INCDIR)dbprint.h \
-	 $(INCDIR)stack.h $(INCDIR)cell.h $(INCDIR)gc.h $(INCDIR)arith.h $(INCDIR)fp.h
+	 $(INCDIR)stack.h $(INCDIR)cell.h $(INCDIR)gcdata.h $(INCDIR)arith.h $(INCDIR)fp.h
 	$(CC) $(RFLAGS) $(SRCDIR)bitbltsub.c $(INLINE) -o $(OBJECTDIR)bitbltsub$(OEXT)

 $(OBJECTDIR)blt.o :  $(SRCDIR)blt.c $(INCDIR)lispemul.h  $(INCDIR)address.h  \
@@ -431,7 +431,7 @@ $(OBJECTDIR)byteswapfns.o: $(SRCDIR)byteswapfns.c $(INLINE)
 $(OBJECTDIR)car-cdr.o :  $(SRCDIR)car-cdr.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)emulglobal.h  $(INCDIR)lispglobal.h  \
 	 $(INCDIR)lisptypes.h  $(INCDIR)address.h  $(INCDIR)address68k.h \
-	 $(INCDIR)gc.h  $(INCDIR)cell.h
+	 $(INCDIR)gcdata.h  $(INCDIR)cell.h
 	$(CC) $(RFLAGS) $(SRCDIR)car-cdr.c $(INLINE) -o $(OBJECTDIR)car-cdr$(OEXT)

 $(OBJECTDIR)chardevice.o :  $(SRCDIR)chardevice.c $(INCDIR)lispemul.h  \
@@ -466,13 +466,13 @@ $(OBJECTDIR)common.o :  $(SRCDIR)common.c $(INCDIR)lispemul.h \
 $(OBJECTDIR)conspage.o :  $(SRCDIR)conspage.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)address.h  $(INCDIR)address68k.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)cell.h  $(INCDIR)lispmap.h \
-	 $(INCDIR)gc.h  $(INCDIR)lispglobal.h
+	 $(INCDIR)gcdata.h  $(INCDIR)lispglobal.h
 	$(CC) $(RFLAGS) $(SRCDIR)conspage.c $(INLINE) -o $(OBJECTDIR)conspage$(OEXT)

 $(OBJECTDIR)createcell.o :  $(SRCDIR)createcell.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)lispmap.h  $(INCDIR)emulglobal.h \
 	 $(INCDIR)lispglobal.h  $(INCDIR)lisptypes.h  $(INCDIR)address.h \
-	 $(INCDIR)address68k.h  $(INCDIR)cell.h  $(INCDIR)gc.h
+	 $(INCDIR)address68k.h  $(INCDIR)cell.h  $(INCDIR)gcdata.h
 	$(CC) $(RFLAGS) $(SRCDIR)createcell.c $(INLINE) -o $(OBJECTDIR)createcell$(OEXT)

 $(OBJECTDIR)draw.o :  $(SRCDIR)draw.c $(INCDIR)lispemul.h  \
@@ -485,7 +485,7 @@ $(OBJECTDIR)z2.o :  $(SRCDIR)z2.c  \
 	 $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lispmap.h  $(INCDIR)lisptypes.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)cell.h  $(INCDIR)stack.h \
-	 $(INCDIR)gc.h  $(INCDIR)my.h
+	 $(INCDIR)gcdata.h  $(INCDIR)my.h
 	$(CC) $(RFLAGS) $(SRCDIR)z2.c $(INLINE) -o $(OBJECTDIR)z2$(OEXT)

 $(OBJECTDIR)eqf.o :  $(SRCDIR)eqf.c  $(INCDIR)fp.h \
@@ -559,10 +559,10 @@ $(OBJECTDIR)directory.o :  $(SRCDIR)directory.c $(INCDIR)lispemul.h  \
 $(OBJECTDIR)fvar.o :  $(SRCDIR)fvar.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)lispglobal.h  $(INCDIR)address68k.h \
 	 $(INCDIR)stack.h  $(INCDIR)emulglobal.h  $(INCDIR)lispmap.h \
-	 $(INCDIR)gc.h $(INCDIR)lisptypes.h
+	 $(INCDIR)gcdata.h $(INCDIR)lisptypes.h
 	$(CC) $(DISPRFLAGS) $(SRCDIR)fvar.c $(INLINE) -o $(OBJECTDIR)fvar$(OEXT)

-$(OBJECTDIR)gc.o :  $(SRCDIR)gc.c $(INCDIR)lispemul.h  $(INCDIR)gc.h  \
+$(OBJECTDIR)gc.o :  $(SRCDIR)gc.c $(INCDIR)lispemul.h  $(INCDIR)gcdata.h  \
 	 $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)emulglobal.h
 	$(CC) $(RFLAGS) $(SRCDIR)gc.c $(INLINE) -o $(OBJECTDIR)gc$(OEXT)
@@ -576,25 +576,25 @@ $(OBJECTDIR)gc2.o :  $(SRCDIR)gc2.c $(INCDIR)lispemul.h  $(INCDIR)lispmap.h  \
 $(OBJECTDIR)gcarrayops.o :  $(SRCDIR)gcarrayops.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)lisptypes.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)lispglobal.h  $(INCDIR)stack.h \
-	 $(INCDIR)cell.h  $(INCDIR)ifpage.h  $(INCDIR)gc.h \
+	 $(INCDIR)cell.h  $(INCDIR)ifpage.h  $(INCDIR)gcdata.h \
 	 $(INCDIR)array.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcarrayops.c $(INLINE) -o $(OBJECTDIR)gcarrayops$(OEXT)

 $(OBJECTDIR)gcfinal.o :  $(SRCDIR)gcfinal.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)lisptypes.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)lispglobal.h  $(INCDIR)stack.h \
-	 $(INCDIR)cell.h  $(INCDIR)ifpage.h  $(INCDIR)gc.h \
+	 $(INCDIR)cell.h  $(INCDIR)ifpage.h  $(INCDIR)gcdata.h \
 	 $(INCDIR)array.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcfinal.c $(INLINE) -o $(OBJECTDIR)gcfinal$(OEXT)

 $(OBJECTDIR)gchoverflow.o :  $(SRCDIR)gchoverflow.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)lisptypes.h  $(INCDIR)address.h \
-	 $(INCDIR)address68k.h  $(INCDIR)lispglobal.h  $(INCDIR)gc.h
+	 $(INCDIR)address68k.h  $(INCDIR)lispglobal.h  $(INCDIR)gcdata.h
 	$(CC) $(RFLAGS) $(SRCDIR)gchoverflow.c $(INLINE) -o $(OBJECTDIR)gchoverflow$(OEXT)

 $(OBJECTDIR)gchtfind.o :  $(SRCDIR)gchtfind.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)lisptypes.h  $(INCDIR)address.h \
-	 $(INCDIR)address68k.h  $(INCDIR)lispglobal.h  $(INCDIR)gc.h \
+	 $(INCDIR)address68k.h  $(INCDIR)lispglobal.h  $(INCDIR)gcdata.h \
 	 $(INCDIR)lispmap.h  $(INCDIR)cell.h
 	$(CC) $(RFLAGS) $(SRCDIR)gchtfind.c $(INLINE) -o $(OBJECTDIR)gchtfind$(OEXT)

@@ -602,35 +602,35 @@ $(OBJECTDIR)gcmain3.o :  $(SRCDIR)gcmain3.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)lisptypes.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)lispglobal.h  $(INCDIR)emulglobal.h \
 	 $(INCDIR)stack.h  $(INCDIR)cell.h  $(INCDIR)ifpage.h \
-	 $(INCDIR)gc.h
+	 $(INCDIR)gcdata.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcmain3.c $(INLINE) -o $(OBJECTDIR)gcmain3$(OEXT)

 $(OBJECTDIR)gcreclaim.o :  $(SRCDIR)gcreclaim.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)emulglobal.h  $(INCDIR)lisptypes.h \
 	 $(INCDIR)address.h  $(INCDIR)address68k.h  $(INCDIR)lispglobal.h \
-	 $(INCDIR)stack.h  $(INCDIR)gc.h
+	 $(INCDIR)stack.h  $(INCDIR)gcdata.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcreclaim.c $(INLINE) -o $(OBJECTDIR)gcreclaim$(OEXT)

 $(OBJECTDIR)gcreccell.o :  $(SRCDIR)gcreccell.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)lisptypes.h  $(INCDIR)address.h $(INCDIR)dbprint.h \
 	 $(INCDIR)address68k.h  $(INCDIR)lispglobal.h  $(INCDIR)stack.h \
-	 $(INCDIR)cell.h  $(INCDIR)ifpage.h  $(INCDIR)gc.h
+	 $(INCDIR)cell.h  $(INCDIR)ifpage.h  $(INCDIR)gcdata.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcreccell.c $(INLINE) -o $(OBJECTDIR)gcreccell$(OEXT)

 $(OBJECTDIR)gccode.o :  $(SRCDIR)gccode.c \
 	 $(INCDIR)lispemul.h  $(INCDIR)lisptypes.h  $(INCDIR)address.h \
 	 $(INCDIR)address68k.h  $(INCDIR)lispglobal.h  $(INCDIR)lispmap.h \
 	 $(INCDIR)stack.h  $(INCDIR)cell.h  $(INCDIR)ifpage.h \
-	 $(INCDIR)gc.h  $(INCDIR)array.h
+	 $(INCDIR)gcdata.h  $(INCDIR)array.h
 	$(CC) $(RFLAGS) $(SRCDIR)gccode.c $(INLINE) -o $(OBJECTDIR)gccode$(OEXT)

 $(OBJECTDIR)gcscan.o :  $(SRCDIR)gcscan.c $(INCDIR)lispemul.h  \
-	 $(INCDIR)lispglobal.h  $(INCDIR)gc.h $(INCDIR)lisptypes.h
+	 $(INCDIR)lispglobal.h  $(INCDIR)gcdata.h $(INCDIR)lisptypes.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcscan.c $(INLINE) -o $(OBJECTDIR)gcscan$(OEXT)

 $(OBJECTDIR)gvar2.o :  $(SRCDIR)gvar2.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)lispglobal.h  $(INCDIR)address68k.h \
-	 $(INCDIR)gc.h  $(INCDIR)emulglobal.h $(INCDIR)cell.h $(INCDIR)lisptypes.h
+	 $(INCDIR)gcdata.h  $(INCDIR)emulglobal.h $(INCDIR)cell.h $(INCDIR)lisptypes.h
 	$(CC) $(RFLAGS) $(SRCDIR)gvar2.c $(INLINE) -o $(OBJECTDIR)gvar2$(OEXT)

 $(OBJECTDIR)hardreturn.o :  $(SRCDIR)hardreturn.c $(INCDIR)lispemul.h  \
@@ -753,7 +753,7 @@ $(OBJECTDIR)return.o :  $(SRCDIR)return.c $(INCDIR)lispemul.h  \
 $(OBJECTDIR)rplcons.o :  $(SRCDIR)rplcons.c $(INCDIR)lispemul.h  \
 	 $(INCDIR)emulglobal.h  $(INCDIR)lispglobal.h \
 	 $(INCDIR)lisptypes.h  $(INCDIR)address.h  $(INCDIR)address68k.h \
-	 $(INCDIR)gc.h  $(INCDIR)cell.h
+	 $(INCDIR)gcdata.h  $(INCDIR)cell.h
 	$(CC) $(RFLAGS) $(SRCDIR)rplcons.c $(INLINE) -o $(OBJECTDIR)rplcons$(OEXT)

 $(OBJECTDIR)rs232c.o :  $(SRCDIR)rs232c.c $(INCDIR)rs232c.h
--- a/bin/mkdos
+++ b/bin/mkdos
@@ -111,7 +111,7 @@ HFILES = $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)arith.h $(INCDIR)cell.h $
 	$(INCDIR)dspif.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)miscstat.h $(INCDIR)lspglob.h $(INCDIR)array.h $(INCDIR)bb.h \
 	$(INCDIR)bitblt.h $(INCDIR)debug.h $(INCDIR)devconf.h $(INCDIR)dspdata.h $(INCDIR)ether.h \
-	$(INCDIR)fast_dsp.h $(INCDIR)fp.h $(INCDIR)gc.h $(INCDIR)hdw_conf.h $(INCDIR)initatms.h $(INCDIR)inlinec.h $(INCDIR)keyboard.h \
+	$(INCDIR)fast_dsp.h $(INCDIR)fp.h $(INCDIR)gcdata.h $(INCDIR)hdw_conf.h $(INCDIR)initatms.h $(INCDIR)inlinec.h $(INCDIR)keyboard.h \
 	$(INCDIR)lispver1.h $(INCDIR)lispver2.h $(INCDIR)lldsp.h $(INCDIR)locfile.h $(INCDIR)mouseif.h $(INCDIR)my.h \
 	$(INCDIR)opcodes.h $(INCDIR)osmsg.h $(INCDIR)pilotbbt.h $(INCDIR)print.h $(INCDIR)profile.h \
 	$(INCDIR)return.h $(INCDIR)stack.h $(INCDIR)stream.h $(INCDIR)subrs.h $(INCDIR)sysatms.h $(INCDIR)timeout.h \
--- a/bin/mkfile
+++ b/bin/mkfile
@@ -116,7 +116,7 @@ HFILES = INCDIR/address.h INCDIR/adr68k.h INCDIR/arith.h INCDIR/cell.h INCDIR/db
 	INCDIR/dspif.h INCDIR/ifpage.h INCDIR/iopage.h INCDIR/lispemul.h INCDIR/lispmap.h \
 	INCDIR/lsptypes.h INCDIR/miscstat.h INCDIR/lspglob.h INCDIR/array.h INCDIR/bb.h \
 	INCDIR/bitblt.h INCDIR/debug.h INCDIR/devconf.h INCDIR/dspdata.h INCDIR/ether.h \
-	INCDIR/fast_dsp.h INCDIR/fp.h INCDIR/gc.h INCDIR/hdw_conf.h INCDIR/initatms.h INCDIR/inlinec.h INCDIR/keyboard.h \
+	INCDIR/fast_dsp.h INCDIR/fp.h INCDIR/gcdata.h INCDIR/hdw_conf.h INCDIR/initatms.h INCDIR/inlinec.h INCDIR/keyboard.h \
 	INCDIR/lispver1.h INCDIR/lispver2.h INCDIR/lldsp.h INCDIR/locfile.h INCDIR/mouseif.h INCDIR/my.h \
 	INCDIR/opcodes.h INCDIR/osmsg.h INCDIR/pilotbbt.h INCDIR/print.h INCDIR/profile.h \
 	INCDIR/return.h INCDIR/stack.h INCDIR/stream.h INCDIR/subrs.h INCDIR/sysatms.h INCDIR/timeout.h \
--- a/bin/mkfile.c
+++ b/bin/mkfile.c
@@ -116,7 +116,7 @@ HFILES = INCDIR/address.h INCDIR/adr68k.h INCDIR/arith.h INCDIR/cell.h INCDIR/db
 	INCDIR/dspif.h INCDIR/ifpage.h INCDIR/iopage.h INCDIR/lispemul.h INCDIR/lispmap.h \
 	INCDIR/lsptypes.h INCDIR/miscstat.h INCDIR/lspglob.h INCDIR/array.h INCDIR/bb.h \
 	INCDIR/bitblt.h INCDIR/debug.h INCDIR/devconf.h INCDIR/dspdata.h INCDIR/ether.h \
-	INCDIR/fast_dsp.h INCDIR/fp.h INCDIR/gc.h INCDIR/hdw_conf.h INCDIR/initatms.h INCDIR/inlinec.h INCDIR/keyboard.h \
+	INCDIR/fast_dsp.h INCDIR/fp.h INCDIR/gcdata.h INCDIR/hdw_conf.h INCDIR/initatms.h INCDIR/inlinec.h INCDIR/keyboard.h \
 	INCDIR/lispver1.h INCDIR/lispver2.h INCDIR/lldsp.h INCDIR/locfile.h INCDIR/mouseif.h INCDIR/my.h \
 	INCDIR/opcodes.h INCDIR/osmsg.h INCDIR/pilotbbt.h INCDIR/print.h INCDIR/profile.h \
 	INCDIR/return.h INCDIR/stack.h INCDIR/stream.h INCDIR/subrs.h INCDIR/sysatms.h INCDIR/timeout.h \
--- a/bin/mkfile.i
+++ b/bin/mkfile.i
@@ -33,7 +33,7 @@ SRCFILES = ./conspage.c ./gcoflow.c ./shift.c ./dbgtool.c ./gcr.c	./llcolor.c ./
 OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj 	gcr.obj llcolor.obj gcrcell.obj llstk.obj 	gcscan.obj loopsops.obj storage.obj 	allocmds.obj dir.obj gvar2.obj lowlev1.obj 	subr.obj arith2.obj hacks.obj lowlev2.obj 	subr0374.obj arith3.obj doscomm.obj 	hardrtn.obj lsthandl.obj sxhash.obj arith4.obj 	draw.obj main.obj testtool.obj array.obj 	dsk.obj inet.obj misc7.obj timer.obj 	array2.obj dspif.obj initdsp.obj miscn.obj 	typeof.obj array3.obj initkbd.obj ubf1.obj 	array4.obj dspsubrs.obj initsout.obj 	mkatom.obj ubf2.obj array5.obj eqf.obj 	intcall.obj mkcell.obj ubf3.obj array6.obj 	ether.obj ufn.obj atom.obj 	findkey.obj kbdsubrs.obj mouseif.obj ufs.obj 	bbtsub.obj foreign.obj keyevent.obj 	unixcomm.obj bin.obj fp.obj keylib.obj 	binds.obj fvar.obj mvs.obj 	unwind.obj bitblt.obj gc.obj 	uraid.obj blt.obj gc2.obj 	kprint.obj osmsg.obj usrsubr.obj byteswap.obj 	gcarray.obj perrno.obj uutils.obj 	carcdr.obj asmbbt.obj gccode.obj 	vars3.obj gcfinal.obj ldsout.obj 	return.obj vmemsave.obj chardev.obj 	gchtfind.obj lineblt8.obj rpc.obj xc.obj 	common.obj gcmain3.obj lisp2c.obj rplcons.obj 	z2.obj vdate.obj $(KEY) $(COLORFILES) $(ARCHFILES) 


-HFILES = ../inc/address.h ../inc/adr68k.h ../inc/arith.h ../inc/cell.h ../inc/dbprint.h ../inc/display.h 	../inc/dspif.h ../inc/ifpage.h ../inc/iopage.h ../inc/lispemul.h ../inc/lispmap.h 	../inc/lsptypes.h ../inc/miscstat.h ../inc/lspglob.h ../inc/array.h ../inc/bb.h 	../inc/bitblt.h ../inc/debug.h ../inc/devconf.h ../inc/dspdata.h ../inc/ether.h 	../inc/fast_dsp.h ../inc/fp.h ../inc/gc.h ../inc/hdw_conf.h ../inc/initatms.h ../inc/inlinec.h ../inc/keyboard.h 	../inc/lispver1.h ../inc/lispver2.h ../inc/lldsp.h ../inc/locfile.h ../inc/mouseif.h ../inc/my.h 	../inc/opcodes.h ../inc/osmsg.h ../inc/pilotbbt.h ../inc/print.h ../inc/profile.h 	../inc/return.h ../inc/stack.h ../inc/stream.h ../inc/subrs.h ../inc/sysatms.h ../inc/timeout.h 	../inc/tos1defs.h ../inc/tosfns.h ../inc/tosret.h ../inc/vmemsave.h 	../inc/xdefs.h ../inc/xbitmaps.h ../inc/xkeymap.h
+HFILES = ../inc/address.h ../inc/adr68k.h ../inc/arith.h ../inc/cell.h ../inc/dbprint.h ../inc/display.h 	../inc/dspif.h ../inc/ifpage.h ../inc/iopage.h ../inc/lispemul.h ../inc/lispmap.h 	../inc/lsptypes.h ../inc/miscstat.h ../inc/lspglob.h ../inc/array.h ../inc/bb.h 	../inc/bitblt.h ../inc/debug.h ../inc/devconf.h ../inc/dspdata.h ../inc/ether.h 	../inc/fast_dsp.h ../inc/fp.h ../inc/gcdata.h ../inc/hdw_conf.h ../inc/initatms.h ../inc/inlinec.h ../inc/keyboard.h 	../inc/lispver1.h ../inc/lispver2.h ../inc/lldsp.h ../inc/locfile.h ../inc/mouseif.h ../inc/my.h 	../inc/opcodes.h ../inc/osmsg.h ../inc/pilotbbt.h ../inc/print.h ../inc/profile.h 	../inc/return.h ../inc/stack.h ../inc/stream.h ../inc/subrs.h ../inc/sysatms.h ../inc/timeout.h 	../inc/tos1defs.h ../inc/tosfns.h ../inc/tosret.h ../inc/vmemsave.h 	../inc/xdefs.h ../inc/xbitmaps.h ../inc/xkeymap.h