diff --git a/src/gamma.c b/src/gamma.c
index ed86e346..781539bf 100644
--- a/src/gamma.c
+++ b/src/gamma.c
@@ -38,6 +38,10 @@
 #endif
 
 
+//////////////////////////////////////////////////////////////////////////
+//////                       GLFW internal API                      //////
+//////////////////////////////////////////////////////////////////////////
+
 void _glfwAllocGammaRamp(GLFWgammaramp* ramp, unsigned int size)
 {
     ramp->red = (unsigned short*) malloc(size * sizeof(unsigned short));
diff --git a/src/x11_time.c b/src/x11_time.c
index 92f0a860..0e915fef 100644
--- a/src/x11_time.c
+++ b/src/x11_time.c
@@ -56,6 +56,11 @@ static uint64_t getRawTime(void)
     }
 }
 
+
+//////////////////////////////////////////////////////////////////////////
+//////                       GLFW internal API                      //////
+//////////////////////////////////////////////////////////////////////////
+
 // Initialise timer
 //
 void _glfwInitTimer(void)
diff --git a/src/x11_window.c b/src/x11_window.c
index 4097526a..623f4cfe 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -60,7 +60,7 @@ typedef struct
 
 // Translates an X event modifier state mask
 //
-int translateState(int state)
+static int translateState(int state)
 {
     int mods = 0;
 
@@ -491,23 +491,6 @@ static void leaveFullscreenMode(_GLFWwindow* window)
     }
 }
 
-// Return the GLFW window corresponding to the specified X11 window
-//
-_GLFWwindow* _glfwFindWindowByHandle(Window handle)
-{
-    _GLFWwindow* window;
-
-    if (XFindContext(_glfw.x11.display,
-                     handle,
-                     _glfw.x11.context,
-                     (XPointer*) &window) != 0)
-    {
-        return NULL;
-    }
-
-    return window;
-}
-
 // Process the specified X event
 //
 static void processEvent(XEvent *event)
@@ -838,6 +821,23 @@ static void processEvent(XEvent *event)
 //////                       GLFW internal API                      //////
 //////////////////////////////////////////////////////////////////////////
 
+// Return the GLFW window corresponding to the specified X11 window
+//
+_GLFWwindow* _glfwFindWindowByHandle(Window handle)
+{
+    _GLFWwindow* window;
+
+    if (XFindContext(_glfw.x11.display,
+                     handle,
+                     _glfw.x11.context,
+                     (XPointer*) &window) != 0)
+    {
+        return NULL;
+    }
+
+    return window;
+}
+
 // Retrieve a single window property of the specified type
 // Inspired by fghGetWindowProperty from freeglut
 //