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.

82 files changed, 106 insertions, 114 deletions

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 2667a36..f27abb4 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -13,7 +13,6 @@ CFLAGS += -DHOSTAPD_DUMP_STATE
 CFLAGS += -I../src
 CFLAGS += -I../src/crypto
 CFLAGS += -I../src/utils
-CFLAGS += -I../src/common
 
 # Uncomment following line and set the path to your kernel tree include
 # directory if your C library does not include all header files.
diff --git a/hostapd/config.c b/hostapd/config.c
index c8c22bb..e0571aa 100644
--- a/hostapd/config.c
+++ b/hostapd/config.c
@@ -23,7 +23,7 @@
 #include "sha1.h"
 #include "eap_server/eap.h"
 #include "radius/radius_client.h"
-#include "wpa_common.h"
+#include "common/wpa_common.h"
 #include "wpa.h"
 #include "uuid.h"
 #include "eap_common/eap_wsc_common.h"
diff --git a/hostapd/config.h b/hostapd/config.h
index 29b7384..beb6b7a 100644
--- a/hostapd/config.h
+++ b/hostapd/config.h
@@ -16,9 +16,9 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include "defs.h"
+#include "common/defs.h"
 #include "ip_addr.h"
-#include "wpa_common.h"
+#include "common/wpa_common.h"
 
 typedef u8 macaddr[ETH_ALEN];
 
diff --git a/hostapd/eapol_sm.h b/hostapd/eapol_sm.h
index b806443..c09c1eb 100644
--- a/hostapd/eapol_sm.h
+++ b/hostapd/eapol_sm.h
@@ -15,7 +15,7 @@
 #ifndef EAPOL_SM_H
 #define EAPOL_SM_H
 
-#include "defs.h"
+#include "common/defs.h"
 #include "radius/radius.h"
 
 /* IEEE Std 802.1X-2004, Ch. 8.2 */
diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 551766e..47941c5 100644
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -22,7 +22,7 @@
 #include "accounting.h"
 #include "eapol_sm.h"
 #include "iapp.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "ieee802_11_auth.h"
 #include "sta_info.h"
 #include "ap_list.h"
@@ -37,7 +37,6 @@
 #include "eap_server/eap_sim_db.h"
 #include "eap_server/eap.h"
 #include "eap_server/tncs.h"
-#include "version.h"
 #include "l2_packet/l2_packet.h"
 #include "wps_hostapd.h"
 #include "tkip_countermeasures.h"
diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
index 84e8641..bac4309 100644
--- a/hostapd/hostapd_cli.c
+++ b/hostapd/hostapd_cli.c
@@ -15,9 +15,9 @@
 #include "includes.h"
 #include <dirent.h>
 
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "common.h"
-#include "version.h"
+#include "common/version.h"
 
 
 static const char *hostapd_cli_version =
diff --git a/hostapd/hw_features.c b/hostapd/hw_features.c
index 2f61465..e6caf50 100644
--- a/hostapd/hw_features.c
+++ b/hostapd/hw_features.c
@@ -17,8 +17,8 @@
 #include "includes.h"
 
 #include "hostapd.h"
-#include "ieee802_11_defs.h"
-#include "ieee802_11_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 #include "eloop.h"
 #include "hw_features.h"
 #include "driver_i.h"
diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c
index be9a3a1..9a2a67c 100644
--- a/hostapd/ieee802_11.c
+++ b/hostapd/ieee802_11.c
@@ -36,7 +36,7 @@
 #include "accounting.h"
 #include "driver_i.h"
 #include "mlme.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 
 
 u8 * hostapd_eid_supp_rates(struct hostapd_data *hapd, u8 *eid)
diff --git a/hostapd/ieee802_11.h b/hostapd/ieee802_11.h
index 68ed983..9bcb309 100644
--- a/hostapd/ieee802_11.h
+++ b/hostapd/ieee802_11.h
@@ -16,8 +16,8 @@
 #ifndef IEEE802_11_H
 #define IEEE802_11_H
 
-#include "ieee802_11_defs.h"
-#include "ieee802_11_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 
 struct hostapd_iface;
 struct hostapd_data;
