diff --git a/driver/cfparse.y b/driver/cfparse.y
index 0ee5fbce7..a6bcbfc2b 100644
--- a/driver/cfparse.y
+++ b/driver/cfparse.y
@@ -18,11 +18,12 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: cfparse.y,v 1.5 2001/12/08 04:13:07 steve Exp $"
+#ident "$Id: cfparse.y,v 1.6 2002/01/02 02:39:34 steve Exp $"
 #endif
 
 
 # include  "globals.h"
+# include  "cfparse_misc.h"
 # include  <ctype.h>
 
 /*
diff --git a/driver/cfparse_misc.h b/driver/cfparse_misc.h
index 41886ad10..a50e3857f 100644
--- a/driver/cfparse_misc.h
+++ b/driver/cfparse_misc.h
@@ -20,12 +20,29 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: cfparse_misc.h,v 1.2 2001/11/12 18:47:32 steve Exp $"
+#ident "$Id: cfparse_misc.h,v 1.3 2002/01/02 02:39:34 steve Exp $"
 #endif
 
+/*
+ * The vlltype supports the passing of detailed source file location
+ * information between the lexical analyzer and the parser. Defining
+ * YYLTYPE compels the lexor to use this type and not something other.
+ */
+struct cfltype {
+      unsigned first_line;
+      unsigned first_column;
+      unsigned last_line;
+      unsigned last_column;
+      const char*text;
+};
+# define YYLTYPE struct cfltype
+extern YYLTYPE yylloc;
 
 /*
  * $Log: cfparse_misc.h,v $
+ * Revision 1.3  2002/01/02 02:39:34  steve
+ *  Use my own cfltype to defend against bison 1.30.
+ *
  * Revision 1.2  2001/11/12 18:47:32  steve
  *  Support +incdir in command files, and ignore other
  *  +args flags. Also ignore -a and -v flags.
diff --git a/vvp/Makefile.in b/vvp/Makefile.in
index 3d904ad3d..cfd5fbe06 100644
--- a/vvp/Makefile.in
+++ b/vvp/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.33 2001/12/30 17:20:33 steve Exp $"
+#ident "$Id: Makefile.in,v 1.34 2002/01/02 02:39:34 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -91,7 +91,7 @@ tables.o: tables.cc
 
 parse.h parse.cc: $(srcdir)/parse.y
 	$(YACC) --verbose -t -d -o parse.cc $(srcdir)/parse.y
-	mv parse.cc.h parse.h
+	mv parse.cc.h parse.h || mv parse.hh parse.h
 
 lexor.cc: $(srcdir)/lexor.lex
 	$(LEX) -s -olexor.cc $(srcdir)/lexor.lex