1 files changed, 5 insertions, 9 deletions

diff --git a/firmware/common/rbpaths.c b/firmware/common/rbpaths.c
index aacd949430..f5a484273c 100644
--- a/firmware/common/rbpaths.c
+++ b/firmware/common/rbpaths.c
@@ -40,17 +40,13 @@
 #undef rmdir
 
 
-#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
+#if (CONFIG_PLATFORM & PLATFORM_ANDROID) || defined(SAMSUNG_YPR0)
 #include "dir-target.h"
-#define opendir opendir_android
-#define mkdir   mkdir_android
-#define rmdir   rmdir_android
+#define opendir _opendir
+#define mkdir   _mkdir
+#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
 static const char rbhome[] = "/sdcard";
-#elif defined(SAMSUNG_YPR0)
-#include "dir-target.h"
-#define opendir opendir_ypr0
-#define mkdir   mkdir_ypr0
-#define rmdir   rmdir_ypr0
+#endif
 #elif (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA))
 #define open    sim_open
 #define remove  sim_remove