Xorg still not buildling

[Adam <adam%NetBSD.org@localhost>]

I am still getting errors while trying to build -current with xorg.
This is a fresh build:

In file included from 
/dist/xsrc/external/mit/xorg-server/dist/hw/xfree86/loader/sdksyms.c:311:
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:46:
 error: expected specifier-qualifier-list before 'XkbDescPtr'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:102:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:135:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:142:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:195:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:203:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:224:
 error: expected ')' before 'char'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:230:
 error: expected ')' before 'int'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:242:
 error: expected declaration specifiers or '...' before 'XColor'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:250:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:255:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:260:
 error: expected '=', ',', ';', 'asm' or '__attribute__' before 
'XkbChangeKbdDisplay'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:266:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:272:
 error: expected ')' before '*' token
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:431:
 error: expected declaration specifiers or '...' before 'XkbComponentNamesPtr'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:432:
 error: expected declaration specifiers or '...' before 'Display'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:433:
 error: expected declaration specifiers or '...' before 'XkbDescPtr'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:438:
 error: expected '=', ',', ';', 'asm' or '__attribute__' before 'XkbMergeFile'
/dist/src/obj.amd64/destdir.amd64/usr/X11R7/include/X11/extensions/xkbfile.h:450:
 error: expected ')' before '*' token


Cheers,
Adam