From cfd0711a73942dc680edf988cd48511e85c98086 Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Thu, 29 Jun 2017 22:24:33 -0700
Subject: [PATCH]     Create car-cdr.h to declare functions defined in
 car-cdr.c     Update files that depend on car-cdr functions to include
 car-cdr.h.     Add dependencies to makefile.

	modified:   makefile-darwin.386-x
	modified:   makefile-init.386
	modified:   makefile-tail
	new file:   ../inc/car-cdr.h
	modified:   ../src/bbtsub.c
	modified:   ../src/car-cdr.c
	modified:   ../src/dsk.c
	modified:   ../src/gcarray.c
	modified:   ../src/gcrcell.c
	modified:   ../src/kprint.c
	modified:   ../src/loopsops.c
	modified:   ../src/lsthandl.c
	modified:   ../src/mvs.c
	modified:   ../src/storage.c
	modified:   ../src/sxhash.c
	modified:   ../src/vars3.c
	modified:   ../src/xc.c
	modified:   ../src/z2.c
---
 bin/makefile-darwin.386-x |  2 +-
 bin/makefile-init.386     |  4 +-
 bin/makefile-tail         | 26 ++++++------
 inc/car-cdr.h             |  9 ++++
 src/bbtsub.c              |  1 +
 src/car-cdr.c             | 86 ++++++++++++++++++++-------------------
 src/dsk.c                 |  1 +
 src/gcarray.c             |  1 +
 src/gcrcell.c             |  1 +
 src/kprint.c              |  1 +
 src/loopsops.c            |  1 +
 src/lsthandl.c            |  1 +
 src/mvs.c                 |  1 +
 src/storage.c             |  1 +
 src/sxhash.c              |  1 +
 src/vars3.c               |  1 +
 src/xc.c                  |  1 +
 src/z2.c                  |  1 +
 18 files changed, 83 insertions(+), 57 deletions(-)
 create mode 100644 inc/car-cdr.h

diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x
index c4b0e28..a269fb9 100755
--- a/bin/makefile-darwin.386-x
+++ b/bin/makefile-darwin.386-x
@@ -48,5 +48,5 @@ $(OBJECTDIR)xc.o:      $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	$(INCDIR)initatms.h  $(INCDIR)gc.h  \
 	$(INCDIR)arith.h $(INCDIR)stream.h \
 	$(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
-	$(INCDIR)tosfns.h  $(INCDIR)inlineC.h
+	$(INCDIR)tosfns.h  $(INCDIR)inlineC.h $(INCDIR)car-cdr.h
 	$(CC) $(DISPRFLAGS) -UOPDISP  $(SRCDIR)xc.c -I$(INCDIR) -o $(OBJECTDIR)xc.o
diff --git a/bin/makefile-init.386 b/bin/makefile-init.386
index cc54a7f..9be644f 100755
--- a/bin/makefile-init.386
+++ b/bin/makefile-init.386
@@ -23,7 +23,7 @@ DISPOPTFLAGS = -O0 -g
 FPFLAGS =
 DFLAGS = -DFSERROR -DNEW_STORAGE -DMACOSX -DOLD_CURSOR -DUSETERMIOS \
 	-DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT  $(XFLAGS) \
-	-DRELEASE=351 -DNOVERSION -DINIT
+	-DRELEASE=351 -DNOVERSION -DINIT -DTRACE -DOPTRACE
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lm
@@ -48,5 +48,5 @@ $(OBJECTDIR)xc.o:      $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
 	$(INCDIR)initatms.h  $(INCDIR)gc.h  \
 	$(INCDIR)arith.h $(INCDIR)stream.h \
 	$(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
-	$(INCDIR)tosfns.h  $(INCDIR)inlineC.h
+	$(INCDIR)tosfns.h  $(INCDIR)inlineC.h $(INCDIR)car-cdr.h
 	$(CC) $(DISPRFLAGS) -UOPDISP  $(SRCDIR)xc.c -I$(INCDIR) -o $(OBJECTDIR)xc.o
diff --git a/bin/makefile-tail b/bin/makefile-tail
index 288fad9..30c5cae 100755
--- a/bin/makefile-tail
+++ b/bin/makefile-tail
@@ -252,7 +252,7 @@ $(OBJECTDIR)kprint.o :  $(SRCDIR)kprint.c  $(REQUIRED-INCS) $(INCDIR)print.h  \
 	 $(INCDIR)address.h  $(INCDIR)lispemul.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)lspglob.h  $(INCDIR)initatms.h \
 	 $(INCDIR)cell.h  $(INCDIR)emlglob.h  $(INCDIR)lispmap.h \
-	 $(INCDIR)adr68k.h
+	 $(INCDIR)adr68k.h $(INCDIR)car-cdr.h
 	$(CC) $(RFLAGS) $(SRCDIR)kprint.c $(INLINE) -o $(OBJECTDIR)kprint$(OEXT)
 
 $(OBJECTDIR)testtool.o :  $(SRCDIR)testtool.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
@@ -340,7 +340,7 @@ $(OBJECTDIR)bbtsub.o :  $(SRCDIR)bbtsub.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h
 	 $(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)gc.h $(INCDIR)arith.h $(INCDIR)fp.h $(INCDIR)car-cdr.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  \
@@ -355,7 +355,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)gc.h  $(INCDIR)cell.h $(INCDIR)car-cdr.h
 	$(CC) $(RFLAGS) $(SRCDIR)car-cdr.c $(INLINE) -o $(OBJECTDIR)car-cdr$(OEXT)
 
 $(OBJECTDIR)chardev.o :  $(SRCDIR)chardev.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
