diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
index c0083747782a..c7775c960ddd 100644
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -1,70 +1,70 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 .include "../Makefile.inc"
 
 .include "../Makefile.crypto"
 
 .PATH.c:${HOSTAPD_DISTDIR}
 
 PACKAGE=	hostapd
 PROG=	hostapd
 SRCS=	config_file.c \
 	ctrl_iface.c \
 	eap_register.c \
 	main.c
 
 MAN=	hostapd.8 hostapd.conf.5
 
 .if ${MK_EXAMPLES} != "no"
 FILESDIR= ${SHAREDIR}/examples/hostapd
 .PATH:	${HOSTAPD_DISTDIR}
 FILES=	hostapd.conf hostapd.eap_user hostapd.wpa_psk
 .endif
 
 CFLAGS+=-I${.CURDIR:H}/wpa_supplicant \
 	-I${WPA_DISTDIR}/src/eap_peer \
 	-DCONFIG_MBO \
 	-DCONFIG_RSN_PREAUTH \
 	-DHOSTAPD
 .if ${MK_INET6} != "no"
 CFLAGS+= -DCONFIG_IPV6
 .endif
 #CFLAGS+= -g
-LIBADD+=	pcap util wpaap wpacommon wpacrypto \
-		wpadrivers wpal2_packet wpaeap_common wpaeap_server \
-		wpaeapol_auth \
-		wparadius wpatls wpautils wpawps
+LIBADD+=	pcap util \
+		wpadrivers wpaap wpal2_packet wpaeap_server \
+		wpaeapol_auth wpaeap_common \
+		wparadius wpatls wpawps wpacommon wpacrypto wpautils
 
 # User customizations for wpa_supplicant/hostapd build environment
 CFLAGS+=${HOSTAPD_CFLAGS}
 #DPADD+=${HOSTAPD_DPADD}
 LDADD+=${HOSTAPD_LDADD}
 #LDFLAGS+=${HOSTAPD_LDFLAGS}
 
 # For WPS, EAP modes, etc
 NEED_DH_GROUPS=y
 NEED_DH_GROUPS_ALL=y
 
 .if !empty(CFLAGS:M*-DCONFIG_WPS)
 NEED_SIM_COMMON=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SERVER_AKA)
 NEED_SIM_COMMON=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SERVER_SIM)
 NEED_SIM_COMMON=y
 .endif
 
 .if defined(NEED_SIM_COMMON)
 NEED_FIPS186_2_PRF=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SERVER_GPSK)
 CFLAGS+=-DEAP_GPSK_SHA256
 NEED_AES_OMAC1=y
 .endif
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile
index bf2cf6252550..93a24295f4a2 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile
+++ b/usr.sbin/wpa/wpa_cli/Makefile
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .include "../Makefile.inc"
 
 .include "../Makefile.crypto"
 
 .PATH.c:${WPA_SUPPLICANT_DISTDIR}
 
 PACKAGE=	wpa
 PROG=	wpa_cli
 SRCS=	wpa_cli.c
 
 MAN=	wpa_cli.8
 
 CFLAGS+= -DCONFIG_TLS=openssl
 # enable use of d_type to identify unix domain sockets
 CFLAGS+= -D_DIRENT_HAVE_D_TYPE
 
 CFLAGS+= -DCONFIG_WPA_CLI_EDIT=y
 LIBADD+=wpaap \
 	wpacommon \
-	wpacrypto \
-	wpaeap_common \
 	wpaeap_peer \
 	wpaeap_server \
 	wpaeapol_auth \
 	wpaeapol_supp \
+	wpaeap_common \
 	wpal2_packet \
 	wparadius \
 	wparsn_supp \
 	wpatls \
