Index: generic/nsfInt.h
===================================================================
diff -u -rcbcfec72376d549a806859c873195cc0ebc9c9ea -r46e91441fa18c0dbcabc216779c00c607740a883
--- generic/nsfInt.h	(.../nsfInt.h)	(revision cbcfec72376d549a806859c873195cc0ebc9c9ea)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 46e91441fa18c0dbcabc216779c00c607740a883)
@@ -564,6 +564,7 @@
   NsfCmdList *isObjectMixinOf;
   NsfCmdList *isClassMixinOf;
   NsfAssertionStore *assertions;
+  Tcl_Obj *mixinRegObjs;
 #ifdef NSF_OBJECTDATA
   Tcl_HashTable *objectdata;
 #endif
@@ -716,13 +717,18 @@
 
 /* obj types */
 EXTERN Tcl_ObjType NsfMixinregObjType;
-int NsfMixinregGet(Tcl_Interp *interp, Tcl_Obj *obj, NsfClass **clPtr, Tcl_Obj **guardObj)
+EXTERN int NsfMixinregGet(Tcl_Interp *interp, Tcl_Obj *obj, NsfClass **clPtr, Tcl_Obj **guardObj)
   nonnull(1) nonnull(2) nonnull(3) nonnull(4);
+EXTERN int NsfMixinregInvalidate(Tcl_Interp *interp, Tcl_Obj *obj) 
+  nonnull(1) nonnull(2);
 
 EXTERN Tcl_ObjType NsfFilterregObjType;
-int NsfFilterregGet(Tcl_Interp *interp, Tcl_Obj *obj, Tcl_Obj **filterObj, Tcl_Obj **guardObj)
+EXTERN int NsfFilterregGet(Tcl_Interp *interp, Tcl_Obj *obj, Tcl_Obj **filterObj, Tcl_Obj **guardObj)
   nonnull(1) nonnull(2) nonnull(3) nonnull(4);
 
+EXTERN NsfClassOpt *NsfRequireClassOpt(/*@notnull@*/ NsfClass *cl) nonnull(1) returns_nonnull;
+
+
 /* Next Scripting ShadowTclCommands */
 typedef struct NsfShadowTclCommandInfo {
   TclObjCmdProcType proc;
@@ -968,7 +974,7 @@
 EXTERN void NsfProfileGetData(Tcl_Interp *interp) nonnull(1);
 
 EXTERN NsfCallStackContent *NsfCallStackGetTopFrame(Tcl_Interp *interp, Tcl_CallFrame **framePtrPtr)
-  nonnull(1) nonnull(2);
+  nonnull(1);
 #endif
 
 /*