SVN r327433 fails to build

An include file change? I couldn't see the cause :-(

The last successful build I have is at SVN r327392.

===> lib/libprocstat (obj,all,install)
Building /usr/obj/usr/src/amd64.amd64/lib/libprocstat/zfs/zfs.o
In file included from /usr/src/lib/libprocstat/zfs.c:41:
/usr/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h:217:9:
error: 'curthread' macro redefined [-Werror,-Wmacro-redefined]
#define curthread       ((void *)(uintptr_t)thr_self())
        ^
/usr/obj/usr/src/amd64.amd64/tmp/usr/include/machine/pcpu.h:230:9: note:
previous definition is here
#define curthread               (__curthread())
        ^
In file included from /usr/src/lib/libprocstat/zfs.c:41:
/usr/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h:236:9:
error: 'curproc' macro redefined [-Werror,-Wmacro-redefined]
#define curproc         (&p0)
        ^
/usr/obj/usr/src/amd64.amd64/tmp/usr/include/sys/pcpu.h:200:9: note:
previous definition is here
#define curproc         (curthread->td_proc)
        ^
2 errors generated.