Index: generic/nsfDecls.h
===================================================================
diff -u -r68b3924a7a90d28e2e11f9b9b8244a85da708073 -r3b729f5cc12d1a497d53e71629c305034745274b
--- generic/nsfDecls.h	(.../nsfDecls.h)	(revision 68b3924a7a90d28e2e11f9b9b8244a85da708073)
+++ generic/nsfDecls.h	(.../nsfDecls.h)	(revision 3b729f5cc12d1a497d53e71629c305034745274b)
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef _XOTCLDECLS
-#define _XOTCLDECLS
+#ifndef _NSFDECLS
+#define _NSFDECLS
 
 /*
  * WARNING: This file is automatically generated by the tools/genStubs.tcl
@@ -485,5 +485,5 @@
 
 /* !END!: Do not edit above this line. */
 
-#endif /* _XOTCLDECLS */
+#endif /* _NSFDECLS */
 
Index: generic/nsfIntDecls.h
===================================================================
diff -u -r2ce5a2cab4731930a5b26455c56806fc201de23c -r3b729f5cc12d1a497d53e71629c305034745274b
--- generic/nsfIntDecls.h	(.../nsfIntDecls.h)	(revision 2ce5a2cab4731930a5b26455c56806fc201de23c)
+++ generic/nsfIntDecls.h	(.../nsfIntDecls.h)	(revision 3b729f5cc12d1a497d53e71629c305034745274b)
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef _XOTCLINTDECLS
-#define _XOTCLINTDECLS
+#ifndef _NSFINTDECLS
+#define _NSFINTDECLS
 
 /*
  * WARNING: This file is automatically generated by the tools/genStubs.tcl
@@ -54,4 +54,4 @@
 
 /* !END!: Do not edit above this line. */
 
-#endif /* _XOTCLINTDECLS */
+#endif /* _NSFINTDECLS */