Index: configure
===================================================================
diff -u -N -r764405083cfd6152d6956674e54f3a77cf7e1dcd -r7d2af5a3b3f0ac8ade700c3cd90a9aac5d00f0fa
--- configure	(.../configure)	(revision 764405083cfd6152d6956674e54f3a77cf7e1dcd)
+++ configure	(.../configure)	(revision 7d2af5a3b3f0ac8ade700c3cd90a9aac5d00f0fa)
@@ -5689,11 +5689,11 @@
     #TEA_ADD_SOURCES([win/winFile.c])
     #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])
 else
-    CLEANFILES="*.o *.a *.so *~ core gmon.out"
+    CLEANFILES="*.a *.so *~ core gmon.out"
     #TEA_ADD_SOURCES([unix/unixFile.c])
     #TEA_ADD_LIBS([-lsuperfly])
 fi
-CLEANFILES="$CLEANFILES pkgIndex.tcl"
+CLEANFILES="$CLEANFILES *.${OBJEXT} pkgIndex.tcl"
 
 #--------------------------------------------------------------------
 # __CHANGE__
Index: configure.in
===================================================================
diff -u -N -r764405083cfd6152d6956674e54f3a77cf7e1dcd -r7d2af5a3b3f0ac8ade700c3cd90a9aac5d00f0fa
--- configure.in	(.../configure.in)	(revision 764405083cfd6152d6956674e54f3a77cf7e1dcd)
+++ configure.in	(.../configure.in)	(revision 7d2af5a3b3f0ac8ade700c3cd90a9aac5d00f0fa)
@@ -233,11 +233,11 @@
     #TEA_ADD_SOURCES([win/winFile.c])
     #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])
 else
-    CLEANFILES="*.o *.a *.so *~ core gmon.out"
+    CLEANFILES="*.a *.so *~ core gmon.out"
     #TEA_ADD_SOURCES([unix/unixFile.c])
     #TEA_ADD_LIBS([-lsuperfly])
 fi
-CLEANFILES="$CLEANFILES pkgIndex.tcl"
+CLEANFILES="$CLEANFILES *.${OBJEXT} pkgIndex.tcl"
 
 #--------------------------------------------------------------------
 # __CHANGE__
Index: generic/nsfInt.h
===================================================================
diff -u -N -r80f0bcea5ed8961fe0d7d9fcb1d7e5d407951823 -r7d2af5a3b3f0ac8ade700c3cd90a9aac5d00f0fa
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 80f0bcea5ed8961fe0d7d9fcb1d7e5d407951823)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 7d2af5a3b3f0ac8ade700c3cd90a9aac5d00f0fa)
@@ -91,11 +91,6 @@
 #  include "dmalloc.h"
 #endif
 
-#ifdef BUILD_nsf
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
  * Makros
  */
@@ -1014,8 +1009,4 @@
 /*# define NSF_INLINE*/
 #endif
 
-/*** common win sermon ***/
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _nsf_int_h_ */
Index: generic/nsfShadow.c
===================================================================
diff -u -N -r802b6ce0c3ff1c3fb46f4a6ffb23f17d12f76d57 -r7d2af5a3b3f0ac8ade700c3cd90a9aac5d00f0fa
--- generic/nsfShadow.c	(.../nsfShadow.c)	(revision 802b6ce0c3ff1c3fb46f4a6ffb23f17d12f76d57)
+++ generic/nsfShadow.c	(.../nsfShadow.c)	(revision 7d2af5a3b3f0ac8ade700c3cd90a9aac5d00f0fa)
@@ -162,7 +162,7 @@
  *
  *----------------------------------------------------------------------
  */
-extern int
+EXTERN int
 NsfProcStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]);
 
 static int