diff --git a/Installation/cmake/modules/CGALConfig_binary.cmake.in b/Installation/cmake/modules/CGALConfig_binary.cmake.in
index bbf0330bd08..44e54f8e356 100644
--- a/Installation/cmake/modules/CGALConfig_binary.cmake.in
+++ b/Installation/cmake/modules/CGALConfig_binary.cmake.in
@@ -180,6 +180,7 @@ set(CGAL_DISABLE_GMP "@CGAL_DISABLE_GMP@")
 include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake)
 include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
 include(${CGAL_MODULES_DIR}/CGAL_TweakFindBoost.cmake)
+include(${CGAL_MODULES_DIR}/CGAL_target_use_TBB.cmake)
 
 # Temporary? Change the CMAKE module path
 cgal_setup_module_path()
diff --git a/Installation/cmake/modules/CGALConfig_install.cmake.in b/Installation/cmake/modules/CGALConfig_install.cmake.in
index a259e6c451a..420e68b0bc5 100644
--- a/Installation/cmake/modules/CGALConfig_install.cmake.in
+++ b/Installation/cmake/modules/CGALConfig_install.cmake.in
@@ -155,6 +155,7 @@ set(CGAL_DISABLE_GMP "@CGAL_DISABLE_GMP@")
 include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake)
 include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
 include(${CGAL_MODULES_DIR}/CGAL_TweakFindBoost.cmake)
+include(${CGAL_MODULES_DIR}/CGAL_target_use_TBB.cmake)
 
 # Temporary? Change the CMAKE module path
 cgal_setup_module_path()
diff --git a/Installation/cmake/modules/CGAL_Common.cmake b/Installation/cmake/modules/CGAL_Common.cmake
index 59f8190136d..51967d5f6d5 100644
--- a/Installation/cmake/modules/CGAL_Common.cmake
+++ b/Installation/cmake/modules/CGAL_Common.cmake
@@ -61,6 +61,5 @@ if( NOT CGAL_COMMON_FILE_INCLUDED )
   # set use-file for Eigen3 (needed to have default solvers)
   set(EIGEN3_USE_FILE "UseEigen3")
 
-  set(TBB_USE_FILE "UseTBB")
   include(${CMAKE_CURRENT_LIST_DIR}/CGAL_target_use_TBB.cmake)
 endif()
diff --git a/Installation/cmake/modules/CGAL_target_use_TBB.cmake b/Installation/cmake/modules/CGAL_target_use_TBB.cmake
index 631ece6a286..76c41c4ec25 100644
--- a/Installation/cmake/modules/CGAL_target_use_TBB.cmake
+++ b/Installation/cmake/modules/CGAL_target_use_TBB.cmake
@@ -3,6 +3,8 @@ if (CGAL_target_use_TBB_included)
 endif()
 set(CGAL_target_use_TBB_included TRUE)
 
+set(TBB_USE_FILE "UseTBB")
+
 function(CGAL_target_use_TBB target)
   if(NOT TARGET Threads::Threads)
     find_package(Threads REQUIRED)