CVS Compile error

[Cogman]

Any help? I get this error when Im trying to compile wine from the latest cvs.
I belive it has to do with the resent update of d3d8_private.h

gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include 
-D_REENTRANT -fPIC -D__WINESRC__  -Wall -mpreferred-stack-boundary=2 -gstabs+ 
-Wpointer-arith -g -O2 -o basetexture.o basetexture.c
In file included from basetexture.c:29:
d3d8_private.h:198: parse error before "PFNGLCOLORTABLEEXTPROC"
d3d8_private.h:198: warning: no semicolon at end of struct or union
d3d8_private.h:198: parse error before "glPointParameterfEXT"
d3d8_private.h:198: warning: type defaults to `int' in declaration of 
`glPointParameterfEXT'
d3d8_private.h:198: `glPointParameterfEXT' redeclared as different kind of 
symbol
/usr/X11R6/include/GL/gl.h:2904: previous declaration of 
`glPointParameterfEXT'
d3d8_private.h:198: warning: data definition has no type or storage class
d3d8_private.h:198: parse error before "glPointParameterfvEXT"
d3d8_private.h:198: warning: type defaults to `int' in declaration of 
`glPointParameterfvEXT'
d3d8_private.h:198: `glPointParameterfvEXT' redeclared as different kind of 
symbol
/usr/X11R6/include/GL/gl.h:2907: previous declaration of 
`glPointParameterfvEXT'
d3d8_private.h:198: warning: data definition has no type or storage class
d3d8_private.h:198: parse error before "glSecondaryColor3ubEXT"
d3d8_private.h:198: warning: type defaults to `int' in declaration of 
`glSecondaryColor3ubEXT'
d3d8_private.h:198: `glSecondaryColor3ubEXT' redeclared as different kind of 
symbol
/usr/X11R6/include/GL/gl.h:3016: previous declaration of 
`glSecondaryColor3ubEXT'
d3d8_private.h:198: warning: data definition has no type or storage class
d3d8_private.h:198: parse error before "glSecondaryColor3fEXT"
d3d8_private.h:198: warning: type defaults to `int' in declaration of 
`glSecondaryColor3fEXT'
d3d8_private.h:198: `glSecondaryColor3fEXT' redeclared as different kind of 
symbol
/usr/X11R6/include/GL/gl.h:3002: previous declaration of 
`glSecondaryColor3fEXT'
d3d8_private.h:198: warning: data definition has no type or storage class
d3d8_private.h:198: parse error before "glSecondaryColor3fvEXT"
d3d8_private.h:198: warning: type defaults to `int' in declaration of 
`glSecondaryColor3fvEXT'
d3d8_private.h:198: `glSecondaryColor3fvEXT' redeclared as different kind of 
symbol
/usr/X11R6/include/GL/gl.h:3004: previous declaration of 
`glSecondaryColor3fvEXT'
d3d8_private.h:198: warning: data definition has no type or storage class
d3d8_private.h:198: parse error before "glSecondaryColorPointerEXT"
d3d8_private.h:198: warning: type defaults to `int' in declaration of 
`glSecondaryColorPointerEXT'
d3d8_private.h:198: `glSecondaryColorPointerEXT' redeclared as different kind 
of symbol
/usr/X11R6/include/GL/gl.h:3028: previous declaration of 
`glSecondaryColorPointerEXT'
d3d8_private.h:198: warning: data definition has no type or storage class
d3d8_private.h:200: parse error before '}' token
d3d8_private.h:200: warning: type defaults to `int' in declaration of 
`GL_Info'
d3d8_private.h:200: warning: data definition has no type or storage class
d3d8_private.h:256: parse error before "GL_Info"
d3d8_private.h:256: warning: no semicolon at end of struct or union
make[2]: *** [basetexture.o] Error 1
make[2]: Leaving directory `/usr/src/a-z/w/wine/dlls/d3d8'
make[1]: *** [d3d8] Error 2
make[1]: Leaving directory `/usr/src/a-z/w/wine/dlls'
make: *** [dlls] Error 2