@@ -412,7 +412,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)gc.h  $(INCDIR)my.h $(INCDIR)car-cdr.h
 	$(CC) $(RFLAGS) $(SRCDIR)z2.c $(INLINE) -o $(OBJECTDIR)z2$(OEXT)
 
 $(OBJECTDIR)eqf.o :  $(SRCDIR)eqf.c  $(REQUIRED-INCS)  $(INCDIR)fp.h \
@@ -481,7 +481,7 @@ $(OBJECTDIR)findkey.o :  $(SRCDIR)findkey.c  $(REQUIRED-INCS) $(INCDIR)lispemul.
 $(OBJECTDIR)dsk.o :  $(SRCDIR)dsk.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  $(INCDIR)lispmap.h \
 	 $(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	 $(INCDIR)fp.h $(INCDIR)arith.h  $(INCDIR)stream.h  $(INCDIR)timeout.h \
-	 $(INCDIR)locfile.h $(INCDIR)osmsg.h $(INCDIR)dbprint.h
+	 $(INCDIR)locfile.h $(INCDIR)osmsg.h $(INCDIR)dbprint.h $(INCDIR)car-cdr.h
 	$(CC) $(RFLAGS) $(SRCDIR)dsk.c $(INLINE) -o $(OBJECTDIR)dsk$(OEXT)
 
 $(OBJECTDIR)ufs.o :  $(SRCDIR)ufs.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  $(INCDIR)lispmap.h  \
@@ -516,7 +516,7 @@ $(OBJECTDIR)gcarray.o :  $(SRCDIR)gcarray.c  $(REQUIRED-INCS) $(INCDIR)lispemul.
 	 $(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)array.h
+	 $(INCDIR)array.h $(INCDIR)car-cdr.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcarray.c $(INLINE) -o $(OBJECTDIR)gcarray$(OEXT)
 
 $(OBJECTDIR)gcfinal.o :  $(SRCDIR)gcfinal.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
@@ -553,7 +553,7 @@ $(OBJECTDIR)gcr.o :  $(SRCDIR)gcr.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 $(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)gc.h $(INCDIR)car-cdr.h
 	$(CC) $(RFLAGS) $(SRCDIR)gcrcell.c $(INLINE) -o $(OBJECTDIR)gcrcell$(OEXT)
 
 $(OBJECTDIR)gccode.o :  $(SRCDIR)gccode.c  $(REQUIRED-INCS) \
@@ -625,7 +625,7 @@ $(OBJECTDIR)keytstno.o :  $(SRCDIR)keytstno.c $(REQUIRED-INCS)
 $(OBJECTDIR)lsthandl.o :  $(SRCDIR)lsthandl.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)emlglob.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lsptypes.h  $(INCDIR)address.h  $(INCDIR)adr68k.h \
-	 $(INCDIR)cell.h
+	 $(INCDIR)cell.h $(INCDIR)car-cdr.h
 	$(CC) $(RFLAGS) $(SRCDIR)lsthandl.c $(INLINE) -o $(OBJECTDIR)lsthandl$(OEXT)
 
 $(OBJECTDIR)llstk.o :  $(SRCDIR)llstk.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
