diff --git a/apps/SOURCES b/apps/SOURCES
index 39b68ce6a6..c122427900 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -94,8 +94,8 @@ gui/statusbar.c
 gui/statusbar-skinned.c
 #endif
 #if (CONFIG_PLATFORM&PLATFORM_ANDROID)
-hosted/yesno.c
-hosted/notification.c
+hosted/android/yesno.c
+hosted/android/notification.c
 #else
 gui/yesno.c
 #endif
@@ -126,7 +126,7 @@ player/keyboard.c
 recorder/bmp.c
 recorder/icons.c
 #if (CONFIG_PLATFORM&PLATFORM_ANDROID)
-hosted/keyboard.c
+hosted/android/keyboard.c
 #else
 recorder/keyboard.c
 #endif
diff --git a/apps/apps.make b/apps/apps.make
index 6afcd12b5c..844816d110 100644
--- a/apps/apps.make
+++ b/apps/apps.make
@@ -8,6 +8,9 @@
 #
 
 INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
+ifdef APP_TYPE
+	INCLUDES += -I$(APPSDIR)/hosted -I$(APPSDIR)/hosted/$(APP_TYPE)
+endif
 SRC += $(call preprocess, $(APPSDIR)/SOURCES)
 
 # apps/features.txt is a file that (is preprocessed and) lists named features
diff --git a/apps/hosted/keyboard.c b/apps/hosted/android/keyboard.c
similarity index 100%
rename from apps/hosted/keyboard.c
rename to apps/hosted/android/keyboard.c
diff --git a/apps/hosted/notification.c b/apps/hosted/android/notification.c
similarity index 100%
rename from apps/hosted/notification.c
rename to apps/hosted/android/notification.c
diff --git a/apps/hosted/notification.h b/apps/hosted/android/notification.h
similarity index 100%
rename from apps/hosted/notification.h
rename to apps/hosted/android/notification.h
diff --git a/apps/hosted/yesno.c b/apps/hosted/android/yesno.c
similarity index 100%
rename from apps/hosted/yesno.c
rename to apps/hosted/android/yesno.c