Cleanup: remove foreach include from header, conflicts with OpenVDB

intern/cycles/blender/blender_device.cpp

@@ -17,6 +17,8 @@
 #include "blender/blender_device.h"
 #include "blender/blender_util.h"
 
+#include "util/util_foreach.h"
+
 CCL_NAMESPACE_BEGIN
 
 enum DenoiserType {

intern/cycles/blender/blender_geometry.cpp

@@ -23,6 +23,8 @@
 #include "blender/blender_sync.h"
 #include "blender/blender_util.h"
 
+#include "util/util_foreach.h"
+
 CCL_NAMESPACE_BEGIN
 
 Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph,

intern/cycles/bvh/bvh_optix.cpp

@@ -22,6 +22,7 @@
 #  include "render/geometry.h"
 #  include "render/mesh.h"
 #  include "render/object.h"
+#  include "util/util_foreach.h"
 #  include "util/util_logging.h"
 #  include "util/util_progress.h"
 

intern/cycles/util/util_profiling.cpp

@@ -15,6 +15,7 @@
  */
 
 #include "util/util_algorithm.h"
+#include "util/util_foreach.h"
 #include "util/util_profiling.h"
 #include "util/util_set.h"
 

intern/cycles/util/util_profiling.h

@@ -19,7 +19,6 @@
 
 #include <atomic>
 
-#include "util/util_foreach.h"
 #include "util/util_map.h"
 #include "util/util_thread.h"
 #include "util/util_vector.h"