diff --git a/CMake/PackageDepends/MITK_OpenMP_Config.cmake b/CMake/PackageDepends/MITK_OpenMP_Config.cmake
index e69de29bb2..8ca95d08c1 100644
--- a/CMake/PackageDepends/MITK_OpenMP_Config.cmake
+++ b/CMake/PackageDepends/MITK_OpenMP_Config.cmake
@@ -0,0 +1 @@
+set(ALL_LIBRARIES OpenMP::OpenMP_CXX)
diff --git a/Modules/AlgorithmsExt/CMakeLists.txt b/Modules/AlgorithmsExt/CMakeLists.txt
index 4e593dfe19..e4632f8e03 100644
--- a/Modules/AlgorithmsExt/CMakeLists.txt
+++ b/Modules/AlgorithmsExt/CMakeLists.txt
@@ -1,16 +1,12 @@
 mitk_create_module(
   DEPENDS MitkDataTypesExt MitkLegacyGL
   PACKAGE_DEPENDS
-    PUBLIC ITK|ITKThresholding
+    PUBLIC ITK|ITKThresholding OpenMP
     PRIVATE ANN ITK|ITKIOImageBase VTK|ImagingGeneral
 )
 
 if(TARGET ${MODULE_TARGET})
-  if(MITK_USE_OpenMP)
-    target_link_libraries(${MODULE_TARGET} PUBLIC OpenMP::OpenMP_CXX)
-  endif()
-
   if(BUILD_TESTING)
     add_subdirectory(test)
   endif()
 endif()
diff --git a/Modules/Classification/CLUtilities/CMakeLists.txt b/Modules/Classification/CLUtilities/CMakeLists.txt
index 0fb4431b3c..0f05dd8069 100644
--- a/Modules/Classification/CLUtilities/CMakeLists.txt
+++ b/Modules/Classification/CLUtilities/CMakeLists.txt
@@ -1,14 +1,10 @@
 mitk_create_module(
   DEPENDS MitkCore MitkCLCore MitkCommandLine MitkDICOM
-  PACKAGE_DEPENDS PUBLIC Eigen PRIVATE tinyxml2 VTK|FiltersStatistics
+  PACKAGE_DEPENDS PUBLIC Eigen OpenMP PRIVATE tinyxml2 VTK|FiltersStatistics
 )
 
 if(TARGET ${MODULE_TARGET})
-  if(MITK_USE_OpenMP)
-    target_link_libraries(${MODULE_TARGET} PUBLIC OpenMP::OpenMP_CXX)
-  endif()
-
   if(BUILD_TESTING)
     add_subdirectory(test)
   endif()
 endif()
diff --git a/Modules/MapperExt/CMakeLists.txt b/Modules/MapperExt/CMakeLists.txt
index ca202f89be..e437f52956 100644
--- a/Modules/MapperExt/CMakeLists.txt
+++ b/Modules/MapperExt/CMakeLists.txt
@@ -1,14 +1,10 @@
 mitk_create_module(
   DEPENDS MitkDataTypesExt MitkLegacyGL
-  PACKAGE_DEPENDS PRIVATE VTK|CommonComputationalGeometry+CommonSystem+RenderingVolumeOpenGL2
+  PACKAGE_DEPENDS PUBLIC OpenMP PRIVATE VTK|CommonComputationalGeometry+CommonSystem+RenderingVolumeOpenGL2
 )
 
 if(TARGET ${MODULE_TARGET})
-  if(MITK_USE_OpenMP)
-    target_link_libraries(${MODULE_TARGET} PUBLIC OpenMP::OpenMP_CXX)
-  endif()
-
   if(BUILD_TESTING)
     add_subdirectory(test)
   endif()
 endif()