diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1d33035dd..d7e0799c7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ include(PackageConfig)      # Defines package_option AND target_use_packages
 include(Interrogate)        # Defines target_interrogate AND add_python_module
 
 # Add the include path for source and header files generated by CMake
-include_directories("${CMAKE_BINARY_DIR}")
+include_directories("${CMAKE_BINARY_DIR}/include")
 
 # Configure Panda3D
 include(dtool/PandaVersion.cmake)
diff --git a/dtool/LocalSetup.cmake b/dtool/LocalSetup.cmake
index 978c79073b..009a45939f 100644
--- a/dtool/LocalSetup.cmake
+++ b/dtool/LocalSetup.cmake
@@ -212,6 +212,6 @@ endif()
 message("See dtool_config.h for more details about the specified configuration.")
 
 # Generate dtool_config.h
-configure_file(dtool_config.h.in "${PROJECT_BINARY_DIR}/dtool_config.h")
-include_directories("${PROJECT_BINARY_DIR}")
+configure_file(dtool_config.h.in "${PROJECT_BINARY_DIR}/include/dtool_config.h")
+include_directories("${PROJECT_BINARY_DIR}/include")
 #install(FILES "${PROJECT_BINARY_DIR}/dtool_config.h" DESTINATION include/panda3d)