Index: generic/nsf.c
===================================================================
diff -u -N -rb49b73b79d290426a2d112abaa18bb4b95dd9b2f -r95656d2638199a6292c1b2c9bc570c37020280b6
--- generic/nsf.c	(.../nsf.c)	(revision b49b73b79d290426a2d112abaa18bb4b95dd9b2f)
+++ generic/nsf.c	(.../nsf.c)	(revision 95656d2638199a6292c1b2c9bc570c37020280b6)
@@ -4228,7 +4228,7 @@
       /*fprintf(stderr, "Warning: CallDirectly object %s idx %s not defined\n",
         ObjectName(object), Nsf_SystemMethodOpts[methodIdx]+1);*/
     } else {
-#if DISPATCH_ALWAYS_DEFINED_METHODS
+#if defined(DISPATCH_ALWAYS_DEFINED_METHODS)
       callDirectly = 0;
 #else
       if ((object->flags & NSF_FILTER_ORDER_VALID) == 0u) {
@@ -4546,7 +4546,7 @@
   nonnull_assert(varName != NULL);
   nonnull_assert(varPtr != NULL);
 
-#if defined (VAR_RESOLVER_TRACE)
+#if defined(VAR_RESOLVER_TRACE)
   fprintf(stderr, "NsColonVarResolver '%s' flags %.6x\n", varName, flags);
 #endif
 
@@ -4569,13 +4569,13 @@
   assert(varFramePtr != NULL);
 
   frameFlags = (unsigned int)Tcl_CallFrame_isProcCallFrame(varFramePtr);
-#if defined (VAR_RESOLVER_TRACE)
+#if defined(VAR_RESOLVER_TRACE)
   fprintf(stderr, "NsColonVarResolver '%s' frame flags %.6x\n", varName,
           Tcl_CallFrame_isProcCallFrame(varFramePtr));
 #endif
 
   if ((frameFlags & FRAME_IS_PROC) != 0u) {
-#if defined (VAR_RESOLVER_TRACE)
+#if defined(VAR_RESOLVER_TRACE)
     fprintf(stderr, "...... forwarding to next resolver\n");
 #endif
     /*fprintf(stderr, "proc-scoped var '%s' assumed, frame %p flags %.6x\n",
@@ -4643,7 +4643,7 @@
 
   *varPtr = (Tcl_Var)VarHashCreateVar(varTablePtr, key, NULL);
 
-#if defined (VAR_RESOLVER_TRACE)
+#if defined(VAR_RESOLVER_TRACE)
   fprintf(stderr, "...... lookup of '%s' for object '%s' returns %p\n",
           varName, ObjectName(object), *varPtr);
 #endif
@@ -5705,7 +5705,7 @@
   Tcl_ForgetImport(interp, nsPtr, "*"); /* don't destroy namespace imported objects */
 
 
-#if OBJDELETION_TRACE
+#if defined(OBJDELETION_TRACE)
   /*
    * Deletion is always tricky. Show, what elements should be deleted
    * in this loop. The actually deleted elements might be actually
@@ -7019,7 +7019,7 @@
   NsfCommandRelease(del);
 }
 
-#if NSF_DEBUGGING
+#if defined(NSF_DEBUGGING)
 /** for debug purposes only */
 static void CmdListPrint(Tcl_Interp *interp, const char *title, NsfCmdList *cmdList)
   nonnull(1) nonnull(3);
@@ -31994,7 +31994,7 @@
    */
   /*fprintf(stderr, "+++ ExiHandler frees runtime state of interp %p\n",interp);*/
   ckfree((char *) RUNTIME_STATE(interp));
-#if USE_ASSOC_DATA
+#if defined(USE_ASSOC_DATA)
   Tcl_DeleteAssocData(interp, "NsfRuntimeState");
 #else
   Tcl_Interp_globalNsPtr(interp)->clientData = NULL;
@@ -32149,7 +32149,7 @@
   runtimeState = ckalloc((int)sizeof(NsfRuntimeState));
   memset(runtimeState, 0, sizeof(NsfRuntimeState));
 
-#if USE_ASSOC_DATA
+#if defined(USE_ASSOC_DATA)
   Tcl_SetAssocData(interp, "NsfRuntimeState", NULL, runtimeState);
 #else
   Tcl_Interp_globalNsPtr(interp)->clientData = runtimeState;
Index: generic/nsfInt.h
===================================================================
diff -u -N -rb49b73b79d290426a2d112abaa18bb4b95dd9b2f -r95656d2638199a6292c1b2c9bc570c37020280b6
--- generic/nsfInt.h	(.../nsfInt.h)	(revision b49b73b79d290426a2d112abaa18bb4b95dd9b2f)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 95656d2638199a6292c1b2c9bc570c37020280b6)
@@ -186,7 +186,7 @@
 #define DSTRING_FREE(dsPtr) \
   if ((dsPtr)->string != (dsPtr)->staticSpace) {Tcl_DStringFree(dsPtr);} MEM_COUNT_FREE("DString",(dsPtr))
 
-#if USE_ASSOC_DATA
+#if defined(USE_ASSOC_DATA)
 # define RUNTIME_STATE(interp) ((NsfRuntimeState*)Tcl_GetAssocData((interp), "NsfRuntimeState", NULL))
 #else
 # define RUNTIME_STATE(interp) ((NsfRuntimeState*)((Interp*)(interp))->globalNsPtr->clientData)