Build failure in usr.bin/kdump with latest current, possibly related to mfi

Hi!
I'm currently having trouble building world. The build fails in 
usr.bin/kdump with the following error:

clang -O2 -pipe -Qunused-arguments -march=core2 
-I/usr/src/usr.bin/kdump/../ktrace -I/usr/src/usr.bin/kdump 
-I/usr/src/usr.bin/kdump/../.. -I. -std=gnu99 -fstack-protector 
-Wsystem-headers -Wall -Wno-format-y2k -W -Wno-unused-parameter 
-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type 
-Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter 
-Wcast-align -Wchar-subscripts -Winline -Wnested-externs 
-Wredundant-decls -Wold-style-definition -Wno-pointer-sign -c ioctl.c
ioctl.c:1729:18: error: use of undeclared identifier 'MFIIO_PASSTHRU32'
         else if (val == MFIIO_PASSTHRU32)
                         ^
ioctl.c:2275:18: error: use of undeclared identifier 'MFI_CMD32'
         else if (val == MFI_CMD32)
                         ^
2 errors generated.
*** [ioctl.o] Error code 1

Stop in /usr/src/usr.bin/kdump.
*** [all] Error code 1

Stop in /usr/src/usr.bin.
*** [usr.bin.all__D] Error code 1

Stop in /usr/src.
*** [everything] Error code 1

Stop in /usr/src.
*** [buildworld] Error code 1

Stop in /usr/src.

The identifiers MFIOO_PASSTHRU32 and MFI_CMD32 are both defined in 
dev/mfi/mfi_ioctl.h, but only if COMPAT_FREEBSD32 is defined.
The attached ioctl.c is the generated ioctl.c connected to kdump. It 
includes mfi_ioctl.h, but COMPAT_FREEBSD32 is not defined, so the 
compile of ioctl.c subsequently fails.  If I modify ioctl.c to add 
#define COMPAT_FREEBSD32 the build progresses, however, I don't know if 
this is the right solution to this issue.

Regards!
-- 
Niclas Zeising