Index: xvfs-create-c.c
==================================================================
--- xvfs-create-c.c
+++ xvfs-create-c.c
@@ -4,11 +4,11 @@
 #include <dirent.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <fcntl.h>
 
-struct options {
+struct xvfs_options {
 	char *name;
 	char *directory;
 };
 
 struct xvfs_state {
@@ -291,11 +291,11 @@
 	fprintf(outfp, "\t\t}\n");
 	fprintf(outfp, "\t}\n");
 	return;
 }
 
-static void parse_xvfs_minirivet_handle_tcl_print(FILE *outfp, const struct options * const options, struct xvfs_state *xvfs_state, char *command) {
+static void parse_xvfs_minirivet_handle_tcl_print(FILE *outfp, const struct xvfs_options * const options, struct xvfs_state *xvfs_state, char *command) {
 	char *buffer_p, *buffer_e;
 
 	buffer_p = command;
 	while (*buffer_p && isspace(*buffer_p)) {
 		buffer_p++;
@@ -326,11 +326,11 @@
 	}
 
 	return;
 }
 
-static int parse_xvfs_minirivet(FILE *outfp, const char * const template, const struct options * const options) {
+static int parse_xvfs_minirivet(FILE *outfp, const char * const template, const struct xvfs_options * const options) {
 	struct xvfs_state xvfs_state;
 	int ch, ch_buf;
 	int template_idx = 0;
 	char tcl_buffer[8192], *tcl_buffer_p;
 	enum xvfs_minirivet_mode mode;
@@ -410,11 +410,11 @@
 #undef parse_xvfs_minirivet_getbyte
 
 	return(1);
 }
 
-static int xvfs_create(FILE *outfp, const struct options * const options) {
+static int xvfs_create(FILE *outfp, const struct xvfs_options * const options) {
 	const int template_len = 65536;
 	const char * const template_file = "lib/xvfs/xvfs.c.rvt";
 	FILE *fp;
 	char *template, *template_p;
 	int template_remain;
@@ -458,11 +458,11 @@
 }
 
 /*
  * Parse command line options
  */
-static int parse_options(int argc, char **argv, struct options *options) {
+static int parse_options(int argc, char **argv, struct xvfs_options *options) {
 	char *arg;
 	char **option;
 	int idx;
 	int retval;
 
@@ -497,11 +497,11 @@
 
 	return(retval);
 }
 
 int main(int argc, char **argv) {
-	struct options options = {0};
+	struct xvfs_options options = {0};
 	int parse_options_ret, xvfs_create_ret;
 
 	argc--;
 	argv++;