diff --git a/hostapd/drv_callbacks.c b/hostapd/drv_callbacks.c
index c6480f32f..f5eed1ccc 100644
--- a/hostapd/drv_callbacks.c
+++ b/hostapd/drv_callbacks.c
@@ -18,6 +18,7 @@
 #include "driver_i.h"
 #include "ieee802_11.h"
 #include "radius/radius.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "accounting.h"
 #include "tkip_countermeasures.h"
diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 47941c53e..e3747b075 100644
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -24,6 +24,7 @@
 #include "iapp.h"
 #include "common/ieee802_11_defs.h"
 #include "ieee802_11_auth.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "ap_list.h"
 #include "driver_i.h"
diff --git a/hostapd/iapp.c b/hostapd/iapp.c
index 95c354536..9a0b2e7c6 100644
--- a/hostapd/iapp.c
+++ b/hostapd/iapp.c
@@ -51,6 +51,7 @@
 #include "ieee802_11.h"
 #include "iapp.h"
 #include "eloop.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 
 
diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c
index 9a2a67c7e..e7a4cded6 100644
--- a/hostapd/ieee802_11.c
+++ b/hostapd/ieee802_11.c
@@ -27,6 +27,7 @@
 #include "radius/radius.h"
 #include "radius/radius_client.h"
 #include "ieee802_11_auth.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "crypto.h"
 #include "ieee802_1x.h"
diff --git a/hostapd/ieee802_1x.c b/hostapd/ieee802_1x.c
index 639949f71..68acd37af 100644
--- a/hostapd/ieee802_1x.c
+++ b/hostapd/ieee802_1x.c
@@ -23,6 +23,7 @@
 #include "md5.h"
 #include "crypto.h"
 #include "eloop.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "wpa.h"
 #include "preauth.h"
diff --git a/hostapd/mlme.c b/hostapd/mlme.c
index f9b143ae4..d394c053e 100644
--- a/hostapd/mlme.c
+++ b/hostapd/mlme.c
@@ -19,6 +19,7 @@
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "wpa.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "mlme.h"
 
diff --git a/hostapd/preauth.c b/hostapd/preauth.c
index b26bb1ffa..2b1558ceb 100644
--- a/hostapd/preauth.c
+++ b/hostapd/preauth.c
@@ -21,6 +21,7 @@
 #include "l2_packet/l2_packet.h"
 #include "ieee802_1x.h"
 #include "eloop.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "common/wpa_common.h"
 #include "eapol_sm.h"
diff --git a/hostapd/sta_info.c b/hostapd/sta_info.c
index fe319c56b..606e85dd1 100644
--- a/hostapd/sta_info.c
+++ b/hostapd/sta_info.c
@@ -16,6 +16,7 @@
 #include "includes.h"
 
 #include "hostapd.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "eloop.h"
 #include "accounting.h"
diff --git a/hostapd/sta_info.h b/hostapd/sta_info.h
index 52e2f2e15..a12808245 100644
--- a/hostapd/sta_info.h
+++ b/hostapd/sta_info.h
@@ -15,8 +15,6 @@
 #ifndef STA_INFO_H
 #define STA_INFO_H
 
-#include "sta_flags.h"
-
 #ifdef CONFIG_IEEE80211N
 #include "common/ieee802_11_defs.h"
 #endif /* CONFIG_IEEE80211N */
diff --git a/hostapd/tkip_countermeasures.c b/hostapd/tkip_countermeasures.c
index 37efc8c69..3671a2930 100644
--- a/hostapd/tkip_countermeasures.c
+++ b/hostapd/tkip_countermeasures.c
@@ -17,6 +17,7 @@
 #include "hostapd.h"
 #include "eloop.h"
 #include "driver_i.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "mlme.h"
 #include "wpa.h"
diff --git a/hostapd/wme.c b/hostapd/wme.c
index efcbe3714..69b05d7d7 100644
--- a/hostapd/wme.c
+++ b/hostapd/wme.c
@@ -18,6 +18,7 @@
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "wme.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "driver_i.h"
 
diff --git a/hostapd/wps_hostapd.c b/hostapd/wps_hostapd.c
index 1ca0ff9ac..793457dc8 100644
--- a/hostapd/wps_hostapd.c
+++ b/hostapd/wps_hostapd.c
@@ -21,6 +21,7 @@
 #include "common/wpa_ctrl.h"
 #include "common/ieee802_11_defs.h"
 #include "common/ieee802_11_common.h"
+#include "sta_flags.h"
 #include "sta_info.h"
 #include "eapol_sm.h"
 #include "wps/wps.h"
diff --git a/src/drivers/driver_prism54.c b/src/drivers/driver_prism54.c
index c0b038e8e..10b8146da 100644
--- a/src/drivers/driver_prism54.c
+++ b/src/drivers/driver_prism54.c
@@ -37,6 +37,7 @@
 #include "../../hostapd/ieee802_1x.h"
 #include "../../hostapd/ieee802_11.h"
 #include "../../hostapd/wpa.h"
+#include "../../hostapd/sta_flags.h"
 #include "../../hostapd/sta_info.h"
 #include "../../hostapd/accounting.h"