diff --git a/hostapd/Makefile b/hostapd/Makefile
index a91aeaa58..6102c10c3 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -331,11 +331,6 @@ OBJS += ../src/wps/wps_nfc_pn531.o
 LIBS += ${PN531_PATH}/lib/wpsnfc.dll
 LIBS += ${PN531_PATH}/lib/libnfc_mapping_pn53x.dll
 endif
-
-ifdef CONFIG_WPS_STRICT
-CFLAGS += -DCONFIG_WPS_STRICT
-OBJS += ../src/wps/wps_validate.o
-endif
 endif
 
 ifdef NEED_WPS_OOB
@@ -355,6 +350,11 @@ OBJS += ../src/wps/http_client.o
 OBJS += ../src/wps/http_server.o
 endif
 
+ifdef CONFIG_WPS_STRICT
+CFLAGS += -DCONFIG_WPS_STRICT
+OBJS += ../src/wps/wps_validate.o
+endif
+
 endif
 
 ifdef CONFIG_EAP_IKEV2
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 4bc00e272..3301e61eb 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -500,11 +500,6 @@ OBJS += ../src/wps/wps_nfc_pn531.o
 LIBS += ${PN531_PATH}/lib/wpsnfc.dll
 LIBS += ${PN531_PATH}/lib/libnfc_mapping_pn53x.dll
 endif
-
-ifdef CONFIG_WPS_STRICT
-CFLAGS += -DCONFIG_WPS_STRICT
-OBJS += ../src/wps/wps_validate.o
-endif
 endif
 
 ifdef NEED_WPS_OOB
@@ -531,6 +526,11 @@ OBJS += ../src/wps/http_client.o
 OBJS += ../src/wps/http_server.o
 endif
 
+ifdef CONFIG_WPS_STRICT
+CFLAGS += -DCONFIG_WPS_STRICT
+OBJS += ../src/wps/wps_validate.o
+endif
+
 endif
 
 ifdef CONFIG_EAP_IKEV2