diff --git a/modules/juce_audio_devices/native/juce_android_OpenSL.cpp b/modules/juce_audio_devices/native/juce_android_OpenSL.cpp
index e2e6f8340e..66b45f0330 100644
--- a/modules/juce_audio_devices/native/juce_android_OpenSL.cpp
+++ b/modules/juce_audio_devices/native/juce_android_OpenSL.cpp
@@ -22,6 +22,8 @@
   ==============================================================================
 */
 
+#undef check
+
 const char* const openSLTypeName = "Android OpenSL";
 
 bool isOpenSLAvailable()
diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
index a93601bdb3..eb9fa7d4c1 100755
--- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
@@ -98,6 +98,8 @@
  #pragma comment(lib, JucePlugin_AAXLibs_path JUCE_AAX_LIB_PATH JUCE_AAX_LIB JUCE_AAX_LIB_SUFFIX ".lib")
 #endif
 
+#undef check
+
 using juce::Component;
 
 const int32_t juceChunkType = 'juce';
diff --git a/modules/juce_core/juce_core.cpp b/modules/juce_core/juce_core.cpp
index 38f03dbf5d..29e55975ea 100644
--- a/modules/juce_core/juce_core.cpp
+++ b/modules/juce_core/juce_core.cpp
@@ -114,6 +114,8 @@
  #include <android/log.h>
 #endif
 
+#undef check
+
 //==============================================================================
 #ifndef    JUCE_STANDALONE_APPLICATION
  JUCE_COMPILER_WARNING ("Please re-save your Introjucer project with the latest Introjucer version to avoid this warning")
diff --git a/modules/juce_core/memory/juce_HeapBlock.h b/modules/juce_core/memory/juce_HeapBlock.h
index bf0ff83b81..5045c4a590 100644
--- a/modules/juce_core/memory/juce_HeapBlock.h
+++ b/modules/juce_core/memory/juce_HeapBlock.h
@@ -33,10 +33,10 @@
 namespace HeapBlockHelper
 {
     template <bool shouldThrow>
-    struct ThrowOnFail          { static void check (void*) {} };
+    struct ThrowOnFail          { static void checkPointer (void*) {} };
 
     template<>
-    struct ThrowOnFail<true>    { static void check (void* data) { if (data == nullptr) throw std::bad_alloc(); } };
+    struct ThrowOnFail<true>    { static void checkPointer (void* data) { if (data == nullptr) throw std::bad_alloc(); } };
 }
 #endif
 
@@ -298,7 +298,7 @@ private:
        #if JUCE_EXCEPTIONS_DISABLED
         jassert (data != nullptr); // without exceptions, you'll need to find a better way to handle this failure case.
        #else
-        HeapBlockHelper::ThrowOnFail<throwOnFailure>::check (data);
+        HeapBlockHelper::ThrowOnFail<throwOnFailure>::checkPointer (data);
        #endif
     }
 
diff --git a/modules/juce_core/system/juce_StandardHeader.h b/modules/juce_core/system/juce_StandardHeader.h
index bf5d2de871..a20f17d66f 100644
--- a/modules/juce_core/system/juce_StandardHeader.h
+++ b/modules/juce_core/system/juce_StandardHeader.h
@@ -114,7 +114,6 @@
 #endif
 
 // undef symbols that are sometimes set by misguided 3rd-party headers..
-#undef check
 #undef TYPE_BOOL
 #undef max
 #undef min
diff --git a/modules/juce_graphics/image_formats/juce_PNGLoader.cpp b/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
index 393bef47af..efb61a778c 100644
--- a/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
+++ b/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
@@ -63,6 +63,7 @@ namespace pnglibNamespace
    #pragma clang diagnostic ignored "-Wsign-conversion"
   #endif
 
+  #undef check
   using std::abs;
   #define NO_DUMMY_DECL
   #define PNGLCONF_H 1