Can't build -current on 6?

Looks like there are some dependency issues with
some of the cddl stuff.  The following is from trying
to build yesterday's -current on a system with a 6.3
kernel and a mostly 6.0 userland.  This worked not very
long ago.

--------------------------------------------------------------
 >>> Building an up-to-date make(1)
--------------------------------------------------------------
...
--------------------------------------------------------------
 >>> World build started on Sat May 24 21:34:10 PDT 2008
--------------------------------------------------------------
...
--------------------------------------------------------------
 >>> Rebuilding the temporary build tree
--------------------------------------------------------------
...
--------------------------------------------------------------
 >>> stage 1.1: legacy release compatibility shims
--------------------------------------------------------------
...
--------------------------------------------------------------
 >>> stage 1.2: bootstrap tools
--------------------------------------------------------------
cd /usr/src/current; MAKEOBJDIRPREFIX=/usr/obj/usr/src/current/tmp 
INSTALL="sh /usr/src/current/tools/install.sh" 
PATH=/usr/obj/usr/src/current/tmp/legacy/usr/sbin:/usr/obj/usr/src/current/tmp/legacy/usr/bin:/usr/obj/usr/src/current/tmp/legacy/usr/games:/sbin:/bin:/usr/sbin:/usr/bin 
  WORLDTMP=/usr/obj/usr/src/current/tmp  VERSION="FreeBSD 6.3-STABLE 
i386 600105"  MAKEFLAGS="-m /usr/src/current/tools/build/mk  -m 
/usr/src/current/share/mk" /usr/obj/usr/src/current/make.i386/make -f 
Makefile.inc1  DESTDIR=  BOOTSTRAPPING=600105  -DWITHOUT_HTML 
-DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN  -DWITHOUT_NLS -DNO_PIC 
-DWITHOUT_PROFILE -DNO_SHARED  -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF 
bootstrap-tools
===> cddl/usr.bin/sgsmsg (obj,depend,all,install)
/usr/obj/usr/src/current/tmp/usr/src/current/cddl/usr.bin/sgsmsg created 
for /usr/src/current/cddl/usr.bin/sgsmsg
rm -f .depend
mkdep -f .depend -a 
-I/usr/src/current/cddl/usr.bin/sgsmsg/../../../sys/cddl/compat/opensolaris 
-I/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/compat/opensolaris/include 
-I/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/include 
-I/usr/src/current/cddl/usr.bin/sgsmsg/../../../sys/cddl/contrib/opensolaris/uts/common 
-I/usr/obj/usr/src/current/tmp/legacy/usr/include 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../sys/cddl/contrib/opensolaris/common/avl/avl.c 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common/string_table.c 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common/findprime.c
In file included from 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c:81:
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/include/sgs.h:57:20: 
libelf.h: No such file or directory
In file included from 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/include/alist.h:45,
                  from 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/include/sgs.h:59,
                  from 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c:81:
/usr/src/current/cddl/usr.bin/sgsmsg/../../../sys/cddl/compat/opensolaris/sys/elf.h:30:26: 
sys/elf.h: No such file or directory
In file included from 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common/string_table.c:31:
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/include/sgs.h:57:20: 
libelf.h: No such file or directory
In file included from 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/include/alist.h:45,
                  from 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/include/sgs.h:59,
                  from 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common/string_table.c:31:
/usr/src/current/cddl/usr.bin/sgsmsg/../../../sys/cddl/compat/opensolaris/sys/elf.h:30:26: 
sys/elf.h: No such file or directory
In file included from 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common/findprime.c:30:
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/include/sgs.h:57:20: 
libelf.h: No such file or directory
In file included from 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/include/alist.h:45,
                  from 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/include/sgs.h:59,
                  from 
/usr/src/current/cddl/usr.bin/sgsmsg/../../../cddl/contrib/opensolaris/cmd/sgs/tools/common/findprime.c:30:
/usr/src/current/cddl/usr.bin/sgsmsg/../../../sys/cddl/compat/opensolaris/sys/elf.h:30:26: 
sys/elf.h: No such file or directory
mkdep: compile failed
*** Error code 1

Stop in /usr/src/current/cddl/usr.bin/sgsmsg.
*** Error code 1

Stop in /usr/src/current.
*** Error code 1

Stop in /usr/src/current.
*** Error code 1

Stop in /usr/src/current.