diff --git a/CMakeLists.txt b/CMakeLists.txt
index c391fd11f..50f5528c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -477,6 +477,8 @@ endif()
 #--------------------------------------------------------------------
 # Add subdirectories
 #--------------------------------------------------------------------
+include(GNUInstallDirs)
+
 add_subdirectory(src)
 
 if (GLFW_BUILD_EXAMPLES)
@@ -495,7 +497,6 @@ endif()
 # Create generated files
 #--------------------------------------------------------------------
 include(CMakePackageConfigHelpers)
-include(GNUInstallDirs)
 
 set(GLFW_INSTALL_CONFIG_DIR    "${CMAKE_INSTALL_LIBDIR}/cmake/glfw3")
 set(GLFW_INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f2061a5c4..cf879bca8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -65,7 +65,7 @@ if (NOT CMAKE_VERSION VERSION_LESS "2.8.11")
     # directories.  TODO If/when cmake_minimum_required increases to
     # >=2.8.11, call this command unconditionally.
     target_include_directories(glfw PUBLIC 
-        $<INSTALL_INTERFACE:${GLFW_INSTALL_INCLUDE_DIR}>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
         $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>)
 endif()