diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index be8b6faaa8..587aeafc4b 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -560,6 +560,9 @@ public:
 //==============================================================================
 #define DONT_SET_USING_JUCE_NAMESPACE 1
 
+#undef max
+#undef min
+
 #include "juce_amalgamated.h"
 
 #define NO_DUMMY_DECL
@@ -64381,7 +64384,7 @@ void LookAndFeel::drawToggleButton (Graphics& g,
 	if (! button.isEnabled())
 		g.setOpacity (0.5f);
 
-	const int textX = tickWidth + 5;
+	const int textX = (int) tickWidth + 5;
 
 	g.drawFittedText (button.getButtonText(),
 					  textX, 0,
@@ -71659,7 +71662,7 @@ public:
 			bool enabled = deviceManager.isMidiInputEnabled (item);
 
 			const int x = getTickX();
-			const int tickW = height - height / 4;
+			const float tickW = height * 0.75f;
 
 			getLookAndFeel().drawTickBox (g, *this, x - tickW, (height - tickW) / 2, tickW, tickW,
 										  enabled, true, true, false);
@@ -72316,7 +72319,7 @@ public:
 				}
 
 				const int x = getTickX();
-				const int tickW = height - height / 4;
+				const float tickW = height * 0.75f;
 
 				getLookAndFeel().drawTickBox (g, *this, x - tickW, (height - tickW) / 2, tickW, tickW,
 											  enabled, true, true, false);
diff --git a/juce_amalgamated.h b/juce_amalgamated.h
index 7f506d0e8c..4ae4bb23c8 100644
--- a/juce_amalgamated.h
+++ b/juce_amalgamated.h
@@ -471,6 +471,7 @@
 #include <cstdlib>
 #include <cstdarg>
 #include <climits>
+#include <limits>
 #include <cmath>
 #include <cwchar>
 #include <stdexcept>
diff --git a/src/core/juce_StandardHeader.h b/src/core/juce_StandardHeader.h
index e639e55d10..cac70f6c71 100644
--- a/src/core/juce_StandardHeader.h
+++ b/src/core/juce_StandardHeader.h
@@ -71,6 +71,7 @@
 #include <cstdlib>
 #include <cstdarg>
 #include <climits>
+#include <limits>
 #include <cmath>
 #include <cwchar>
 #include <stdexcept>
diff --git a/src/gui/components/lookandfeel/juce_LookAndFeel.cpp b/src/gui/components/lookandfeel/juce_LookAndFeel.cpp
index 9e9dbd34df..17c1f9274d 100644
--- a/src/gui/components/lookandfeel/juce_LookAndFeel.cpp
+++ b/src/gui/components/lookandfeel/juce_LookAndFeel.cpp
@@ -470,7 +470,7 @@ void LookAndFeel::drawToggleButton (Graphics& g,
     if (! button.isEnabled())
         g.setOpacity (0.5f);
 
-    const int textX = tickWidth + 5;
+    const int textX = (int) tickWidth + 5;
 
     g.drawFittedText (button.getButtonText(),
                       textX, 0,
diff --git a/src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp b/src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp
index d04d686193..546bee233f 100644
--- a/src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp
+++ b/src/gui/components/special/juce_AudioDeviceSelectorComponent.cpp
@@ -122,7 +122,7 @@ public:
             bool enabled = deviceManager.isMidiInputEnabled (item);
 
             const int x = getTickX();
-            const int tickW = height - height / 4;
+            const float tickW = height * 0.75f;
 
             getLookAndFeel().drawTickBox (g, *this, x - tickW, (height - tickW) / 2, tickW, tickW,
                                           enabled, true, true, false);
@@ -783,7 +783,7 @@ public:
                 }
 
                 const int x = getTickX();
-                const int tickW = height - height / 4;
+                const float tickW = height * 0.75f;
 
                 getLookAndFeel().drawTickBox (g, *this, x - tickW, (height - tickW) / 2, tickW, tickW,
                                               enabled, true, true, false);
diff --git a/src/juce_amalgamated_template.cpp b/src/juce_amalgamated_template.cpp
index e91fc77185..852c14c8e2 100644
--- a/src/juce_amalgamated_template.cpp
+++ b/src/juce_amalgamated_template.cpp
@@ -55,6 +55,9 @@
 //==============================================================================
 #define DONT_SET_USING_JUCE_NAMESPACE 1
 
+#undef max
+#undef min
+
 #include "../juce_amalgamated.h"
 
 #define NO_DUMMY_DECL