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, 48 insertions, 51 deletions

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";