diff --git a/hostapd/ap_list.c b/hostapd/ap_list.c
index 30c2d7204..67362f7b7 100644
--- a/hostapd/ap_list.c
+++ b/hostapd/ap_list.c
@@ -18,6 +18,7 @@
 #include "includes.h"
 
 #include "hostapd.h"
+#include "config.h"
 #include "ieee802_11.h"
 #include "eloop.h"
 #include "sta_info.h"
diff --git a/hostapd/config.c b/hostapd/config.c
index 78c33405c..043fd599e 100644
--- a/hostapd/config.c
+++ b/hostapd/config.c
@@ -28,6 +28,7 @@
 #include "uuid.h"
 #include "eap_common/eap_wsc_common.h"
 #include "sta_info.h"
+#include "config.h"
 
 
 #define MAX_STA_COUNT 2007
diff --git a/hostapd/driver_atheros.c b/hostapd/driver_atheros.c
index 58bc59f42..7ee8701bb 100644
--- a/hostapd/driver_atheros.c
+++ b/hostapd/driver_atheros.c
@@ -59,6 +59,7 @@
 #include "wireless_copy.h"
 
 #include "hostapd.h"
+#include "config.h"
 #include "driver.h"
 #include "eloop.h"
 #include "priv_netlink.h"
diff --git a/hostapd/driver_bsd.c b/hostapd/driver_bsd.c
index 134894e47..a138d4ef7 100644
--- a/hostapd/driver_bsd.c
+++ b/hostapd/driver_bsd.c
@@ -31,6 +31,7 @@
 #undef WPA_OUI_TYPE
 
 #include "hostapd.h"
+#include "config.h"
 #include "driver.h"
 #include "eloop.h"
 #include "l2_packet/l2_packet.h"
diff --git a/hostapd/driver_hostap.c b/hostapd/driver_hostap.c
index 57c6ee884..b2aaae775 100644
--- a/hostapd/driver_hostap.c
+++ b/hostapd/driver_hostap.c
@@ -33,6 +33,7 @@
 #endif /* USE_KERNEL_HEADERS */
 
 #include "hostapd.h"
+#include "config.h"
 #include "driver.h"
 #include "eloop.h"
 #include "priv_netlink.h"
diff --git a/hostapd/driver_i.h b/hostapd/driver_i.h
index 280e56e86..ee281641b 100644
--- a/hostapd/driver_i.h
+++ b/hostapd/driver_i.h
@@ -17,6 +17,7 @@
 #define DRIVER_I_H
 
 #include "driver.h"
+#include "config.h"
 
 static inline void *
 hostapd_driver_init(struct hostapd_data *hapd)
diff --git a/hostapd/driver_madwifi.c b/hostapd/driver_madwifi.c
index a40f731f8..726b9c8bd 100644
--- a/hostapd/driver_madwifi.c
+++ b/hostapd/driver_madwifi.c
@@ -56,6 +56,7 @@
 #include "wireless_copy.h"
 
 #include "hostapd.h"
+#include "config.h"
 #include "driver.h"
 #include "eloop.h"
 #include "priv_netlink.h"
diff --git a/hostapd/driver_nl80211.c b/hostapd/driver_nl80211.c
index 16e4eddf3..4355996bf 100644
--- a/hostapd/driver_nl80211.c
+++ b/hostapd/driver_nl80211.c
@@ -31,6 +31,7 @@
 #include <net/if_arp.h>
 
 #include "hostapd.h"
+#include "config.h"
 #include "driver.h"
 #include "eloop.h"
 #include "hw_features.h"
diff --git a/hostapd/driver_prism54.c b/hostapd/driver_prism54.c
index 02c18af0b..37d5c47fb 100644
--- a/hostapd/driver_prism54.c
+++ b/hostapd/driver_prism54.c
@@ -36,6 +36,7 @@
 #endif /* USE_KERNEL_HEADERS */
 
 #include "hostapd.h"
+#include "config.h"
 #include "driver.h"
 #include "ieee802_1x.h"
 #include "eloop.h"
diff --git a/hostapd/driver_test.c b/hostapd/driver_test.c
index 74b80df10..58aa194ad 100644
--- a/hostapd/driver_test.c
+++ b/hostapd/driver_test.c
@@ -17,6 +17,7 @@
 #include <dirent.h>
 
 #include "hostapd.h"
+#include "config.h"
 #include "driver.h"
 #include "sha1.h"
 #include "eloop.h"
diff --git a/hostapd/driver_wired.c b/hostapd/driver_wired.c
index 0a1d73335..5cb60d07c 100644
--- a/hostapd/driver_wired.c
+++ b/hostapd/driver_wired.c
@@ -29,6 +29,7 @@
 #endif /* USE_KERNEL_HEADERS */
 
 #include "hostapd.h"
+#include "config.h"
 #include "eloop.h"
 #include "sta_info.h"
 #include "driver.h"
diff --git a/hostapd/hostapd.h b/hostapd/hostapd.h
index 75dc0f3f5..9ea7a5f5d 100644
--- a/hostapd/hostapd.h
+++ b/hostapd/hostapd.h
@@ -19,7 +19,6 @@
 
 #include "common.h"
 #include "hostapd_defs.h"
-#include "config.h"
 
 struct wpa_driver_ops;
 struct wpa_ctrl_dst;
diff --git a/hostapd/iapp.c b/hostapd/iapp.c
index 6d6dba8f7..95c354536 100644
--- a/hostapd/iapp.c
+++ b/hostapd/iapp.c
@@ -47,6 +47,7 @@
 #endif /* USE_KERNEL_HEADERS */
 
 #include "hostapd.h"
+#include "config.h"
 #include "ieee802_11.h"
 #include "iapp.h"
 #include "eloop.h"
diff --git a/hostapd/ieee802_11_auth.c b/hostapd/ieee802_11_auth.c
index 5de4e2efb..5ae3ac337 100644
--- a/hostapd/ieee802_11_auth.c
+++ b/hostapd/ieee802_11_auth.c
@@ -22,6 +22,7 @@
 #ifndef CONFIG_NATIVE_WINDOWS
 
 #include "hostapd.h"
+#include "config.h"
 #include "ieee802_11.h"
 #include "ieee802_11_auth.h"
 #include "radius/radius.h"
diff --git a/hostapd/preauth.c b/hostapd/preauth.c
index 1cea5d556..011492bda 100644
--- a/hostapd/preauth.c
+++ b/hostapd/preauth.c
@@ -17,6 +17,7 @@
 #ifdef CONFIG_RSN_PREAUTH
 
 #include "hostapd.h"
+#include "config.h"
 #include "l2_packet/l2_packet.h"
 #include "ieee802_1x.h"
 #include "eloop.h"