From 81f4f6195ecaf4d8c24f178183c7f6237ef0073c Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Sat, 26 Dec 2009 00:31:51 +0200
Subject: [PATCH] Include header files explicitly in *.c, not via header files

---
 hostapd/ctrl_iface.c   | 1 +
 src/ap/ap_list.c       | 2 ++
 src/ap/ap_mlme.c       | 1 +
 src/ap/beacon.c        | 2 ++
 src/ap/drv_callbacks.c | 1 +
 src/ap/iapp.c          | 1 +
 src/ap/ieee802_11.c    | 2 ++
 src/ap/ieee802_11.h    | 4 +---
 src/ap/ieee802_11_ht.c | 1 +
 src/ap/sta_info.c      | 1 +
 src/ap/wmm.c           | 2 ++
 src/ap/wpa_auth.c      | 1 +
 src/ap/wpa_auth_ft.c   | 2 ++
 src/ap/wpa_auth_ie.c   | 1 +
 14 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index bf42bca2c..430c4ba7e 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -22,6 +22,7 @@
 
 #include "utils/common.h"
 #include "utils/eloop.h"
+#include "common/ieee802_11_defs.h"
 #include "drivers/driver.h"
 #include "radius/radius_client.h"
 #include "ap/hostapd.h"
diff --git a/src/ap/ap_list.c b/src/ap/ap_list.c
index 0b7a8a109..5297dbf3b 100644
--- a/src/ap/ap_list.c
+++ b/src/ap/ap_list.c
@@ -18,6 +18,8 @@
 
 #include "utils/common.h"
 #include "utils/eloop.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 #include "drivers/driver.h"
 #include "hostapd.h"
 #include "ap_config.h"
diff --git a/src/ap/ap_mlme.c b/src/ap/ap_mlme.c
index 5f8fd8775..2b09b11e7 100644
--- a/src/ap/ap_mlme.c
+++ b/src/ap/ap_mlme.c
@@ -17,6 +17,7 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
+#include "common/ieee802_11_defs.h"
 #include "ieee802_11.h"
 #include "wpa_auth.h"
 #include "sta_info.h"
diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index aa09bea2d..b01a378e4 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -19,6 +19,8 @@
 #ifndef CONFIG_NATIVE_WINDOWS
 
 #include "utils/common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 #include "drivers/driver.h"
 #include "hostapd.h"
 #include "ieee802_11.h"
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 26c7a0d9a..ed71d20b8 100644
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -17,6 +17,7 @@
 #include "utils/common.h"
 #include "radius/radius.h"
 #include "drivers/driver.h"
+#include "common/ieee802_11_defs.h"
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "sta_info.h"
diff --git a/src/ap/iapp.c b/src/ap/iapp.c
index e9a86168e..115d91e8c 100644
--- a/src/ap/iapp.c
+++ b/src/ap/iapp.c
@@ -48,6 +48,7 @@
 
 #include "utils/common.h"
 #include "utils/eloop.h"
+#include "common/ieee802_11_defs.h"
 #include "hostapd.h"
 #include "ap_config.h"
 #include "ieee802_11.h"
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 91d4b978a..80815ac03 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -20,6 +20,8 @@
 #include "utils/eloop.h"
 #include "crypto/crypto.h"
 #include "drivers/driver.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 #include "common/wpa_ctrl.h"
 #include "radius/radius.h"
 #include "radius/radius_client.h"
diff --git a/src/ap/ieee802_11.h b/src/ap/ieee802_11.h
index 3347256ee..e4350b176 100644
--- a/src/ap/ieee802_11.h
+++ b/src/ap/ieee802_11.h
@@ -15,13 +15,11 @@
 #ifndef IEEE802_11_H
 #define IEEE802_11_H
 
-#include "common/ieee802_11_defs.h"
-#include "common/ieee802_11_common.h"
-
 struct hostapd_iface;
 struct hostapd_data;
 struct sta_info;
 struct hostapd_frame_info;
+struct ieee80211_ht_capabilities;
 
 void ieee802_11_send_deauth(struct hostapd_data *hapd, const u8 *addr,
 			    u16 reason);
diff --git a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c
index 30e2e44c5..1b39a6aaa 100644
--- a/src/ap/ieee802_11_ht.c
+++ b/src/ap/ieee802_11_ht.c
@@ -16,6 +16,7 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
+#include "common/ieee802_11_defs.h"
 #include "drivers/driver.h"
 #include "hostapd.h"
 #include "ap_config.h"
diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
index c387519f6..05bdc4174 100644
--- a/src/ap/sta_info.c
+++ b/src/ap/sta_info.c
@@ -16,6 +16,7 @@
 
 #include "utils/common.h"
 #include "utils/eloop.h"
+#include "common/ieee802_11_defs.h"
 #include "radius/radius.h"
 #include "radius/radius_client.h"
 #include "drivers/driver.h"
diff --git a/src/ap/wmm.c b/src/ap/wmm.c
index 403560ee4..bbed83d6f 100644
--- a/src/ap/wmm.c
+++ b/src/ap/wmm.c
@@ -17,6 +17,8 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "sta_info.h"
diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
index 0db226a00..0c1003d7b 100644
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
@@ -19,6 +19,7 @@
 #include "utils/common.h"
 #include "utils/eloop.h"
 #include "utils/state_machine.h"
+#include "common/ieee802_11_defs.h"
 #include "crypto/aes_wrap.h"
 #include "crypto/crypto.h"
 #include "crypto/sha1.h"
diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c
index e2e6b208c..c916ebe51 100644
--- a/src/ap/wpa_auth_ft.c
+++ b/src/ap/wpa_auth_ft.c
@@ -15,6 +15,8 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 #include "crypto/aes_wrap.h"
 #include "ap_config.h"
 #include "ieee802_11.h"
diff --git a/src/ap/wpa_auth_ie.c b/src/ap/wpa_auth_ie.c
index 7b1d9b741..29c960340 100644
--- a/src/ap/wpa_auth_ie.c
+++ b/src/ap/wpa_auth_ie.c
@@ -15,6 +15,7 @@
 #include "utils/includes.h"
 
 #include "utils/common.h"
+#include "common/ieee802_11_defs.h"
 #include "eapol_auth/eapol_auth_sm.h"
 #include "ap_config.h"
 #include "ieee802_11.h"