Index: generic/nsf.h
===================================================================
diff -u -r4501d2e258779aefc5533ba0a3bcc5ee4d4ee77f -r2db70d133393ce61e5901f06741c11634748c93d
--- generic/nsf.h	(.../nsf.h)	(revision 4501d2e258779aefc5533ba0a3bcc5ee4d4ee77f)
+++ generic/nsf.h	(.../nsf.h)	(revision 2db70d133393ce61e5901f06741c11634748c93d)
@@ -85,6 +85,8 @@
 #ifdef PRE9
 # if !defined(Tcl_LibraryInitProc)
 #  define Tcl_LibraryInitProc Tcl_PackageInitProc
+# endif
+# if !defined(Tcl_GetChild)
 #  define Tcl_GetChild Tcl_GetSlave
 #  define Tcl_GetParent Tcl_GetMaster
 # endif
Index: generic/nsfAccessInt.h
===================================================================
diff -u -r4501d2e258779aefc5533ba0a3bcc5ee4d4ee77f -r2db70d133393ce61e5901f06741c11634748c93d
--- generic/nsfAccessInt.h	(.../nsfAccessInt.h)	(revision 4501d2e258779aefc5533ba0a3bcc5ee4d4ee77f)
+++ generic/nsfAccessInt.h	(.../nsfAccessInt.h)	(revision 2db70d133393ce61e5901f06741c11634748c93d)
@@ -138,7 +138,7 @@
  * For Tcl 8.7+, we should better switch to using the public interface
  * to manipulating the internal rep of Tcl_Objs.
  */
-#if defined(TclFreeIntRep)
+#if !defined(PRE9) && !defined(TclFreeInternalRep)
 # define TclFreeInternalRep(objPtr) TclFreeIntRep((objPtr))
 #endif