diff --git a/cvs.h b/cvs.h
index 2ce17ff..56cf7d6 100644
--- a/cvs.h
+++ b/cvs.h
@@ -724,14 +724,14 @@ void progress_end(const char * /*format*/, ...) _printflike(1, 2);

 /* Work around glitches in Bison and Flex */

-typedef void *yyscan_t;
+typedef void *yyscan2_t;

-int yyget_column (yyscan_t);
-void yyset_column(int, yyscan_t);
+int yyget_column (yyscan2_t);
+void yyset_column(int, yyscan2_t);

 /* FIXME: remove once the Bison bug requiring this is fixed */
 #define YY_DECL int yylex \
-   (YYSTYPE * yylval_param , yyscan_t yyscanner, cvs_file *cvs)
+   (YYSTYPE * yylval_param , yyscan2_t yyscanner, cvs_file *cvs)

 /*
  * Global options
diff --git a/gram.y b/gram.y
index a8e725b..b077a87 100644
--- a/gram.y
+++ b/gram.y
@@ -18,7 +18,9 @@
  */

 #include "cvs.h"
+#define yyscan_t yyscan2_t
 #include "gram.h"
+#undef yyscan_t
 #include "lex.h"

 extern int yyerror(yyscan_t, cvs_file *, char *);
diff --git a/import.c b/import.c
index 011ff6d..7f5ae13 100644
--- a/import.c
+++ b/import.c
@@ -23,7 +23,9 @@
 #endif /* THREADS */

 #include "cvs.h"
+#define yyscan_t yyscan2_t
 #include "gram.h"
+#undef yyscan_t
 #include "lex.h"

 /*