smartmontools now broken on -current (by svn r301771, r301778?)

The recent nvme updates have broken smartmontools ..

imb_at_toshi:/home/imb> sudo smartctl -a /dev/ada0
smartctl 6.5 2016-05-07 r4318 [FreeBSD 11.0-ALPHA2 amd64] (local build)
Copyright (C) 2002-16, Bruce Allen, Christian Franke, www.smartmontools.org

/dev/ada0: Inappropriate ioctl for device
Please specify device type with the -d option.

Attempts to recompile the utility also fail:

c++ -DHAVE_CONFIG_H -I.  -DBUILD_INFO='"(local build)"'
-DSMARTMONTOOLS_SYSCONFDIR='"/usr/local/etc"'
-DSMARTMONTOOLS_SMARTDSCRIPTDIR='"/usr/local/etc"'
-DSMARTMONTOOLS_DRIVEDBDIR='"/usr/local/share/smartmontools"'        -O2
-pipe -march=core2 -fstack-protector -fno-strict-aliasing  -Wall -W -c
-o cciss.o cciss.cpp
In file included from os_freebsd.cpp:43:
./atacmds.h:77:9: warning: 'ATA_SET_FEATURES' macro redefined
[-Wmacro-redefined]
#define ATA_SET_FEATURES                0xef
        ^
/usr/include/sys/ata.h:399:10: note: previous definition is here
#define         ATA_SET_FEATURES        0x05    /* set features */
                ^
In file included from os_freebsd.cpp:74:
./freebsd_nvme_ioctl.h:34:8: error: redefinition of 'nvme_command'
struct nvme_command
       ^
/usr/include/dev/nvme/nvme.h:201:8: note: previous definition is here
struct nvme_command
       ^
In file included from os_freebsd.cpp:74:
./freebsd_nvme_ioctl.h:67:8: error: redefinition of 'nvme_status'
struct nvme_status {
       ^
/usr/include/dev/nvme/nvme.h:234:8: note: previous definition is here
struct nvme_status {
       ^
In file included from os_freebsd.cpp:74:
./freebsd_nvme_ioctl.h:77:8: error: redefinition of 'nvme_completion'
struct nvme_completion {
       ^
/usr/include/dev/nvme/nvme.h:244:8: note: previous definition is here
struct nvme_completion {
       ^
In file included from os_freebsd.cpp:74:
./freebsd_nvme_ioctl.h:94:8: error: redefinition of 'nvme_pt_command'
struct nvme_pt_command {
       ^
/usr/include/dev/nvme/nvme.h:765:8: note: previous definition is here
struct nvme_pt_command {
       ^
1 warning and 4 errors generated.