diff --git a/hostapd/Makefile b/hostapd/Makefile
index 9a53245bc..37fd8bb5b 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -42,15 +42,15 @@ OBJS += ../src/ap/ap_drv_ops.o
 OBJS += ../src/ap/utils.o
 OBJS += ../src/ap/authsrv.o
 OBJS += ../src/ap/ieee802_1x.o
-OBJS += ../src/ap/config.o
+OBJS += ../src/ap/ap_config.o
 OBJS += ../src/ap/ieee802_11_auth.o
 OBJS += ../src/ap/sta_info.o
-OBJS += ../src/ap/wpa.o
+OBJS += ../src/ap/wpa_auth.o
 OBJS += ../src/ap/tkip_countermeasures.o
-OBJS += ../src/ap/mlme.o
+OBJS += ../src/ap/ap_mlme.o
 OBJS += ../src/ap/wpa_auth_ie.o
-OBJS += ../src/ap/preauth.o
-OBJS += ../src/ap/pmksa_cache.o
+OBJS += ../src/ap/preauth_auth.o
+OBJS += ../src/ap/pmksa_cache_auth.o
 
 NEED_RC4=y
 NEED_AES=y
@@ -137,7 +137,7 @@ endif
 
 ifdef CONFIG_PEERKEY
 CFLAGS += -DCONFIG_PEERKEY
-OBJS += ../src/ap/peerkey.o
+OBJS += ../src/ap/peerkey_auth.o
 endif
 
 ifdef CONFIG_IEEE80211W
@@ -148,7 +148,7 @@ endif
 
 ifdef CONFIG_IEEE80211R
 CFLAGS += -DCONFIG_IEEE80211R
-OBJS += ../src/ap/wpa_ft.o
+OBJS += ../src/ap/wpa_auth_ft.o
 NEED_SHA256=y
 NEED_AES_OMAC1=y
 NEED_AES_UNWRAP=y
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 8983f447a..0ec83b098 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -12,19 +12,19 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 #ifndef CONFIG_NATIVE_WINDOWS
 #include <grp.h>
 #endif /* CONFIG_NATIVE_WINDOWS */
 
-#include "common.h"
-#include "uuid.h"
+#include "utils/common.h"
+#include "utils/uuid.h"
 #include "common/ieee802_11_defs.h"
 #include "drivers/driver.h"
 #include "eap_server/eap.h"
 #include "radius/radius_client.h"
-#include "ap/wpa.h"
-#include "ap/config.h"
+#include "ap/wpa_auth.h"
+#include "ap/ap_config.h"
 #include "config_file.h"
 
 
diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index ccb2266f3..bf42bca2c 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -1,6 +1,6 @@
 /*
  * hostapd / UNIX domain socket -based control interface
- * Copyright (c) 2004-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2004-2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -12,7 +12,7 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
 #ifndef CONFIG_NATIVE_WINDOWS
 
@@ -20,14 +20,14 @@
 #include <sys/stat.h>
 #include <stddef.h>
 
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
 #include "drivers/driver.h"
 #include "radius/radius_client.h"
 #include "ap/hostapd.h"
-#include "ap/config.h"
+#include "ap/ap_config.h"
 #include "ap/ieee802_1x.h"
-#include "ap/wpa.h"
+#include "ap/wpa_auth.h"
 #include "ap/ieee802_11.h"
 #include "ap/sta_info.h"
 #include "ap/accounting.h"
diff --git a/hostapd/dump_state.c b/hostapd/dump_state.c
index 7eeb2924f..bba3068cc 100644
--- a/hostapd/dump_state.c
+++ b/hostapd/dump_state.c
@@ -12,16 +12,16 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
+#include "utils/common.h"
 #include "radius/radius_client.h"
 #include "radius/radius_server.h"
 #include "eapol_auth/eapol_auth_sm.h"
 #include "eapol_auth/eapol_auth_sm_i.h"
 #include "eap_server/eap.h"
 #include "ap/hostapd.h"
-#include "ap/config.h"
+#include "ap/ap_config.h"
 #include "ap/sta_info.h"
 #include "dump_state.h"
 
diff --git a/hostapd/main.c b/hostapd/main.c
index d69e1e637..eb0ef595c 100644
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -12,20 +12,20 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 #ifndef CONFIG_NATIVE_WINDOWS
 #include <syslog.h>
 #endif /* CONFIG_NATIVE_WINDOWS */
 
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
 #include "crypto/tls.h"
 #include "common/version.h"
 #include "drivers/driver.h"
 #include "eap_server/eap.h"
 #include "eap_server/tncs.h"
 #include "ap/hostapd.h"
