diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index 31619e65..075a64a2 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -1099,6 +1099,8 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height, const char* title, G
  *
  *  @note This function may only be called from the main thread.
  *
+ *  @note This function may not be called from a callback.
+ *
  *  @note If the window's context is current on the main thread, it is
  *  detached before being destroyed.
  *
@@ -1390,6 +1392,8 @@ GLFWAPI void glfwSetWindowIconifyCallback(GLFWwindow* window, GLFWwindowiconifyf
  *
  *  @note This function may only be called from the main thread.
  *
+ *  @note This function may not be called from a callback.
+ *
  *  @sa glfwWaitEvents
  */
 GLFWAPI void glfwPollEvents(void);
@@ -1399,6 +1403,8 @@ GLFWAPI void glfwPollEvents(void);
  *
  *  @note This function may only be called from the main thread.
  *
+ *  @note This function may not be called from a callback.
+ *
  *  @sa glfwPollEvents
  */
 GLFWAPI void glfwWaitEvents(void);