diff --git a/src/window.c b/src/window.c
index 693354ee..385595ce 100644
--- a/src/window.c
+++ b/src/window.c
@@ -632,7 +632,7 @@ GLFWAPI GLFWwindow glfwOpenWindow(int width, int height,
 // Make the OpenGL context associated with the specified window current
 //========================================================================
 
-GLFWAPI void glfwMakeWindowCurrent(GLFWwindow window)
+GLFWAPI void glfwMakeWindowCurrent(GLFWwindow handle)
 {
     if (!_glfwInitialized)
     {
@@ -640,6 +640,8 @@ GLFWAPI void glfwMakeWindowCurrent(GLFWwindow window)
         return;
     }
 
+    _GLFWwindow* window = (_GLFWwindow*) handle;
+
     if (_glfwLibrary.currentWindow == window)
         return;
 
@@ -652,7 +654,7 @@ GLFWAPI void glfwMakeWindowCurrent(GLFWwindow window)
 // Returns GL_TRUE if the specified window handle is an actual window
 //========================================================================
 
-GLFWAPI int glfwIsWindow(GLFWwindow window)
+GLFWAPI int glfwIsWindow(GLFWwindow handle)
 {
     _GLFWwindow* entry;
 
@@ -662,6 +664,8 @@ GLFWAPI int glfwIsWindow(GLFWwindow window)
         return GL_FALSE;
     }
 
+    _GLFWwindow* window = (_GLFWwindow*) handle;
+
     if (window == NULL)
         return GL_FALSE;
 
@@ -817,7 +821,7 @@ GLFWAPI void glfwCloseWindow(GLFWwindow handle)
 // Set the window title
 //========================================================================
 
-GLFWAPI void glfwSetWindowTitle(GLFWwindow window, const char* title)
+GLFWAPI void glfwSetWindowTitle(GLFWwindow handle, const char* title)
 {
     if (!_glfwInitialized)
     {
@@ -825,6 +829,8 @@ GLFWAPI void glfwSetWindowTitle(GLFWwindow window, const char* title)
         return;
     }
 
+    _GLFWwindow* window = (_GLFWwindow*) handle;
+
     _glfwPlatformSetWindowTitle(window, title);
 }