diff --git a/intern/cycles/integrator/path_trace_work_cpu.cpp b/intern/cycles/integrator/path_trace_work_cpu.cpp
index 8c323770fef..5113cfb0478 100644
--- a/intern/cycles/integrator/path_trace_work_cpu.cpp
+++ b/intern/cycles/integrator/path_trace_work_cpu.cpp
@@ -7,6 +7,10 @@
 #include "device/cpu/kernel.h"
 #include "device/device.h"
 
+#ifdef WITH_CYCLES_DEBUG
+#  include "kernel/film/write.h"
+#endif
+
 #include "kernel/integrator/path_state.h"
 
 #include "integrator/pass_accessor_cpu.h"
@@ -331,10 +335,10 @@ void PathTraceWorkCPU::guiding_init_kernel_globals(void *guiding_field,
   }
 }
 
-void PathTraceWorkCPU::guiding_push_sample_data_to_global_storage(
-    ThreadKernelGlobalsCPU *kg,
-    IntegratorStateCPU *state,
-    const ccl_global float *ccl_restrict render_buffer)
+void PathTraceWorkCPU::guiding_push_sample_data_to_global_storage(ThreadKernelGlobalsCPU *kg,
+                                                                  IntegratorStateCPU *state,
+                                                                  ccl_global float *ccl_restrict
+                                                                      render_buffer)
 {
 #  ifdef WITH_CYCLES_DEBUG
   if (VLOG_WORK_IS_ON) {
diff --git a/intern/cycles/integrator/path_trace_work_cpu.h b/intern/cycles/integrator/path_trace_work_cpu.h
index f56d710329a..24944156805 100644
--- a/intern/cycles/integrator/path_trace_work_cpu.h
+++ b/intern/cycles/integrator/path_trace_work_cpu.h
@@ -65,8 +65,7 @@ class PathTraceWorkCPU : public PathTraceWork {
    * This function is called at the end of a random walk/path generation. */
   void guiding_push_sample_data_to_global_storage(ThreadKernelGlobalsCPU *kg,
                                                   IntegratorStateCPU *state,
-                                                  const ccl_global float *ccl_restrict
-                                                      render_buffer);
+                                                  ccl_global float *ccl_restrict render_buffer);
 #endif
 
  protected:
diff --git a/intern/cycles/kernel/integrator/guiding.h b/intern/cycles/kernel/integrator/guiding.h
index afb19e69fe3..ffa03eefa97 100644
--- a/intern/cycles/kernel/integrator/guiding.h
+++ b/intern/cycles/kernel/integrator/guiding.h
@@ -10,6 +10,10 @@
 #include "kernel/integrator/state.h"
 #include "kernel/util/colorspace.h"
 
+#ifdef WITH_CYCLES_DEBUG
+#  include "kernel/closure/bsdf.h"
+#endif
+
 #include "util/color.h"
 
 CCL_NAMESPACE_BEGIN