diff --git a/gui/Android.mk b/gui/Android.mk
index 17defd9..51cf4ca 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -74,7 +74,11 @@
     LOCAL_CFLAGS += -DTW_ROUND_SCREEN
 endif
 
-LOCAL_C_INCLUDES += bionic system/core/libpixelflinger/include
+LOCAL_C_INCLUDES += \
+    bionic \
+    system/core/include \
+    system/core/libpixelflinger/include
+
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
     LOCAL_C_INCLUDES += external/stlport/stlport
 endif
diff --git a/gui/action.cpp b/gui/action.cpp
index fef4762..9c8af35 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <dirent.h>
-#include <pwd.h>
+#include <private/android_filesystem_config.h>
 
 #include <string>
 #include <sstream>
@@ -938,14 +938,8 @@
 	time_t tm;
 	char path[256];
 	int path_len;
-	uid_t uid = -1;
-	gid_t gid = -1;
-
-	struct passwd *pwd = getpwnam("media_rw");
-	if (pwd) {
-		uid = pwd->pw_uid;
-		gid = pwd->pw_gid;
-	}
+	uid_t uid = AID_MEDIA_RW;
+	gid_t gid = AID_MEDIA_RW;
 
 	const std::string storage = DataManager::GetCurrentStoragePath();
 	if (PartitionManager.Is_Mounted_By_Path(storage)) {