Removed unneeded header file inclusions.

25 files changed, 2 insertions, 36 deletions

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 1853c8f..9868309 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -22,7 +22,6 @@
 #include "hostapd.h"
 #include "eloop.h"
 #include "config.h"
-#include "eapol_sm.h"
 #include "ieee802_1x.h"
 #include "wpa.h"
 #include "radius_client.h"
diff --git a/hostapd/driver_madwifi.c b/hostapd/driver_madwifi.c
index 506f73d..976620f 100644
--- a/hostapd/driver_madwifi.c
+++ b/hostapd/driver_madwifi.c
@@ -41,11 +41,8 @@
 #define MADWIFI_NG
 #endif /* IEEE80211_IOCTL_SETWMMPARAMS */
 
-#include <net/if_arp.h>
 #include "wireless_copy.h"
 
-#include <netpacket/packet.h>
-
 #include "hostapd.h"
 #include "driver.h"
 #include "ieee802_1x.h"
@@ -54,7 +51,6 @@
 #include "sta_info.h"
 #include "l2_packet.h"
 
-#include "eapol_sm.h"
 #include "wpa.h"
 #include "radius.h"
 #include "ieee802_11.h"
diff --git a/hostapd/driver_prism54.c b/hostapd/driver_prism54.c
index 83c9300..e3eb8c9 100644
--- a/hostapd/driver_prism54.c
+++ b/hostapd/driver_prism54.c
@@ -33,10 +33,8 @@
 #include "driver.h"
 #include "ieee802_1x.h"
 #include "eloop.h"
-#include "priv_netlink.h"
 #include "ieee802_11.h"
 #include "prism54.h"
-#include "eapol_sm.h"
 #include "wpa.h"
 #include "radius.h"
 #include "sta_info.h"
diff --git a/hostapd/driver_test.c b/hostapd/driver_test.c
index d5db7df..ac392a3 100644
--- a/hostapd/driver_test.c
+++ b/hostapd/driver_test.c
@@ -13,7 +13,6 @@
  */
 
 #include "includes.h"
-#include <sys/ioctl.h>
 #include <sys/un.h>
 #include <dirent.h>
 
@@ -23,7 +22,6 @@
 #include "eloop.h"
 #include "ieee802_1x.h"
 #include "sta_info.h"
-#include "eapol_sm.h"
 #include "wpa.h"
 #include "accounting.h"
 #include "radius.h"
diff --git a/hostapd/eap_aka.c b/hostapd/eap_aka.c
index b9a169b..830ed20 100644
--- a/hostapd/eap_aka.c
+++ b/hostapd/eap_aka.c
@@ -15,7 +15,6 @@
 #include "includes.h"
 
 #include "common.h"
-#include "crypto.h"
 #include "eap_i.h"
 #include "eap_sim_common.h"
 #include "eap_sim_db.h"
diff --git a/hostapd/eap_sim.c b/hostapd/eap_sim.c
index 98019f3..e4b4187 100644
--- a/hostapd/eap_sim.c
+++ b/hostapd/eap_sim.c
@@ -15,7 +15,6 @@
 #include "includes.h"
 
 #include "common.h"
-#include "crypto.h"
 #include "eap_i.h"
 #include "eap_sim_common.h"
 #include "eap_sim_db.h"
diff --git a/hostapd/hw_features.c b/hostapd/hw_features.c
index 484959f..b3dad7c 100644
--- a/hostapd/hw_features.c
+++ b/hostapd/hw_features.c
@@ -19,7 +19,6 @@
 #include "hw_features.h"
 #include "driver.h"
 #include "config.h"
-#include "ieee802_11.h"
 #include "eloop.h"
 
 
diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c
index e067af3..cba5173 100644
--- a/hostapd/ieee802_11.c
+++ b/hostapd/ieee802_11.c
@@ -27,7 +27,6 @@
 #include "radius_client.h"
 #include "ieee802_11_auth.h"
 #include "sta_info.h"
-#include "eapol_sm.h"
 #include "rc4.h"
 #include "ieee802_1x.h"
 #include "wpa.h"
