diff --git a/hostapd/config.c b/hostapd/config.c
index d01514bbf..0f1d45196 100644
--- a/hostapd/config.c
+++ b/hostapd/config.c
@@ -33,7 +33,7 @@
 
 #define MAX_STA_COUNT 2007
 
-extern struct wpa_driver_ops *hostapd_drivers[];
+extern struct hapd_driver_ops *hostapd_drivers[];
 
 
 #ifndef CONFIG_NO_VLAN
@@ -200,7 +200,7 @@ static void hostapd_config_defaults_bss(struct hostapd_bss_config *bss)
 }
 
 
-static struct hostapd_config * hostapd_config_defaults(void)
+struct hostapd_config * hostapd_config_defaults(void)
 {
 	struct hostapd_config *conf;
 	struct hostapd_bss_config *bss;
diff --git a/hostapd/config.h b/hostapd/config.h
index fbcc353ca..6f53c3f05 100644
--- a/hostapd/config.h
+++ b/hostapd/config.h
@@ -347,7 +347,7 @@ struct hostapd_config {
 	int *supported_rates;
 	int *basic_rates;
 
-	const struct wpa_driver_ops *driver;
+	const struct hapd_driver_ops *driver;
 
 	int passive_scan_interval; /* seconds, 0 = disabled */
 	int passive_scan_listen; /* usec */
@@ -392,6 +392,7 @@ struct hostapd_config {
 
 int hostapd_mac_comp(const void *a, const void *b);
 int hostapd_mac_comp_empty(const void *a);
+struct hostapd_config * hostapd_config_defaults(void);
 struct hostapd_config * hostapd_config_read(const char *fname);
 void hostapd_config_free(struct hostapd_config *conf);
 int hostapd_maclist_found(struct mac_acl_entry *list, int num_entries,
diff --git a/hostapd/driver.h b/hostapd/driver.h
index f7b034242..6db7d37db 100644
--- a/hostapd/driver.h
+++ b/hostapd/driver.h
@@ -13,8 +13,8 @@
  * See README and COPYING for more details.
  */
 
-#ifndef DRIVER_H
-#define DRIVER_H
+#ifndef HOSTAPD_DRIVER_H
+#define HOSTAPD_DRIVER_H
 
 #include "defs.h"
 #include "sta_flags.h"
@@ -65,7 +65,7 @@ struct hostapd_neighbor_bss {
 	int sec_chan; /* 0 for 20 MHz channels */
 };
 
-struct wpa_driver_ops {
+struct hapd_driver_ops {
 	const char *name;		/* as appears in the config file */
 
 	void * (*init)(struct hostapd_data *hapd);
@@ -243,4 +243,4 @@ void hostapd_mgmt_tx_cb(struct hostapd_data *hapd, u8 *buf, size_t len,
 			u16 stype, int ok);
 void hostapd_michael_mic_failure(struct hostapd_data *hapd, const u8 *addr);
 
-#endif /* DRIVER_H */
+#endif /* HOSTAPD_DRIVER_H */
diff --git a/hostapd/driver_atheros.c b/hostapd/driver_atheros.c
index 7ab4bd6b5..17f11adde 100644
--- a/hostapd/driver_atheros.c
+++ b/hostapd/driver_atheros.c
@@ -1316,7 +1316,7 @@ madwifi_commit(void *priv)
 	return madwifi_set_iface_flags(priv, 1);
 }
 
-const struct wpa_driver_ops wpa_driver_atheros_ops = {
+const struct hapd_driver_ops wpa_driver_atheros_ops = {
 	.name			= "atheros",
 	.init			= madwifi_init,
 	.deinit			= madwifi_deinit,
diff --git a/hostapd/driver_bsd.c b/hostapd/driver_bsd.c
index 478acd72c..1f24aa6e3 100644
--- a/hostapd/driver_bsd.c
+++ b/hostapd/driver_bsd.c
@@ -750,7 +750,7 @@ bsd_deinit(void *priv)
 	free(drv);
 }
 
-const struct wpa_driver_ops wpa_driver_bsd_ops = {
+const struct hapd_driver_ops wpa_driver_bsd_ops = {
 	.name			= "bsd",
 	.init			= bsd_init,
 	.deinit			= bsd_deinit,
diff --git a/hostapd/driver_hostap.c b/hostapd/driver_hostap.c
index ce92633ea..a13f2dbdd 100644
--- a/hostapd/driver_hostap.c
+++ b/hostapd/driver_hostap.c
@@ -1227,7 +1227,7 @@ static struct hostapd_hw_modes * hostap_get_hw_feature_data(void *priv,
 }
 
 
-const struct wpa_driver_ops wpa_driver_hostap_ops = {
+const struct hapd_driver_ops wpa_driver_hostap_ops = {
 	.name = "hostap",
 	.init = hostap_init,
 	.deinit = hostap_driver_deinit,
diff --git a/hostapd/driver_madwifi.c b/hostapd/driver_madwifi.c
index fecb10407..7b2fb12d4 100644
--- a/hostapd/driver_madwifi.c
+++ b/hostapd/driver_madwifi.c
@@ -1372,7 +1372,7 @@ madwifi_commit(void *priv)
 	return madwifi_set_iface_flags(priv, 1);
 }
 
-const struct wpa_driver_ops wpa_driver_madwifi_ops = {
+const struct hapd_driver_ops wpa_driver_madwifi_ops = {
 	.name			= "madwifi",
 	.init			= madwifi_init,
 	.deinit			= madwifi_deinit,
diff --git a/hostapd/driver_nl80211.c b/hostapd/driver_nl80211.c
index d76b456d8..772b3e995 100644
--- a/hostapd/driver_nl80211.c
+++ b/hostapd/driver_nl80211.c
@@ -3103,7 +3103,7 @@ static void i802_deinit(void *priv)
 }
 
 
-const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+const struct hapd_driver_ops wpa_driver_nl80211_ops = {
 	.name = "nl80211",
 	.init = i802_init,
 	.init_bssid = i802_init_bssid,
diff --git a/hostapd/driver_none.c b/hostapd/driver_none.c
index 96e7e644e..c82f0e98d 100644
--- a/hostapd/driver_none.c
+++ b/hostapd/driver_none.c
@@ -54,7 +54,7 @@ static int none_driver_send_ether(void *priv, const u8 *dst, const u8 *src,
 }
 
 
-const struct wpa_driver_ops wpa_driver_none_ops = {
+const struct hapd_driver_ops wpa_driver_none_ops = {
 	.name = "none",
 	.init = none_driver_init,
 	.deinit = none_driver_deinit,
diff --git a/hostapd/driver_prism54.c b/hostapd/driver_prism54.c
index 8315e21be..a946c3b36 100644
--- a/hostapd/driver_prism54.c
+++ b/hostapd/driver_prism54.c
@@ -1077,7 +1077,7 @@ static void prism54_driver_deinit(void *priv)
 }
 
 
-const struct wpa_driver_ops wpa_driver_prism54_ops = {
+const struct hapd_driver_ops wpa_driver_prism54_ops = {
 	.name = "prism54",
 	.init = prism54_driver_init,
 	.deinit = prism54_driver_deinit,
diff --git a/hostapd/driver_test.c b/hostapd/driver_test.c
index abd0c58a0..94da5d03b 100644
--- a/hostapd/driver_test.c
+++ b/hostapd/driver_test.c
@@ -1200,7 +1200,7 @@ static void test_driver_deinit(void *priv)
 }
 
 
-const struct wpa_driver_ops wpa_driver_test_ops = {
+const struct hapd_driver_ops wpa_driver_test_ops = {
 	.name = "test",
 	.init = test_driver_init,
 	.deinit = test_driver_deinit,
diff --git a/hostapd/driver_wired.c b/hostapd/driver_wired.c
index 5cb60d07c..cb942ff1d 100644
--- a/hostapd/driver_wired.c
+++ b/hostapd/driver_wired.c
@@ -366,7 +366,7 @@ static void wired_driver_deinit(void *priv)
 }
 
 
-const struct wpa_driver_ops wpa_driver_wired_ops = {
+const struct hapd_driver_ops wpa_driver_wired_ops = {
 	.name = "wired",
 	.init = wired_driver_init,
 	.deinit = wired_driver_deinit,
diff --git a/hostapd/drivers.c b/hostapd/drivers.c
index bde6e609f..baf1b9cdc 100644
--- a/hostapd/drivers.c
+++ b/hostapd/drivers.c
@@ -16,35 +16,35 @@
 
 
 #ifdef CONFIG_DRIVER_HOSTAP
-extern struct wpa_driver_ops wpa_driver_hostap_ops; /* driver_hostap.c */
+extern struct hapd_driver_ops wpa_driver_hostap_ops; /* driver_hostap.c */
 #endif /* CONFIG_DRIVER_HOSTAP */
 #ifdef CONFIG_DRIVER_NL80211
-extern struct wpa_driver_ops wpa_driver_nl80211_ops; /* driver_nl80211.c */
+extern struct hapd_driver_ops wpa_driver_nl80211_ops; /* driver_nl80211.c */
 #endif /* CONFIG_DRIVER_NL80211 */
 #ifdef CONFIG_DRIVER_PRISM54
-extern struct wpa_driver_ops wpa_driver_prism54_ops; /* driver_prism54.c */
+extern struct hapd_driver_ops wpa_driver_prism54_ops; /* driver_prism54.c */
 #endif /* CONFIG_DRIVER_PRISM54 */
 #ifdef CONFIG_DRIVER_MADWIFI
-extern struct wpa_driver_ops wpa_driver_madwifi_ops; /* driver_madwifi.c */
+extern struct hapd_driver_ops wpa_driver_madwifi_ops; /* driver_madwifi.c */
 #endif /* CONFIG_DRIVER_MADWIFI */
 #ifdef CONFIG_DRIVER_ATHEROS
-extern struct wpa_driver_ops wpa_driver_atheros_ops; /* driver_atheros.c */
+extern struct hapd_driver_ops wpa_driver_atheros_ops; /* driver_atheros.c */
 #endif /* CONFIG_DRIVER_ATHEROS */
 #ifdef CONFIG_DRIVER_BSD
-extern struct wpa_driver_ops wpa_driver_bsd_ops; /* driver_bsd.c */
+extern struct hapd_driver_ops wpa_driver_bsd_ops; /* driver_bsd.c */
 #endif /* CONFIG_DRIVER_BSD */
 #ifdef CONFIG_DRIVER_WIRED
-extern struct wpa_driver_ops wpa_driver_wired_ops; /* driver_wired.c */
+extern struct hapd_driver_ops wpa_driver_wired_ops; /* driver_wired.c */
 #endif /* CONFIG_DRIVER_WIRED */
 #ifdef CONFIG_DRIVER_TEST
-extern struct wpa_driver_ops wpa_driver_test_ops; /* driver_test.c */
+extern struct hapd_driver_ops wpa_driver_test_ops; /* driver_test.c */
 #endif /* CONFIG_DRIVER_TEST */
 #ifdef CONFIG_DRIVER_NONE
-extern struct wpa_driver_ops wpa_driver_none_ops; /* driver_none.c */
+extern struct hapd_driver_ops wpa_driver_none_ops; /* driver_none.c */
 #endif /* CONFIG_DRIVER_NONE */
 
 
-struct wpa_driver_ops *hostapd_drivers[] =
+struct hapd_driver_ops *hostapd_drivers[] =
 {
 #ifdef CONFIG_DRIVER_HOSTAP
 	&wpa_driver_hostap_ops,
diff --git a/hostapd/hostapd.h b/hostapd/hostapd.h
index 0f1d684e3..694a9c03e 100644
--- a/hostapd/hostapd.h
+++ b/hostapd/hostapd.h
@@ -20,7 +20,7 @@
 #include "common.h"
 #include "hostapd_defs.h"
 
-struct wpa_driver_ops;
+struct hapd_driver_ops;
 struct wpa_ctrl_dst;
 struct radius_server_data;
 struct upnp_wps_device_sm;
@@ -54,7 +54,7 @@ struct hostapd_data {
 #define AID_WORDS ((2008 + 31) / 32)
 	u32 sta_aid[AID_WORDS];
 
-	const struct wpa_driver_ops *driver;
+	const struct hapd_driver_ops *driver;
 	void *drv_priv;
 
 	u8 *default_wep_key;