Index: lib/xvfs/xvfs.tcl
==================================================================
--- lib/xvfs/xvfs.tcl
+++ lib/xvfs/xvfs.tcl
@@ -248,10 +248,20 @@
 	set ::xvfs::fsName $fsName
 	set ::xvfs::rootDirectory $rootDirectory
 }
 
 proc ::xvfs::run {} {
+	uplevel #0 { package require minirivet }
 	::minirivet::parse [file join $::xvfs::_xvfsDir xvfs.c.rvt]
 }
 
+proc ::xvfs::setOutputChannel {channel} {
+	uplevel #0 { package require minirivet }
+	tailcall ::minirivet::setOutputChannel $channel
+}
+
+proc ::xvfs::setOutputVariable {variable} {
+	uplevel #0 { package require minirivet }
+	tailcall ::minirivet::setOutputVariable $variable
+}
 
 package provide xvfs 1

Index: xvfs-create
==================================================================
--- xvfs-create
+++ xvfs-create
@@ -41,16 +41,17 @@
 	return [join $output "\n"]
 }
 
 switch -- $mode {
 	"run" {
+		package require xvfs
+
 		if {[info exists outputFile]} {
 			set fd [open $outputFile w]
-			::minirivet::setOutputChannel $fd
+			::xvfs::setOutputChannel $fd
 		}
 
-		package require xvfs
 		set ::xvfs::argv $argv
 		::xvfs::run
 
 		if {[info exists fd]} {
 			close $fd