diff --git a/intern/cycles/hydra/CMakeLists.txt b/intern/cycles/hydra/CMakeLists.txt
index 187978578e7..adcd4778ae5 100644
--- a/intern/cycles/hydra/CMakeLists.txt
+++ b/intern/cycles/hydra/CMakeLists.txt
@@ -117,11 +117,12 @@ target_link_libraries(cycles_hydra
 )
 
 if(WITH_CYCLES_HYDRA_RENDER_DELEGATE)
-  set(HdCyclesPluginName hdCycles)
-  add_library(${HdCyclesPluginName} SHARED
+  set(SRC_HD_CYCLES_PLUGIN
     plugin.h
     plugin.cpp
   )
+  set(HdCyclesPluginName hdCycles)
+  add_library(${HdCyclesPluginName} SHARED ${SRC_HD_CYCLES_PLUGIN})
 
   set_target_properties(${HdCyclesPluginName}
     PROPERTIES PREFIX ""
diff --git a/intern/cycles/integrator/CMakeLists.txt b/intern/cycles/integrator/CMakeLists.txt
index a5cda10de1d..6e27df17f41 100644
--- a/intern/cycles/integrator/CMakeLists.txt
+++ b/intern/cycles/integrator/CMakeLists.txt
@@ -37,6 +37,7 @@ set(SRC_HEADERS
   denoiser_gpu.h
   denoiser_oidn.h
   denoiser_optix.h
+  guiding.h
   path_trace.h
   tile.h
   pass_accessor.h
diff --git a/intern/renderdoc_dynload/CMakeLists.txt b/intern/renderdoc_dynload/CMakeLists.txt
index 2057ccae81e..9fd454bef08 100644
--- a/intern/renderdoc_dynload/CMakeLists.txt
+++ b/intern/renderdoc_dynload/CMakeLists.txt
@@ -14,6 +14,9 @@ set(SRC
   intern/renderdoc_api.cc
 
   include/renderdoc_api.hh
+
+  # Without these files listed, they aren't known to CMake.
+  ../../extern/renderdoc/include/renderdoc_app.h
 )
 
 blender_add_lib(bf_intern_renderdoc_dynload "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index d49ad00502a..e090a9de537 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -301,6 +301,7 @@ set(SRC
   engines/eevee_next/eevee_material.hh
   engines/eevee_next/eevee_motion_blur.hh
   engines/eevee_next/eevee_pipeline.hh
+  engines/eevee_next/eevee_raytrace.hh
   engines/eevee_next/eevee_reflection_probes.hh
   engines/eevee_next/eevee_renderbuffers.hh
   engines/eevee_next/eevee_sampling.hh
diff --git a/source/blender/render/hydra/CMakeLists.txt b/source/blender/render/hydra/CMakeLists.txt
index eea46d6720e..a5576a3d00c 100644
--- a/source/blender/render/hydra/CMakeLists.txt
+++ b/source/blender/render/hydra/CMakeLists.txt
@@ -87,6 +87,7 @@ set(SRC
   light_tasks_delegate.h
   preview_engine.h
   render_task_delegate.h
+  settings.h
   viewport_engine.h
 )