@@ -647,7 +647,7 @@ $(OBJECTDIR)loopsops.o : $(SRCDIR)loopsops.c  $(REQUIRED-INCS) $(INCDIR)lispemul
 	 $(INCDIR)emlglob.h  $(INCDIR)address.h $(INCDIR)lsptypes.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)cell.h  $(INCDIR)lspglob.h \
 	 $(INCDIR)lispmap.h  $(INCDIR)ifpage.h  $(INCDIR)iopage.h \
-	 $(INCDIR)debug.h $(INCDIR)profile.h
+	 $(INCDIR)debug.h $(INCDIR)profile.h $(INCDIR)car-cdr.h
 	$(CC) $(RFLAGS) $(SRCDIR)loopsops.c $(INLINE) -o $(OBJECTDIR)loopsops$(OEXT)
 
 $(OBJECTDIR)lowlev1.o :  $(SRCDIR)lowlev1.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
@@ -669,7 +669,7 @@ $(OBJECTDIR)misc7.o :  $(SRCDIR)misc7.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 $(OBJECTDIR)mvs.o :  $(SRCDIR)mvs.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lspglob.h  $(INCDIR)adr68k.h \
 	 $(INCDIR)lispmap.h  $(INCDIR)lsptypes.h  $(INCDIR)emlglob.h \
-	 $(INCDIR)stack.h $(INCDIR)opcodes.h
+	 $(INCDIR)stack.h $(INCDIR)opcodes.h $(INCDIR)car-cdr.h
 	$(CC) $(RFLAGS) $(SRCDIR)mvs.c $(INLINE) -o $(OBJECTDIR)mvs$(OEXT)
 
 $(OBJECTDIR)mkatom.o :  $(SRCDIR)mkatom.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
@@ -708,7 +708,7 @@ $(OBJECTDIR)storage.o :  $(SRCDIR)storage.c  $(REQUIRED-INCS) $(INCDIR)hdw_conf.
 	 $(INCDIR)lispemul.h  $(INCDIR)address.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)lispmap.h  $(INCDIR)stack.h \
 	 $(INCDIR)lspglob.h  $(INCDIR)cell.h  $(INCDIR)lsptypes.h \
-	 $(INCDIR)ifpage.h
+	 $(INCDIR)ifpage.h $(INCDIR)car-cdr.h
 	$(CC) $(RFLAGS) $(SRCDIR)storage.c $(INLINE) -o $(OBJECTDIR)storage$(OEXT)
 
 $(OBJECTDIR)subr.o :  $(SRCDIR)subr.c  $(REQUIRED-INCS) \
@@ -784,7 +784,7 @@ $(OBJECTDIR)unwind.o :  $(SRCDIR)unwind.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h
 $(OBJECTDIR)vars3.o :  $(SRCDIR)vars3.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lspglob.h  $(INCDIR)lispmap.h \
 	 $(INCDIR)adr68k.h  $(INCDIR)emlglob.h  $(INCDIR)cell.h \
-	 $(INCDIR)lsptypes.h  $(INCDIR)stack.h
+	 $(INCDIR)lsptypes.h  $(INCDIR)stack.h $(INCDIR)car-cdr.h
 	$(CC) $(RFLAGS) $(SRCDIR)vars3.c $(INLINE) -o $(OBJECTDIR)vars3$(OEXT)
 
 $(OBJECTDIR)vmemsave.o :  $(SRCDIR)vmemsave.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
@@ -821,7 +821,7 @@ $(OBJECTDIR)socdvr.o : $(SRCDIR)socdvr.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h \
 $(OBJECTDIR)sxhash.o : $(SRCDIR)sxhash.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h  \
 	 $(INCDIR)lspglob.h  $(INCDIR)adr68k.h \
 	 $(INCDIR)lispmap.h  $(INCDIR)lsptypes.h  $(INCDIR)emlglob.h \
-	 $(INCDIR)arith.h 
+	 $(INCDIR)arith.h $(INCDIR)car-cdr.h
 	$(CC) $(RFLAGS) $(SRCDIR)sxhash.c $(INLINE) -o $(OBJECTDIR)sxhash$(OEXT)
 
 $(OBJECTDIR)usrsubr.o : $(SRCDIR)usrsubr.c $(REQUIRED-INCS) 
