diff --git a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.h b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.h
index fca1bd5913..2e64914102 100644
--- a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.h
+++ b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.h
@@ -89,7 +89,7 @@ public:
     void drawTabButton (TabBarButton& button, Graphics&, bool isMouseOver, bool isMouseDown) override;
     void drawTabAreaBehindFrontButton (TabbedButtonBar&, Graphics&, int, int) override {}
     int getTabButtonBestWidth (TabBarButton&, int tabDepth) override;
-    void drawConcertinaPanelHeader (Graphics&, const Rectangle<int>&, bool, bool, ConcertinaPanel&, Component&) override;
+    void drawConcertinaPanelHeader (Graphics&, const juce::Rectangle<int>&, bool, bool, ConcertinaPanel&, Component&) override;
     static Colour getTabBackgroundColour (TabBarButton&);
 
 private:
diff --git a/extras/Introjucer/Source/Utility/jucer_Icons.h b/extras/Introjucer/Source/Utility/jucer_Icons.h
index bf2912ded5..853d8c3c81 100644
--- a/extras/Introjucer/Source/Utility/jucer_Icons.h
+++ b/extras/Introjucer/Source/Utility/jucer_Icons.h
@@ -33,7 +33,7 @@ struct Icon
     Icon (const Path& p, Colour c)  : path (&p), colour (c) {}
     Icon (const Path* p, Colour c)  : path (p),  colour (c) {}
 
-    void draw (Graphics& g, const Rectangle<float>& area, bool isCrossedOut) const
+    void draw (Graphics& g, const juce::Rectangle<float>& area, bool isCrossedOut) const
     {
         if (path != nullptr)
         {
diff --git a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.h b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.h
index 7ab3fa6c74..3578f96b1a 100644
--- a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.h
+++ b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.h
@@ -435,7 +435,7 @@ private:
 
         void resized() override
         {
-            Rectangle<int> r (getLocalBounds());
+            juce::Rectangle<int> r (getLocalBounds());
 
             button.setBounds (r.removeFromRight (24));
             textbox.setBounds (r);
diff --git a/modules/juce_core/maths/juce_MathsFunctions.h b/modules/juce_core/maths/juce_MathsFunctions.h
index 61ab44d243..42fc60a790 100644
--- a/modules/juce_core/maths/juce_MathsFunctions.h
+++ b/modules/juce_core/maths/juce_MathsFunctions.h
@@ -88,7 +88,7 @@ typedef unsigned int                uint32;
   typedef unsigned int              pointer_sized_uint;
 #endif
 
-#if JUCE_MSVC
+#if JUCE_WINDOWS && ! JUCE_MINGW
   typedef pointer_sized_int ssize_t;
 #endif
 
diff --git a/modules/juce_core/memory/juce_Atomic.h b/modules/juce_core/memory/juce_Atomic.h
index 1ca3bde0ab..9421652d4e 100644
--- a/modules/juce_core/memory/juce_Atomic.h
+++ b/modules/juce_core/memory/juce_Atomic.h
@@ -207,7 +207,7 @@ private:
   #endif
 
 //==============================================================================
-#elif JUCE_GCC || JUCE_CLANG
+#elif (JUCE_GCC || JUCE_CLANG) && ! JUCE_WINDOWS
   #define JUCE_ATOMICS_GCC 1        // GCC with intrinsics
 
   #if JUCE_IOS || JUCE_ANDROID // (64-bit ops will compile but not link on these mobile OSes)
diff --git a/modules/juce_core/text/juce_CharPointer_ASCII.h b/modules/juce_core/text/juce_CharPointer_ASCII.h
index 3b68e4ce16..ed685180c8 100644
--- a/modules/juce_core/text/juce_CharPointer_ASCII.h
+++ b/modules/juce_core/text/juce_CharPointer_ASCII.h
@@ -276,10 +276,10 @@ public:
 
     int compareIgnoreCase (const CharPointer_ASCII other) const
     {
-       #if JUCE_MSVC
-        return stricmp (data, other.data);
-       #elif JUCE_MINGW
+       #if JUCE_MINGW
         return CharacterFunctions::compareIgnoreCase (*this, other);
+       #elif JUCE_WINDOWS
+        return stricmp (data, other.data);
        #else
         return strcasecmp (data, other.data);
        #endif
diff --git a/modules/juce_core/text/juce_CharPointer_UTF8.h b/modules/juce_core/text/juce_CharPointer_UTF8.h
index b54d7e8cff..5fd09c2a4b 100644
--- a/modules/juce_core/text/juce_CharPointer_UTF8.h
+++ b/modules/juce_core/text/juce_CharPointer_UTF8.h
@@ -420,10 +420,10 @@ public:
     /** Compares this string with another one. */
     int compareIgnoreCase (const CharPointer_UTF8 other) const noexcept
     {
-       #if JUCE_MSVC
-        return stricmp (data, other.data);
-       #elif JUCE_MINGW
+       #if JUCE_MINGW
         return CharacterFunctions::compareIgnoreCase (*this, other);
+       #elif JUCE_WINDOWS
+        return stricmp (data, other.data);
        #else
         return strcasecmp (data, other.data);
        #endif