diff --git a/hostapd/mlme.c b/hostapd/mlme.c
index 5acf52c..21781f9 100644
--- a/hostapd/mlme.c
+++ b/hostapd/mlme.c
@@ -18,7 +18,6 @@
 
 #include "hostapd.h"
 #include "ieee802_11.h"
-#include "sta_info.h"
 #include "wpa.h"
 #include "mlme.h"
 
diff --git a/hostapd/peerkey.c b/hostapd/peerkey.c
index 7ac2996..f88f1a7 100644
--- a/hostapd/peerkey.c
+++ b/hostapd/peerkey.c
@@ -15,7 +15,6 @@
 #include "includes.h"
 
 #include "common.h"
-#include "config.h"
 #include "eloop.h"
 #include "sha1.h"
 #include "wpa.h"
diff --git a/hostapd/pmksa_cache.c b/hostapd/pmksa_cache.c
index 2a738ec..b4a7bd2 100644
--- a/hostapd/pmksa_cache.c
+++ b/hostapd/pmksa_cache.c
@@ -18,7 +18,6 @@
 #include "ap.h"
 #include "config.h"
 #include "common.h"
-#include "wpa.h"
 #include "eloop.h"
 #include "sha1.h"
 #include "ieee802_1x.h"
diff --git a/hostapd/sta_info.c b/hostapd/sta_info.c
index 7733191..60714f1 100644
--- a/hostapd/sta_info.c
+++ b/hostapd/sta_info.c
@@ -21,7 +21,6 @@
 #include "ieee802_1x.h"
 #include "ieee802_11.h"
 #include "radius.h"
-#include "eapol_sm.h"
 #include "wpa.h"
 #include "preauth.h"
 #include "radius_client.h"
diff --git a/hostapd/wpa.c b/hostapd/wpa.c
index 63471b7..7b5d2e3 100644
--- a/hostapd/wpa.c
+++ b/hostapd/wpa.c
@@ -21,7 +21,6 @@
 #include "eapol_sm.h"
 #include "wpa.h"
 #include "sha1.h"
-#include "md5.h"
 #include "rc4.h"
 #include "aes_wrap.h"
 #include "crypto.h"
