--- gforth/engine/engine.c	2008/01/13 21:50:26	1.106
+++ gforth/engine/engine.c	2008/10/15 15:27:33	1.110
@@ -1,6 +1,6 @@
 /* Gforth virtual machine (aka inner interpreter)
 
-  Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -44,7 +44,9 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <dirent.h>
+#ifdef HAVE_WCHAR_H
 #include <wchar.h>
+#endif
 #include <sys/resource.h>
 #ifdef HAVE_FNMATCH_H
 #include <fnmatch.h>
@@ -70,10 +72,6 @@
 #include <callback.h>
 #endif
 
-#ifdef HAS_LIBFFI
-#include <ffi.h>
-#endif
-
 #ifndef SEEK_SET
 /* should be defined in stdio.h, but some systems don't have it */
 #define SEEK_SET 0
@@ -317,9 +315,13 @@ Label *gforth_engine(Xt *ip0, Cell *sp0,
    returns array of machine code labels (for use in a loader), if ip==NULL
 */
 {
-#ifndef GFORTH_DEBUGGING
+#if defined(GFORTH_DEBUGGING)
+#if defined(GLOBALS_NONRELOC)
+  register saved_regs *saved_regs_p TOSREG = saved_regs_p0;
+#endif /* defined(GLOBALS_NONRELOC) */
+#else /* !defined(GFORTH_DEBUGGING) */
   register Cell *rp RPREG;
-#endif
+#endif /* !defined(GFORTH_DEBUGGING) */
 #ifndef NO_IP
   register Xt *ip IPREG = ip0;
 #endif
@@ -340,12 +342,8 @@ Label *gforth_engine(Xt *ip0, Cell *sp0,
   long long llrv;
   void * prv;
 #endif
-#ifdef HAS_LIBFFI
-  extern void * gforth_ritem;
-  extern void ** gforth_clist;
-  extern void ffi_callback(ffi_cif * cif, void * resp, void ** args, Xt * ip);
-#endif
   register Address up UPREG = gforth_UP;
+#if !defined(GFORTH_DEBUGGING)
   register Cell MAYBE_UNUSED spTOS TOSREG;
   register Cell MAYBE_UNUSED spb spbREG;
   register Cell MAYBE_UNUSED spc spcREG;
@@ -355,6 +353,7 @@ Label *gforth_engine(Xt *ip0, Cell *sp0,
   register Cell MAYBE_UNUSED spg speREG;
   register Cell MAYBE_UNUSED sph speREG;
   IF_fpTOS(register Float fpTOS FTOSREG;)
+#endif /* !defined(GFORTH_DEBUGGING) */
 #if defined(DOUBLY_INDIRECT)
   static Label *symbols;
   static void *routines[]= {