Can't compile current i386 kernel

[Greg Thomas <ethant_(_at_)_pacificnet_(_dot_)_net>]

Make stops with the following error:

../../../../net/if_bridge.c:1: syntax error before `<'
*** Error code 1

Stop in /usr/src/sys/arch/i386/compile/GRITS (line 1063 of Makefile).


Here are the steps that I have followed:

1) Copied CVS tree from the 2.7 CD.

2) Patched the source and compiled a patched, well-working 2.7 kernel.

3) I cleaned out /usr/obj using the instructions in FAQ 1.5.

4) I export CVSROOT=anoncvs_(_at_)_anoncvs5_(_dot_)_usa_(_dot_)_openbsd_(_dot_)_org:/cvs and export 
CVS_RSH="/usr/bin/ssh".

5) I do a cvs -d $CVSROOT -q up -PAd

6) I follow FAQ 1.8 and compile gcc 2.95.3pre twice.

7) I follow FAQ 5.3 and get the above error.

Am I doing anything glaringly wrong?

Thanks, Greg