Make buildworld failure

[walt]

Well, after my perfect start yesterday I updated sources today
and tried to recompile the system a second time:
cc -O -pipe -march=pentiumpro -I/usr/src/usr.bin/kdump/../ktrace 
-I/usr/src/usr.bin/kdump/../.. -I/usr/src/usr.bin/kdump/../../sys 
-D__FreeBSD__    -c /usr/src/usr.bin/kdump/kdump.c
*Initialization*:1: warning: `__FreeBSD__' redefined
*Initialization*:1: warning: this is the location of the previous definition
cc -O -pipe -march=pentiumpro -I/usr/src/usr.bin/kdump/../ktrace 
-I/usr/src/usr.bin/kdump/../.. -I/usr/src/usr.bin/kdump/../../sys 
-D__FreeBSD__    -c ioctl.c
*Initialization*:1: warning: `__FreeBSD__' redefined
*Initialization*:1: warning: this is the location of the previous definition
ioctl.c:32: fs/nwfs/nwfs.h: No such file or directory
In file included from ioctl.c:98:
/usr/src/usr.bin/kdump/../../sys/sys/memrange.h:20: warning: 
`MDF_ACTIVE' redefined
/usr/include/pccard/cardinfo.h:115: warning: this is the location of the 
previous definition
In file included from ioctl.c:110:
/usr/src/usr.bin/kdump/../../sys/sys/wormio.h:103: warning: 
`CDRIOCBLANK' redefined
/usr/src/usr.bin/kdump/../../sys/sys/cdrio.h:89: warning: this is the 
location of the previous definition
ioctl.c:112: ufs/nwfs/nwfs.h: No such file or directory

And it appears to be true:

#find /usr/include -name nwfs.h
/usr/include/nwfs/nwfs.h
/usr/include/vfs/nwfs/nwfs.h
#find /usr/src -name nwfs.h
/usr/src/sys/vfs/nwfs/nwfs.h
I just looked thru /usr/include and still find quite a few
files and directories left over from FBSD.  Could these old
files be causing a problem?  (/usr/include/sys is all new)
Thanks!