diff --git a/hostapd/ieee802_1x.c b/hostapd/ieee802_1x.c
index a6313fd..639949f 100644
--- a/hostapd/ieee802_1x.c
+++ b/hostapd/ieee802_1x.c
@@ -30,8 +30,8 @@
 #include "driver_i.h"
 #include "hw_features.h"
 #include "eap_server/eap.h"
-#include "ieee802_11_defs.h"
-#include "wpa_ctrl.h"
+#include "common/ieee802_11_defs.h"
+#include "common/wpa_ctrl.h"
 
 
 static void ieee802_1x_finished(struct hostapd_data *hapd,
diff --git a/hostapd/main.c b/hostapd/main.c
index 8bcc745..e7fddf4 100644
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -19,7 +19,7 @@
 
 #include "eloop.h"
 #include "hostapd.h"
-#include "version.h"
+#include "common/version.h"
 #include "config.h"
 #include "tls.h"
 #include "eap_server/eap.h"
diff --git a/hostapd/peerkey.c b/hostapd/peerkey.c
index 83f3ce5..e74b936 100644
--- a/hostapd/peerkey.c
+++ b/hostapd/peerkey.c
@@ -19,7 +19,6 @@
 #include "sha1.h"
 #include "sha256.h"
 #include "wpa.h"
-#include "defs.h"
 #include "wpa_auth_i.h"
 #include "wpa_auth_ie.h"
 
diff --git a/hostapd/preauth.c b/hostapd/preauth.c
index 011492b..b26bb1f 100644
--- a/hostapd/preauth.c
+++ b/hostapd/preauth.c
@@ -22,7 +22,7 @@
 #include "ieee802_1x.h"
 #include "eloop.h"
 #include "sta_info.h"
-#include "wpa_common.h"
+#include "common/wpa_common.h"
 #include "eapol_sm.h"
 #include "wpa.h"
 #include "preauth.h"
diff --git a/hostapd/sta_info.h b/hostapd/sta_info.h
index a3f94c5..52e2f2e 100644
--- a/hostapd/sta_info.h
+++ b/hostapd/sta_info.h
@@ -18,7 +18,7 @@
 #include "sta_flags.h"
 
 #ifdef CONFIG_IEEE80211N
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #endif /* CONFIG_IEEE80211N */
 
 /* Maximum number of supported rates (from both Supported Rates and Extended
diff --git a/hostapd/tkip_countermeasures.c b/hostapd/tkip_countermeasures.c
index 92019b3..37efc8c 100644
--- a/hostapd/tkip_countermeasures.c
+++ b/hostapd/tkip_countermeasures.c
@@ -20,7 +20,7 @@
 #include "sta_info.h"
 #include "mlme.h"
 #include "wpa.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "tkip_countermeasures.h"
 
 
diff --git a/hostapd/wpa.h b/hostapd/wpa.h
index 824c2e4..760818a 100644
--- a/hostapd/wpa.h
+++ b/hostapd/wpa.h
@@ -15,9 +15,9 @@
 #ifndef WPA_AUTH_H
 #define WPA_AUTH_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"
 
 #ifdef _MSC_VER
 #pragma pack(push, 1)
diff --git a/hostapd/wpa_ft.c b/hostapd/wpa_ft.c
index 115f1fc..5510423 100644
--- a/hostapd/wpa_ft.c
+++ b/hostapd/wpa_ft.c
@@ -20,7 +20,6 @@
 #include "aes_wrap.h"
 #include "ieee802_11.h"
 #include "wme.h"
-#include "defs.h"
 #include "wpa_auth_i.h"
 #include "wpa_auth_ie.h"
 
diff --git a/hostapd/wps_hostapd.c b/hostapd/wps_hostapd.c
index 4fe4834..1ca0ff9 100644
--- a/hostapd/wps_hostapd.c
+++ b/hostapd/wps_hostapd.c
@@ -18,9 +18,9 @@
 #include "driver_i.h"
 #include "eloop.h"
 #include "uuid.h"
-#include "wpa_ctrl.h"
-#include "ieee802_11_defs.h"
-#include "ieee802_11_common.h"
+#include "common/wpa_ctrl.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 #include "sta_info.h"
 #include "eapol_sm.h"
 #include "wps/wps.h"
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"
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 43a5454..c91758b 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -12,7 +12,6 @@ export BINDIR ?= /usr/local/sbin/
 CFLAGS += -I../src
 CFLAGS += -I../src/crypto
 CFLAGS += -I../src/utils
-CFLAGS += -I../src/common
 CFLAGS += -I../src/rsn_supp
 
 ALL=wpa_supplicant wpa_passphrase wpa_cli
diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
index e09e3ed..e3dcabc 100644
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -15,7 +15,7 @@
 #ifndef CONFIG_SSID_H
 #define CONFIG_SSID_H
 
-#include "defs.h"
+#include "common/defs.h"
 #include "eap_peer/eap_config.h"
 
 #define MAX_SSID_LEN 32
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 48e445d..0855db8 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -25,9 +25,9 @@
 #include "l2_packet/l2_packet.h"
 #include "preauth.h"
 #include "pmksa_cache.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "eap_peer/eap.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "wps_supplicant.h"
 #include "wps/wps.h"
 #include "ibss_rsn.h"
diff --git a/wpa_supplicant/ctrl_iface_dbus_handlers.c b/wpa_supplicant/ctrl_iface_dbus_handlers.c
index 0e9d4af..55b1acb 100644
--- a/wpa_supplicant/ctrl_iface_dbus_handlers.c
+++ b/wpa_supplicant/ctrl_iface_dbus_handlers.c
@@ -23,7 +23,7 @@
 #include "notify.h"
 #include "eap_peer/eap_methods.h"
 #include "dbus_dict_helpers.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "wpas_glue.h"
 #include "eapol_supp/eapol_supp_sm.h"
 #include "wps_supplicant.h"
diff --git a/wpa_supplicant/ctrl_iface_dbus_new_handlers.c b/wpa_supplicant/ctrl_iface_dbus_new_handlers.c
index 40c5a23..a017dbc 100644
--- a/wpa_supplicant/ctrl_iface_dbus_new_handlers.c
+++ b/wpa_supplicant/ctrl_iface_dbus_new_handlers.c
@@ -25,7 +25,7 @@
 #include "notify.h"
 #include "eap_peer/eap_methods.h"
 #include "dbus_dict_helpers.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "wpas_glue.h"
 #include "eapol_supp/eapol_supp_sm.h"
 #include "wps_supplicant.h"
diff --git a/wpa_supplicant/ctrl_iface_named_pipe.c b/wpa_supplicant/ctrl_iface_named_pipe.c
index e8b53b1..5f7e24d 100644
--- a/wpa_supplicant/ctrl_iface_named_pipe.c
+++ b/wpa_supplicant/ctrl_iface_named_pipe.c
@@ -20,7 +20,7 @@
 #include "eapol_supp/eapol_supp_sm.h"
 #include "wpa_supplicant_i.h"
 #include "ctrl_iface.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 
 #ifdef __MINGW32_VERSION
 /* mingw-w32api v3.1 does not yet include sddl.h, so define needed parts here
diff --git a/wpa_supplicant/ctrl_iface_udp.c b/wpa_supplicant/ctrl_iface_udp.c
index 18e4040..110ca4f 100644
--- a/wpa_supplicant/ctrl_iface_udp.c
+++ b/wpa_supplicant/ctrl_iface_udp.c
@@ -20,7 +20,7 @@
 #include "eapol_supp/eapol_supp_sm.h"
 #include "wpa_supplicant_i.h"
 #include "ctrl_iface.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 
 
 #define COOKIE_LEN 8
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index dc28c2f..d5223c5 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -25,10 +25,10 @@
 #include "pcsc_funcs.h"
 #include "preauth.h"
 #include "pmksa_cache.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "eap_peer/eap.h"
 #include "notify.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "blacklist.h"
 #include "wpas_glue.h"
 #include "wps_supplicant.h"
diff --git a/wpa_supplicant/mlme.c b/wpa_supplicant/mlme.c
index 9bdb9fb..a71df15 100644
--- a/wpa_supplicant/mlme.c
+++ b/wpa_supplicant/mlme.c
@@ -23,8 +23,8 @@
 #include "notify.h"
 #include "driver_i.h"
 #include "wpa.h"
-#include "ieee802_11_defs.h"
-#include "ieee802_11_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 #include "mlme.h"
 
 
diff --git a/wpa_supplicant/nmake.mak b/wpa_supplicant/nmake.mak
index 4302260..8b9956f 100644
--- a/wpa_supplicant/nmake.mak
+++ b/wpa_supplicant/nmake.mak
@@ -48,7 +48,7 @@ CFLAGS = $(CFLAGS) /DPCSC_FUNCS
 CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE
 CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE_NAMED_PIPE
 CFLAGS = $(CFLAGS) /DCONFIG_DRIVER_NDIS
-CFLAGS = $(CFLAGS) /I..\src /I..\src\utils /I..\src\common /I..\src\crypto
+CFLAGS = $(CFLAGS) /I..\src /I..\src\utils /I..\src\crypto
 CFLAGS = $(CFLAGS) /I..\src\rsn_supp /I..\src\eapol_supp /I.
 CFLAGS = $(CFLAGS) /DWIN32
 CFLAGS = $(CFLAGS) /Fo$(OBJDIR)\\ /c
diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
index 7b2764c..b4fe000 100644
--- a/wpa_supplicant/sme.c
+++ b/wpa_supplicant/sme.c
@@ -15,9 +15,9 @@
 #include "includes.h"
 
 #include "common.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "eapol_supp/eapol_supp_sm.h"
-#include "wpa_common.h"
+#include "common/wpa_common.h"
 #include "wpa.h"
 #include "pmksa_cache.h"
 #include "config.h"
diff --git a/wpa_supplicant/symbian/wpa_supplicant.mmp b/wpa_supplicant/symbian/wpa_supplicant.mmp
index dc67ba8..e16e083 100644
--- a/wpa_supplicant/symbian/wpa_supplicant.mmp
+++ b/wpa_supplicant/symbian/wpa_supplicant.mmp
@@ -5,7 +5,7 @@ TARGETTYPE	exe
 
 SYSTEMINCLUDE \epoc32\include \epoc32\include\variant \epoc32\include\ecom \epoc32\include\libc
 
-USERINCLUDE	.. ..\..\src ..\..\src\utils ..\..\src\common ..\..\src\crypto ..\..\src\rsn_supp
+USERINCLUDE	.. ..\..\src ..\..\src\utils ..\..\src\crypto ..\..\src\rsn_supp
 
 SOURCEPATH	..
 SOURCE		main_symbian.cpp
diff --git a/wpa_supplicant/tests/test_wpa.c b/wpa_supplicant/tests/test_wpa.c
index 4c341b6..af1aa02 100644
--- a/wpa_supplicant/tests/test_wpa.c
+++ b/wpa_supplicant/tests/test_wpa.c
@@ -16,7 +16,7 @@
 
 #include "common.h"
 #include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "../config.h"
 #include "wpa.h"
 #include "wpa_ie.h"
diff --git a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
index c4dd452..28cfa3d 100755
--- a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
+++ b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
@@ -40,7 +40,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\common;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"

+				AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -119,7 +119,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\common;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"

+				AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

diff --git a/wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj b/wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj
index 6d36cba..8edf12d 100755
--- a/wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj
+++ b/wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj
@@ -40,7 +40,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\src\utils;..\..\..\src\common"

+				AdditionalIncludeDirectories="..\..\..\src\utils"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -118,7 +118,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..\..\src\utils;..\..\..\src\common"

+				AdditionalIncludeDirectories="..\..\..\src\utils"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

diff --git a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
index 93d25e8..2791825 100755
--- a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
+++ b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
@@ -40,7 +40,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\common;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"

+				AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -119,7 +119,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\common;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"

+				AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

diff --git a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
index 6226271..a10b66d 100755
--- a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
+++ b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
@@ -40,7 +40,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\common;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"

+				AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -119,7 +119,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\common;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"

+				AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index dc7ae6c..82d7ae2 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -24,9 +24,9 @@
 #include <readline/history.h>
 #endif /* CONFIG_READLINE */
 
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "common.h"
-#include "version.h"
+#include "common/version.h"
 
 
 static const char *wpa_cli_version =
diff --git a/wpa_supplicant/wpa_gui-qt4/addinterface.cpp b/wpa_supplicant/wpa_gui-qt4/addinterface.cpp
index 02fecfe..22cdc92 100644
--- a/wpa_supplicant/wpa_gui-qt4/addinterface.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/addinterface.cpp
@@ -13,7 +13,7 @@
  */
 
 #include <cstdio>
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 
 #include <QMessageBox>
 
diff --git a/wpa_supplicant/wpa_gui-qt4/peers.cpp b/wpa_supplicant/wpa_gui-qt4/peers.cpp
index 12ed18a..d1439e2 100644
--- a/wpa_supplicant/wpa_gui-qt4/peers.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/peers.cpp
@@ -16,7 +16,7 @@
 #include <QImageReader>
 #include <QMessageBox>
 
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "wpagui.h"
 #include "stringquery.h"
 #include "peers.h"
diff --git a/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp b/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp
index 42fbdbc..d8feb6c 100644
--- a/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp
@@ -14,7 +14,7 @@
 
 #include "userdatarequest.h"
 #include "wpagui.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 
 
 UserDataRequest::UserDataRequest(QWidget *parent, const char *, bool,
diff --git a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
index ec01b3b..7a78843 100644
--- a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
+++ b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
@@ -27,7 +27,7 @@ win32 {
   SOURCES += ../../src/utils/os_unix.c
 }
 
-INCLUDEPATH	+= . .. ../../src/utils ../../src/common
+INCLUDEPATH	+= . .. ../../src ../../src/utils
 
 HEADERS	+= wpamsg.h \
 	wpagui.h \
diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
index fb7d747..943bd53 100644
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
@@ -29,7 +29,7 @@
 
 #include "wpagui.h"
 #include "dirent.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "userdatarequest.h"
 #include "networkconfig.h"
 
diff --git a/wpa_supplicant/wpa_gui/scanresults.ui b/wpa_supplicant/wpa_gui/scanresults.ui
index 66c8b4b..dea305b 100644
--- a/wpa_supplicant/wpa_gui/scanresults.ui
+++ b/wpa_supplicant/wpa_gui/scanresults.ui
@@ -151,7 +151,7 @@
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in implementation">wpa_ctrl.h</include>
+    <include location="local" impldecl="in implementation">common/wpa_ctrl.h</include>
     <include location="local" impldecl="in implementation">wpagui.h</include>
     <include location="local" impldecl="in implementation">networkconfig.h</include>
     <include location="local" impldecl="in implementation">scanresults.ui.h</include>
diff --git a/wpa_supplicant/wpa_gui/userdatarequest.ui b/wpa_supplicant/wpa_gui/userdatarequest.ui
index c3d545f..6106b1e 100644
--- a/wpa_supplicant/wpa_gui/userdatarequest.ui
+++ b/wpa_supplicant/wpa_gui/userdatarequest.ui
@@ -140,7 +140,7 @@
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in implementation">wpa_ctrl.h</include>
+    <include location="local" impldecl="in implementation">common/wpa_ctrl.h</include>
     <include location="local" impldecl="in implementation">wpagui.h</include>
     <include location="local" impldecl="in implementation">userdatarequest.ui.h</include>
 </includes>
diff --git a/wpa_supplicant/wpa_gui/wpa_gui.pro b/wpa_supplicant/wpa_gui/wpa_gui.pro
index 6363db9..a42a4ac 100644
--- a/wpa_supplicant/wpa_gui/wpa_gui.pro
+++ b/wpa_supplicant/wpa_gui/wpa_gui.pro
@@ -19,7 +19,7 @@ win32 {
   SOURCES += ../../src/utils/os_unix.c
 }
 
-INCLUDEPATH	+= . .. ../../src/utils ../../src/common
+INCLUDEPATH	+= . .. ../../src ../../src/utils
 
 HEADERS	+= wpamsg.h
 
diff --git a/wpa_supplicant/wpa_gui/wpagui.ui b/wpa_supplicant/wpa_gui/wpagui.ui
index 01666a3..b49d96b 100644
--- a/wpa_supplicant/wpa_gui/wpagui.ui
+++ b/wpa_supplicant/wpa_gui/wpagui.ui
@@ -414,7 +414,7 @@
     <include location="local" impldecl="in declaration">wpamsg.h</include>
     <include location="local" impldecl="in declaration">eventhistory.h</include>
     <include location="local" impldecl="in declaration">scanresults.h</include>
-    <include location="local" impldecl="in implementation">wpa_ctrl.h</include>
+    <include location="local" impldecl="in implementation">common/wpa_ctrl.h</include>
     <include location="global" impldecl="in implementation">dirent.h</include>
     <include location="global" impldecl="in implementation">qmessagebox.h</include>
     <include location="global" impldecl="in implementation">qapplication.h</include>
diff --git a/wpa_supplicant/wpa_priv.c b/wpa_supplicant/wpa_priv.c
index 193c542..975a4ed 100644
--- a/wpa_supplicant/wpa_priv.c
+++ b/wpa_supplicant/wpa_priv.c
@@ -21,11 +21,11 @@
 
 #include "common.h"
 #include "eloop.h"
-#include "version.h"
+#include "common/version.h"
 #include "drivers/driver.h"
 #include "l2_packet/l2_packet.h"
-#include "privsep_commands.h"
-#include "ieee802_11_defs.h"
+#include "common/privsep_commands.h"
+#include "common/ieee802_11_defs.h"
 
 
 struct wpa_priv_interface {
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 5ea06f4..b73010a 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -30,12 +30,12 @@
 #include "driver_i.h"
 #include "ctrl_iface.h"
 #include "pcsc_funcs.h"
-#include "version.h"
+#include "common/version.h"
 #include "preauth.h"
 #include "pmksa_cache.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "mlme.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "blacklist.h"
 #include "wpas_glue.h"
 #include "wps_supplicant.h"
diff --git a/wpa_supplicant/wpas_glue.c b/wpa_supplicant/wpas_glue.c
index b1f8bf8..a59c0f1 100644
--- a/wpa_supplicant/wpas_glue.c
+++ b/wpa_supplicant/wpas_glue.c
@@ -20,14 +20,14 @@
 #include "eloop.h"
 #include "config.h"
 #include "l2_packet/l2_packet.h"
-#include "wpa_common.h"
+#include "common/wpa_common.h"
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
 #include "pmksa_cache.h"
 #include "mlme.h"
 #include "sme.h"
-#include "ieee802_11_defs.h"
-#include "wpa_ctrl.h"
+#include "common/ieee802_11_defs.h"
+#include "common/wpa_ctrl.h"
 #include "wpas_glue.h"
 #include "wps_supplicant.h"
 
diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 938ad89..de0a370 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -15,16 +15,16 @@
 #include "includes.h"
 
 #include "common.h"
-#include "ieee802_11_defs.h"
-#include "ieee802_11_common.h"
-#include "wpa_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
+#include "common/wpa_common.h"
 #include "config.h"
 #include "eap_peer/eap.h"
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
 #include "eloop.h"
 #include "uuid.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "notify.h"
 #include "eap_common/eap_wsc_common.h"
 #include "blacklist.h"
diff --git a/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj b/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
index 7b7ecb5..1d94554 100644
--- a/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
+++ b/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
@@ -455,7 +455,6 @@
 					../../src,
 					../../src/crypto,
 					../../src/utils,
-					../../src/common,
 					../../src/rsn_supp,
 				);
 				ONLY_ACTIVE_ARCH = YES;
@@ -479,7 +478,6 @@
 					../../src,
 					../../src/crypto,
 					../../src/utils,
-					../../src/common,
 					../../src/rsn_supp,
 				);
 				OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS";