kern/43370: kernel build failure

[steve%prd.co.uk@localhost]

>Number:         43370
>Category:       kern
>Synopsis:       kernel build fails in fil.c
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    kern-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu May 27 12:05:00 +0000 2010
>Originator:     Steve Blinkhorn
>Release:        NetBSD 5.0-current 2010-05-26
>Organization:
Psychometric R&D Ltd
Steve Blinkhorn <steve%prd.co.uk@localhost>
>Environment:
        
        
System: NetBSD newsole.prd.co.uk 5.0.2 NetBSD 5.0.2 (GENERIC) #0: Sat Feb  6 
17:53:27 UTC 2010 
builds%b7.netbsd.org@localhost:/home/builds/ab/netbsd-5-0-2-RELEASE/i386/201002061851Z-obj/home/builds/ab/netbsd-5-0-2-RELEASE/src/sys/arch/i386/compile/GENERIC
 i386
Architecture: i386
Machine: i386
>Description:
        
GENERIC kernel compilation fails in fil.c, apparently because of
header file problems:
cc -ffreestanding -fno-zero-initialized-in-bss -O2 -std=gnu99 
-fno-strict-aliasi ng -Werror -Wall -Wno-main -Wno-format-zero-length 
-Wpointer-arith -Wmissing-pro totypes -Wstrict-prototypes -Wswitch -Wshadow 
-Wcast-qual -Wwrite-strings -Wno-u nreachable-code -Wno-sign-compare 
-Wno-pointer-sign -Wno-attributes -Wextra -Wno -unused-parameter -Werror 
-march=i486 -mtune=pentiumpro -Di386 -I.  -I../../../..  
/contrib/dev/ath/netbsd -I../../../../../common/include -I../../../../arch 
-I../ ../../.. -nostdinc -DLKM -DMAXUSERS=64 -D_KERNEL -D_KERNEL_OPT 
-I../../../../lib /libkern/../../../common/lib/libc/quad 
-I../../../../lib/libkern/../../../common /lib/libc/string 
-I../../../../lib/libkern/../../../common/lib/libc/arch/i386/st ring 
-I../../../../../common/include -I../../../../dist/ipf -c ../../../../dist/ 
ipf/netinet/fil.c
In file included from ../../../../dist/ipf/netinet/fil.c:125:
../../../../netinet/ip_fil.h:572: error: expected declaration specifiers or 
'...  ' before 'caddr_t'
../../../../netinet/ip_fil.h:627: error: expected ')' before 'int'

I have repeatedly updated my sources from CVS without effect.
>How-To-Repeat:
        make clean
        make depend
        make
>Fix:
        

>Unformatted: