diff --git a/src/x11_clipboard.c b/src/x11_clipboard.c
index a833ed1f..5bc92d44 100644
--- a/src/x11_clipboard.c
+++ b/src/x11_clipboard.c
@@ -1,6 +1,6 @@
 //========================================================================
 // GLFW - An OpenGL library
-// Platform:    X11/GLX
+// Platform:    X11
 // API version: 3.0
 // WWW:         http://www.glfw.org/
 //------------------------------------------------------------------------
@@ -182,7 +182,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
     if (_glfwLibrary.X11.selection.status == _GLFW_CONVERSION_FAILED)
     {
         _glfwSetError(GLFW_FORMAT_UNAVAILABLE,
-                      "X11/GLX: Failed to convert selection to string");
+                      "X11: Failed to convert selection to string");
         return NULL;
     }
 
diff --git a/src/x11_egl_opengl.c b/src/x11_egl_opengl.c
index a6582aa7..82880c93 100644
--- a/src/x11_egl_opengl.c
+++ b/src/x11_egl_opengl.c
@@ -1,6 +1,6 @@
 //========================================================================
 // GLFW - An OpenGL library
-// Platform:    X11/EGL/GLES
+// Platform:    X11/EGL
 // API version: 3.0
 // WWW:         http://www.glfw.org/
 //------------------------------------------------------------------------
diff --git a/src/x11_fullscreen.c b/src/x11_fullscreen.c
index a17acde4..e718951f 100644
--- a/src/x11_fullscreen.c
+++ b/src/x11_fullscreen.c
@@ -1,6 +1,6 @@
 //========================================================================
 // GLFW - An OpenGL library
-// Platform:    X11/GLX
+// Platform:    X11
 // API version: 3.0
 // WWW:         http://www.glfw.org/
 //------------------------------------------------------------------------
@@ -350,7 +350,7 @@ int _glfwPlatformGetVideoModes(GLFWvidmode* list, int maxcount)
     if (vislist == NULL)
     {
         _glfwSetError(GLFW_PLATFORM_ERROR,
-                      "X11/GLX: Failed to retrieve the available visuals");
+                      "X11: Failed to retrieve the available visuals");
         return 0;
     }
 
diff --git a/src/x11_gamma.c b/src/x11_gamma.c
index 44cd1139..148ae740 100644
--- a/src/x11_gamma.c
+++ b/src/x11_gamma.c
@@ -1,6 +1,6 @@
 //========================================================================
 // GLFW - An OpenGL library
-// Platform:    X11/GLX
+// Platform:    X11
 // API version: 3.0
 // WWW:         http://www.glfw.org/
 //------------------------------------------------------------------------
@@ -115,7 +115,7 @@ void _glfwPlatformGetGammaRamp(GLFWgammaramp* ramp)
     if (_glfwLibrary.originalRampSize != GLFW_GAMMA_RAMP_SIZE)
     {
         _glfwSetError(GLFW_PLATFORM_ERROR,
-                      "X11/GLX: Failed to get gamma ramp due to size "
+                      "X11: Failed to get gamma ramp due to size "
                       "incompatibility");
         return;
     }
@@ -166,7 +166,7 @@ void _glfwPlatformSetGammaRamp(const GLFWgammaramp* ramp)
     if (_glfwLibrary.originalRampSize != GLFW_GAMMA_RAMP_SIZE)
     {
         _glfwSetError(GLFW_PLATFORM_ERROR,
-                      "X11/GLX: Failed to set gamma ramp due to size "
+                      "X11: Failed to set gamma ramp due to size "
                       "incompatibility");
         return;
     }
diff --git a/src/x11_init.c b/src/x11_init.c
index 3ad323f4..75aa6c59 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -491,7 +491,7 @@ static GLboolean initDisplay(void)
     _glfwLibrary.X11.display = XOpenDisplay(NULL);
     if (!_glfwLibrary.X11.display)
     {
-        _glfwSetError(GLFW_OPENGL_UNAVAILABLE, "X11/GLX: Failed to open X display");
+        _glfwSetError(GLFW_OPENGL_UNAVAILABLE, "X11: Failed to open X display");
         return GL_FALSE;
     }
 
