diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp
index 3f132b9e05..3d089e71eb 100644
--- a/Core/HLE/sceAtrac.cpp
+++ b/Core/HLE/sceAtrac.cpp
@@ -73,18 +73,12 @@ static const int MAX_CONFIG_VOLUME = 8;
 
 #ifdef USE_FFMPEG
 
-// Urgh! Why is this needed?
-#ifdef ANDROID
-#ifndef UINT64_C
-#define UINT64_C(c) (c ## ULL)
-#endif
-#endif
-
 extern "C" {
 #include <libavformat/avformat.h>
 #include <libswresample/swresample.h>
 #include <libavutil/samplefmt.h>
 }
+
 #endif // USE_FFMPEG
 
 struct InputBuffer {
diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp
index f602b057f8..87eba22da1 100644
--- a/Core/HLE/sceMp3.cpp
+++ b/Core/HLE/sceMp3.cpp
@@ -29,12 +29,6 @@
 #define PRId64  "%llu" 
 #endif
 
-// Urgh! Why is this needed?
-#ifdef ANDROID
-#ifndef UINT64_C
-#define UINT64_C(c) (c ## ULL)
-#endif
-#endif
 extern "C" {
 #include <libavutil/opt.h>
 #include <libavformat/avformat.h>
diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp
index d6821c2022..5314f7c3a5 100644
--- a/Core/HW/MediaEngine.cpp
+++ b/Core/HW/MediaEngine.cpp
@@ -25,13 +25,6 @@
 
 #ifdef USE_FFMPEG
 
-// Urgh! Why is this needed?
-#ifdef ANDROID
-#ifndef UINT64_C
-#define UINT64_C(c) (c ## ULL)
-#endif
-#endif
-
 extern "C" {
 
 #include "libavcodec/avcodec.h"
diff --git a/Core/HW/SimpleAT3Dec.cpp b/Core/HW/SimpleAT3Dec.cpp
index 8454ed931a..3c3cbb5a51 100644
--- a/Core/HW/SimpleAT3Dec.cpp
+++ b/Core/HW/SimpleAT3Dec.cpp
@@ -21,13 +21,6 @@
 
 #ifdef USE_FFMPEG
 
-// TODO: Replace all these by -D__STDC_CONSTANT_MACROS
-#ifdef ANDROID
-#ifndef UINT64_C
-#define UINT64_C(c) (c ## ULL)
-#endif
-#endif
-
 extern "C" {
 #include <libavformat/avformat.h>
 #include <libswresample/swresample.h>
diff --git a/GPU/Software/SoftGpu.cpp b/GPU/Software/SoftGpu.cpp
index 16d629afb0..54e6585e07 100644
--- a/GPU/Software/SoftGpu.cpp
+++ b/GPU/Software/SoftGpu.cpp
@@ -39,8 +39,8 @@ static GLuint program;
 
 const int FB_WIDTH = 480;
 const int FB_HEIGHT = 272;
-FormatBuffer fb = {NULL};
-FormatBuffer depthbuf = {NULL};
+FormatBuffer fb;
+FormatBuffer depthbuf;
 u32 clut[4096];
 
 GLuint OpenGL_CompileProgram(const char* vertexShader, const char* fragmentShader)
diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
index bfc94565f1..d51cbc8b83 100644
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@@ -359,6 +359,7 @@
     <None Include="..\android\atlasscript.txt" />
     <None Include="..\android\jni\Android.mk" />
     <None Include="..\android\jni\Application.mk" />
+    <None Include="..\android\jni\Locals.mk" />
     <None Include="..\assets\langregion.ini" />
     <None Include="..\CMakeLists.txt" />
     <None Include="..\README.md" />
diff --git a/Windows/PPSSPP.vcxproj.filters b/Windows/PPSSPP.vcxproj.filters
index 7753ca85f2..f3aaaa53c5 100644
--- a/Windows/PPSSPP.vcxproj.filters
+++ b/Windows/PPSSPP.vcxproj.filters
@@ -281,6 +281,9 @@
     <None Include="version.rc">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="..\android\jni\Locals.mk">
+      <Filter>Other Platforms</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ppsspp.rc">
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 500aaaffa2..1da0d80ddd 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := native_audio
-LOCAL_CFLAGS := -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-literal-suffix
+LOCAL_CFLAGS := -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-literal-suffix -D__STDC_CONSTANT_MACROS
 # yes, it's really CPPFLAGS for C++
 LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti
 NATIVE := ../../native
@@ -26,8 +26,6 @@ SRC := ../..
 
 include $(LOCAL_PATH)/Locals.mk
 
-#  $(SRC)/Core/EmuThread.cpp \
-
 # http://software.intel.com/en-us/articles/getting-started-on-optimizing-ndk-project-for-multiple-cpu-architectures
 
 ifeq ($(TARGET_ARCH_ABI),x86) 
diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
index 61e1b601eb..e99af4fe71 100644
--- a/android/jni/Locals.mk
+++ b/android/jni/Locals.mk
@@ -1,7 +1,7 @@
 # These are definitions for LOCAL_ variables for PPSSPP.
 # They are shared between ppsspp_jni (lib for Android app) and ppsspp_headless.
 
-LOCAL_CFLAGS := -DUSE_FFMPEG -DUSE_PROFILER -DUSING_GLES2 -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-unused-variable -fno-strict-aliasing
+LOCAL_CFLAGS := -DUSE_FFMPEG -DUSING_GLES2 -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-unused-variable -fno-strict-aliasing -D__STDC_CONSTANT_MACROS
 # yes, it's really CPPFLAGS for C++
 LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder -Wno-literal-suffix
 LOCAL_C_INCLUDES := \
diff --git a/native b/native
index f8cab66c8c..c1f05326c4 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit f8cab66c8c2eadbb9c8bdba515d76e946750e08e
+Subproject commit c1f05326c45a31c7e54464754c0f654cd2e2caaf