CARDBUS i386 build problem, or just me?

Moin moin,
I'm having problems when building -current for some weeks, building
the supplied CARDBUS conf file -- GENERIC is okay, as well as a
custom-kernel derived from my last-working kernel of years ago that
should reflect my hardware.
I haven't tried building any other predefined config files, on i386.
I get a failure when crossbuilding under Linux, source file
src/sys/dev/cardbus/rbus_ppb.c like so:
<snip>
ys/lib/libkern/../../../common/lib/libc/arch/i386/string -I/usr/local/src/netbsd
-current-src/src/NetBSD.cvs/src/sys/dist/ipf -c /usr/local/src/netbsd-current-sr
c/src/NetBSD.cvs/src/sys/dev/cardbus/rbus_ppb.c
In file included from
/usr/local/src/netbsd-current-src/src/NetBSD.cvs/src/sys/dev/cardbus/rbus_ppb.c:67:
/usr/local/src/netbsd-current-src/src/NetBSD.cvs/src/sys/dev/pci/pccbbvar.h:70:
error: redefinition of 'struct pcic_handle'
*** Failed target: rbus_ppb.o
This file #includes
64 #include <dev/ic/i82365var.h>
and
67 #include <dev/pci/pccbbvar.h>
both of which, from the latter, define
70 struct pcic_handle {
71 /* extracted from i82365var.h */
rather differently.
Is it possible my source is out-of-sync or something?
I don't *need* this particular config, but thought I'd build it as a
fallback should my hardware fail either with my custom kernel or with
GENERIC, as has happened at times in the past.
thanks,
barry bouwsma