diff --git a/deps/xdiff/CMakeLists.txt b/deps/xdiff/CMakeLists.txt
index 743ac636f..82af0fad5 100644
--- a/deps/xdiff/CMakeLists.txt
+++ b/deps/xdiff/CMakeLists.txt
@@ -6,7 +6,7 @@ add_library(xdiff OBJECT ${SRC_XDIFF})
 target_include_directories(xdiff SYSTEM PRIVATE
 	"${PROJECT_SOURCE_DIR}/include"
 	"${PROJECT_SOURCE_DIR}/src/util"
-	"${PROJECT_BINARY_DIR}/src/util"
+	"${PROJECT_BINARY_DIR}/gen_headers"
 	${LIBGIT2_SYSTEM_INCLUDES}
 	${LIBGIT2_DEPENDENCY_INCLUDES})
 
diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
index d121c588a..517ede8ca 100644
--- a/src/cli/CMakeLists.txt
+++ b/src/cli/CMakeLists.txt
@@ -1,9 +1,8 @@
 set(CLI_INCLUDES
-	"${libgit2_BINARY_DIR}/src/util"
-	"${libgit2_BINARY_DIR}/include"
 	"${libgit2_SOURCE_DIR}/src/util"
 	"${libgit2_SOURCE_DIR}/src/cli"
 	"${libgit2_SOURCE_DIR}/include"
+	"${libgit2_BINARY_DIR}/gen_headers"
 	"${LIBGIT2_DEPENDENCY_INCLUDES}"
 	"${LIBGIT2_SYSTEM_INCLUDES}")
 
diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt
index c9b642ec9..8045ddef9 100644
--- a/src/libgit2/CMakeLists.txt
+++ b/src/libgit2/CMakeLists.txt
@@ -7,11 +7,10 @@ include(PkgBuildConfig)
 include(CMakePackageConfigHelpers)
 
 set(LIBGIT2_INCLUDES
-	"${PROJECT_BINARY_DIR}/src/util"
-	"${PROJECT_BINARY_DIR}/include"
 	"${PROJECT_SOURCE_DIR}/src/libgit2"
 	"${PROJECT_SOURCE_DIR}/src/util"
-	"${PROJECT_SOURCE_DIR}/include")
+	"${PROJECT_SOURCE_DIR}/include"
+	"${PROJECT_BINARY_DIR}/gen_headers")
 
 # Collect sourcefiles
 file(GLOB SRC_H
@@ -104,7 +103,7 @@ endif()
 
 # support experimental features and functionality
 
-configure_file(experimental.h.in "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}/experimental.h")
+configure_file(experimental.h.in "${PROJECT_BINARY_DIR}/gen_headers/experimental.h")
 
 # translate filenames in the headers so that they match the install directory
 # (allows for side-by-side installs of libgit2 and libgit2-experimental.)
@@ -120,6 +119,8 @@ foreach(HEADER_SOURCE ${SRC_H})
 	configure_file("${CMAKE_CURRENT_BINARY_DIR}/${HEADER_RELATIVE}.tmp" "${PROJECT_BINARY_DIR}/${HEADER_RELATIVE}" COPYONLY)
 endforeach()
 
+configure_file("${PROJECT_BINARY_DIR}/gen_headers/experimental.h" "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}/experimental.h" COPYONLY)
+
 # cmake package targets
 
 set(LIBGIT2_TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 3692dc3d3..062e0c6c8 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -2,13 +2,12 @@
 
 add_library(util OBJECT)
 
-configure_file(git2_features.h.in git2_features.h)
+configure_file(git2_features.h.in "${PROJECT_BINARY_DIR}/gen_headers/git2_features.h")
 
 set(UTIL_INCLUDES
-	"${PROJECT_BINARY_DIR}/src/util"
-	"${PROJECT_BINARY_DIR}/include"
 	"${PROJECT_SOURCE_DIR}/src/util"
-	"${PROJECT_SOURCE_DIR}/include")
+	"${PROJECT_SOURCE_DIR}/include"
+	"${PROJECT_BINARY_DIR}/gen_headers")
 
 file(GLOB UTIL_SRC *.c *.h allocators/*.c allocators/*.h hash.h)
 list(SORT UTIL_SRC)