Index: generic/nsf.c
===================================================================
diff -u -N -ra1a7bac439af86ed53e54e945d898041ad6768cc -r41e05440d57881136dac05fe1b02c5bd5897edea
--- generic/nsf.c	(.../nsf.c)	(revision a1a7bac439af86ed53e54e945d898041ad6768cc)
+++ generic/nsf.c	(.../nsf.c)	(revision 41e05440d57881136dac05fe1b02c5bd5897edea)
@@ -200,15 +200,20 @@
  * Function prototypes
  */
 
-/* Prototypes for method definitions */
+/*
+ * Prototypes for method definitions
+ */
 static Tcl_ObjCmdProc NsfForwardMethod;
 static Tcl_ObjCmdProc NsfObjscopedMethod;
 static Tcl_ObjCmdProc NsfSetterMethod;
 static Tcl_ObjCmdProc NsfProcAliasMethod;
 static Tcl_ObjCmdProc NsfAsmProc;
 
 
-/* Prototypes for methods called directly when CallDirectly() returns NULL */
+
+/*
+ * Prototypes for methods called directly when CallDirectly() returns NULL
+ */
 static int NsfCAllocMethod(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *nameObj)
   nonnull(1) nonnull(2);
 static int NsfCAllocMethod_(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *nameObj, Tcl_Namespace *parentNsPtr)
Index: generic/nsfInt.h
===================================================================
diff -u -N -r8eda3322a7c8ba5e61c427f41e1bb90d40dd72e2 -r41e05440d57881136dac05fe1b02c5bd5897edea
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 8eda3322a7c8ba5e61c427f41e1bb90d40dd72e2)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 41e05440d57881136dac05fe1b02c5bd5897edea)
@@ -987,6 +987,11 @@
 #endif
 
 /*
+ * Prototypes for method definitions
+ */
+EXTERN Tcl_ObjCmdProc NsfObjDispatch;
+
+/*
  *  NsfObject Reference Accounting
  */
 EXTERN void NsfCleanupObject_(NsfObject *object) nonnull(1);
@@ -1117,9 +1122,6 @@
 EXTERN int NsfGetClassFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
 			      NsfClass **clPtr, int withUnknown)
   nonnull(1) nonnull(2) nonnull(3);
-EXTERN int NsfObjDispatch(ClientData cd, Tcl_Interp *interp,
-			  int objc, Tcl_Obj *CONST objv[])
-  nonnull(1) nonnull(2) nonnull(4);
 
 EXTERN int NsfObjWrongArgs(Tcl_Interp *interp, CONST char *msg,
 			   Tcl_Obj *cmdName, Tcl_Obj *methodName,
@@ -1284,7 +1286,7 @@
 #endif
 
 /* In Tcl 8.6 (tclInt.h), vsnprintf is mapped to _vsnprintf. In Tcl
-   8.5, this is missing from tclInt.h. So ... */ 
+   8.5, this is missing from tclInt.h. So ... */
 
 #if defined(PRE86) && defined(_MSC_VER)
 #define vsnprintf _vsnprintf