diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
index d5426d2f45da..24c25ffc0b94 100644
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -45,11 +45,15 @@ SRCS=	accounting.c \
 	ieee802_11.c \
 	ieee802_11_auth.c \
 	ieee802_11_common.c \
+	ieee802_11_he.c \
+	ieee802_11_ht.c \
 	ieee802_11_shared.c \
+	ieee802_11_vht.c \
 	ieee802_1x.c \
 	ip_addr.c \
 	l2_packet_freebsd.c \
 	main.c \
+	mbo_ap.c \
 	ms_funcs.c \
 	neighbor_db.c \
 	os_unix.c \
@@ -103,6 +107,11 @@ CFLAGS+=-I${.CURDIR:H}/wpa_supplicant \
 	-DCONFIG_DRIVER_BSD \
 	-DCONFIG_DRIVER_RADIUS_ACL \
 	-DCONFIG_HS20 \
+	-DCONFIG_MBO \
+	-DCONFIG_IEEE80211N \
+	-DCONFIG_IEEE80211W \
+	-DCONFIG_IEEE80211AC \
+	-DCONFIG_IEEE80211AX \
 	-DCONFIG_INTERWORKING \
 	-DCONFIG_PEERKEY \
 	-DCONFIG_RSN_PREAUTH \
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 31d128e86d44..7556e9b8d26a 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -42,6 +42,10 @@ CFLAGS+=-DCONFIG_BACKEND_FILE \
 	-DCONFIG_DRIVER_WIRED \
 	-DCONFIG_GAS \
 	-DCONFIG_IEEE80211R \
+	-DCONFIG_IEEE80211N \
+	-DCONFIG_IEEE80211W \
+	-DCONFIG_IEEE80211AC \
+	-DCONFIG_IEEE80211AX \
 	-DCONFIG_PEERKEY \
 	-DCONFIG_PRIVSEP \
 	-DCONFIG_SMARTCARD \