diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80915fad..e3588dec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,13 +14,9 @@ option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" ON)
 option(GLFW_BUILD_TESTS "Build the GLFW test programs" ON)
 option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 
-option(GLFW_DOCUMENT_NATIVE "Include documentation of native access functions" OFF)
 option(GLFW_DOCUMENT_INTERNALS "Include documentation of internal functions" OFF)
 
-set(GLFW_DOC_HEADERS "${GLFW_SOURCE_DIR}/include/GL/glfw3.h")
-if (GLFW_DOCUMENT_NATIVE)
-    set(GLFW_DOC_HEADERS "${GLFW_DOC_HEADERS} ${GLFW_SOURCE_DIR}/include/GL/glfw3native.h")
-endif()
+set(GLFW_DOC_HEADERS "${GLFW_SOURCE_DIR}/include/GL/glfw3.h ${GLFW_SOURCE_DIR}/include/GL/glfw3native.h")
 if (GLFW_DOCUMENT_INTERNALS)
     set(GLFW_DOC_HEADERS "${GLFW_DOC_HEADERS} ${GLFW_SOURCE_DIR}/src/internal.h")
 endif()
diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
index 9bebfbd6..a04c8bab 100644
--- a/docs/Doxyfile.in
+++ b/docs/Doxyfile.in
@@ -488,7 +488,7 @@ SORT_MEMBERS_CTORS_1ST = NO
 # hierarchy of group names into alphabetical order. If set to NO (the default)
 # the group names will appear in their defined order.
 
-SORT_GROUP_NAMES       = NO
+SORT_GROUP_NAMES       = YES
 
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
 # sorted by fully-qualified names, including namespaces. If set to