diff --git a/CMakeLists.txt b/CMakeLists.txt
index a882285f..3bae0e51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1539,12 +1539,26 @@ endwhile()
 #- Linking
 target_link_libraries(StreamFX PRIVATE $<LINK_LIBRARY:WHOLE_ARCHIVE,StreamFX_Core>)
 foreach(_ENTITY ${_RESOLVED})
-	if(NOT TARGET StreamFX_${_ENTITY})
-		continue()
-	endif()
+	set(RENTITY "StreamFX_${_ENTITY}")
+	get_target_property(_DEPENDS "${RENTITY}" COMPONENT_DEPENDS)
 
 	# Finally if everything is correct, do things.
-	target_link_libraries(StreamFX PRIVATE $<LINK_LIBRARY:WHOLE_ARCHIVE,StreamFX_${_ENTITY}>)
+	target_link_libraries(StreamFX PRIVATE $<LINK_LIBRARY:WHOLE_ARCHIVE,${RENTITY}>)
+
+	if(_DEPENDS)
+		foreach(_DEPEND ${_DEPENDS})
+			list(GET _DEPEND 0 _ENTITY2)
+			set(RENTITY2 "StreamFX_${_ENTITY2}")
+
+			streamfx_enabled_component(${_ENTITY2} T_CHECK)
+			if(T_CHECK)
+				target_link_libraries(${RENTITY}
+					PUBLIC
+						$<LINK_LIBRARY:WHOLE_ARCHIVE,${RENTITY2}>
+				)
+			endif()
+		endforeach()
+	endif()
 endforeach()
 
 ################################################################################
diff --git a/components/nvidia/source/nvidia/ar/nvidia-ar-facedetection.hpp b/components/nvidia/include/nvidia/ar/nvidia-ar-facedetection.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/ar/nvidia-ar-facedetection.hpp
rename to components/nvidia/include/nvidia/ar/nvidia-ar-facedetection.hpp
diff --git a/components/nvidia/source/nvidia/ar/nvidia-ar-feature.hpp b/components/nvidia/include/nvidia/ar/nvidia-ar-feature.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/ar/nvidia-ar-feature.hpp
rename to components/nvidia/include/nvidia/ar/nvidia-ar-feature.hpp
diff --git a/components/nvidia/source/nvidia/ar/nvidia-ar.hpp b/components/nvidia/include/nvidia/ar/nvidia-ar.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/ar/nvidia-ar.hpp
rename to components/nvidia/include/nvidia/ar/nvidia-ar.hpp
diff --git a/components/nvidia/source/nvidia/cuda/nvidia-cuda-context.hpp b/components/nvidia/include/nvidia/cuda/nvidia-cuda-context.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/cuda/nvidia-cuda-context.hpp
rename to components/nvidia/include/nvidia/cuda/nvidia-cuda-context.hpp
diff --git a/components/nvidia/source/nvidia/cuda/nvidia-cuda-gs-texture.hpp b/components/nvidia/include/nvidia/cuda/nvidia-cuda-gs-texture.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/cuda/nvidia-cuda-gs-texture.hpp
rename to components/nvidia/include/nvidia/cuda/nvidia-cuda-gs-texture.hpp
diff --git a/components/nvidia/source/nvidia/cuda/nvidia-cuda-memory.hpp b/components/nvidia/include/nvidia/cuda/nvidia-cuda-memory.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/cuda/nvidia-cuda-memory.hpp
rename to components/nvidia/include/nvidia/cuda/nvidia-cuda-memory.hpp
diff --git a/components/nvidia/source/nvidia/cuda/nvidia-cuda-obs.hpp b/components/nvidia/include/nvidia/cuda/nvidia-cuda-obs.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/cuda/nvidia-cuda-obs.hpp
rename to components/nvidia/include/nvidia/cuda/nvidia-cuda-obs.hpp
diff --git a/components/nvidia/source/nvidia/cuda/nvidia-cuda-stream.hpp b/components/nvidia/include/nvidia/cuda/nvidia-cuda-stream.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/cuda/nvidia-cuda-stream.hpp
rename to components/nvidia/include/nvidia/cuda/nvidia-cuda-stream.hpp
diff --git a/components/nvidia/source/nvidia/cuda/nvidia-cuda.hpp b/components/nvidia/include/nvidia/cuda/nvidia-cuda.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/cuda/nvidia-cuda.hpp
rename to components/nvidia/include/nvidia/cuda/nvidia-cuda.hpp
diff --git a/components/nvidia/source/nvidia/cv/nvidia-cv-image.hpp b/components/nvidia/include/nvidia/cv/nvidia-cv-image.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/cv/nvidia-cv-image.hpp
rename to components/nvidia/include/nvidia/cv/nvidia-cv-image.hpp
diff --git a/components/nvidia/source/nvidia/cv/nvidia-cv-texture.hpp b/components/nvidia/include/nvidia/cv/nvidia-cv-texture.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/cv/nvidia-cv-texture.hpp
rename to components/nvidia/include/nvidia/cv/nvidia-cv-texture.hpp
diff --git a/components/nvidia/source/nvidia/cv/nvidia-cv.hpp b/components/nvidia/include/nvidia/cv/nvidia-cv.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/cv/nvidia-cv.hpp
rename to components/nvidia/include/nvidia/cv/nvidia-cv.hpp
diff --git a/components/nvidia/source/nvidia/vfx/nvidia-vfx-denoising.hpp b/components/nvidia/include/nvidia/vfx/nvidia-vfx-denoising.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/vfx/nvidia-vfx-denoising.hpp
rename to components/nvidia/include/nvidia/vfx/nvidia-vfx-denoising.hpp
diff --git a/components/nvidia/source/nvidia/vfx/nvidia-vfx-effect.hpp b/components/nvidia/include/nvidia/vfx/nvidia-vfx-effect.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/vfx/nvidia-vfx-effect.hpp
rename to components/nvidia/include/nvidia/vfx/nvidia-vfx-effect.hpp
diff --git a/components/nvidia/source/nvidia/vfx/nvidia-vfx-greenscreen.hpp b/components/nvidia/include/nvidia/vfx/nvidia-vfx-greenscreen.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/vfx/nvidia-vfx-greenscreen.hpp
rename to components/nvidia/include/nvidia/vfx/nvidia-vfx-greenscreen.hpp
diff --git a/components/nvidia/source/nvidia/vfx/nvidia-vfx-superresolution.hpp b/components/nvidia/include/nvidia/vfx/nvidia-vfx-superresolution.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/vfx/nvidia-vfx-superresolution.hpp
rename to components/nvidia/include/nvidia/vfx/nvidia-vfx-superresolution.hpp
diff --git a/components/nvidia/source/nvidia/vfx/nvidia-vfx.hpp b/components/nvidia/include/nvidia/vfx/nvidia-vfx.hpp
similarity index 100%
rename from components/nvidia/source/nvidia/vfx/nvidia-vfx.hpp
rename to components/nvidia/include/nvidia/vfx/nvidia-vfx.hpp