diff --git a/inc/car-cdr.h b/inc/car-cdr.h
new file mode 100644
index 0000000..47afdf1
--- /dev/null
+++ b/inc/car-cdr.h
@@ -0,0 +1,9 @@
+LispPTR car(register LispPTR datum);
+LispPTR cdr(register LispPTR datum);
+LispPTR rplaca(register LispPTR x, register LispPTR y);
+LispPTR rplacd(LispPTR x, register LispPTR y);
+LispPTR N_OP_car(register LispPTR tos);
+LispPTR N_OP_cdr(register LispPTR tos);
+LispPTR N_OP_rplaca(register LispPTR tosm1, register LispPTR tos);
+LispPTR N_OP_rplacd(register LispPTR tosm1, register LispPTR tos);
+ConsCell *find_close_prior_cell(struct conspage *page, LispPTR oldcell); /* XXX why not in conspage? */
diff --git a/src/bbtsub.c b/src/bbtsub.c
index 64f5c79..6ceabec 100644
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -72,6 +72,7 @@ static char *id = "$Id: bbtsub.c,v 1.3 2001/12/24 01:08:59 sybalsky Exp $ Copyri
 #include "arith.h"
 #include "stack.h"
 #include "cell.h"
+#include "car-cdr.h"
 #include "gc.h"
 #include "iopage.h"
 extern IOPAGE *IOPage68K;
diff --git a/src/car-cdr.c b/src/car-cdr.c
index dfb4e7a..f954d4d 100644
--- a/src/car-cdr.c
+++ b/src/car-cdr.c
@@ -44,6 +44,7 @@ static char *id = "$Id: car-cdr.c,v 1.3 1999/05/31 23:35:25 sybalsky Exp $ Copyr
 #include "adr68k.h"
 #include "gc.h"
 #include "cell.h"
+#include "car-cdr.h"
 
 /************************************************************************/
 /*									*/
@@ -191,7 +192,8 @@ LispPTR rplaca(register LispPTR x, register LispPTR y)
 */
 /**********************************************************************/
 #ifdef NEWCDRCODING
-ConsCell *find_cdrable_pair(LispPTR carpart, LispPTR cdrpart); /* below... */
+static ConsCell *find_cdrable_pair(LispPTR carpart, LispPTR cdrpart); /* below... */
+static ConsCell *find_close_cell(struct conspage *page, LispPTR oldcell);
 #endif
 extern struct conspage *next_conspage(void); /* conspage.c */
 
@@ -206,7 +208,6 @@ LispPTR rplacd(LispPTR x, register LispPTR y)
   LispPTR rp_page;
   DLword cdr_code;
   register struct conspage *cons68k;
