Index: generic/nsf.c
===================================================================
diff -u -r2e90c0205abcb6a2fa8e60531b5f19730195b6f9 -raaca0380befc823055c1a345eaeeaee7734705f4
--- generic/nsf.c	(.../nsf.c)	(revision 2e90c0205abcb6a2fa8e60531b5f19730195b6f9)
+++ generic/nsf.c	(.../nsf.c)	(revision aaca0380befc823055c1a345eaeeaee7734705f4)
@@ -3020,7 +3020,7 @@
  *
  *----------------------------------------------------------------------
  */
-CONST char *
+static CONST char *
 MethodName(Tcl_Obj *methodObj) {
   char *methodName;
 
@@ -3032,6 +3032,12 @@
   return methodName;
 }
 
+CONST char *
+NsfMethodName(Tcl_Obj *methodObj) {
+  return MethodName(methodObj);
+}
+
+
 /*
  *----------------------------------------------------------------------
  * NsColonVarResolver --
@@ -15852,7 +15858,7 @@
 #define SkipNonposParamDefs(cPtr) \
   for (; ++cPtr <= lastParamPtr && *cPtr->name == '-';)
 
-Nsf_Param CONST *
+static Nsf_Param CONST *
 NextParam(Nsf_Param CONST *paramPtr, Nsf_Param CONST *lastParamPtr) {
   for (; ++paramPtr <= lastParamPtr && *paramPtr->name == '-'; );
   return paramPtr;
Index: generic/nsfError.c
===================================================================
diff -u -r5592fe7601230e30f1b02b73de8fe84fc05917f0 -raaca0380befc823055c1a345eaeeaee7734705f4
--- generic/nsfError.c	(.../nsfError.c)	(revision 5592fe7601230e30f1b02b73de8fe84fc05917f0)
+++ generic/nsfError.c	(.../nsfError.c)	(revision aaca0380befc823055c1a345eaeeaee7734705f4)
@@ -73,8 +73,8 @@
 NsfDStringArgv(Tcl_DString *dsPtr, int objc, Tcl_Obj *CONST objv[]) {
   int i;
   if (objc > 0) {
-    Tcl_DStringAppendElement(dsPtr, MethodName(objv[0]));
-    for (i=1; i<objc; i++) {
+    Tcl_DStringAppendElement(dsPtr, NsfMethodName(objv[0]));
+    for (i = 1; i < objc; i++) {
       Tcl_DStringAppendElement(dsPtr, ObjStr(objv[i]));
     }
   }
@@ -182,7 +182,7 @@
   }
   if (methodName) {
     if (need_space) Tcl_AppendResult(interp, " ", (char *) NULL);
-    Tcl_AppendResult(interp, MethodName(methodName), (char *) NULL);
+    Tcl_AppendResult(interp, NsfMethodName(methodName), (char *) NULL);
     need_space = 1;
   }
   if (arglist != NULL) {
Index: generic/nsfInt.h
===================================================================
diff -u -r2e90c0205abcb6a2fa8e60531b5f19730195b6f9 -raaca0380befc823055c1a345eaeeaee7734705f4
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 2e90c0205abcb6a2fa8e60531b5f19730195b6f9)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision aaca0380befc823055c1a345eaeeaee7734705f4)
@@ -914,10 +914,10 @@
 extern int NsfObjWrongArgs(Tcl_Interp *interp, CONST char *msg, 
 			   Tcl_Obj *cmdName, Tcl_Obj *methodName, 
 			   char *arglist);
-extern CONST char *MethodName(Tcl_Obj *methodObj);
+extern CONST char *NsfMethodName(Tcl_Obj *methodObj);
 extern void NsfReportVars(Tcl_Interp *interp);
+extern void NsfDStringArgv(Tcl_DString *dsPtr, int objc, Tcl_Obj *CONST objv[]);
 
-
 /* 
  * NsfFlag type
  */