diff --git a/hostapd/beacon.h b/hostapd/beacon.h
index ba5095898..afca98b70 100644
--- a/hostapd/beacon.h
+++ b/hostapd/beacon.h
@@ -16,7 +16,7 @@
 #ifndef BEACON_H
 #define BEACON_H
 
-struct ieee80211_mgmt *mgmt;
+struct ieee80211_mgmt;
 
 void handle_probe_req(struct hostapd_data *hapd, struct ieee80211_mgmt *mgmt,
 		      size_t len);
diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index 7b9b2431a..25f0ed421 100644
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -17,6 +17,7 @@
 
 #include "common.h"
 #include "../hostapd/hostapd.h"
+#include "../hostapd/config.h"
 #include "eap_common/eap_defs.h"
 #include "eap_server/eap_methods.h"
 #include "eap_common/eap_wsc_common.h"