Index: generic/nsf.c
===================================================================
diff -u -rfe7198d3b12818582efe3c83c5cb2963184f1f34 -r6d66926b77bdd9441f604beb08829018140142f4
--- generic/nsf.c	(.../nsf.c)	(revision fe7198d3b12818582efe3c83c5cb2963184f1f34)
+++ generic/nsf.c	(.../nsf.c)	(revision 6d66926b77bdd9441f604beb08829018140142f4)
@@ -231,6 +231,14 @@
 static Tcl_ObjCmdProc NsfAsmProc;
 Tcl_ObjCmdProc NsfProcStub;
 
+/*
+ * Prototypes for interpreter life-cyle
+ */
+EXTERN Tcl_PackageInitProc Nsf_SafeInit;
+EXTERN Tcl_PackageInitProc Nsf_Init;
+static Tcl_ExitProc Nsf_ExitProc;
+static Tcl_ExitProc Nsf_ThreadExitProc;
+static Tcl_ExitProc ExitHandler;
 
 /*
  * Prototypes for methods called directly when CallDirectly() returns NULL
@@ -34677,8 +34685,6 @@
 /*
  *  Exit Handler
  */
-static void ExitHandler(ClientData clientData)
-  nonnull(1);
 
 static void
 ExitHandler(ClientData clientData) {
@@ -34826,12 +34832,9 @@
 /*
  * Gets activated at thread-exit
  */
-static void Nsf_ThreadExitProc(ClientData clientData)
-  nonnull(1);
 
 static void
 Nsf_ThreadExitProc(ClientData clientData) {
-  void Nsf_ExitProc(ClientData clientData);
 
   nonnull_assert(clientData != NULL);
 
@@ -34846,10 +34849,8 @@
 /*
  * Gets activated at application-exit
  */
-void Nsf_ExitProc(ClientData clientData)
-  nonnull(1);
 
-void
+static void
 Nsf_ExitProc(ClientData clientData) {
 
   nonnull_assert(clientData != NULL);
@@ -34888,9 +34889,6 @@
 #include <google/profiler.h>
 #endif
 
-int Nsf_Init(
-    Tcl_Interp *interp
-) nonnull(1);
 
 int
 Nsf_Init(
@@ -35238,11 +35236,6 @@
   return TCL_OK;
 }
 
-
-EXTERN int Nsf_SafeInit(
-    Tcl_Interp *interp
-) nonnull(1);
-
 EXTERN int
 Nsf_SafeInit(Tcl_Interp *interp) {