I tried doing a 'make build' for the first time in a month, and got the 
following errors in vi.  I'm supped -current as of June 16...

===> build
cc -O -I/home/paul/src/usr.bin/vi/build -I/home/paul/src/usr.bin/vi/build/../include  -Werror  -c /home/paul/src/usr.bin/vi/build/../cl/cl_bsd.c
In file included from /home/paul/src/usr.bin/vi/build/../cl/../common/common.h:96,
                 from /home/paul/src/usr.bin/vi/build/../cl/cl_bsd.c:28:
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:84: conflicting types for `opts_init'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:77: previous declaration of `opts_init'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:85: conflicting types for `opts_set'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:79: previous declaration of `opts_set'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:93: conflicting types for `f_altwerase'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:85: previous declaration of `f_altwerase'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:94: conflicting types for `f_columns'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:87: previous declaration of `f_columns'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:95: conflicting types for `f_lines'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:89: previous declaration of `f_lines'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:96: conflicting types for `f_lisp'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:90: previous declaration of `f_lisp'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:98: conflicting types for `f_paragraph'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:96: previous declaration of `f_paragraph'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:100: conflicting types for `f_readonly'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:97: previous declaration of `f_readonly'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:103: conflicting types for `f_section'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:98: previous declaration of `f_section'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:104: conflicting types for `f_ttywerase'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:104: previous declaration of `f_ttywerase'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:105: conflicting types for `f_w300'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:106: previous declaration of `f_w300'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:106: conflicting types for `f_w1200'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:105: previous declaration of `f_w1200'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:107: conflicting types for `f_w9600'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:107: previous declaration of `f_w9600'
/home/paul/src/usr.bin/vi/build/../include/common_extern.h:108: conflicting types for `f_window'
/home/paul/src/usr.bin/vi/build/../cl/../common/options.h:108: previous declaration of `f_window'
*** Error code 1

Stop.
*** Error code 1

Stop.