diff --git a/README.md b/README.md
index 1ef8b7fa..9e7ce539 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,8 @@ guide in the GLFW documentation.
  - [X11] Bugfix: Removed joystick axis value negation left over from GLFW 2
  - [X11] Bugfix: The position of hidden windows was ignored by Metacity
                  and Compiz
+ - [X11] Bugfix: The `pthread.h` header was not included by the GLX platform
+                 header.
 
 
 ## Contact
diff --git a/src/glx_context.c b/src/glx_context.c
index 47ae653f..6b87000d 100644
--- a/src/glx_context.c
+++ b/src/glx_context.c
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <pthread.h>
 
 
 // This is the only glXGetProcAddress variant not declared by glxext.h
diff --git a/src/glx_platform.h b/src/glx_platform.h
index 74e60a81..4b133a2d 100644
--- a/src/glx_platform.h
+++ b/src/glx_platform.h
@@ -41,6 +41,8 @@
  #include <dlfcn.h>
 #endif
 
+#include <pthread.h>
+
 // We support four different ways for getting addresses for GL/GLX
 // extension functions: glXGetProcAddress, glXGetProcAddressARB,
 // glXGetProcAddressEXT, and dlsym