diff -ur org.global/htags/asm.l global/htags/asm.l
--- org.global/htags/asm.l	2005-03-25 18:30:04.910215424 -0800
+++ global/htags/asm.l	2005-03-29 01:03:54.727643712 -0800
@@ -40,6 +40,8 @@
 
 #define LEXTEXT	asmtext
 #define LEXLENG	asmleng
+#define LEXIN asmin
+#define LEXRESTART asmrestart
 
 #ifdef ECHO
 #undef ECHO
diff -ur org.global/htags/c.l global/htags/c.l
--- org.global/htags/c.l	2005-03-25 18:30:04.910215424 -0800
+++ global/htags/c.l	2005-03-29 01:03:54.728643560 -0800
@@ -38,8 +38,10 @@
 #include "../gtags-parser/c_res.h"
 #include "lexcommon.h"
 
-#define LEXTEXT	ctext
-#define LEXLENG	cleng
+#define LEXTEXT	c_text
+#define LEXLENG	c_leng
+#define LEXIN c_in
+#define LEXRESTART c_restart
 
 #ifdef ECHO
 #undef ECHO
@@ -66,7 +68,7 @@
 
 %start	C C_COMMENT CPP_COMMENT SHELL_COMMENT STRING LITERAL PREPROCESSOR_LINE
 %start	YACC_DECLARATIONS YACC_RULES YACC_PROLOGUE BRACED_CODE
-%option 8bit noyywrap noyy_top_state stack prefix="c"
+%option 8bit noyywrap noyy_top_state stack prefix="c_"
 %%
  /* Backslash-newline */
 \\\n		DEFAULT_BACKSLASH_NEWLINE_ACTION
diff -ur org.global/htags/cpp.l global/htags/cpp.l
--- org.global/htags/cpp.l	2005-03-25 18:30:04.910215424 -0800
+++ global/htags/cpp.l	2005-03-29 01:03:54.728643560 -0800
@@ -40,6 +40,8 @@
 
 #define LEXTEXT	cpptext
 #define LEXLENG	cppleng
+#define LEXIN cppin
+#define LEXRESTART cpprestart
 
 #ifdef ECHO
 #undef ECHO
diff -ur org.global/htags/java.l global/htags/java.l
--- org.global/htags/java.l	2005-03-25 18:30:04.910215424 -0800
+++ global/htags/java.l	2005-03-29 01:03:54.729643408 -0800
@@ -38,6 +38,8 @@
 
 #define LEXTEXT	javatext
 #define LEXLENG	javaleng
+#define LEXIN javain
+#define LEXRESTART javarestart
 
 #ifdef ECHO
 #undef ECHO
diff -ur org.global/htags/lexcommon.h global/htags/lexcommon.h
--- org.global/htags/lexcommon.h	2005-03-25 18:30:04.909215576 -0800
+++ global/htags/lexcommon.h	2005-03-29 01:03:54.729643408 -0800
@@ -38,8 +38,8 @@
 #define LINENO	lineno
 
 #define DEFAULT_BEGIN_OF_FILE_ACTION {					\
-        yyin = ip;							\
-        yyrestart(yyin);						\
+        LEXIN = ip;							\
+        LEXRESTART(LEXIN);						\
         lineno = 1;							\
         begin_line = 1;							\
 }
diff -ur org.global/htags/php.l global/htags/php.l
--- org.global/htags/php.l	2005-03-25 18:30:04.910215424 -0800
+++ global/htags/php.l	2005-03-29 01:03:54.729643408 -0800
@@ -45,6 +45,8 @@
 
 #define LEXTEXT	phptext
 #define LEXLENG	phpleng
+#define LEXIN phpin
+#define LEXRESTART phprestart
 
 #ifdef ECHO
 #undef ECHO
diff -ur org.global/htags/src2html.c global/htags/src2html.c
--- org.global/htags/src2html.c	2005-03-28 23:25:32.468923424 -0800
+++ global/htags/src2html.c	2005-03-29 00:40:31.271001552 -0800
@@ -64,7 +64,7 @@
 void asm_parser_init(FILE *);
 
 /* executing procedures */
-int clex(void);
+int c_lex(void);
 int cpplex(void);
 int javalex(void);
 int phplex(void);
@@ -75,8 +75,8 @@
  */
 struct lang_entry lang_switch[] = {
 	/* lang_name	init_proc 		exec_proc */
-	{"c",		c_parser_init,		clex},		/* DEFAULT */
-	{"yacc",	yacc_parser_init,	clex},
+	{"c",		c_parser_init,		c_lex},		/* DEFAULT */
+	{"yacc",	yacc_parser_init,	c_lex},
 	{"cpp",		cpp_parser_init,	cpplex},
 	{"java",	java_parser_init,	javalex},
 	{"php",		php_parser_init,	phplex},