Index: generic/nsfInt.h
===================================================================
diff -u -ra422e30cf3600a498fac637e16604693577f7802 -r65d1c0f8d783d97a78b93f14871045fa9d4e5a41
--- generic/nsfInt.h	(.../nsfInt.h)	(revision a422e30cf3600a498fac637e16604693577f7802)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 65d1c0f8d783d97a78b93f14871045fa9d4e5a41)
@@ -43,8 +43,8 @@
  *
  */
 
-#ifndef _nsf_int_h_
-#define _nsf_int_h_
+#ifndef NSF_INCLUDE_nsf_int_h_
+#define NSF_INCLUDE_nsf_int_h_
 
 /*
  * Well behaved compiler with C99 support should define __STDC_VERSION__
@@ -144,7 +144,7 @@
 # include <tclCompile.h>
 #endif
 
-#if __GNUC_PREREQ(2, 95)
+#if NSF__GNUC_PREREQ(2, 95)
 /* Use gcc branch prediction hint to minimize cost of e.g. DTrace
  * ENABLED checks.
  */
@@ -155,13 +155,13 @@
 #  define likely(x) (x)
 #endif
 
-#if __GNUC_PREREQ(3, 3)
+#if NSF__GNUC_PREREQ(3, 3)
 # define nonnull(ARGS) __attribute__((__nonnull__(ARGS)))
 #else
 # define nonnull(ARGS)
 #endif
 
-#if __GNUC_PREREQ(4, 9)
+#if NSF__GNUC_PREREQ(4, 9)
 # define returns_nonnull __attribute__((returns_nonnull))
 #else
 # define returns_nonnull
@@ -174,7 +174,7 @@
  * attribute could not be used, if declared as unused.
  */
 #ifdef UNUSED
-#elif __GNUC_PREREQ(2, 7)
+#elif NSF__GNUC_PREREQ(2, 7)
 # define UNUSED(x) UNUSED_ ## x __attribute__((unused))
 #elif defined(__LCLINT__)
 # define UNUSED(x) /*@unused@*/ (x)
@@ -1393,4 +1393,4 @@
   NsfCallStackFindCallingContext((interp), (offset), (framePtrPtr), NULL)
 
 EXTERN const char *Nsf_Configureoption[];
-#endif /* _nsf_int_h_ */
+#endif /* NSF_INCLUDE_nsf_int_h_ */