-#include "ap/config.h"
+#include "ap/ap_config.h"
 #include "config_file.h"
 #include "eap_register.h"
 #include "dump_state.h"
diff --git a/src/ap/accounting.c b/src/ap/accounting.c
index 12678bcf1..7939c680f 100644
--- a/src/ap/accounting.c
+++ b/src/ap/accounting.c
@@ -12,18 +12,18 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
-#include "hostapd.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
 #include "drivers/driver.h"
 #include "radius/radius.h"
 #include "radius/radius_client.h"
-#include "eloop.h"
-#include "accounting.h"
+#include "hostapd.h"
 #include "ieee802_1x.h"
-#include "config.h"
+#include "ap_config.h"
 #include "sta_info.h"
+#include "accounting.h"
 
 
 /* Default interval in seconds for polling TX/RX octets from the driver if
diff --git a/src/ap/config.c b/src/ap/ap_config.c
similarity index 99%
rename from src/ap/config.c
rename to src/ap/ap_config.c
index e62a9c28b..c695de13d 100644
--- a/src/ap/config.c
+++ b/src/ap/ap_config.c
@@ -12,18 +12,18 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
+#include "utils/common.h"
 #include "crypto/sha1.h"
 #include "radius/radius_client.h"
 #include "common/ieee802_11_defs.h"
 #include "common/eapol_common.h"
 #include "eap_common/eap_wsc_common.h"
 #include "eap_server/eap.h"
-#include "wpa.h"
+#include "wpa_auth.h"
 #include "sta_info.h"
-#include "config.h"
+#include "ap_config.h"
 
 
 static void hostapd_config_free_vlan(struct hostapd_bss_config *bss)
diff --git a/src/ap/config.h b/src/ap/ap_config.h
similarity index 100%
rename from src/ap/config.h
rename to src/ap/ap_config.h
diff --git a/src/ap/ap_list.c b/src/ap/ap_list.c
index 4878104cd..0b7a8a109 100644
--- a/src/ap/ap_list.c
+++ b/src/ap/ap_list.c
@@ -20,7 +20,7 @@
 #include "utils/eloop.h"
 #include "drivers/driver.h"
 #include "hostapd.h"
-#include "config.h"
+#include "ap_config.h"
 #include "ieee802_11.h"
 #include "sta_info.h"
 #include "beacon.h"
diff --git a/src/ap/mlme.c b/src/ap/ap_mlme.c
similarity index 98%
rename from src/ap/mlme.c
rename to src/ap/ap_mlme.c
index adc7ce6aa..5f8fd8775 100644
--- a/src/ap/mlme.c
+++ b/src/ap/ap_mlme.c
@@ -14,13 +14,13 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
+#include "utils/common.h"
 #include "ieee802_11.h"
-#include "wpa.h"
+#include "wpa_auth.h"
 #include "sta_info.h"
-#include "mlme.h"
+#include "ap_mlme.h"
 
 
 #ifndef CONFIG_NO_HOSTAPD_LOGGER
diff --git a/src/ap/mlme.h b/src/ap/ap_mlme.h
similarity index 100%
rename from src/ap/mlme.h
rename to src/ap/ap_mlme.h
diff --git a/src/ap/authsrv.c b/src/ap/authsrv.c
index 508688ea6..b90114362 100644
--- a/src/ap/authsrv.c
+++ b/src/ap/authsrv.c
@@ -21,7 +21,7 @@
 #include "eapol_auth/eapol_auth_sm.h"
 #include "radius/radius_server.h"
 #include "hostapd.h"
-#include "config.h"
+#include "ap_config.h"
 #include "sta_info.h"
 #include "authsrv.h"
 
diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index d2a012ab9..aa09bea2d 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -14,19 +14,19 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
 #ifndef CONFIG_NATIVE_WINDOWS
 
-#include "common.h"
+#include "utils/common.h"
+#include "drivers/driver.h"
 #include "hostapd.h"
 #include "ieee802_11.h"
-#include "wpa.h"
+#include "wpa_auth.h"
 #include "wmm.h"
-#include "beacon.h"
-#include "drivers/driver.h"
-#include "config.h"
+#include "ap_config.h"
 #include "sta_info.h"
+#include "beacon.h"
 
 
 static u8 ieee802_11_erp_info(struct hostapd_data *hapd)
diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c
index 7940f801c..e50b0a70c 100644
--- a/src/ap/ctrl_iface_ap.c
+++ b/src/ap/ctrl_iface_ap.c
@@ -12,15 +12,15 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
-#include "ap/hostapd.h"
-#include "ap/ieee802_1x.h"
-#include "ap/wpa.h"
-#include "ap/ieee802_11.h"
-#include "ap/sta_info.h"
-#include "ap/wps_hostapd.h"
+#include "utils/common.h"
+#include "hostapd.h"
+#include "ieee802_1x.h"
+#include "wpa_auth.h"
+#include "ieee802_11.h"
+#include "sta_info.h"
+#include "wps_hostapd.h"
 #include "ctrl_iface_ap.h"
 
 
diff --git a/src/ap/driver_i.h b/src/ap/driver_i.h
index aa280f79c..9ab1b4ad8 100644
--- a/src/ap/driver_i.h
+++ b/src/ap/driver_i.h
@@ -16,7 +16,7 @@
 #define DRIVER_I_H
 
 #include "drivers/driver.h"
-#include "ap/config.h"
+#include "ap/ap_config.h"
 
 static inline int
 hostapd_set_ieee8021x(struct hostapd_data *hapd, struct wpa_bss_params *params)
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 072219170..abf9163f0 100644
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -12,20 +12,20 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
+#include "utils/common.h"
 #include "radius/radius.h"
-#include "ap/hostapd.h"
-#include "ap/ieee802_11.h"
-#include "ap/sta_info.h"
-#include "ap/accounting.h"
-#include "ap/tkip_countermeasures.h"
-#include "ap/iapp.h"
-#include "ap/ieee802_1x.h"
-#include "ap/wpa.h"
-#include "ap/wmm.h"
-#include "ap/wps_hostapd.h"
+#include "hostapd.h"
+#include "ieee802_11.h"
+#include "sta_info.h"
+#include "accounting.h"
+#include "tkip_countermeasures.h"
+#include "iapp.h"
+#include "ieee802_1x.h"
+#include "wpa_auth.h"
+#include "wmm.h"
+#include "wps_hostapd.h"
 #include "driver_i.h"
 
 
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index fe7a3c52c..e6151d56b 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -12,24 +12,24 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
 #include "common/ieee802_11_defs.h"
 #include "radius/radius_client.h"
-#include "ap/hostapd.h"
-#include "ap/authsrv.h"
-#include "ap/sta_info.h"
-#include "ap/accounting.h"
-#include "ap/ap_list.h"
-#include "ap/beacon.h"
-#include "ap/iapp.h"
-#include "ap/ieee802_1x.h"
-#include "ap/ieee802_11_auth.h"
-#include "ap/vlan_init.h"
-#include "ap/wpa.h"
-#include "ap/wps_hostapd.h"
+#include "hostapd.h"
+#include "authsrv.h"
+#include "sta_info.h"
+#include "accounting.h"
+#include "ap_list.h"
+#include "beacon.h"
+#include "iapp.h"
+#include "ieee802_1x.h"
+#include "ieee802_11_auth.h"
+#include "vlan_init.h"
+#include "wpa_auth.h"
+#include "wps_hostapd.h"
 #include "hw_features.h"
 #include "driver_i.h"
 #include "wpa_auth_glue.h"
diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
index e89c9d7e5..f4081cff6 100644
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
@@ -20,10 +20,10 @@
 #include "utils/eloop.h"
 #include "common/ieee802_11_defs.h"
 #include "common/ieee802_11_common.h"
-#include "ap/hostapd.h"
-#include "ap/config.h"
-#include "hw_features.h"
+#include "hostapd.h"
+#include "ap_config.h"
 #include "driver_i.h"
+#include "hw_features.h"
 
 
 void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,
diff --git a/src/ap/iapp.c b/src/ap/iapp.c
index 4545bfaf4..e9a86168e 100644
--- a/src/ap/iapp.c
+++ b/src/ap/iapp.c
@@ -48,10 +48,10 @@
 
 #include "utils/common.h"
 #include "utils/eloop.h"
-#include "ap/hostapd.h"
-#include "ap/config.h"
-#include "ap/ieee802_11.h"
-#include "ap/sta_info.h"
+#include "hostapd.h"
+#include "ap_config.h"
+#include "ieee802_11.h"
+#include "sta_info.h"
 #include "iapp.h"
 
 
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 316965b14..91d4b978a 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -24,17 +24,17 @@
 #include "radius/radius.h"
 #include "radius/radius_client.h"
 #include "hostapd.h"
-#include "ieee802_11.h"
 #include "beacon.h"
 #include "ieee802_11_auth.h"
 #include "sta_info.h"
 #include "ieee802_1x.h"
-#include "wpa.h"
+#include "wpa_auth.h"
 #include "wmm.h"
 #include "ap_list.h"
 #include "accounting.h"
-#include "config.h"
-#include "mlme.h"
+#include "ap_config.h"
+#include "ap_mlme.h"
+#include "ieee802_11.h"
 
 
 u8 * hostapd_eid_supp_rates(struct hostapd_data *hapd, u8 *eid)
diff --git a/src/ap/ieee802_11_auth.c b/src/ap/ieee802_11_auth.c
index 51551002e..a3b4fdc99 100644
--- a/src/ap/ieee802_11_auth.c
+++ b/src/ap/ieee802_11_auth.c
@@ -1,6 +1,6 @@
 /*
  * hostapd / IEEE 802.11 authentication (ACL)
- * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -17,18 +17,18 @@
  * authentication frame processing.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
 #ifndef CONFIG_NATIVE_WINDOWS
 
-#include "common.h"
-#include "hostapd.h"
-#include "config.h"
-#include "ieee802_11.h"
-#include "ieee802_11_auth.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
 #include "radius/radius.h"
 #include "radius/radius_client.h"
-#include "eloop.h"
+#include "hostapd.h"
+#include "ap_config.h"
+#include "ieee802_11.h"
+#include "ieee802_11_auth.h"
 
 #define RADIUS_ACL_TIMEOUT 30
 
diff --git a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c
index 1cf612b6e..30e2e44c5 100644
--- a/src/ap/ieee802_11_ht.c
+++ b/src/ap/ieee802_11_ht.c
@@ -13,12 +13,12 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
+#include "utils/common.h"
 #include "drivers/driver.h"
 #include "hostapd.h"
-#include "config.h"
+#include "ap_config.h"
 #include "sta_info.h"
 #include "beacon.h"
 #include "ieee802_11.h"
diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c
index a619b1571..69df06eec 100644
--- a/src/ap/ieee802_1x.c
+++ b/src/ap/ieee802_1x.c
@@ -12,27 +12,27 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
 #include "crypto/md5.h"
 #include "crypto/crypto.h"
 #include "common/ieee802_11_defs.h"
 #include "common/wpa_ctrl.h"
 #include "radius/radius.h"
 #include "radius/radius_client.h"
+#include "eap_server/eap.h"
 #include "eapol_auth/eapol_auth_sm.h"
 #include "eapol_auth/eapol_auth_sm_i.h"
 #include "hostapd.h"
-#include "ieee802_1x.h"
 #include "accounting.h"
 #include "sta_info.h"
-#include "wpa.h"
-#include "preauth.h"
-#include "pmksa_cache.h"
-#include "config.h"
-#include "eap_server/eap.h"
+#include "wpa_auth.h"
+#include "preauth_auth.h"
+#include "pmksa_cache_auth.h"
+#include "ap_config.h"
+#include "ieee802_1x.h"
 
 
 static void ieee802_1x_finished(struct hostapd_data *hapd,
diff --git a/src/ap/peerkey.c b/src/ap/peerkey_auth.c
similarity index 98%
rename from src/ap/peerkey.c
rename to src/ap/peerkey_auth.c
index 4bee2d94b..f68c47909 100644
--- a/src/ap/peerkey.c
+++ b/src/ap/peerkey_auth.c
@@ -1,6 +1,6 @@
 /*
  * hostapd - PeerKey for Direct Link Setup (DLS)
- * Copyright (c) 2006-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2006-2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -12,13 +12,13 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
 #include "crypto/sha1.h"
 #include "crypto/sha256.h"
-#include "wpa.h"
+#include "wpa_auth.h"
 #include "wpa_auth_i.h"
 #include "wpa_auth_ie.h"
 
diff --git a/src/ap/pmksa_cache.c b/src/ap/pmksa_cache_auth.c
similarity index 98%
rename from src/ap/pmksa_cache.c
rename to src/ap/pmksa_cache_auth.c
index 2df6c8177..22f44b784 100644
--- a/src/ap/pmksa_cache.c
+++ b/src/ap/pmksa_cache_auth.c
@@ -12,16 +12,15 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
-#include "sta_info.h"
-#include "config.h"
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
 #include "eapol_auth/eapol_auth_sm.h"
 #include "eapol_auth/eapol_auth_sm_i.h"
-#include "pmksa_cache.h"
+#include "sta_info.h"
+#include "ap_config.h"
+#include "pmksa_cache_auth.h"
 
 
 static const int pmksa_cache_max_entries = 1024;
diff --git a/src/ap/pmksa_cache.h b/src/ap/pmksa_cache_auth.h
similarity index 100%
rename from src/ap/pmksa_cache.h
rename to src/ap/pmksa_cache_auth.h
diff --git a/src/ap/preauth.c b/src/ap/preauth_auth.c
similarity index 97%
rename from src/ap/preauth.c
rename to src/ap/preauth_auth.c
index d544fc518..ade0a9e7f 100644
--- a/src/ap/preauth.c
+++ b/src/ap/preauth_auth.c
@@ -12,22 +12,22 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
 #ifdef CONFIG_RSN_PREAUTH
 
-#include "common.h"
-#include "hostapd.h"
-#include "config.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
 #include "l2_packet/l2_packet.h"
-#include "ieee802_1x.h"
-#include "eloop.h"
-#include "sta_info.h"
 #include "common/wpa_common.h"
 #include "eapol_auth/eapol_auth_sm.h"
 #include "eapol_auth/eapol_auth_sm_i.h"
-#include "wpa.h"
-#include "preauth.h"
+#include "hostapd.h"
+#include "ap_config.h"
+#include "ieee802_1x.h"
+#include "sta_info.h"
+#include "wpa_auth.h"
+#include "preauth_auth.h"
 
 #ifndef ETH_P_PREAUTH
 #define ETH_P_PREAUTH 0x88C7 /* IEEE 802.11i pre-authentication */
