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