Index: xvfs-core.c
==================================================================
--- xvfs-core.c
+++ xvfs-core.c
@@ -1216,5 +1216,12 @@
 	Tcl_SetHashValue(mapEntry, instanceInfo);
 
 	return(TCL_OK);
 }
 #endif /* XVFS_MODE_SERVER */
+#undef XVFS_DEBUG_PRINTF
+#undef XVFS_DEBUG_PUTS
+#undef XVFS_DEBUG_ENTER
+#undef XVFS_DEBUG_LEAVE
+#undef XVFS_INTERNAL_SERVER_MAGIC
+#undef XVFS_INTERNAL_SERVER_MAGIC_LEN
+#undef XVFS_ROOT_MOUNTPOINT

Index: xvfs-core.h
==================================================================
--- xvfs-core.h
+++ xvfs-core.h
@@ -73,10 +73,11 @@
 int Xvfs_Init(Tcl_Interp *interp);
 
 #else
 #  error Unsupported XVFS_MODE
 #endif
+#undef XVFS_REGISTER_INTERFACE
 
 /*
  * In flexible or standalone mode, directly include what
  * would otherwise be a separate translation unit, to
  * avoid symbols leaking

Index: xvfs.c.rvt
==================================================================
--- xvfs.c.rvt
+++ xvfs.c.rvt
@@ -233,5 +233,7 @@
 		return(register_ret);
 	}
 	
 	return(TCL_OK);
 }
+#undef XVFS_NAME_LOOKUP_ERROR
+#undef XVFS_FILE_BLOCKSIZE