diff --git a/src/common/capwap_element.c b/src/common/capwap_element.c
index ec7ddc8..669fdbe 100644
--- a/src/common/capwap_element.c
+++ b/src/common/capwap_element.c
@@ -650,7 +650,10 @@ int capwap_validate_parsed_packet(struct capwap_parsed_packet* packet, struct ca
 			}
 
 			case CAPWAP_IEEE80211_WLAN_CONFIGURATION_REQUEST: {
-				if (capwap_get_message_element(packet, CAPWAP_ELEMENT_80211_ADD_WLAN)) {
+				if (capwap_get_message_element(packet, CAPWAP_ELEMENT_80211_ADD_WLAN) ||
+					capwap_get_message_element(packet, CAPWAP_ELEMENT_80211_UPDATE_WLAN) ||
+					capwap_get_message_element(packet, CAPWAP_ELEMENT_80211_DELETE_WLAN)) {
+
 					return 0;
 				}
 
diff --git a/src/wtp/wtp_dfa.h b/src/wtp/wtp_dfa.h
index 8854f41..b824dd0 100644
--- a/src/wtp/wtp_dfa.h
+++ b/src/wtp/wtp_dfa.h
@@ -1,7 +1,6 @@
 #ifndef __WTP_DFA_HEADER__
 #define __WTP_DFA_HEADER__
 
-#include "wtp.h"
 #include "capwap_network.h"
 #include "capwap_protocol.h"
 #include "capwap_element.h"