diff --git a/src/cocoa_joystick.m b/src/cocoa_joystick.m
index 3a5751ef0..00ab8e4ae 100644
--- a/src/cocoa_joystick.m
+++ b/src/cocoa_joystick.m
@@ -247,9 +247,9 @@ static void matchCallback(void* context,
                       compareElements, NULL);
 
     js = _glfwAllocJoystick(name, guid,
-                            CFArrayGetCount(axes),
-                            CFArrayGetCount(buttons),
-                            CFArrayGetCount(hats));
+                            (int) CFArrayGetCount(axes),
+                            (int) CFArrayGetCount(buttons),
+                            (int) CFArrayGetCount(hats));
 
     js->ns.device  = device;
     js->ns.axes    = axes;
@@ -399,11 +399,13 @@ int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode)
 
             const long delta = axis->maximum - axis->minimum;
             if (delta == 0)
-                _glfwInputJoystickAxis(js, i, 0.f);
+            {
+                _glfwInputJoystickAxis(js, (int) i, 0.f);
+            }
             else
             {
                 const float value = (2.f * (raw - axis->minimum) / delta) - 1.f;
-                _glfwInputJoystickAxis(js, i, value);
+                _glfwInputJoystickAxis(js, (int) i, value);
             }
         }
     }
@@ -417,7 +419,7 @@ int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode)
             _GLFWjoyelementNS* button = (_GLFWjoyelementNS*)
                 CFArrayGetValueAtIndex(js->ns.buttons, i);
             const char value = getElementValue(js, button) - button->minimum;
-            _glfwInputJoystickButton(js, i, value);
+            _glfwInputJoystickButton(js, (int) i, value);
         }
 
         for (i = 0;  i < CFArrayGetCount(js->ns.hats);  i++)
@@ -441,7 +443,7 @@ int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode)
             if (state < 0 || state > 8)
                 state = 8;
 
-            _glfwInputJoystickHat(js, i, states[state]);
+            _glfwInputJoystickHat(js, (int) i, states[state]);
         }
     }
 
diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index 16fbb7bfd..7cc7117c7 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -686,7 +686,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
                         [sender draggingLocation].x,
                         contentRect.size.height - [sender draggingLocation].y);
 
-    const int count = [files count];
+    const int count = (int) [files count];
     if (count)
     {
         NSEnumerator* e = [files objectEnumerator];
diff --git a/src/input.c b/src/input.c
index c06715aa4..0747a23a8 100644
--- a/src/input.c
+++ b/src/input.c
@@ -136,8 +136,8 @@ static GLFWbool parseMapping(_GLFWmapping* mapping, const char* string)
 
                 if (fields[i].element->type == _GLFW_JOYSTICK_HATBIT)
                 {
-                    const unsigned int hat = strtoul(c + 1, (char**) &c, 10);
-                    const unsigned int bit = strtoul(c + 1, (char**) &c, 10);
+                    const unsigned int hat = (unsigned int) strtoul(c + 1, (char**) &c, 10);
+                    const unsigned int bit = (unsigned int) strtoul(c + 1, (char**) &c, 10);
                     fields[i].element->value = (hat << 4) | bit;
                 }
                 else
diff --git a/src/osmesa_context.h b/src/osmesa_context.h
index e6ae57810..07bb469a6 100644
--- a/src/osmesa_context.h
+++ b/src/osmesa_context.h
@@ -37,7 +37,7 @@
 #define OSMESA_CONTEXT_MINOR_VERSION 0x37
 
 typedef void* OSMesaContext;
-typedef void (*OSMESAproc)();
+typedef void (*OSMESAproc)(void);
 
 typedef OSMesaContext (GLAPIENTRY * PFN_OSMesaCreateContextExt)(GLenum,GLint,GLint,GLint,OSMesaContext);
 typedef OSMesaContext (GLAPIENTRY * PFN_OSMesaCreateContextAttribs)(const int*,OSMesaContext);