-  ConsCell *find_close_cell(struct conspage * page, LispPTR oldcell);
 
   if (Listp(x) == NIL) {
     if (x == NIL_PTR) {
@@ -475,42 +476,6 @@ LispPTR N_OP_rplacd(register LispPTR tosm1, register LispPTR tos) {
 
 } /* end of N_OP_rplacd */
 
-/************************************************************************/
-/*									*/
-/*			f i n d _ c l o s e _ c e l l			*/
-/*									*/
-/*	Given the real address of a CONS page and an existing cell	*/
-/*	on that page, return another cell that is close enough to	*/
-/*	be used as the CDR of the existing cell (i.e., within 7		*/
-/*	cells.  If no such cell exists, return 0.			*/
-/*									*/
-/*	If a cell is found, it is taken off the free chain before	*/
-/*	being returned.							*/
-/*									*/
-/************************************************************************/
-
-ConsCell *find_close_cell(struct conspage *page, LispPTR oldcell) {
-  unsigned oldoffset = oldcell & 0xFF;
-  unsigned offset = page->next_cell;
-  unsigned prior = 0;
-
-  while (offset) {
-    if ((offset > oldoffset) && (offset <= (oldoffset + 14))) {
-      if (prior)
-        ((freecons *)((DLword *)page + prior))->next_free =
-            ((freecons *)((DLword *)page + offset))->next_free;
-      else
-        page->next_cell = ((freecons *)((DLword *)page + offset))->next_free;
-      page->count -= 1;
-      return (ConsCell *)((DLword *)page + offset);
-    }
-
-    prior = offset;
-    offset = ((freecons *)((DLword *)page + offset))->next_free;
-  }
-  return ((ConsCell *)0); /* No cell close enough */
-}
-
 /************************************************************************/
 /*									*/
 /*	        f i n d _ c l o s e _ p r i o r _ c e l l		*/
@@ -559,15 +524,52 @@ ConsCell *find_close_prior_cell(struct conspage *page, LispPTR oldcell) {
   return ((ConsCell *)0); /* No cell close enough */
 }
 
+#ifdef NEWCDRCODING
 /************************************************************************/
 /*									*/
+/*			f i n d _ c l o s e _ c e l l			*/
 /*									*/
+/*	Given the real address of a CONS page and an existing cell	*/
+/*	on that page, return another cell that is close enough to	*/
+/*	be used as the CDR of the existing cell (i.e., within 7		*/
+/*	cells.  If no such cell exists, return 0.			*/
+/*									*/
+/*	If a cell is found, it is taken off the free chain before	*/
+/*	being returned.							*/
+/*									*/
+/************************************************************************/
+
+static ConsCell *find_close_cell(struct conspage *page, LispPTR oldcell) {
+  unsigned oldoffset = oldcell & 0xFF;
+  unsigned offset = page->next_cell;
+  unsigned prior = 0;
+
+  while (offset) {
+    if ((offset > oldoffset) && (offset <= (oldoffset + 14))) {
+      if (prior)
+        ((freecons *)((DLword *)page + prior))->next_free =
+            ((freecons *)((DLword *)page + offset))->next_free;
+      else
+        page->next_cell = ((freecons *)((DLword *)page + offset))->next_free;
+      page->count -= 1;
+      return (ConsCell *)((DLword *)page + offset);
+    }
+
+    prior = offset;
+    offset = ((freecons *)((DLword *)page + offset))->next_free;
+  }
+  return ((ConsCell *)0); /* No cell close enough */
+}
+
+/************************************************************************/
+/*									*/
+/*		f i n d _ c d r p a i r _ i n _ p a g e			*/
 /*									*/
 /*									*/
 /*									*/
 /************************************************************************/
 
-ConsCell *find_cdrpair_in_page(struct conspage *pg, LispPTR carpart, LispPTR cdrpart) {
+static ConsCell *find_cdrpair_in_page(struct conspage *pg, LispPTR carpart, LispPTR cdrpart) {
   ConsCell *cell;
   unsigned offset, prior, priorprior, nprior, poffset, noffset;
 
@@ -634,13 +636,13 @@ ConsCell *find_cdrpair_in_page(struct conspage *pg, LispPTR carpart, LispPTR cdr
 
 /************************************************************************/
 /*									*/
-/*									*/
+/*		f i n d _ c d r a b l e _ p a i r			*/
 /*									*/
 /*									*/
 /*									*/
 /************************************************************************/
 
-ConsCell *find_cdrable_pair(LispPTR carpart, LispPTR cdrpart) {
+static ConsCell *find_cdrable_pair(LispPTR carpart, LispPTR cdrpart) {
   unsigned offset, prior, priorprior, pgno;
   struct conspage *pg;
   ConsCell *cell;
@@ -652,3 +654,5 @@ ConsCell *find_cdrable_pair(LispPTR carpart, LispPTR cdrpart) {
 
   return (find_cdrpair_in_page(next_conspage(), carpart, cdrpart));
 }
+
+#endif
diff --git a/src/dsk.c b/src/dsk.c
index 8baabd2..9590771 100644
--- a/src/dsk.c
+++ b/src/dsk.c
@@ -110,6 +110,7 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright
 #include "locfile.h"
 #include "osmsg.h"
 #include "dbprint.h"
+#include "car-cdr.h"
 
 #if defined(ULTRIX) || defined(MACOSX) || defined(FREEBSD)
 #include <sys/mount.h>
diff --git a/src/gcarray.c b/src/gcarray.c
index 5275fd7..4011ffc 100644
--- a/src/gcarray.c
+++ b/src/gcarray.c
@@ -55,6 +55,7 @@ static char *id = "$Id: gcarray.c,v 1.3 1999/05/31 23:35:30 sybalsky Exp $ Copyr
 #include "lspglob.h"
 #include "stack.h"
 #include "cell.h"
+#include "car-cdr.h"
 #include "ifpage.h"
 #include "gc.h"
 #include "array.h"
diff --git a/src/gcrcell.c b/src/gcrcell.c
index 0225ae3..0214d41 100644
--- a/src/gcrcell.c
+++ b/src/gcrcell.c
@@ -77,6 +77,7 @@ static char *id = "$Id: gcrcell.c,v 1.3 1999/05/31 23:35:32 sybalsky Exp $ Copyr
 #include "lspglob.h"
 #include "stack.h"
 #include "cell.h"
+#include "car-cdr.h"
 #include "ifpage.h"
 #include "gc.h"
 #include "dbprint.h"
diff --git a/src/kprint.c b/src/kprint.c
index d3c767f..c4a8c0d 100644
--- a/src/kprint.c
+++ b/src/kprint.c
@@ -24,6 +24,7 @@ static char *id = "$Id: kprint.c,v 1.2 1999/05/31 23:35:36 sybalsky Exp $ Copyri
 #include "lspglob.h"
 #include "initatms.h"
 #include "cell.h"
+#include "car-cdr.h"
 #include "emlglob.h"
 #include "lispmap.h"
 #include "adr68k.h"
diff --git a/src/loopsops.c b/src/loopsops.c
index 63ed445..c892185 100644
--- a/src/loopsops.c
+++ b/src/loopsops.c
@@ -28,6 +28,7 @@ static char *id = "$Id: loopsops.c,v 1.3 1999/05/31 23:35:37 sybalsky Exp $ Copy
 #include "lispemul.h"
 #include "lsptypes.h"
 #include "cell.h"
+#include "car-cdr.h"
 #include "lispmap.h"
 #include "lspglob.h"
 #include "adr68k.h"
diff --git a/src/lsthandl.c b/src/lsthandl.c
index daf37a3..0dea29b 100644
--- a/src/lsthandl.c
+++ b/src/lsthandl.c
@@ -31,6 +31,7 @@ static char *id = "$Id: lsthandl.c,v 1.4 1999/05/31 23:35:38 sybalsky Exp $ Copy
 #include "address.h"
 #include "adr68k.h"
 #include "cell.h"
+#include "car-cdr.h"
 
 /***********************************************************************/
 /*	 N_OP_fmemb							*/
diff --git a/src/mvs.c b/src/mvs.c
index 3227424..0126a65 100644
--- a/src/mvs.c
+++ b/src/mvs.c
@@ -34,6 +34,7 @@ static char *id = "$Id: mvs.c,v 1.3 1999/05/31 23:35:40 sybalsky Exp $ Copyright
 #include "lsptypes.h"
 #include "stack.h"
 #include "opcodes.h"
+#include "car-cdr.h"
 
 #ifdef AIXPS2
 #include "inlnPS2.h"
diff --git a/src/storage.c b/src/storage.c
index 5fdec62..3e86d16 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -32,6 +32,7 @@ static const char *id =
 #include "stack.h"
 #include "lspglob.h"
 #include "cell.h"
+#include "car-cdr.h"
 #include "lsptypes.h"
 #include "ifpage.h"
 #include "gc.h"
diff --git a/src/sxhash.c b/src/sxhash.c
index b41a7ff..5681cd5 100644
--- a/src/sxhash.c
+++ b/src/sxhash.c
@@ -27,6 +27,7 @@ static char *id = "$Id: sxhash.c,v 1.4 2001/12/24 01:09:06 sybalsky Exp $ Copyri
 #include "address.h"
 #include "stack.h"
 #include "cell.h"
+#include "car-cdr.h"
 #include "array.h"
 
 #include "arith.h"
diff --git a/src/vars3.c b/src/vars3.c
index ba878c1..1d378fe 100644
--- a/src/vars3.c
+++ b/src/vars3.c
@@ -22,6 +22,7 @@ static char *id = "$Id: vars3.c,v 1.4 2001/12/24 01:09:07 sybalsky Exp $ Copyrig
 #include "adr68k.h"
 #include "emlglob.h"
 #include "cell.h"
+#include "car-cdr.h"
 #include "lsptypes.h"
 #include "stack.h"
 
diff --git a/src/xc.c b/src/xc.c
index 3134891..a84f3ef 100644
--- a/src/xc.c
+++ b/src/xc.c
@@ -51,6 +51,7 @@ static char *id = "$Id: xc.c,v 1.4 2001/12/26 22:17:06 sybalsky Exp $ Copyright
 #include "lsptypes.h"
 #include "lispmap.h"
 #include "cell.h"
+#include "car-cdr.h"
 #include "initatms.h"
 #include "gc.h"
 #include "arith.h"
diff --git a/src/z2.c b/src/z2.c
index d701991..343edcd 100644
--- a/src/z2.c
+++ b/src/z2.c
@@ -41,6 +41,7 @@ static char *id = "$Id: z2.c,v 1.3 1999/05/31 23:35:47 sybalsky Exp $ Copyright
 #include "stack.h"
 #include "gc.h"
 #include "my.h"
+#include "car-cdr.h"
 
 struct cadr_cell cadr(LispPTR cell_adr);