diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c242ea016..80561e2182 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,22 +9,24 @@ enable_testing()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/macros/")
 
-# Include global modules
-include(AutoInclude)        # Implements automatic include_directories finding
-include(AddBisonTarget)     # Defines add_bison_target function
-include(AddFlexTarget)      # Defines add_flex_target function
-include(CompositeSources)   # Defines composite_sources function
+# Include global modules needed for configure scripts
 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")
 
 # Configure Panda3D
 include(dtool/PandaVersion.cmake)
 include(dtool/Package.cmake)
 include(dtool/Config.cmake)
 
+# Include global modules
+include(AutoInclude)        # Implements automatic include_directories finding
+include(AddBisonTarget)     # Defines add_bison_target function
+include(AddFlexTarget)      # Defines add_flex_target function
+include(CompositeSources)   # Defines composite_sources function
+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")
+
 # Determine which trees to build.
 option(BUILD_DTOOL "Build the dtool source tree." ON)
 option(BUILD_PANDA "Build the panda source tree." ON)