Remove src/common from default header file path

This makes it clearer which files are including header from src/common.
Some of these cases should probably be cleaned up in the future not to
do that.

In addition, src/common/nl80211_copy.h and wireless_copy.h were moved
into src/drivers since they are only used by driver wrappers and do not
need to live in src/common.

32 files changed, 34 insertions, 35 deletions

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 1409576..4b864e1 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -17,7 +17,7 @@
 
 #define WPA_SUPPLICANT_DRIVER_VERSION 4
 
-#include "defs.h"
+#include "common/defs.h"
 
 #define HOSTAPD_CHAN_DISABLED 0x00000001
 #define HOSTAPD_CHAN_PASSIVE_SCAN 0x00000002
diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index de1b048..3e1342a 100644
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -67,7 +67,7 @@
 #include "l2_packet/l2_packet.h"
 
 #include "../hostapd/wps_hostapd.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 
 struct madwifi_driver_data {
diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index 2bd51a4..7cf6159 100644
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -19,7 +19,7 @@
 #include "common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 #include <net/if.h>
 
diff --git a/src/drivers/driver_hostap.c b/src/drivers/driver_hostap.c
index 930a69c..6963de4 100644
--- a/src/drivers/driver_hostap.c
+++ b/src/drivers/driver_hostap.c
@@ -29,7 +29,7 @@
 #include <netpacket/packet.h>
 
 #include "priv_netlink.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "../../hostapd/hostapd.h"
 #include "../../hostapd/hw_features.h"
 #include "../../hostapd/sta_flags.h"
diff --git a/src/drivers/driver_madwifi.c b/src/drivers/driver_madwifi.c
index ff63bb0..5af69a6 100644
--- a/src/drivers/driver_madwifi.c
+++ b/src/drivers/driver_madwifi.c
@@ -26,7 +26,7 @@
 #include "driver.h"
 #include "driver_wext.h"
 #include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "wireless_copy.h"
 
 /*
diff --git a/src/drivers/driver_ndis.c b/src/drivers/driver_ndis.c
index 46f92c5..b38d9a0 100644
--- a/src/drivers/driver_ndis.c
+++ b/src/drivers/driver_ndis.c
@@ -40,7 +40,7 @@ int close(int fd);
 #include "common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "driver_ndis.h"
 
 int wpa_driver_register_event_cb(struct wpa_driver_ndis_data *drv);
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 33076a1..77245eb 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -28,7 +28,7 @@
 #include "common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 #if defined(CONFIG_AP) || defined(HOSTAPD)
 #include <netpacket/packet.h>
diff --git a/src/drivers/driver_none.c b/src/drivers/driver_none.c
index a5d66c4..aaeacd6 100644
--- a/src/drivers/driver_none.c
+++ b/src/drivers/driver_none.c
@@ -14,7 +14,7 @@
 
 #include "includes.h"
 
-#include "../hostapd/hostapd.h"
+#include "common.h"
 #include "driver.h"
 
 
diff --git a/src/drivers/driver_privsep.c b/src/drivers/driver_privsep.c
index 35c5e37..baec717 100644
--- a/src/drivers/driver_privsep.c
+++ b/src/drivers/driver_privsep.c
@@ -18,7 +18,7 @@
 #include "common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "privsep_commands.h"
+#include "common/privsep_commands.h"
 
 
 struct wpa_driver_privsep_data {
diff --git a/src/drivers/driver_ps3.c b/src/drivers/driver_ps3.c
index d3eb419..19d44de 100644
--- a/src/drivers/driver_ps3.c
+++ b/src/drivers/driver_ps3.c
@@ -16,11 +16,11 @@
 #include <sys/ioctl.h>
 #include "wireless_copy.h"
 #include "common.h"
-#include "wpa_common.h"
+#include "common/wpa_common.h"
 #include "driver.h"
 #include "eloop.h"
 #include "driver_wext.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 static int wpa_driver_ps3_set_wpa_key(struct wpa_driver_wext_data *drv,
 				struct wpa_driver_associate_params *params)
diff --git a/src/drivers/driver_ralink.c b/src/drivers/driver_ralink.c
index 1fc4f2d..431d38f 100644
--- a/src/drivers/driver_ralink.c
+++ b/src/drivers/driver_ralink.c
@@ -22,7 +22,7 @@
 #include "driver.h"
 #include "l2_packet/l2_packet.h"
 #include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "priv_netlink.h"
 #include "driver_ralink.h"
 
diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c
index 38325a5..439f726 100644
--- a/src/drivers/driver_test.c
+++ b/src/drivers/driver_test.c
@@ -32,7 +32,7 @@
 #include "l2_packet/l2_packet.h"
 #include "eloop.h"
 #include "sha1.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 #include "../../hostapd/hostapd.h"
 #include "../../hostapd/wpa.h"
diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
index 2cedb32..9d6a48d 100644
--- a/src/drivers/driver_wext.c
+++ b/src/drivers/driver_wext.c
@@ -28,8 +28,8 @@
 #include "eloop.h"
 #include "priv_netlink.h"
 #include "driver_wext.h"
-#include "ieee802_11_defs.h"
-#include "wpa_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/wpa_common.h"
 
 
 static int wpa_driver_wext_flush_pmkid(void *priv);
diff --git a/src/common/nl80211_copy.h b/src/drivers/nl80211_copy.h
index 50afca3..50afca3 100644
--- a/src/common/nl80211_copy.h
+++ b/src/drivers/nl80211_copy.h
diff --git a/src/drivers/scan_helpers.c b/src/drivers/scan_helpers.c
index 6338770..a8c1c02 100644
--- a/src/drivers/scan_helpers.c
+++ b/src/drivers/scan_helpers.c
@@ -16,7 +16,7 @@
 
 #include "common.h"
 #include "drivers/driver.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 
 const u8 * wpa_scan_get_ie(const struct wpa_scan_res *res, u8 ie)
diff --git a/src/common/wireless_copy.h b/src/drivers/wireless_copy.h
index ad76466..ad76466 100644
--- a/src/common/wireless_copy.h
+++ b/src/drivers/wireless_copy.h
diff --git a/src/eap_peer/eap.c b/src/eap_peer/eap.c
index a957953..dd9a8be 100644
--- a/src/eap_peer/eap.c
+++ b/src/eap_peer/eap.c
@@ -29,7 +29,7 @@
 #include "tls.h"
 #include "crypto.h"
 #include "pcsc_funcs.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "state_machine.h"
 #include "eap_common/eap_wsc_common.h"
 
diff --git a/src/eap_peer/eap.h b/src/eap_peer/eap.h
index d7a5628..40d0b69 100644
--- a/src/eap_peer/eap.h
+++ b/src/eap_peer/eap.h
@@ -15,7 +15,7 @@
 #ifndef EAP_H
 #define EAP_H
 
-#include "defs.h"
+#include "common/defs.h"
 #include "eap_common/eap_defs.h"
 #include "eap_peer/eap_methods.h"
 
diff --git a/src/eap_peer/eap_mschapv2.c b/src/eap_peer/eap_mschapv2.c
index 8b27bc1..d0ca44d 100644
--- a/src/eap_peer/eap_mschapv2.c
+++ b/src/eap_peer/eap_mschapv2.c
@@ -25,7 +25,7 @@
 #include "eap_i.h"
 #include "eap_config.h"
 #include "ms_funcs.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "mschapv2.h"
 
 
diff --git a/src/eap_server/eap.h b/src/eap_server/eap.h
index dc00c31..27aa3ad 100644
--- a/src/eap_server/eap.h
+++ b/src/eap_server/eap.h
@@ -15,7 +15,7 @@
 #ifndef EAP_H
 #define EAP_H
 
-#include "defs.h"
+#include "common/defs.h"
 #include "eap_common/eap_defs.h"
 #include "eap_server/eap_methods.h"
 #include "wpabuf.h"
diff --git a/src/eapol_supp/eapol_supp_sm.c b/src/eapol_supp/eapol_supp_sm.c
index 19d57b9..f3dc4bf 100644
--- a/src/eapol_supp/eapol_supp_sm.c
+++ b/src/eapol_supp/eapol_supp_sm.c
@@ -18,7 +18,7 @@
 #include "eapol_supp_sm.h"
 #include "eap_peer/eap.h"
 #include "eloop.h"
-#include "eapol_common.h"
+#include "common/eapol_common.h"
 #include "md5.h"
 #include "crypto.h"
 #include "state_machine.h"
diff --git a/src/eapol_supp/eapol_supp_sm.h b/src/eapol_supp/eapol_supp_sm.h
index e6e8cc6..00fc886 100644
--- a/src/eapol_supp/eapol_supp_sm.h
+++ b/src/eapol_supp/eapol_supp_sm.h
@@ -15,7 +15,7 @@
 #ifndef EAPOL_SUPP_SM_H
 #define EAPOL_SUPP_SM_H
 
-#include "defs.h"
+#include "common/defs.h"
 
 typedef enum { Unauthorized, Authorized } PortStatus;
 typedef enum { Auto, ForceUnauthorized, ForceAuthorized } PortControl;
diff --git a/src/l2_packet/l2_packet_privsep.c b/src/l2_packet/l2_packet_privsep.c
index c0e7c49..79d2968 100644
--- a/src/l2_packet/l2_packet_privsep.c
+++ b/src/l2_packet/l2_packet_privsep.c
@@ -18,7 +18,7 @@
 #include "common.h"
 #include "eloop.h"
 #include "l2_packet.h"
-#include "privsep_commands.h"
+#include "common/privsep_commands.h"
 
 
 struct l2_packet_data {
diff --git a/src/radius/radius_server.c b/src/radius/radius_server.c
index 2d1259b..7c8c525 100644
--- a/src/radius/radius_server.c
+++ b/src/radius/radius_server.c
@@ -18,7 +18,6 @@
 #include "common.h"
 #include "radius.h"
 #include "eloop.h"
-#include "defs.h"
 #include "eap_server/eap.h"
 #include "radius_server.h"
 
diff --git a/src/rsn_supp/peerkey.c b/src/rsn_supp/peerkey.c
index 36392ba..ae567ca 100644
--- a/src/rsn_supp/peerkey.c
+++ b/src/rsn_supp/peerkey.c
@@ -23,7 +23,7 @@
 #include "wpa.h"
 #include "wpa_i.h"
 #include "wpa_ie.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "peerkey.h"
 
 
diff --git a/src/rsn_supp/preauth.c b/src/rsn_supp/preauth.c
index f4e8cbb..64e2146 100644
--- a/src/rsn_supp/preauth.c
+++ b/src/rsn_supp/preauth.c
@@ -22,7 +22,7 @@
 #include "preauth.h"
 #include "pmksa_cache.h"
 #include "wpa_i.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 
 #if defined(IEEE8021X_EAPOL) && !defined(CONFIG_NO_WPA2)
diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index 55e9f2b..887bf00 100644
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -25,7 +25,7 @@
 #include "wpa_i.h"
 #include "wpa_ie.h"
 #include "peerkey.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 
 /**
diff --git a/src/rsn_supp/wpa.h b/src/rsn_supp/wpa.h
index cd503bb..b2fa2e5 100644
--- a/src/rsn_supp/wpa.h
+++ b/src/rsn_supp/wpa.h
@@ -15,9 +15,9 @@
 #ifndef WPA_H
 #define WPA_H
 
-#include "defs.h"
-#include "eapol_common.h"
-#include "wpa_common.h"
+#include "common/defs.h"
+#include "common/eapol_common.h"
+#include "common/wpa_common.h"
 
 struct wpa_sm;
 struct eapol_sm;
diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c
index 9a39ed2..5b7d528 100644
--- a/src/rsn_supp/wpa_ft.c
+++ b/src/rsn_supp/wpa_ft.c
@@ -19,8 +19,8 @@
 #include "wpa_i.h"
 #include "wpa_ie.h"
 #include "aes_wrap.h"
-#include "ieee802_11_defs.h"
-#include "ieee802_11_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 
 #ifdef CONFIG_IEEE80211R
 
diff --git a/src/rsn_supp/wpa_ie.c b/src/rsn_supp/wpa_ie.c
index 84f2811..0feb1f6 100644
--- a/src/rsn_supp/wpa_ie.c
+++ b/src/rsn_supp/wpa_ie.c
@@ -17,7 +17,7 @@
 #include "common.h"
 #include "wpa.h"
 #include "pmksa_cache.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "wpa_i.h"
 #include "wpa_ie.h"
 
diff --git a/src/wps/wps.c b/src/wps/wps.c
index cc5baab..251883d 100644
--- a/src/wps/wps.c
+++ b/src/wps/wps.c
@@ -18,7 +18,7 @@
 #include "dh_group5.h"
 #include "wps_i.h"
 #include "wps_dev_attr.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 
 /**
diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index 3d86174..fe4b49b 100644
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -17,7 +17,7 @@
 #include "common.h"
 #include "sha256.h"
 #include "base64.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "eloop.h"
 #include "wps_i.h"
 #include "wps_dev_attr.h"