diff --git a/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c b/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c
index 46db9e3a5c..4eac42e958 100644
--- a/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c
+++ b/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c
@@ -244,7 +244,11 @@ void FLAC__cpu_info(FLAC__CPUInfo *info)
 		struct sigaction sigill_save;
 		struct sigaction sigill_sse;
 		sigill_sse.sa_sigaction = sigill_handler_sse_os;
+      #ifdef __ANDROID__
+        sigemptyset (&sigill_sse.sa_mask);
+      #else
 		__sigemptyset(&sigill_sse.sa_mask);
+      #endif
 		sigill_sse.sa_flags = SA_SIGINFO | SA_RESETHAND; /* SA_RESETHAND just in case our SIGILL return jump breaks, so we don't get stuck in a loop */
 		if(0 == sigaction(SIGILL, &sigill_sse, &sigill_save))
 		{
diff --git a/modules/juce_graphics/image_formats/juce_PNGLoader.cpp b/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
index 173849b950..393bef47af 100644
--- a/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
+++ b/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
@@ -42,6 +42,10 @@ namespace zlibNamespace
 #endif
 }
 
+#if ! defined (jmp_buf) || ! defined (longjmp)
+ #include <setjmp.h>
+#endif
+
 namespace pnglibNamespace
 {
   using namespace zlibNamespace;