diff --git a/modules/juce_audio_plugin_client/Unity/juce_UnityPluginInterface.h b/modules/juce_audio_plugin_client/Unity/juce_UnityPluginInterface.h
index 5cfe674e5c..a86daeee81 100644
--- a/modules/juce_audio_plugin_client/Unity/juce_UnityPluginInterface.h
+++ b/modules/juce_audio_plugin_client/Unity/juce_UnityPluginInterface.h
@@ -30,7 +30,7 @@
 //==============================================================================
 #define UNITY_AUDIO_PLUGIN_API_VERSION 0x010401
 
-#if JUCE_WINDOWS
+#if JUCE_MSVC
  #define UNITY_INTERFACE_API __stdcall
  #define UNITY_INTERFACE_EXPORT __declspec(dllexport)
 #else
diff --git a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp
index 0947eb5f72..e0aca97284 100644
--- a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp
@@ -3175,7 +3175,7 @@ JUCE_EXPORTED_FUNCTION IPluginFactory* PLUGIN_API GetPluginFactory()
 {
     PluginHostType::jucePlugInClientCurrentWrapperType = AudioProcessor::wrapperType_VST3;
 
-   #if JUCE_WINDOWS
+   #if JUCE_MSVC
     // Cunning trick to force this function to be exported. Life's too short to
     // faff around creating .def files for this kind of thing.
     #pragma comment(linker, "/EXPORT:" __FUNCTION__ "=" __FUNCDNAME__)
diff --git a/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h b/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h
index da0c178af6..2c0f129848 100644
--- a/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h
+++ b/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h
@@ -31,7 +31,7 @@
  #define STRICT 1
  #include <windows.h>
  #include <float.h>
- #if ! JUCE_MINGW
+ #if JUCE_MSVC
   #pragma warning (disable : 4312 4355)
  #endif
  #ifdef __INTEL_COMPILER