Index: generic/nsfInt.h
===================================================================
diff -u -rbc85b3848186ff8269496f53c45255a11c556f53 -rbc86c5d5cba70c6f5db2b184c143a7dde00cca4c
--- generic/nsfInt.h	(.../nsfInt.h)	(revision bc85b3848186ff8269496f53c45255a11c556f53)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision bc86c5d5cba70c6f5db2b184c143a7dde00cca4c)
@@ -317,6 +317,7 @@
   int length;
 } NsfStringIncrStruct;
 
+
 /* 
  * cmd flags
  */
@@ -518,6 +519,15 @@
   struct NsfClasses *nextPtr;
 } NsfClasses;
 
+/*
+ * needed in nsf.c and in nsfShadow
+ */
+typedef struct NsfProcClientData {
+  Tcl_Obj *procName;
+  NsfParamDefs *paramDefs;
+  int with_ad;
+} NsfProcClientData;
+
 typedef enum SystemMethodsIdx {
   NSF_c_alloc_idx, 
   NSF_c_create_idx, 
@@ -587,7 +597,7 @@
   NSF_METHOD, NSF_OBJECT, NSF_SETTER, NSF_VALUECHECK,
   NSF_GUARD_OPTION, NSF___UNKNOWN__, 
   /* Partly redefined Tcl commands; leave them together at the end */
-  NSF_EXPR, NSF_FORMAT, NSF_INFO, NSF_INFO_FRAME, NSF_INTERP, NSF_IS, 
+  NSF_EXPR, NSF_FORMAT, NSF_INFO_BODY, NSF_INFO_FRAME, NSF_INTERP, NSF_IS, 
   NSF_RENAME, NSF_SUBST
 } NsfGlobalNames;
 #if !defined(NSF_C)
@@ -607,7 +617,7 @@
   "method", "object", "setter", "valuecheck",
   "-guard", "__unknown__",
   /* tcl commands */
-  "expr", "format", "info", "::tcl::info::frame", "interp", "::tcl::string::is", 
+  "expr", "format", "::tcl::info::body", "::tcl::info::frame", "interp", "::tcl::string::is", 
   "rename", "subst"
 };
 #endif
@@ -842,7 +852,6 @@
 void NsfStringIncrInit(NsfStringIncrStruct *iss);
 void NsfStringIncrFree(NsfStringIncrStruct *iss);
 
-
 /*
    Tcl uses 01 and 02, TclOO uses 04 and 08, so leave some space free
    for further extensions of tcl and tcloo...