Index: generic/nsf.h
===================================================================
diff -u -r2db70d133393ce61e5901f06741c11634748c93d -rfc37052db0300fa580ab01429454387346030040
--- generic/nsf.h	(.../nsf.h)	(revision 2db70d133393ce61e5901f06741c11634748c93d)
+++ generic/nsf.h	(.../nsf.h)	(revision fc37052db0300fa580ab01429454387346030040)
@@ -76,7 +76,9 @@
 #endif
 
 #if defined(PRE86)
-# define CONST86
+# ifndef CONST86
+#  define CONST86
+# endif
 # define Tcl_GetErrorLine(interp) (interp)->errorLine
 #else
 # define NRE
@@ -97,6 +99,11 @@
 #else
 # define TCL_SIZE_T size_t
 #endif
+
+#ifndef TCL_INDEX_NONE
+# define TCL_INDEX_NONE -1
+#endif
+
 /*
  * Feature activation/deactivation
  */
Index: generic/nsfInt.h
===================================================================
diff -u -r958b24f921951c5e7c3f454134ddf17843df22bc -rfc37052db0300fa580ab01429454387346030040
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 958b24f921951c5e7c3f454134ddf17843df22bc)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision fc37052db0300fa580ab01429454387346030040)
@@ -147,9 +147,6 @@
 #endif
 
 #include <tclInt.h>
-#ifndef TCL_INDEX_NONE
-# define TCL_INDEX_NONE -1
-#endif
 
 #include "nsf.h"