Compilation problems xf86-video-intel

[Lars Ivar Igesund]

I'm trying to compile the latest git of this to test the new modesetting 
stuff. I was able to do this the last time, just after the merge to master, 
but today I'm having some problems.

First (which I also had last time, but forgot to mention):

in xserver/hw/xfree86/modes/xf86Modes.h, xf86Parser.h is included but in my 
checkout it is in ../parser/ . Possibly a missing path in the makefile?

Second, which branch of xserver are we supposed to use? I got the same error 
with both master and server-1.3-branch.

And finally the compile error itself:

gcc -DHAVE_CONFIG_H -I. -I. -I.. -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -I/usr/include/xorg -I/usr/include/drm -I/usr/include/X11/dri -DXF86_MODES_RENAME -I../src/modes -I../src/parser -DI830_XV -DI830_USE_XAA -DI830_USE_EXA -g -O2 -MT 
i830_dri.lo -MD -MP -MF .deps/i830_dri.Tpo -c 
i830_dri.c  -fPIC -DPIC -o .libs/i830_dri.o
i830_dri.c: In function 'I830DRISwapContext':
i830_dri.c:1197: warning: unused variable 'sPriv'
i830_dri.c: In function 'I830DRIClipNotify':
i830_dri.c:1557: error: 'struct _I830Rec' has no member named 'driRegion'
i830_dri.c:1557: error: 'struct _I830Rec' has no member named 'driRegion'
i830_dri.c:1557: error: 'struct _I830Rec' has no member named 'driRegion'
i830_dri.c:1557: error: 'struct _I830Rec' has no member named 'driRegion'
i830_dri.c:1558: error: 'struct _I830Rec' has no member named 'driRegion'
i830_dri.c:1558: error: 'struct _I830Rec' has no member named 'driRegion'
i830_dri.c:1585: error: 'struct _I830Rec' has no member named 'driRegion'
i830_dri.c:1585: error: 'struct _I830Rec' has no member named 'driRegion'
i830_dri.c:1594: error: 'struct _I830Rec' has no member named 'driRegion'
i830_dri.c:1594: error: 'struct _I830Rec' has no member named 'driRegion'
make[3]: *** [i830_dri.lo] Error 1

Thanks!

Lars Ivar Igesund