diff --git a/hostapd/Makefile b/hostapd/Makefile
index 5b34ba839..113dcbc02 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -125,7 +125,7 @@ CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX
 
 ifdef CONFIG_IAPP
 CFLAGS += -DCONFIG_IAPP
-OBJS += iapp.o
+OBJS += ../src/ap/iapp.o
 endif
 
 ifdef CONFIG_RSN_PREAUTH
diff --git a/hostapd/drv_callbacks.c b/hostapd/drv_callbacks.c
index 81c1b82df..072219170 100644
--- a/hostapd/drv_callbacks.c
+++ b/hostapd/drv_callbacks.c
@@ -21,12 +21,12 @@
 #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 "driver_i.h"
-#include "iapp.h"
 
 
 int hostapd_notif_new_sta(struct hostapd_data *hapd, const u8 *addr)
diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 6ce92403c..6525b7b05 100644
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -31,6 +31,7 @@
 #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/preauth.h"
@@ -39,7 +40,6 @@
 #include "ap/wpa.h"
 #include "ap/wps_hostapd.h"
 #include "hw_features.h"
-#include "iapp.h"
 #include "driver_i.h"
 #include "ctrl_iface.h"
 
diff --git a/hostapd/iapp.c b/src/ap/iapp.c
similarity index 100%
rename from hostapd/iapp.c
rename to src/ap/iapp.c
diff --git a/hostapd/iapp.h b/src/ap/iapp.h
similarity index 100%
rename from hostapd/iapp.h
rename to src/ap/iapp.h