diff --git a/system/core/include/cutils/jstring.h b/system/core/include/cutils/jstring.h
index a342608..4a9e868 100644
--- a/system/core/include/cutils/jstring.h
+++ b/system/core/include/cutils/jstring.h
@@ -20,6 +20,8 @@
 #include <stdint.h>
 #include <stddef.h>
 
+#define char16_t uint16_t
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/system/core/mkbootimg/unpackbootimg.c b/system/core/mkbootimg/unpackbootimg.c
index 7badcb4..718dead 100755
--- a/system/core/mkbootimg/unpackbootimg.c
+++ b/system/core/mkbootimg/unpackbootimg.c
@@ -11,6 +11,9 @@
 
 #ifdef _WIN32
 #include <direct.h>
+#else
+#include <sys/stat.h>
+#include <sys/types.h>
 #endif
 
 #define CMDLINE_SUFFIX    "-cmdline"