Index: generic/nsf.c
===================================================================
diff -u -N -r8dbedb9a954b6d9de577b60067bcb9806acd0e35 -r51302024811f2930d4047d2729e1c0f03f13c4ec
--- generic/nsf.c	(.../nsf.c)	(revision 8dbedb9a954b6d9de577b60067bcb9806acd0e35)
+++ generic/nsf.c	(.../nsf.c)	(revision 51302024811f2930d4047d2729e1c0f03f13c4ec)
@@ -242,9 +242,13 @@
 EXTERN Tcl_PackageInitProc Nsf_SafeInit;
 EXTERN Tcl_PackageInitProc Nsf_Init;
 static Tcl_ExitProc Nsf_ExitProc;
-static Tcl_ExitProc Nsf_ThreadExitProc;
 static Tcl_ExitProc ExitHandler;
 
+#if defined(TCL_THREADS)
+static Tcl_ExitProc Nsf_ThreadExitProc;
+#endif
+
+
 /*
  * Prototypes for methods called directly when CallDirectly() returns NULL
  */
@@ -654,13 +658,15 @@
   dlPtr->size ++;
 }
 
+#ifdef DO_CLEANUP
 static void
 NsfDListFree(NsfDList *dlPtr) {
   if (dlPtr->data != &dlPtr->static_data[0]) {
     ckfree((char*)dlPtr->data);
   }
   NsfDListInit(dlPtr);
 }
+#endif
 
 /*
  *----------------------------------------------------------------------
@@ -4483,7 +4489,7 @@
 static int
 ObjectSystemsCleanup(Tcl_Interp *interp, bool withKeepvars) {
   NsfCmdList      *instances = NULL, *entryPtr;
-  NsfObjectSystem *osPtr, *nPtr;
+  NsfObjectSystem *osPtr;
 
   nonnull_assert(interp != NULL);
 
@@ -15181,7 +15187,7 @@
 #endif
 
 
-
+#ifdef DO_CLEANUP
 /*
  *----------------------------------------------------------------------
  * NsfColonCmdContextFree --
@@ -15208,6 +15214,7 @@
 #endif
   FREE(NsfColonCmdContext, clientData);
 }
+#endif
 
 /*
  *----------------------------------------------------------------------