Unable to build libedit

When I attempt to make buildworld on my current system, I fail in
building libedit. This seems to have started when the NetBSD sync
occurred back on Aug. 11.

I now get:
/usr/local/libexec/ccache/cc -O2 -fno-strict-aliasing -pipe  -I. -I/usr/src/lib/libedit    -c editline.c
In file included from editline.c:6:
/usr/src/lib/libedit/el.c: In function `el_set':
/usr/src/lib/libedit/el.c:249: error: `EL_GETCFN' undeclared (first use in this function)
/usr/src/lib/libedit/el.c:249: error: (Each undeclared identifier is reported only once
/usr/src/lib/libedit/el.c:249: error: for each function it appears in.)
/usr/src/lib/libedit/el.c:256: error: `EL_CLIENTDATA' undeclared (first use in this function)
/usr/src/lib/libedit/el.c:260: error: `EL_UNBUFFERED' undeclared (first use in this function)
/usr/src/lib/libedit/el.c:272: error: `EL_PREP_TERM' undeclared (first use in this function)
/usr/src/lib/libedit/el.c: In function `el_get':
/usr/src/lib/libedit/el.c:393: error: `EL_GETCFN' undeclared (first use in this function)
/usr/src/lib/libedit/el.c:398: error: `EL_CLIENTDATA' undeclared (first use in this function)
/usr/src/lib/libedit/el.c:403: error: `EL_UNBUFFERED' undeclared (first use in this function)
In file included from editline.c:10:
/usr/src/lib/libedit/hist.c: In function `hist_command':
/usr/src/lib/libedit/hist.c:181: error: `H_SETUNIQUE' undeclared (first use in this function)
In file included from editline.c:13:
/usr/src/lib/libedit/parse.c: In function `parse_line':
/usr/src/lib/libedit/parse.c:81: error: `Tokenizer' undeclared (first use in this function)
/usr/src/lib/libedit/parse.c:81: error: `tok' undeclared (first use in this function)
/usr/src/lib/libedit/parse.c:85: warning: passing arg 3 of `el_parse' from incompatible pointer type
/usr/src/lib/libedit/parse.c: At top level:
/usr/src/lib/libedit/parse.c:96: error: conflicting types for 'el_parse'
/usr/include/histedit.h:106: error: previous declaration of 'el_parse' was here
/usr/src/lib/libedit/parse.c:96: error: conflicting types for 'el_parse'
/usr/include/histedit.h:106: error: previous declaration of 'el_parse' was here
In file included from editline.c:15:
/usr/src/lib/libedit/read.c: In function `el_read_setfn':
/usr/src/lib/libedit/read.c:78: error: `EL_BUILTIN_GETCFN' undeclared (first use in this function)
/usr/src/lib/libedit/read.c: In function `el_read_getfn':
/usr/src/lib/libedit/read.c:91: error: `EL_BUILTIN_GETCFN' undeclared (first use in this function)
/usr/src/lib/libedit/read.c: At top level:
/usr/src/lib/libedit/read.c:214: error: conflicting types for 'el_push'
/usr/include/histedit.h:95: error: previous declaration of 'el_push' was here
/usr/src/lib/libedit/read.c:214: error: conflicting types for 'el_push'
/usr/include/histedit.h:95: error: previous declaration of 'el_push' was here
*** Error code 1

Stop in /usr/src/lib/libedit.

I have cleaned, deleted the contents of /usr/src/lib/libedit and
re-cvsuped, deleted /usr/obj, and, as a last resort, read UPDATING. I
have looked for where all of the EL_* stuff might be defined, but I
can't find it anywhere obvious.

Any ideas on what is wrong? I last updated the system (my only current
system) on Aug. 7, 2005 without problems.

Thanks,
-- 
R. Kevin Oberman, Network Engineer
Energy Sciences Network (ESnet)
Ernest O. Lawrence Berkeley National Laboratory (Berkeley Lab)
E-mail: oberman_at_es.net			Phone: +1 510 486-8634