build of xf86-video-intel fails (fallout from libdrm update?)

[Tobias Nygren <tnn%NetBSD.org@localhost>]

 cc -DHAVE_CONFIG_H -I. -I..
-I/usb/pkgsrc-obj/x11/xf86-video-intel/work.x40/.buildlink/include
-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing
-D_POSIX_THREAD_SAFE_FUNCTIONS
-I/usb/pkgsrc-obj/x11/xf86-video-intel/work.x40/.buildlink/include/xorg
-I/usb/pkgsrc-obj/x11/xf86-video-intel/work.x40/.buildlink/include/pixman-1
-I/usb/pkgsrc-obj/x11/xf86-video-intel/work.x40/.buildlink/include/drm
-I/usb/pkgsrc-obj/x11/xf86-video-intel/work.x40/.buildlink/include/X11/dri
-DI830_XV -DI830_USE_XAA -DI830_USE_EXA -O2 -march=pentium-m -MT
i810_driver.lo -MD -MP -MF .deps/i810_driver.Tpo -c i810_driver.c
-fPIC -DPIC -o .libs/i810_driver.o
In file included from i810_driver.c:88:
i830.h:73:20: error: xf86mm.h: No such file or directory
In file included from i810_driver.c:88:
i830.h:199: error: expected specifier-qualifier-list before 'drmBO'
*** Error code 1
Stop.
make: stopped
in /usb/pkgsrc-obj/x11/xf86-video-intel/work.x40/xf86-video-intel-2.3.2/src
*** Error code 1