diff --git a/src/ap/preauth.h b/src/ap/preauth_auth.h
similarity index 100%
rename from src/ap/preauth.h
rename to src/ap/preauth_auth.h
diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
index 4016bd82f..c387519f6 100644
--- a/src/ap/sta_info.c
+++ b/src/ap/sta_info.c
@@ -12,24 +12,24 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
 #include "radius/radius.h"
 #include "radius/radius_client.h"
 #include "drivers/driver.h"
 #include "hostapd.h"
-#include "sta_info.h"
-#include "eloop.h"
 #include "accounting.h"
 #include "ieee802_1x.h"
 #include "ieee802_11.h"
-#include "wpa.h"
-#include "preauth.h"
-#include "config.h"
+#include "wpa_auth.h"
+#include "preauth_auth.h"
+#include "ap_config.h"
 #include "beacon.h"
-#include "mlme.h"
+#include "ap_mlme.h"
 #include "vlan_init.h"
+#include "sta_info.h"
 
 static int ap_sta_in_other_bss(struct hostapd_data *hapd,
 			       struct sta_info *sta, u32 flags);
diff --git a/src/ap/tkip_countermeasures.c b/src/ap/tkip_countermeasures.c
index e3c9f1bb0..9690348e9 100644
--- a/src/ap/tkip_countermeasures.c
+++ b/src/ap/tkip_countermeasures.c
@@ -12,15 +12,15 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
-#include "hostapd.h"
-#include "eloop.h"
-#include "sta_info.h"
-#include "mlme.h"
-#include "wpa.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
 #include "common/ieee802_11_defs.h"
