--- gforth/engine/engine.c	2006/10/27 21:47:02	1.94
+++ gforth/engine/engine.c	2007/03/04 22:39:37	1.97
@@ -1,6 +1,6 @@
 /* Gforth virtual machine (aka inner interpreter)
 
-  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.
 
@@ -54,7 +54,7 @@
 #include "fnmatch.h"
 #endif
 #else
-#include "systypes.h"
+/* #include <systypes.h> */
 #endif
 
 #if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN) /* what else? */
@@ -359,6 +359,11 @@ Label *gforth_engine(Xt *ip0, Cell *sp0,
 #include PRIM_LAB_I
 #undef INST_ADDR
   };
+#ifdef INCLUDE_IMAGE
+#define INST_ADDR(name) ((Label)&&I_##name)
+#include "image.i"
+#undef INST_ADDR
+#endif
 #ifdef CPU_DEP2
   CPU_DEP2
 #endif