Index: lib/xvfs/xvfs.tcl
==================================================================
--- lib/xvfs/xvfs.tcl
+++ lib/xvfs/xvfs.tcl
@@ -99,30 +99,10 @@
 	} else {
 		set isTopLevel false
 	}
 
 	if {$isTopLevel} {
-		puts {
-/*
- * XXX:TODO: Move this header information
- */
-#include <unistd.h>
-#include <tcl.h>
-
-typedef enum {
-	XVFS_FILE_TYPE_REG,
-	XVFS_FILE_TYPE_DIR
-} xvfs_file_type_t;
-
-typedef Tcl_WideInt xvfs_size_t;
-
-struct xvfs_file_data {
-	const char          *name;
-	xvfs_file_type_t    type;
-	xvfs_size_t         size;
-	const unsigned char *data;
-};}
 		puts "static struct xvfs_file_data xvfs_${fsName}_data\[\] = \{"
 	}
 
 	# XXX:TODO: Include hidden files ?
 	foreach file [glob -nocomplain -tails -directory $workingDirectory *] {

Index: xvfs.c.rvt
==================================================================
--- xvfs.c.rvt
+++ xvfs.c.rvt
@@ -1,11 +1,28 @@
 #include <xvfs-common.h>
+#include <unistd.h>
+#include <tcl.h>
+
+typedef enum {
+	XVFS_FILE_TYPE_REG,
+	XVFS_FILE_TYPE_DIR
+} xvfs_file_type_t;
+
+typedef Tcl_WideInt xvfs_size_t;
+
+struct xvfs_file_data {
+	const char          *name;
+	xvfs_file_type_t    type;
+	xvfs_size_t         size;
+	const unsigned char *data;
+};
 
 <?
 	package require xvfs
 	xvfs::main $argv
 ?>
+
 static const char **xvfs_<?= $::xvfs::fsName ?>_getChildren(const char *path, Tcl_WideInt limit) {
 }
 
 static const unsigned char *xvfs_<?= $::xvfs::fsName ?>_getData(const char *path, Tcl_WideInt start, Tcl_WideInt length) {
 }