+#include "hostapd.h"
+#include "sta_info.h"
+#include "ap_mlme.h"
+#include "wpa_auth.h"
 #include "tkip_countermeasures.h"
 
 
diff --git a/src/ap/vlan_init.c b/src/ap/vlan_init.c
index 3bce50c2a..56032abf2 100644
--- a/src/ap/vlan_init.c
+++ b/src/ap/vlan_init.c
@@ -14,11 +14,11 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
+#include "utils/common.h"
 #include "hostapd.h"
-#include "config.h"
+#include "ap_config.h"
 #include "vlan_init.h"
 
 
@@ -31,7 +31,7 @@
 #include <linux/if_bridge.h>
 
 #include "drivers/priv_netlink.h"
-#include "eloop.h"
+#include "utils/eloop.h"
 
 
 struct full_dynamic_vlan {
diff --git a/src/ap/wmm.c b/src/ap/wmm.c
index 2db2d8da5..403560ee4 100644
--- a/src/ap/wmm.c
+++ b/src/ap/wmm.c
@@ -2,6 +2,7 @@
  * hostapd / WMM (Wi-Fi Multimedia)
  * Copyright 2002-2003, Instant802 Networks, Inc.
  * Copyright 2005-2006, Devicescape Software, Inc.
+ * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -13,13 +14,13 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
+#include "utils/common.h"
 #include "hostapd.h"
 #include "ieee802_11.h"
 #include "sta_info.h"
-#include "config.h"
+#include "ap_config.h"
 #include "wmm.h"
 
 
diff --git a/src/ap/wmm.h b/src/ap/wmm.h
index fbaf8adc5..96b04e890 100644
--- a/src/ap/wmm.h
+++ b/src/ap/wmm.h
@@ -17,6 +17,7 @@
 #define WME_H
 
 struct ieee80211_mgmt;
+struct wmm_tspec_element;
 
 u8 * hostapd_eid_wmm(struct hostapd_data *hapd, u8 *eid);
 int hostapd_eid_wmm_valid(struct hostapd_data *hapd, const u8 *eid,
diff --git a/src/ap/wpa.c b/src/ap/wpa_auth.c
similarity index 99%
rename from src/ap/wpa.c
rename to src/ap/wpa_auth.c
index 4af26e9cf..0db226a00 100644
--- a/src/ap/wpa.c
+++ b/src/ap/wpa_auth.c
@@ -12,22 +12,22 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
 #ifndef CONFIG_NATIVE_WINDOWS
 
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
+#include "utils/state_machine.h"
 #include "crypto/aes_wrap.h"
 #include "crypto/crypto.h"
 #include "crypto/sha1.h"
 #include "crypto/sha256.h"
 #include "eapol_auth/eapol_auth_sm.h"
-#include "config.h"
-#include "wpa.h"
+#include "ap_config.h"
 #include "ieee802_11.h"
-#include "pmksa_cache.h"
-#include "state_machine.h"
+#include "wpa_auth.h"
+#include "pmksa_cache_auth.h"
 #include "wpa_auth_i.h"
 #include "wpa_auth_ie.h"
 
diff --git a/src/ap/wpa.h b/src/ap/wpa_auth.h
similarity index 100%
rename from src/ap/wpa.h
rename to src/ap/wpa_auth.h
diff --git a/src/ap/wpa_ft.c b/src/ap/wpa_auth_ft.c
similarity index 99%
rename from src/ap/wpa_ft.c
rename to src/ap/wpa_auth_ft.c
index 172a07ccb..e2e6b208c 100644
--- a/src/ap/wpa_ft.c
+++ b/src/ap/wpa_auth_ft.c
@@ -1,6 +1,6 @@
 /*
  * hostapd - IEEE 802.11r - Fast BSS Transition
- * Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2004-2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -12,14 +12,14 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
+#include "utils/common.h"
 #include "crypto/aes_wrap.h"
-#include "config.h"
-#include "wpa.h"
+#include "ap_config.h"
 #include "ieee802_11.h"
 #include "wmm.h"
+#include "wpa_auth.h"
 #include "wpa_auth_i.h"
 #include "wpa_auth_ie.h"
 
diff --git a/src/ap/wpa_auth_glue.c b/src/ap/wpa_auth_glue.c
index 1c7b8756d..82e4bbf0c 100644
--- a/src/ap/wpa_auth_glue.c
+++ b/src/ap/wpa_auth_glue.c
@@ -20,12 +20,12 @@
 #include "eapol_auth/eapol_auth_sm_i.h"
 #include "eap_server/eap.h"
 #include "l2_packet/l2_packet.h"
-#include "ap/hostapd.h"
-#include "ap/ieee802_1x.h"
-#include "ap/preauth.h"
-#include "ap/sta_info.h"
-#include "ap/tkip_countermeasures.h"
-#include "ap/wpa.h"
+#include "hostapd.h"
+#include "ieee802_1x.h"
+#include "preauth_auth.h"
+#include "sta_info.h"
+#include "tkip_countermeasures.h"
+#include "wpa_auth.h"
 #include "driver_i.h"
 
 
diff --git a/src/ap/wpa_auth_ie.c b/src/ap/wpa_auth_ie.c
index da37f8285..7b1d9b741 100644
--- a/src/ap/wpa_auth_ie.c
+++ b/src/ap/wpa_auth_ie.c
@@ -12,14 +12,14 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
-#include "config.h"
-#include "ieee802_11.h"
+#include "utils/common.h"
 #include "eapol_auth/eapol_auth_sm.h"
-#include "wpa.h"
-#include "pmksa_cache.h"
+#include "ap_config.h"
+#include "ieee802_11.h"
+#include "wpa_auth.h"
+#include "pmksa_cache_auth.h"
 #include "wpa_auth_ie.h"
 #include "wpa_auth_i.h"
 
diff --git a/src/ap/wps_hostapd.c b/src/ap/wps_hostapd.c
index 965db26ca..2c893f4bf 100644
--- a/src/ap/wps_hostapd.c
+++ b/src/ap/wps_hostapd.c
@@ -1,6 +1,6 @@
 /*
  * hostapd / WPS integration
- * Copyright (c) 2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2008-2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -26,9 +26,9 @@
 #include "wps/wps.h"
 #include "wps/wps_defs.h"
 #include "wps/wps_dev_attr.h"
-#include "ap/hostapd.h"
-#include "ap/config.h"
-#include "ap/sta_info.h"
+#include "hostapd.h"
+#include "ap_config.h"
+#include "sta_info.h"
 #include "wps_hostapd.h"
 
 
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 135ad10d7..d7c874f66 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -591,11 +591,11 @@ OBJS += ../src/ap/hostapd.o
 OBJS += ../src/ap/wpa_auth_glue.o
 OBJS += ../src/ap/utils.o
 OBJS += ../src/ap/authsrv.o
-OBJS += ../src/ap/config.o
+OBJS += ../src/ap/ap_config.o
 OBJS += ../src/utils/ip_addr.o
 OBJS += ../src/ap/sta_info.o
 OBJS += ../src/ap/tkip_countermeasures.o
-OBJS += ../src/ap/mlme.o
+OBJS += ../src/ap/ap_mlme.o
 OBJS += ../src/ap/ieee802_1x.o
 OBJS += ../src/eapol_auth/eapol_auth_sm.o
 OBJS += ../src/ap/ieee802_11_auth.o
@@ -635,14 +635,14 @@ endif
 ifdef NEED_RSN_AUTHENTICATOR
 CFLAGS += -DCONFIG_NO_RADIUS
 NEED_AES_WRAP=y
-OBJS += ../src/ap/wpa.o
+OBJS += ../src/ap/wpa_auth.o
 OBJS += ../src/ap/wpa_auth_ie.o
-OBJS += ../src/ap/pmksa_cache.o
+OBJS += ../src/ap/pmksa_cache_auth.o
 ifdef CONFIG_IEEE80211R
-OBJS += ../src/ap/wpa_ft.o
+OBJS += ../src/ap/wpa_auth_ft.o
 endif
 ifdef CONFIG_PEERKEY
-OBJS += ../src/ap/peerkey.o
+OBJS += ../src/ap/peerkey_auth.o
 endif
 endif
 
@@ -665,14 +665,14 @@ OBJS_h += ../src/ap/ieee802_1x.o
 endif
 
 ifdef CONFIG_WPA_AUTHENTICATOR
-OBJS_h += ../src/ap/wpa.o
+OBJS_h += ../src/ap/wpa_auth.o
 OBJS_h += ../src/ap/wpa_auth_ie.o
-OBJS_h += ../src/ap/pmksa_cache.o
+OBJS_h += ../src/ap/pmksa_cache_auth.o
 ifdef CONFIG_IEEE80211R
-OBJS_h += ../src/ap/wpa_ft.o
+OBJS_h += ../src/ap/wpa_auth_ft.o
 endif
 ifdef CONFIG_PEERKEY
-OBJS_h += ../src/ap/peerkey.o
+OBJS_h += ../src/ap/peerkey_auth.o
 endif
 endif
 
diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index c730127c6..3b5488ef4 100644
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -13,11 +13,11 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
+#include "utils/common.h"
 #include "ap/hostapd.h"
-#include "ap/config.h"
+#include "ap/ap_config.h"
 #ifdef NEED_AP_MLME
 #include "ap/ieee802_11.h"
 #endif /* NEED_AP_MLME */