+	wpacrypto \
 	wpautils
 LIBADD+=	pcap util
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 332f66315346..c86be9497eca 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -1,120 +1,121 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .include "../Makefile.inc"
 
 .include "../Makefile.crypto"
 
 .PATH.c:${WPA_SUPPLICANT_DISTDIR} \
 	${WPA_DISTDIR}/src/drivers
 
 PACKAGE=	wpa
 PROG=	wpa_supplicant
 
 SRCS=	blacklist.c \
 	bss.c \
 	config.c \
 	config_file.c \
 	ctrl_iface.c \
 	ctrl_iface_unix.c \
 	eap_register.c \
 	events.c \
 	gas_query.c \
 	main.c \
 	notify.c \
 	op_classes.c \
 	offchannel.c \
 	rrm.c \
 	scan.c \
 	wmm_ac.c \
 	wpa_supplicant.c \
 	wpas_glue.c
 
 MAN=	wpa_supplicant.8 wpa_supplicant.conf.5
 
 .if ${MK_EXAMPLES} != "no"
 FILESDIR= ${SHAREDIR}/examples/etc
 .PATH:	${WPA_SUPPLICANT_DISTDIR}
 FILES=	wpa_supplicant.conf
 .endif
 
 CFLAGS+=-DCONFIG_BACKEND_FILE
 #CFLAGS+= -g
-LIBADD+=pcap util wpaap wpacommon wpacrypto wpadrivers wpaeapol_supp \
-	wpaeap_common wpaeap_server \
-	wpaeap_peer wpal2_packet wparsn_supp wpatls wpautils wpawps
+LIBADD+=pcap util wpadrivers wpaap wpaeapol_supp \
+	wpaeap_server \
+	wpaeap_peer wpaeap_common wpal2_packet wparsn_supp wpatls wpawps \
+	wpacommon wpacrypto wpautils
 
 # User customizations to the wpa_supplicant build environment
 CFLAGS+=${WPA_SUPPLICANT_CFLAGS}
 #DPADD+=${WPA_SUPPLICANT_DPADD}
 LDADD+=${WPA_SUPPLICANT_LDADD}
 #LDFLAGS+=${WPA_SUPPLICANT_LDFLAGS}
 
 .if ${MK_WPA_SUPPLICANT_EAPOL} != "no"
 CFLAGS+=-DEAP_GTC \
 	-DEAP_LEAP \
 	-DEAP_MD5 \
 	-DEAP_MSCHAPv2 \
 	-DEAP_OTP \
 	-DEAP_PEAP \
 	-DEAP_PSK \
 	-DEAP_TLS \
 	-DEAP_TTLS \
 	-DEAP_WSC \
 	-DIEEE8021X_EAPOL
 SRCS+=	hs20_supplicant.c \
 	interworking.c \
 	wps_supplicant.c
 NEED_AES_EAX=y
 NEED_AES_ENCBLOCK=y
 NEED_AES_OMAC1=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_AKA)
 SRCS+=	eap_aka.c
 NEED_SIM_COMMON=y
 NEED_AES_CBC=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SIM)
 SRCS+=	eap_sim.c
 NEED_SIM_COMMON=y
 NEED_AES_CBC=y
 .endif
 
 .if defined(NEED_SIM_COMMON)
 SRCS+=	eap_sim_common.c
 NEED_FIPS186_2_PRF=y
 .endif
 
 # PC/SC interface for smartcards (USIM, GSM SIM)
 # GSM/UMTS authentication algorithm (for EAP-SIM/EAP-AKA)
 # NB: requires devel/pcsc-lite
 #
 # WPA_SUPPLICANT_CFLAGS=-DEAP_AKA -DPCSC_FUNCS -I/usr/local/include/PCSC
 # WPA_SUPPLICANT_LDADD=-L/usr/local/lib
 #
 .if !empty(CFLAGS:M*-DPCSC_FUNCS)
 SRCS+=	pcsc_funcs.c
 LIBADD+=	pcslite pthread
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_GPSK)
 CFLAGS+=-DEAP_GPSK_SHA256
 SRCS+=	eap_gpsk.c \
 	eap_gpsk_common.c
 NEED_AES_OMAC1=y
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_PAX)
 SRCS+=	eap_pax.c \
 	eap_pax_common.c
 .endif
 
 .if !empty(CFLAGS:M*-DEAP_SAKE)
 SRCS+=	eap_sake.c \
 	eap_sake_common.c
 .endif
 
 .include <bsd.prog.mk>