diff --git a/README.md b/README.md
index f26d0204..6f91c3fc 100644
--- a/README.md
+++ b/README.md
@@ -248,6 +248,7 @@ skills.
  - blanco
  - Kyle Brenneman
  - Martin Capitanio
+ - David Carlier
  - Chi-kwan Chan
  - Lambert Clara
  - Andrew Corrigan
diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h
index 775ce209..8ddcfd8b 100644
--- a/include/GLFW/glfw3.h
+++ b/include/GLFW/glfw3.h
@@ -209,9 +209,6 @@ extern "C" {
  #endif /*__APPLE__*/
 
 #endif /* OpenGL and OpenGL ES headers */
-#ifndef GLAPIENTRY
- #define GLAPIENTRY APIENTRY
-#endif /* GLAPIENT
 
 #if defined(GLFW_INCLUDE_VULKAN)
 
@@ -4909,6 +4906,13 @@ GLFWAPI VkResult glfwCreateWindowSurface(VkInstance instance, GLFWwindow* window
  #undef GLFW_CALLBACK_DEFINED
 #endif
 
+/* Some OpenGL related headers need GLAPIENTRY, but it is unconditionally
+ * defined by some gl.h variants (OpenBSD) so define it after if needed.
+ */
+#ifndef GLAPIENTRY
+ #define GLAPIENTRY APIENTRY
+#endif
+
 /* -------------------- END SYSTEM/COMPILER SPECIFIC --------------------- */