diff --git a/modules/juce_core/system/juce_StandardHeader.h b/modules/juce_core/system/juce_StandardHeader.h
index a1e50c092c..9589d1eb3b 100644
--- a/modules/juce_core/system/juce_StandardHeader.h
+++ b/modules/juce_core/system/juce_StandardHeader.h
@@ -65,6 +65,7 @@
 #include <cmath>
 #include <condition_variable>
 #include <cstddef>
+#include <cstring>
 #include <functional>
 #include <future>
 #include <iomanip>
@@ -98,7 +99,7 @@
 // Now we'll include some common OS headers..
 JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4514 4245 4100)
 
-#if JUCE_MSVC
+#if JUCE_WINDOWS
  #include <intrin.h>
 #endif
 
@@ -111,7 +112,6 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4514 4245 4100)
 #endif
 
 #if JUCE_LINUX || JUCE_BSD
- #include <cstring>
  #include <signal.h>
 
  #if __INTEL_COMPILER