diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f6ac6469..bd725007 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,16 +38,16 @@ elseif (_GLFW_WAYLAND)
 endif()
 
 if (_GLFW_EGL)
-    list(APPEND glfw_HEADERS ${common_HEADERS} egl_platform.h)
+    list(APPEND glfw_HEADERS ${common_HEADERS} egl_context.h)
     list(APPEND glfw_SOURCES ${common_SOURCES} egl_context.c)
 elseif (_GLFW_NSGL)
-    list(APPEND glfw_HEADERS ${common_HEADERS} nsgl_platform.h)
+    list(APPEND glfw_HEADERS ${common_HEADERS} nsgl_context.h)
     list(APPEND glfw_SOURCES ${common_SOURCES} nsgl_context.m)
 elseif (_GLFW_WGL)
-    list(APPEND glfw_HEADERS ${common_HEADERS} wgl_platform.h)
+    list(APPEND glfw_HEADERS ${common_HEADERS} wgl_context.h)
     list(APPEND glfw_SOURCES ${common_SOURCES} wgl_context.c)
 elseif (_GLFW_X11)
-    list(APPEND glfw_HEADERS ${common_HEADERS} glx_platform.h)
+    list(APPEND glfw_HEADERS ${common_HEADERS} glx_context.h)
     list(APPEND glfw_SOURCES ${common_SOURCES} glx_context.c)
 endif()
 
diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h
index 8d9c0abd..feeeb0b2 100644
--- a/src/cocoa_platform.h
+++ b/src/cocoa_platform.h
@@ -40,7 +40,7 @@ typedef void* id;
 #include "posix_tls.h"
 
 #if defined(_GLFW_NSGL)
- #include "nsgl_platform.h"
+ #include "nsgl_context.h"
 #else
  #error "No supported context creation API selected"
 #endif
diff --git a/src/egl_platform.h b/src/egl_context.h
similarity index 97%
rename from src/egl_platform.h
rename to src/egl_context.h
index 77650fa6..d60b2294 100644
--- a/src/egl_platform.h
+++ b/src/egl_context.h
@@ -25,8 +25,8 @@
 //
 //========================================================================
 
-#ifndef _egl_platform_h_
-#define _egl_platform_h_
+#ifndef _egl_context_h_
+#define _egl_context_h_
 
 #include <EGL/egl.h>
 
@@ -91,4 +91,4 @@ int _glfwAnalyzeContext(const _GLFWwindow* window,
                         const _GLFWctxconfig* ctxconfig,
                         const _GLFWfbconfig* fbconfig);
 
-#endif // _egl_platform_h_
+#endif // _egl_context_h_
diff --git a/src/glx_platform.h b/src/glx_context.h
similarity index 98%
rename from src/glx_platform.h
rename to src/glx_context.h
index 440f599c..1f8e4952 100644
--- a/src/glx_platform.h
+++ b/src/glx_context.h
@@ -25,8 +25,8 @@
 //
 //========================================================================
 
-#ifndef _glx_platform_h_
-#define _glx_platform_h_
+#ifndef _glx_context_h_
+#define _glx_context_h_
 
 #define GLX_GLXEXT_LEGACY
 #include <GL/glx.h>
@@ -123,4 +123,4 @@ int _glfwCreateContext(_GLFWwindow* window,
                        const _GLFWfbconfig* fbconfig);
 void _glfwDestroyContext(_GLFWwindow* window);
 
-#endif // _glx_platform_h_
+#endif // _glx_context_h_
diff --git a/src/internal.h b/src/internal.h
index 53023525..b341bf47 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -200,7 +200,7 @@ struct _GLFWfbconfig
     int         samples;
     GLboolean   sRGB;
 
-    // This is defined in the context API's platform.h
+    // This is defined in the context API's context.h
     _GLFW_PLATFORM_FBCONFIG;
 };
 
@@ -262,7 +262,7 @@ struct _GLFWwindow
 
     // This is defined in the window API's platform.h
     _GLFW_PLATFORM_WINDOW_STATE;
-    // This is defined in the context API's platform.h
+    // This is defined in the context API's context.h
     _GLFW_PLATFORM_CONTEXT_STATE;
 };
 
@@ -347,7 +347,7 @@ struct _GLFWlibrary
 
     // This is defined in the window API's platform.h
     _GLFW_PLATFORM_LIBRARY_WINDOW_STATE;
