Index: generic/nsf.c
===================================================================
diff -u -N -r0e9572616054a937b9a93193d145d21ff684ccfa -re157ce6c9468e2a9fe01b45d1547f0a0e20e3e8a
--- generic/nsf.c	(.../nsf.c)	(revision 0e9572616054a937b9a93193d145d21ff684ccfa)
+++ generic/nsf.c	(.../nsf.c)	(revision e157ce6c9468e2a9fe01b45d1547f0a0e20e3e8a)
@@ -16665,10 +16665,12 @@
  * See https://core.tcl-lang.org/tcl/tktview?name=4663e0636f (also for other
  * mid-term options)
  */
-#define TCL_NO_TOMMATH_H 1
+//#define TCL_NO_TOMMATH_H 1
+typedef size_t mp_int[4];
 #endif
-#include <tclTomMath.h>
 
+//#include <tclTomMath.h>
+
 int Nsf_ConvertToInteger(Tcl_Interp *interp, Tcl_Obj *objPtr,  const Nsf_Param *pPtr,
                      ClientData *clientData, Tcl_Obj **outObjPtr)
   nonnull(1) nonnull(2) nonnull(3) nonnull(4) nonnull(5);
@@ -16698,9 +16700,9 @@
      */
     result = TCL_ERROR;
   } else {
-    long        longValue;
-    Tcl_WideInt wideIntValue;
-    mp_int      bignumValue;
+    long         longValue;
+    Tcl_WideInt  wideIntValue;
+    mp_int       bignumValue;
 
     /*
      * We have to figure out, whether the value is an int. We perform this