options FAST_IPSEC + device pfsync incompatibility?

While playing for a while with IPSEC and got around the racoon/isakmpd 
MSIZE related problems, i've decided to give FAST_IPSEC a try.
But with option FAST_IPSEC my kernel refused to compile.
I tracked down the problem to device pfsync.
If it is not in the kernel config, then the kernel compiles OK.

here is my config :
su-2.05b# uname -a
FreeBSD phobos.totalterror.net 6.0-CURRENT FreeBSD 6.0-CURRENT #9: Thu Aug 
19 13
:50:12 EEST 2004     
root_at_phobos.totalterror.net:/usr/obj/usr/src/sys/PHOBOS-X31
  i386

cvsupped today...,

and the kernel stops compiling with this error :

cc -c -O -pipe  -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes 
 -W
missing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions 
-st
d=c99 -g -nostdinc -I-  -I. -I../../.. -I../../../contrib/dev/acpica 
-I../../../
contrib/altq -I../../../contrib/ipfilter -I../../../contrib/pf 
-I../../../contri
b/dev/ath -I../../../contrib/dev/ath/freebsd -I../../../contrib/ngatm 
-D_KERNEL
-include opt_global.h -fno-common -finline-limit=8000 --param 
inline-unit-growth
=100 --param large-function-growth=1000  -mno-align-long-strings 
-mpreferred-sta
ck-boundary=2 -ffreestanding -Werror  ../../../netinet/in_proto.c
In file included from ../../../netinet/in_proto.c:91:
../../../contrib/pf/net/pfvar.h:57: error: redefinition of `union 
sockaddr_union
'
*** Error code 1

Stop in /usr/src/sys/i386/compile/PHOBOS-X31.

---------------------

the problem seems to be that in in_proto.c there is #ifdef DEV_PFSYNC, which 
if defined includes pfvar.h, but at this point the 'union sockaddr_union' is 
already defined by another include....

I can supply full kernel config and any other info if needed.


Regards,
Niki