Index: generic/xotclInt.h
===================================================================
diff -u -rf6fa24164340e38b7315e02f4f2f667a7b3fd006 -r6ad5c75139b83b9bf0c180d2b2ceceafa8bf69f4
--- generic/xotclInt.h	(.../xotclInt.h)	(revision f6fa24164340e38b7315e02f4f2f667a7b3fd006)
+++ generic/xotclInt.h	(.../xotclInt.h)	(revision 6ad5c75139b83b9bf0c180d2b2ceceafa8bf69f4)
@@ -18,6 +18,10 @@
 #include <string.h>
 #include <assert.h>
 
+#if defined(HAVE_TCL_COMPILE_H)
+# include <tclCompile.h>
+#endif
+
 #if defined(PROFILE)
 #  include <sys/time.h>
 #endif
@@ -601,11 +605,12 @@
 #define XOTCL_CSC_CALL_IS_DESTROY 2
 #define XOTCL_CSC_CALL_IS_GUARD 4
 
+#if !defined(TCL85STACK)
 typedef struct XOTclCallStack {
   XOTclCallStackContent content[MAX_NESTING_DEPTH];
   XOTclCallStackContent *top;
-  short guardCount;
 } XOTclCallStack;
+#endif
 
 #if defined(PROFILE)
 typedef struct XOTclProfile {
@@ -616,7 +621,9 @@
 #endif
 
 typedef struct XOTclRuntimeState {
+#if !defined(TCL85STACK)
   XOTclCallStack cs;
+#endif
   Tcl_Namespace *XOTclClassesNS;
   Tcl_Namespace *XOTclNS;
   /*
@@ -648,6 +655,7 @@
 #if defined(PROFILE)
   XOTclProfile profile;
 #endif
+  short guardCount;
   ClientData clientData;
 } XOTclRuntimeState;