diff --git a/wpa_supplicant/base64.c b/wpa_supplicant/base64.c
index a1e0de8..f9eb485 100644
--- a/wpa_supplicant/base64.c
+++ b/wpa_supplicant/base64.c
@@ -153,7 +153,6 @@ unsigned char * base64_decode(const unsigned char *src, size_t len,
 
 
 #ifdef TEST_MAIN
-#include <stdio.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index 513203c..f7a9062 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -17,7 +17,6 @@
 #include "common.h"
 #include "wpa.h"
 #include "sha1.h"
-#include "eapol_sm.h"
 #include "eap.h"
 #include "config.h"
 
diff --git a/wpa_supplicant/ctrl_iface_dbus.c b/wpa_supplicant/ctrl_iface_dbus.c
index 68f3c44..189f3a3 100644
--- a/wpa_supplicant/ctrl_iface_dbus.c
+++ b/wpa_supplicant/ctrl_iface_dbus.c
@@ -13,18 +13,13 @@
  */
 
 #include "includes.h"
-#include <dbus/dbus.h>
 
 #include "common.h"
 #include "eloop.h"
 #include "config.h"
-#include "eapol_sm.h"
 #include "wpa_supplicant_i.h"
 #include "ctrl_iface_dbus.h"
 #include "ctrl_iface_dbus_handlers.h"
-#include "preauth.h"
-#include "wpa_ctrl.h"
-#include "eap.h"
 
 struct ctrl_iface_dbus_priv {
 	DBusConnection *con;
diff --git a/wpa_supplicant/ctrl_iface_dbus_handlers.c b/wpa_supplicant/ctrl_iface_dbus_handlers.c
index 870cdad..c3ed51d 100644
--- a/wpa_supplicant/ctrl_iface_dbus_handlers.c
+++ b/wpa_supplicant/ctrl_iface_dbus_handlers.c
@@ -13,7 +13,6 @@
  */
 
 #include "includes.h"
-#include <dbus/dbus.h>
 
 #include "common.h"
 #include "config.h"
diff --git a/wpa_supplicant/driver_ndiswrapper.c b/wpa_supplicant/driver_ndiswrapper.c
index 3e49023..886bbcc 100644
--- a/wpa_supplicant/driver_ndiswrapper.c
+++ b/wpa_supplicant/driver_ndiswrapper.c
@@ -15,13 +15,10 @@
 
 #include "includes.h"
 #include <sys/ioctl.h>
-#include <net/if_arp.h>
 
 #include "wireless_copy.h"
 #include "common.h"
 #include "driver.h"
-#include "eloop.h"
-#include "priv_netlink.h"
 #include "driver_wext.h"
 
 struct wpa_driver_ndiswrapper_data {
diff --git a/wpa_supplicant/eap_aka.c b/wpa_supplicant/eap_aka.c
index d34dbb7..66fba7a 100644
--- a/wpa_supplicant/eap_aka.c
+++ b/wpa_supplicant/eap_aka.c
@@ -16,7 +16,6 @@
 
 #include "common.h"
 #include "eap_i.h"
-#include "crypto.h"
 #include "pcsc_funcs.h"
 #include "eap_sim_common.h"
 
diff --git a/wpa_supplicant/eap_otp.c b/wpa_supplicant/eap_otp.c
index 16f4b34..f52a62e 100644
--- a/wpa_supplicant/eap_otp.c
+++ b/wpa_supplicant/eap_otp.c
@@ -16,7 +16,6 @@
 
 #include "common.h"
 #include "eap_i.h"
-#include "config_ssid.h"
 
 
 static void * eap_otp_init(struct eap_sm *sm)
diff --git a/wpa_supplicant/eap_psk.c b/wpa_supplicant/eap_psk.c
index bb1c6b0..819dc38 100644
--- a/wpa_supplicant/eap_psk.c
+++ b/wpa_supplicant/eap_psk.c
@@ -20,7 +20,6 @@
 #include "common.h"
 #include "eap_i.h"
 #include "config_ssid.h"
-#include "md5.h"
 #include "aes_wrap.h"
 #include "eap_psk_common.h"
 
diff --git a/wpa_supplicant/eap_sim.c b/wpa_supplicant/eap_sim.c
index a1ad058..e92cb32 100644
--- a/wpa_supplicant/eap_sim.c
+++ b/wpa_supplicant/eap_sim.c
@@ -17,7 +17,6 @@
 #include "common.h"
 #include "eap_i.h"
 #include "config_ssid.h"
-#include "crypto.h"
 #include "pcsc_funcs.h"
 #include "eap_sim_common.h"
 
diff --git a/wpa_supplicant/eap_tls_common.c b/wpa_supplicant/eap_tls_common.c
index 19be73e..6192045 100644
--- a/wpa_supplicant/eap_tls_common.c
+++ b/wpa_supplicant/eap_tls_common.c
@@ -18,7 +18,6 @@
 #include "eap_i.h"
 #include "eap_tls_common.h"
 #include "config_ssid.h"
-#include "md5.h"
 #include "sha1.h"
 #include "tls.h"
 #include "config.h"
diff --git a/wpa_supplicant/eap_vendor_test.c b/wpa_supplicant/eap_vendor_test.c
index 26e346e..620e093 100644
--- a/wpa_supplicant/eap_vendor_test.c
+++ b/wpa_supplicant/eap_vendor_test.c
@@ -20,7 +20,9 @@
 
 #include "common.h"
 #include "eap_i.h"
+#ifdef TEST_PENDING_REQUEST
 #include "eloop.h"
+#endif /* TEST_PENDING_REQUEST */
 
 
 #define EAP_VENDOR_ID 0xfffefd
diff --git a/wpa_supplicant/mlme.c b/wpa_supplicant/mlme.c
index ba21341..6688927 100644
--- a/wpa_supplicant/mlme.c
+++ b/wpa_supplicant/mlme.c
@@ -21,8 +21,6 @@
 #include "config_ssid.h"
 #include "wpa_supplicant_i.h"
 #include "wpa.h"
-#include "wpa_ie.h"
-#include "os.h"
 #include "driver.h"
 #include "ieee802_11_defs.h"
 #include "mlme.h"