Index: generic/gentclAPI.tcl
===================================================================
diff -u -r8a19ff2ec04063dbc140fdd7f3b26745d5138a2f -r37833d2979f789fc14627e6c1f38ca3cb0ceac01
--- generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision 8a19ff2ec04063dbc140fdd7f3b26745d5138a2f)
+++ generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision 37833d2979f789fc14627e6c1f38ca3cb0ceac01)
@@ -523,7 +523,7 @@
   puts $stubDecls
   puts $decls
   set enumString [join $enums ",\n "]
-  puts "enum {\n $enumString\n} NsfMethods;\n"
+  puts "EXTERN enum {\n $enumString\n} NsfMethods;\n"
   puts $fns
   set definitionString [join $ifds ",\n"]
   set terminator {NULL, NULL, 0, {{NULL, 0, 0, NULL, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}}
Index: generic/nsf.c
===================================================================
diff -u -r9e281d5110f397a9e9b8317325d0675f1793246d -r37833d2979f789fc14627e6c1f38ca3cb0ceac01
--- generic/nsf.c	(.../nsf.c)	(revision 9e281d5110f397a9e9b8317325d0675f1793246d)
+++ generic/nsf.c	(.../nsf.c)	(revision 37833d2979f789fc14627e6c1f38ca3cb0ceac01)
@@ -33536,7 +33536,7 @@
   nonnull_assert(object != NULL);
   nonnull_assert(class != NULL);
 
-  Tcl_SetBooleanObj(Tcl_GetObjResult(interp), (int)HasMixin(interp, object, class));
+  Tcl_SetBooleanObj(Tcl_GetObjResult(interp), (int)(HasMixin(interp, object, class)));
   return TCL_OK;
 }
 
@@ -33566,7 +33566,7 @@
   nonnull_assert(object != NULL);
   nonnull_assert(class != NULL);
 
-  Tcl_SetBooleanObj(Tcl_GetObjResult(interp), (int)IsSubType(object->cl, class));
+  Tcl_SetBooleanObj(Tcl_GetObjResult(interp), (int)(IsSubType(object->cl, class)));
   return TCL_OK;
 }
 
Index: generic/nsfAPI.h
===================================================================
diff -u -r8a19ff2ec04063dbc140fdd7f3b26745d5138a2f -r37833d2979f789fc14627e6c1f38ca3cb0ceac01
--- generic/nsfAPI.h	(.../nsfAPI.h)	(revision 8a19ff2ec04063dbc140fdd7f3b26745d5138a2f)
+++ generic/nsfAPI.h	(.../nsfAPI.h)	(revision 37833d2979f789fc14627e6c1f38ca3cb0ceac01)
@@ -771,7 +771,7 @@
 static int NsfObjInfoVarsMethod(Tcl_Interp *interp, NsfObject *object, const char *pattern)
   NSF_nonnull(1) NSF_nonnull(2);
 
-enum {
+EXTERN enum {
  NsfCAllocMethodIdx,
  NsfCCreateMethodIdx,
  NsfCDeallocMethodIdx,
Index: generic/nsfInt.h
===================================================================
diff -u -r7ad03f0f42ae651084aefb409c6c00b2318821c7 -r37833d2979f789fc14627e6c1f38ca3cb0ceac01
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 7ad03f0f42ae651084aefb409c6c00b2318821c7)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 37833d2979f789fc14627e6c1f38ca3cb0ceac01)
@@ -713,9 +713,8 @@
   NSF_s_set_idx
 } SystemMethodsIdx;
 
-#if !defined(NSF_C)
 EXTERN const char *Nsf_SystemMethodOpts[];
-#else
+#if defined(NSF_C)
 const char *Nsf_SystemMethodOpts[] = {
   "-class.alloc",
   "-class.create",
@@ -780,9 +779,8 @@
   NSF_STRING_IS, NSF_EVAL, NSF_DISASSEMBLE,
   NSF_RENAME
 } NsfGlobalNames;
-#if !defined(NSF_C)
 EXTERN const char *NsfGlobalStrings[];
-#else
+#if defined(NSF_C)
 const char *NsfGlobalStrings[] = {
   "", "0", "1",
   /* methods called internally */
@@ -1394,4 +1392,5 @@
 #define NsfCallStackFindLastInvocation(interp, offset, framePtrPtr) \
   NsfCallStackFindCallingContext((interp), (offset), (framePtrPtr), NULL)
 
+EXTERN const char *Nsf_Configureoption[];
 #endif /* _nsf_int_h_ */
Index: library/mongodb/mongoAPI.h
===================================================================
diff -u -r8a19ff2ec04063dbc140fdd7f3b26745d5138a2f -r37833d2979f789fc14627e6c1f38ca3cb0ceac01
--- library/mongodb/mongoAPI.h	(.../mongoAPI.h)	(revision 8a19ff2ec04063dbc140fdd7f3b26745d5138a2f)
+++ library/mongodb/mongoAPI.h	(.../mongoAPI.h)	(revision 37833d2979f789fc14627e6c1f38ca3cb0ceac01)
@@ -212,7 +212,7 @@
 static int NsfMongoStatus(Tcl_Interp *interp, mongoc_client_t *connPtr, Tcl_Obj *connObj)
   NSF_nonnull(1) NSF_nonnull(2);
 
-enum {
+EXTERN enum {
  NsfCollectionCloseIdx,
  NsfCollectionOpenIdx,
  NsfMongoCloseIdx,