diff --git a/ChangeLog b/ChangeLog
index 1e5bb481ef..b69cacfe8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Sep 17 20:29:33 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y: add prototypes for Microsoft compiler.
+
+	* ext/ripper/depend (parse.obj): lex.c exists at hdrdir.
+
+	* {bcc32,win32,wince}/Makefile.sub (YACC, YFLAGS, parse.c):
+	  use bison.
+
 Fri Sep 17 17:11:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_delete): element comparison might change array
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index b0739aa91d..700b23fc81 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -49,7 +49,8 @@ CPP = cpp32
 RC = brcc32
 !endif
 !ifndef YACC
-YACC = byacc
+YACC = bison
+YFLAGS = -o y.tab.c
 !endif
 !ifndef AR
 AR = tlib
diff --git a/ext/ripper/depend b/ext/ripper/depend
index 6d34ef2fb6..b0ab953a94 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -1,4 +1,4 @@
-ripper.o: lex.c eventids1.c eventids2.c
+ripper.o: $(hdrdir)/lex.c eventids1.c eventids2.c
 
 ripper.c: ripper.y
 	bison -t -v -o$@ ripper.y
diff --git a/parse.y b/parse.y
index c7b1f3b24c..0976d367c7 100644
--- a/parse.y
+++ b/parse.y
@@ -4412,6 +4412,7 @@ yycompile(parser, f, line)
 }
 #endif /* !RIPPER */
 
+static VALUE lex_get_str _((struct parser_params *, VALUE));
 static VALUE
 lex_get_str(parser, s)
     struct parser_params *parser;
@@ -4468,6 +4469,7 @@ rb_compile_cstr(f, s, len, line)
     return rb_compile_string(f, rb_str_new(s, len), line);
 }
 
+static VALUE lex_io_gets _((struct parser_params *, VALUE));
 static VALUE
 lex_io_gets(parser, io)
     struct parser_params *parser;
@@ -8466,6 +8468,7 @@ ripper_warning0(parser, fmt)
     rb_funcall(parser->value, rb_intern("warning"), 1, rb_str_new2(fmt));
 }
 
+static VALUE ripper_lex_get_generic _((struct parser_params *, VALUE));
 static VALUE
 ripper_lex_get_generic(parser, src)
     struct parser_params *parser;
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index c7d683bc89..b45d9bc339 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -38,7 +38,8 @@ CC = cl
 CPP = $(CC) -E
 !endif
 !if !defined(YACC)
-YACC = byacc
+YACC = bison
+YFLAGS = -o y.tab.c
 !endif
 AR = lib -nologo
 PURIFY =
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 5f87da64fc..b5856a8c39 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -38,7 +38,8 @@ CC = cl
 CPP = $(CC) -E
 !endif
 !if !defined(YACC)
-YACC = byacc
+YACC = bison
+YFLAGS = -o y.tab.c
 !endif
 AR = lib -nologo
 PURIFY =