@@ -525,7 +525,7 @@ static GLboolean initDisplay(void)
                              &_glfwLibrary.X11.RandR.minorVersion))
         {
             _glfwSetError(GLFW_PLATFORM_ERROR,
-                          "X11/GLX: Failed to query RandR version");
+                          "X11: Failed to query RandR version");
             return GL_FALSE;
         }
     }
diff --git a/src/x11_input.c b/src/x11_input.c
index 49961395..2ea8b8c4 100644
--- a/src/x11_input.c
+++ b/src/x11_input.c
@@ -1,6 +1,6 @@
 //========================================================================
 // GLFW - An OpenGL library
-// Platform:    X11 (Unix)
+// Platform:    X11
 // API version: 3.0
 // WWW:         http://www.glfw.org/
 //------------------------------------------------------------------------
diff --git a/src/x11_joystick.c b/src/x11_joystick.c
index 444c479f..35dad02b 100644
--- a/src/x11_joystick.c
+++ b/src/x11_joystick.c
@@ -1,6 +1,6 @@
 //========================================================================
 // GLFW - An OpenGL library
-// Platform:    X11/GLX
+// Platform:    X11
 // API version: 3.0
 // WWW:         http://www.glfw.org/
 //------------------------------------------------------------------------
diff --git a/src/x11_keysym2unicode.c b/src/x11_keysym2unicode.c
index 1f610fdd..c0d10c6e 100644
--- a/src/x11_keysym2unicode.c
+++ b/src/x11_keysym2unicode.c
@@ -1,6 +1,6 @@
 //========================================================================
 // GLFW - An OpenGL library
-// Platform:    X11/GLX
+// Platform:    X11
 // API version: 3.0
 // WWW:         http://www.glfw.org/
 //------------------------------------------------------------------------
diff --git a/src/x11_time.c b/src/x11_time.c
index f1445233..bf3335d3 100644
--- a/src/x11_time.c
+++ b/src/x11_time.c
@@ -1,6 +1,6 @@
 //========================================================================
 // GLFW - An OpenGL library
-// Platform:    X11/GLX
+// Platform:    X11
 // API version: 3.0
 // WWW:         http://www.glfw.org/
 //------------------------------------------------------------------------
diff --git a/src/x11_window.c b/src/x11_window.c
index 84b6f7d6..9eca8fd1 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -1,6 +1,6 @@
 //========================================================================
 // GLFW - An OpenGL library
-// Platform:    X11/GLX
+// Platform:    X11
 // API version: 3.0
 // WWW:         http://www.glfw.org/
 //------------------------------------------------------------------------
@@ -146,7 +146,7 @@ static GLboolean createWindow(_GLFWwindow* window,
             // TODO: Handle all the various error codes here
 
             _glfwSetError(GLFW_PLATFORM_ERROR,
-                          "X11/GLX: Failed to create window");
+                          "X11: Failed to create window");
             return GL_FALSE;
         }
     }
@@ -205,7 +205,7 @@ static GLboolean createWindow(_GLFWwindow* window,
         if (!hints)
         {
             _glfwSetError(GLFW_OUT_OF_MEMORY,
-                          "X11/GLX: Failed to allocate WM hints");
+                          "X11: Failed to allocate WM hints");
             return GL_FALSE;
         }
 
@@ -222,7 +222,7 @@ static GLboolean createWindow(_GLFWwindow* window,
         if (!hints)
         {
             _glfwSetError(GLFW_OUT_OF_MEMORY,
-                          "X11/GLX: Failed to allocate size hints");
+                          "X11: Failed to allocate size hints");
             return GL_FALSE;
         }