-    // This is defined in the context API's platform.h
+    // This is defined in the context API's context.h
     _GLFW_PLATFORM_LIBRARY_OPENGL_STATE;
     // This is defined in the platform's time.h
     _GLFW_PLATFORM_LIBRARY_TIME_STATE;
diff --git a/src/nsgl_platform.h b/src/nsgl_context.h
similarity index 97%
rename from src/nsgl_platform.h
rename to src/nsgl_context.h
index 86c0dd1f..7fb770be 100644
--- a/src/nsgl_platform.h
+++ b/src/nsgl_context.h
@@ -24,8 +24,8 @@
 //
 //========================================================================
 
-#ifndef _nsgl_platform_h_
-#define _nsgl_platform_h_
+#ifndef _nsgl_context_h_
+#define _nsgl_context_h_
 
 #define _GLFW_PLATFORM_FBCONFIG
 #define _GLFW_PLATFORM_CONTEXT_STATE        _GLFWcontextNSGL nsgl
@@ -68,4 +68,4 @@ int _glfwCreateContext(_GLFWwindow* window,
                        const _GLFWfbconfig* fbconfig);
 void _glfwDestroyContext(_GLFWwindow* window);
 
-#endif // _nsgl_platform_h_
+#endif // _nsgl_context_h_
diff --git a/src/wayland_platform.h b/src/wayland_platform.h
index 7ea371ff..cf0d2c48 100644
--- a/src/wayland_platform.h
+++ b/src/wayland_platform.h
@@ -31,7 +31,7 @@
 #include <wayland-client.h>
 
 #if defined(_GLFW_EGL)
- #include "egl_platform.h"
+ #include "egl_context.h"
 #else
  #error "The Wayland backend depends on EGL platform support"
 #endif
diff --git a/src/wgl_platform.h b/src/wgl_context.h
similarity index 98%
rename from src/wgl_platform.h
rename to src/wgl_context.h
index 7fea8695..b7f57455 100644
--- a/src/wgl_platform.h
+++ b/src/wgl_context.h
@@ -25,8 +25,8 @@
 //
 //========================================================================
 
-#ifndef _wgl_platform_h_
-#define _wgl_platform_h_
+#ifndef _wgl_context_h_
+#define _wgl_context_h_
 
 // This path may need to be changed if you build GLFW using your own setup
 // We ship and use our own copy of wglext.h since GLFW uses fairly new
@@ -95,4 +95,4 @@ int _glfwAnalyzeContext(const _GLFWwindow* window,
                         const _GLFWctxconfig* ctxconfig,
                         const _GLFWfbconfig* fbconfig);
 
-#endif // _wgl_platform_h_
+#endif // _wgl_context_h_
diff --git a/src/win32_platform.h b/src/win32_platform.h
index 4af3bc36..591d8752 100644
--- a/src/win32_platform.h
+++ b/src/win32_platform.h
@@ -154,11 +154,11 @@ typedef HRESULT (WINAPI * DWMISCOMPOSITIONENABLED_T)(BOOL*);
 #include "win32_tls.h"
 
 #if defined(_GLFW_WGL)
- #include "wgl_platform.h"
+ #include "wgl_context.h"
 #elif defined(_GLFW_EGL)
  #define _GLFW_EGL_NATIVE_WINDOW  window->win32.handle
  #define _GLFW_EGL_NATIVE_DISPLAY EGL_DEFAULT_DISPLAY
- #include "egl_platform.h"
+ #include "egl_context.h"
 #else
  #error "No supported context creation API selected"
 #endif
diff --git a/src/x11_platform.h b/src/x11_platform.h
index 0f493b1d..785b2ead 100644
--- a/src/x11_platform.h
+++ b/src/x11_platform.h
@@ -52,12 +52,12 @@
 
 #if defined(_GLFW_GLX)
  #define _GLFW_X11_CONTEXT_VISUAL window->glx.visual
- #include "glx_platform.h"
+ #include "glx_context.h"
 #elif defined(_GLFW_EGL)
  #define _GLFW_X11_CONTEXT_VISUAL window->egl.visual
  #define _GLFW_EGL_NATIVE_WINDOW  window->x11.handle
  #define _GLFW_EGL_NATIVE_DISPLAY _glfw.x11.display
- #include "egl_platform.h"
+ #include "egl_context.h"
 #else
  #error "No supported context creation API selected"
 #endif