diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 438a7dea..0ccf2f14 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,21 +7,21 @@ set(common_SOURCES context.c init.c input.c monitor.c vulkan.c window.c)
 
 if (_GLFW_COCOA)
     set(glfw_HEADERS ${common_HEADERS} cocoa_platform.h cocoa_joystick.h
-                     posix_tls.h nsgl_context.h egl_context.h osmesa_context.c)
+                     posix_thread.h nsgl_context.h egl_context.h osmesa_context.c)
     set(glfw_SOURCES ${common_SOURCES} cocoa_init.m cocoa_joystick.m
-                     cocoa_monitor.m cocoa_window.m cocoa_time.c posix_tls.c
+                     cocoa_monitor.m cocoa_window.m cocoa_time.c posix_thread.c
                      nsgl_context.m egl_context.c osmesa_context.c)
 elseif (_GLFW_WIN32)
     set(glfw_HEADERS ${common_HEADERS} win32_platform.h win32_joystick.h
                      wgl_context.h egl_context.h osmesa_context.h)
     set(glfw_SOURCES ${common_SOURCES} win32_init.c win32_joystick.c
-                     win32_monitor.c win32_time.c win32_tls.c win32_window.c
+                     win32_monitor.c win32_time.c win32_thread.c win32_window.c
                      wgl_context.c egl_context.c osmesa_context.c)
 elseif (_GLFW_X11)
     set(glfw_HEADERS ${common_HEADERS} x11_platform.h xkb_unicode.h posix_time.h
-                     posix_tls.h glx_context.h egl_context.h osmesa_context.h)
+                     posix_thread.h glx_context.h egl_context.h osmesa_context.h)
     set(glfw_SOURCES ${common_SOURCES} x11_init.c x11_monitor.c x11_window.c
-                     xkb_unicode.c posix_time.c posix_tls.c glx_context.c
+                     xkb_unicode.c posix_time.c posix_thread.c glx_context.c
                      egl_context.c osmesa_context.c)
 
     if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
@@ -33,10 +33,10 @@ elseif (_GLFW_X11)
     endif()
 elseif (_GLFW_WAYLAND)
     set(glfw_HEADERS ${common_HEADERS} wl_platform.h linux_joystick.h
-                     posix_time.h posix_tls.h xkb_unicode.h egl_context.h
+                     posix_time.h posix_thread.h xkb_unicode.h egl_context.h
                      osmesa_context.h)
     set(glfw_SOURCES ${common_SOURCES} wl_init.c wl_monitor.c wl_window.c
-                     linux_joystick.c posix_time.c posix_tls.c xkb_unicode.c
+                     linux_joystick.c posix_time.c posix_thread.c xkb_unicode.c
                      egl_context.c osmesa_context.c)
 
     ecm_add_wayland_client_protocol(glfw_SOURCES
@@ -49,16 +49,16 @@ elseif (_GLFW_WAYLAND)
         BASENAME pointer-constraints-unstable-v1)
 elseif (_GLFW_MIR)
     set(glfw_HEADERS ${common_HEADERS} mir_platform.h linux_joystick.h
-                     posix_time.h posix_tls.h xkb_unicode.h egl_context.h
+                     posix_time.h posix_thread.h xkb_unicode.h egl_context.h
                      osmesa_context.h)
     set(glfw_SOURCES ${common_SOURCES} mir_init.c mir_monitor.c mir_window.c
-                     linux_joystick.c posix_time.c posix_tls.c xkb_unicode.c
+                     linux_joystick.c posix_time.c posix_thread.c xkb_unicode.c
                      egl_context.c osmesa_context.c)
 elseif (_GLFW_OSMESA)
     set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h
-                     posix_time.h posix_tls.h osmesa_context.h)
+                     posix_time.h posix_thread.h osmesa_context.h)
     set(glfw_SOURCES ${common_SOURCES} null_init.c null_monitor.c null_window.c
-                     null_joystick.c posix_time.c posix_tls.c osmesa_context.c)
+                     null_joystick.c posix_time.c posix_thread.c osmesa_context.c)
 endif()
 
 if (APPLE)
diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h
index f744f78c..b8e0bc98 100644
--- a/src/cocoa_platform.h
+++ b/src/cocoa_platform.h
@@ -48,7 +48,7 @@ typedef struct VkMacOSSurfaceCreateInfoMVK
 
 typedef VkResult (APIENTRY *PFN_vkCreateMacOSSurfaceMVK)(VkInstance,const VkMacOSSurfaceCreateInfoMVK*,const VkAllocationCallbacks*,VkSurfaceKHR*);
 
-#include "posix_tls.h"
+#include "posix_thread.h"
 #include "cocoa_joystick.h"
 #include "nsgl_context.h"
 #include "egl_context.h"
diff --git a/src/internal.h b/src/internal.h
index 72ac953e..0da36741 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -495,7 +495,7 @@ struct _GLFWjoystick
  */
 struct _GLFWtls
 {
-    // This is defined in the platform's tls.h
+    // This is defined in the platform's thread.h
     _GLFW_PLATFORM_TLS_STATE;
 };
 
@@ -503,7 +503,7 @@ struct _GLFWtls
  */
 struct _GLFWmutex
 {
-    // This is defined in the platform's tls.h
+    // This is defined in the platform's thread.h
     _GLFW_PLATFORM_MUTEX_STATE;
 };
 
diff --git a/src/mir_platform.h b/src/mir_platform.h
index 3dac43ec..da00a326 100644
--- a/src/mir_platform.h
+++ b/src/mir_platform.h
@@ -44,7 +44,7 @@ typedef struct VkMirWindowCreateInfoKHR
 typedef VkResult (APIENTRY *PFN_vkCreateMirWindowKHR)(VkInstance,const VkMirWindowCreateInfoKHR*,const VkAllocationCallbacks*,VkSurfaceKHR*);
 typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceMirPresentationSupportKHR)(VkPhysicalDevice,uint32_t,MirConnection*);
 
-#include "posix_tls.h"
+#include "posix_thread.h"
 #include "posix_time.h"
 #include "linux_joystick.h"
 #include "xkb_unicode.h"
diff --git a/src/null_platform.h b/src/null_platform.h
index dfb88a16..2d67c50c 100644
--- a/src/null_platform.h
+++ b/src/null_platform.h
@@ -39,7 +39,7 @@
 
 #include "osmesa_context.h"
 #include "posix_time.h"
-#include "posix_tls.h"
+#include "posix_thread.h"
 #include "null_joystick.h"
 
 #if defined(_GLFW_WIN32)
diff --git a/src/posix_tls.c b/src/posix_thread.c
similarity index 100%
rename from src/posix_tls.c
rename to src/posix_thread.c
diff --git a/src/posix_tls.h b/src/posix_thread.h
similarity index 100%
rename from src/posix_tls.h
rename to src/posix_thread.h
diff --git a/src/win32_tls.c b/src/win32_thread.c
similarity index 100%
rename from src/win32_tls.c
rename to src/win32_thread.c
diff --git a/src/wl_platform.h b/src/wl_platform.h
index 62069857..c543d82c 100644
--- a/src/wl_platform.h
+++ b/src/wl_platform.h
@@ -43,7 +43,7 @@ typedef struct VkWaylandSurfaceCreateInfoKHR
 typedef VkResult (APIENTRY *PFN_vkCreateWaylandSurfaceKHR)(VkInstance,const VkWaylandSurfaceCreateInfoKHR*,const VkAllocationCallbacks*,VkSurfaceKHR*);
 typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalDevice,uint32_t,struct wl_display*);
 
-#include "posix_tls.h"
+#include "posix_thread.h"
 #include "posix_time.h"
 #include "linux_joystick.h"
 #include "xkb_unicode.h"
diff --git a/src/x11_platform.h b/src/x11_platform.h
index 48ee88b1..e56630cf 100644
--- a/src/x11_platform.h
+++ b/src/x11_platform.h
@@ -92,7 +92,7 @@ typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR)(V
 typedef VkResult (APIENTRY *PFN_vkCreateXcbSurfaceKHR)(VkInstance,const VkXcbSurfaceCreateInfoKHR*,const VkAllocationCallbacks*,VkSurfaceKHR*);
 typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR)(VkPhysicalDevice,uint32_t,xcb_connection_t*,xcb_visualid_t);
 
-#include "posix_tls.h"
+#include "posix_thread.h"
 #include "posix_time.h"
 #include "xkb_unicode.h"
 #include "glx_context.h"