diff --git a/CMake/VirtualFluidsMacros.cmake b/CMake/VirtualFluidsMacros.cmake
index 2d6e63256955f8b739b2c84e695214185471600f..e2d7ba9674174f5e1f1fe0c0e45cc98437bedf95 100644
--- a/CMake/VirtualFluidsMacros.cmake
+++ b/CMake/VirtualFluidsMacros.cmake
@@ -225,7 +225,11 @@ function(vf_add_library)
     target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/gpu)
     target_include_directories(${library_name} PRIVATE ${VF_SRC_DIR}/cpu)
 
-
+    if(BUILD_VF_GPU)
+        target_include_directories(${library_name} PRIVATE "${VF_THIRD_DIR}/cuda_samples/")
+        target_include_directories(${library_name} PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
+    endif()
+    
     status("... configuring target: ${library_name} (type=${ARG_BUILDTYPE}) done")
 
     unset(CMAKE_CXX_CLANG_TIDY)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dafb380b456cefc7c9af4ff3a8bba63d03cb57f7..8d743768918b108fcb5d68b6df89f01867c41c0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,10 +106,6 @@ if(BUILD_VF_GPU)
 
     message("CUDA Architecture: ${CMAKE_CUDA_ARCHITECTURES}")
 
-    set(CUDA_CUT_INCLUDE_DIR "${VF_THIRD_DIR}/cuda_samples/")
-    include_directories(${CUDA_CUT_INCLUDE_DIR})
-    include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
-
     include (gpu.cmake)
 endif()