diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a0982a27..37584c9c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,16 +29,16 @@ message( STATUS "PPC step: First configures" )
 include(cmake/configure.cmake)
 include(cmake/modes.cmake)
 include(cmake/sanitizers.cmake)
-include(cmake/json.cmake)
-include(cmake/libenvpp.cmake)
-include(cmake/stb.cmake)
+foreach(dep json libenvpp stb)
+    include(cmake/${dep}.cmake)
+endforeach()
 
 ################# Parallel programming technologies #################
 
 message( STATUS "PPC step: Setup parallel programming technologies" )
-include(cmake/mpi.cmake)
-include(cmake/openmp.cmake)
-include(cmake/onetbb.cmake)
+foreach(dep mpi openmp onetbb)
+    include(cmake/${dep}.cmake)
+endforeach()
 
 ######################### External projects #########################
 
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index a867e59fd..d9b5057e3 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -27,14 +27,18 @@ target_include_directories(
   ${exec_func_lib} PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty
                           ${CMAKE_SOURCE_DIR}/modules ${CMAKE_SOURCE_DIR}/tasks)
 
-ppc_link_envpp(${exec_func_lib})
-ppc_link_json(${exec_func_lib})
-ppc_link_gtest(${exec_func_lib})
-ppc_link_threads(${exec_func_lib})
-ppc_link_openmp(${exec_func_lib})
-ppc_link_tbb(${exec_func_lib})
-ppc_link_mpi(${exec_func_lib})
-ppc_link_stb(${exec_func_lib})
+foreach(
+  link
+  envpp
+  json
+  gtest
+  threads
+  openmp
+  tbb
+  mpi
+  stb)
+  cmake_language(CALL "ppc_link_${link}" ${exec_func_lib})
+endforeach()
 
 add_executable(${exec_func_tests} ${FUNC_TESTS_SOURCE_FILES})