--- gforth/Makefile.in	2006/10/27 21:47:00	1.334
+++ gforth/Makefile.in	2006/12/31 13:39:10	1.338
@@ -1,6 +1,6 @@
 #Makefile for Gforth
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -142,7 +142,7 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/
 	arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS arch/amd64/CVS \
 	arch/arm/CVS arch/r8c/CVS
 
-INCLUDES = engine/forth.h engine/threaded.h engine/io.h
+INCLUDES = engine/forth.h engine/threaded.h engine/io.h engine/longlong.h
 
 KERN_SRC = \
 	mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
@@ -254,7 +254,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 	locate.fs more.fs other.fs prims2x.fs random.fs \
 	regexp.fs sokoban.fs string.fs table.fs tags.fs \
 	tt.fs \
-	unbuffer.fs wordsets.fs \
+	unbuffer.fs wordsets.fs xwords.fs \
 	test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
 	test/string.fs test/float.fs test/gforth.fs \
 	test/other.fs test/signals.fs test/checkans.fs \
@@ -634,7 +634,7 @@ checkone test:	gforth$(EXE) gforth.fi
 		$(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
 		$(FORTH) test/other.fs -e bye
 		$(FORTHS) test/signals.fs -e bye
-		$(FORTHS) test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
+		$(FORTHS) test/coremore.fs test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
 		$(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out
 		$(FORTH) prims2x.fs -e \
 		  "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \