Cycles: remove prefix from source code file names

Remove prefix of filenames that is the same as the folder name. This used
to help when #includes were using individual files, but now they are always
relative to the cycles root directory and so the prefixes are redundant.

For patches and branches, git merge and rebase should be able to detect the
renames and move over code to the right file.

63 files changed, 277 insertions, 278 deletions

diff --git a/intern/cycles/scene/alembic.cpp b/intern/cycles/scene/alembic.cpp
index 07a969e88d3..39b5f467736 100644
--- a/intern/cycles/scene/alembic.cpp
+++ b/intern/cycles/scene/alembic.cpp
@@ -24,11 +24,11 @@
 #include "scene/scene.h"
 #include "scene/shader.h"
 
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_progress.h"
-#include "util/util_transform.h"
-#include "util/util_vector.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/progress.h"
+#include "util/transform.h"
+#include "util/vector.h"
 
 #ifdef WITH_ALEMBIC
 
diff --git a/intern/cycles/scene/alembic.h b/intern/cycles/scene/alembic.h
index 9aeef273910..77aafd0ab32 100644
--- a/intern/cycles/scene/alembic.h
+++ b/intern/cycles/scene/alembic.h
@@ -19,9 +19,9 @@
 #include "graph/node.h"
 #include "scene/attribute.h"
 #include "scene/procedural.h"
-#include "util/util_set.h"
-#include "util/util_transform.h"
-#include "util/util_vector.h"
+#include "util/set.h"
+#include "util/transform.h"
+#include "util/vector.h"
 
 #ifdef WITH_ALEMBIC
 
diff --git a/intern/cycles/scene/alembic_read.cpp b/intern/cycles/scene/alembic_read.cpp
index 1ce64d9ee41..35f4854127a 100644
--- a/intern/cycles/scene/alembic_read.cpp
+++ b/intern/cycles/scene/alembic_read.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "scene/alembic.h"
 #include "scene/alembic_read.h"
+#include "scene/alembic.h"
 #include "scene/mesh.h"
 
-#include "util/util_color.h"
-#include "util/util_progress.h"
+#include "util/color.h"
+#include "util/progress.h"
 
 #ifdef WITH_ALEMBIC
 
diff --git a/intern/cycles/scene/alembic_read.h b/intern/cycles/scene/alembic_read.h
index 9cc8622a1ba..6b656b59481 100644
--- a/intern/cycles/scene/alembic_read.h
+++ b/intern/cycles/scene/alembic_read.h
@@ -21,7 +21,7 @@
 #  include <Alembic/AbcCoreFactory/All.h>
 #  include <Alembic/AbcGeom/All.h>
 
-#  include "util/util_vector.h"
+#  include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/attribute.cpp b/intern/cycles/scene/attribute.cpp
index 0c440fb9fd1..3401eea307f 100644
--- a/intern/cycles/scene/attribute.cpp
+++ b/intern/cycles/scene/attribute.cpp
@@ -19,9 +19,9 @@
 #include "scene/image.h"
 #include "scene/mesh.h"
 
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_transform.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/transform.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/attribute.h b/intern/cycles/scene/attribute.h
index 9af3dcaee26..4a25a900c14 100644
--- a/intern/cycles/scene/attribute.h
+++ b/intern/cycles/scene/attribute.h
@@ -19,13 +19,13 @@
 
 #include "scene/image.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
-#include "util/util_list.h"
-#include "util/util_param.h"
-#include "util/util_set.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/list.h"
+#include "util/param.h"
+#include "util/set.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/background.cpp b/intern/cycles/scene/background.cpp
index db5be885538..72dccc6f9a8 100644
--- a/intern/cycles/scene/background.cpp
+++ b/intern/cycles/scene/background.cpp
@@ -23,10 +23,10 @@
 #include "scene/shader_nodes.h"
 #include "scene/stats.h"
 
-#include "util/util_foreach.h"
-#include "util/util_math.h"
-#include "util/util_time.h"
-#include "util/util_types.h"
+#include "util/foreach.h"
+#include "util/math.h"
+#include "util/time.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/background.h b/intern/cycles/scene/background.h
index 2f7ef0f7737..31f15d09749 100644
--- a/intern/cycles/scene/background.h
+++ b/intern/cycles/scene/background.h
@@ -19,7 +19,7 @@
 
 #include "graph/node.h"
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/bake.cpp b/intern/cycles/scene/bake.cpp
index 86c5c4c02af..90c9e0e4ae8 100644
--- a/intern/cycles/scene/bake.cpp
+++ b/intern/cycles/scene/bake.cpp
@@ -22,7 +22,7 @@
 #include "scene/stats.h"
 #include "session/buffers.h"
 
-#include "util/util_foreach.h"
+#include "util/foreach.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/bake.h b/intern/cycles/scene/bake.h
index 044383d2d43..370cc20ae4f 100644
--- a/intern/cycles/scene/bake.h
+++ b/intern/cycles/scene/bake.h
@@ -20,8 +20,8 @@
 #include "device/device.h"
 #include "scene/scene.h"
 
-#include "util/util_progress.h"
-#include "util/util_vector.h"
+#include "util/progress.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/camera.cpp b/intern/cycles/scene/camera.cpp
index 1e78f8dd36f..5877b82ead5 100644
--- a/intern/cycles/scene/camera.cpp
+++ b/intern/cycles/scene/camera.cpp
@@ -23,13 +23,13 @@
 
 #include "device/device.h"
 
-#include "util/util_foreach.h"
-#include "util/util_function.h"
-#include "util/util_logging.h"
-#include "util/util_math_cdf.h"
-#include "util/util_task.h"
-#include "util/util_time.h"
-#include "util/util_vector.h"
+#include "util/foreach.h"
+#include "util/function.h"
+#include "util/log.h"
+#include "util/math_cdf.h"
+#include "util/task.h"
+#include "util/time.h"
+#include "util/vector.h"
 
 /* needed for calculating differentials */
 #include "kernel/device/cpu/compat.h"
diff --git a/intern/cycles/scene/camera.h b/intern/cycles/scene/camera.h
index cb8ecac1a7e..58e39599267 100644
--- a/intern/cycles/scene/camera.h
+++ b/intern/cycles/scene/camera.h
@@ -17,15 +17,15 @@
 #ifndef __CAMERA_H__
 #define __CAMERA_H__
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
 #include "graph/node.h"
 
-#include "util/util_array.h"
-#include "util/util_boundbox.h"
-#include "util/util_projection.h"
-#include "util/util_transform.h"
-#include "util/util_types.h"
+#include "util/array.h"
+#include "util/boundbox.h"
+#include "util/projection.h"
+#include "util/transform.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/colorspace.cpp b/intern/cycles/scene/colorspace.cpp
index 8584a6f5dd7..c1a308fcbaa 100644
--- a/intern/cycles/scene/colorspace.cpp
+++ b/intern/cycles/scene/colorspace.cpp
@@ -16,13 +16,13 @@
 
 #include "scene/colorspace.h"
 
-#include "util/util_color.h"
-#include "util/util_half.h"
-#include "util/util_image.h"
-#include "util/util_logging.h"
-#include "util/util_math.h"
-#include "util/util_thread.h"
-#include "util/util_vector.h"
+#include "util/color.h"
+#include "util/half.h"
+#include "util/image.h"
+#include "util/log.h"
+#include "util/math.h"
+#include "util/thread.h"
+#include "util/vector.h"
 
 #ifdef WITH_OCIO
 #  include <OpenColorIO/OpenColorIO.h>
diff --git a/intern/cycles/scene/colorspace.h b/intern/cycles/scene/colorspace.h
index 51d0b121cc0..7f7bc604f07 100644
--- a/intern/cycles/scene/colorspace.h
+++ b/intern/cycles/scene/colorspace.h
@@ -17,8 +17,8 @@
 #ifndef __COLORSPACE_H__
 #define __COLORSPACE_H__
 
-#include "util/util_map.h"
-#include "util/util_param.h"
+#include "util/map.h"
+#include "util/param.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/constant_fold.cpp b/intern/cycles/scene/constant_fold.cpp
index b2a17198c93..ca065e3f678 100644
--- a/intern/cycles/scene/constant_fold.cpp
+++ b/intern/cycles/scene/constant_fold.cpp
@@ -17,8 +17,8 @@
 #include "scene/constant_fold.h"
 #include "scene/shader_graph.h"
 
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
+#include "util/foreach.h"
+#include "util/log.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/constant_fold.h b/intern/cycles/scene/constant_fold.h
index fec4123c361..36b249920d0 100644
--- a/intern/cycles/scene/constant_fold.h
+++ b/intern/cycles/scene/constant_fold.h
@@ -17,8 +17,8 @@
 #ifndef __CONSTANT_FOLD_H__
 #define __CONSTANT_FOLD_H__
 
-#include "kernel/svm/svm_types.h"
-#include "util/util_types.h"
+#include "kernel/svm/types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/curves.cpp b/intern/cycles/scene/curves.cpp
index 6e45905d367..7863ce6c666 100644
--- a/intern/cycles/scene/curves.cpp
+++ b/intern/cycles/scene/curves.cpp
@@ -20,10 +20,10 @@
 #include "scene/object.h"
 #include "scene/scene.h"
 
-#include "util/util_foreach.h"
-#include "util/util_map.h"
-#include "util/util_progress.h"
-#include "util/util_vector.h"
+#include "util/foreach.h"
+#include "util/map.h"
+#include "util/progress.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/curves.h b/intern/cycles/scene/curves.h
index 9b0e2a29977..3076f4291f5 100644
--- a/intern/cycles/scene/curves.h
+++ b/intern/cycles/scene/curves.h
@@ -17,8 +17,8 @@
 #ifndef __CURVES_H__
 #define __CURVES_H__
 
-#include "util/util_array.h"
-#include "util/util_types.h"
+#include "util/array.h"
+#include "util/types.h"
 
 #include "scene/hair.h"
 
diff --git a/intern/cycles/scene/film.cpp b/intern/cycles/scene/film.cpp
index 3f91e0321b2..b6480fa64f1 100644
--- a/intern/cycles/scene/film.cpp
+++ b/intern/cycles/scene/film.cpp
@@ -26,11 +26,11 @@
 #include "scene/stats.h"
 #include "scene/tables.h"
 
-#include "util/util_algorithm.h"
-#include "util/util_foreach.h"
-#include "util/util_math.h"
-#include "util/util_math_cdf.h"
-#include "util/util_time.h"
+#include "util/algorithm.h"
+#include "util/foreach.h"
+#include "util/math.h"
+#include "util/math_cdf.h"
+#include "util/time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/film.h b/intern/cycles/scene/film.h
index ede0d6298a6..5207c5e62b5 100644
--- a/intern/cycles/scene/film.h
+++ b/intern/cycles/scene/film.h
@@ -18,10 +18,10 @@
 #define __FILM_H__
 
 #include "scene/pass.h"
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/string.h"
+#include "util/vector.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
 #include "graph/node.h"
 
diff --git a/intern/cycles/scene/geometry.cpp b/intern/cycles/scene/geometry.cpp
index 9fe34ac6e99..5141e1f8358 100644
--- a/intern/cycles/scene/geometry.cpp
+++ b/intern/cycles/scene/geometry.cpp
@@ -32,15 +32,15 @@
 #include "scene/stats.h"
 #include "scene/volume.h"
 
-#include "subd/subd_patch_table.h"
-#include "subd/subd_split.h"
+#include "subd/patch_table.h"
+#include "subd/split.h"
 
-#include "kernel/osl/osl_globals.h"
+#include "kernel/osl/globals.h"
 
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_progress.h"
-#include "util/util_task.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/progress.h"
+#include "util/task.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/geometry.h b/intern/cycles/scene/geometry.h
index 8133132229e..335bcdcd0b7 100644
--- a/intern/cycles/scene/geometry.h
+++ b/intern/cycles/scene/geometry.h
@@ -19,15 +19,15 @@
 
 #include "graph/node.h"
 
-#include "bvh/bvh_params.h"
+#include "bvh/params.h"
 
 #include "scene/attribute.h"
 
-#include "util/util_boundbox.h"
-#include "util/util_set.h"
-#include "util/util_transform.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/boundbox.h"
+#include "util/set.h"
+#include "util/transform.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/hair.cpp b/intern/cycles/scene/hair.cpp
index 2390da5bf88..2951a609ae9 100644
--- a/intern/cycles/scene/hair.cpp
+++ b/intern/cycles/scene/hair.cpp
@@ -23,7 +23,7 @@
 
 #include "integrator/shader_eval.h"
 
-#include "util/util_progress.h"
+#include "util/progress.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/image.cpp b/intern/cycles/scene/image.cpp
index ac85cf5185e..80091e01b8c 100644
--- a/intern/cycles/scene/image.cpp
+++ b/intern/cycles/scene/image.cpp
@@ -22,15 +22,15 @@
 #include "scene/scene.h"
 #include "scene/stats.h"
 
-#include "util/util_foreach.h"
-#include "util/util_image.h"
-#include "util/util_image_impl.h"
-#include "util/util_logging.h"
-#include "util/util_path.h"
-#include "util/util_progress.h"
-#include "util/util_task.h"
-#include "util/util_texture.h"
-#include "util/util_unique_ptr.h"
+#include "util/foreach.h"
+#include "util/image.h"
+#include "util/image_impl.h"
+#include "util/log.h"
+#include "util/path.h"
+#include "util/progress.h"
+#include "util/task.h"
+#include "util/texture.h"
+#include "util/unique_ptr.h"
 
 #ifdef WITH_OSL
 #  include <OSL/oslexec.h>
diff --git a/intern/cycles/scene/image.h b/intern/cycles/scene/image.h
index 0c0bbff170a..6447b028ebf 100644
--- a/intern/cycles/scene/image.h
+++ b/intern/cycles/scene/image.h
@@ -17,15 +17,15 @@
 #ifndef __IMAGE_H__
 #define __IMAGE_H__
 
-#include "device/device_memory.h"
+#include "device/memory.h"
 
 #include "scene/colorspace.h"
 
-#include "util/util_string.h"
-#include "util/util_thread.h"
-#include "util/util_transform.h"
-#include "util/util_unique_ptr.h"
-#include "util/util_vector.h"
+#include "util/string.h"
+#include "util/thread.h"
+#include "util/transform.h"
+#include "util/unique_ptr.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/image_oiio.cpp b/intern/cycles/scene/image_oiio.cpp
index 256a7aeb7d4..feafae035a1 100644
--- a/intern/cycles/scene/image_oiio.cpp
+++ b/intern/cycles/scene/image_oiio.cpp
@@ -16,9 +16,9 @@
 
 #include "scene/image_oiio.h"
 
-#include "util/util_image.h"
-#include "util/util_logging.h"
-#include "util/util_path.h"
+#include "util/image.h"
+#include "util/log.h"
+#include "util/path.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/image_sky.cpp b/intern/cycles/scene/image_sky.cpp
index cd8b8d0d991..4f0877aeb99 100644
--- a/intern/cycles/scene/image_sky.cpp
+++ b/intern/cycles/scene/image_sky.cpp
@@ -18,10 +18,10 @@
 
 #include "sky_model.h"
 
-#include "util/util_image.h"
-#include "util/util_logging.h"
-#include "util/util_path.h"
-#include "util/util_task.h"
+#include "util/image.h"
+#include "util/log.h"
+#include "util/path.h"
+#include "util/task.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/image_vdb.cpp b/intern/cycles/scene/image_vdb.cpp
index 466df82dd73..d3315670390 100644
--- a/intern/cycles/scene/image_vdb.cpp
+++ b/intern/cycles/scene/image_vdb.cpp
@@ -16,8 +16,8 @@
 
 #include "scene/image_vdb.h"
 
-#include "util/util_logging.h"
-#include "util/util_openvdb.h"
+#include "util/log.h"
+#include "util/openvdb.h"
 
 #ifdef WITH_OPENVDB
 #  include <openvdb/tools/Dense.h>
diff --git a/intern/cycles/scene/integrator.cpp b/intern/cycles/scene/integrator.cpp
index 5bf82898958..3e795b30e7f 100644
--- a/intern/cycles/scene/integrator.cpp
+++ b/intern/cycles/scene/integrator.cpp
@@ -27,13 +27,13 @@
 #include "scene/sobol.h"
 #include "scene/stats.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
-#include "util/util_foreach.h"
-#include "util/util_hash.h"
-#include "util/util_logging.h"
-#include "util/util_task.h"
-#include "util/util_time.h"
+#include "util/foreach.h"
+#include "util/hash.h"
+#include "util/log.h"
+#include "util/task.h"
+#include "util/time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/integrator.h b/intern/cycles/scene/integrator.h
index 468971986c5..c380203f4f3 100644
--- a/intern/cycles/scene/integrator.h
+++ b/intern/cycles/scene/integrator.h
@@ -17,9 +17,9 @@
 #ifndef __INTEGRATOR_H__
 #define __INTEGRATOR_H__
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
-#include "device/device_denoise.h" /* For the parameters and type enum. */
+#include "device/denoise.h" /* For the parameters and type enum. */
 #include "graph/node.h"
 #include "integrator/adaptive_sampling.h"
 
diff --git a/intern/cycles/scene/jitter.h b/intern/cycles/scene/jitter.h
index ed34c7a4f4d..756e4a1de78 100644
--- a/intern/cycles/scene/jitter.h
+++ b/intern/cycles/scene/jitter.h
@@ -17,7 +17,7 @@
 #ifndef __JITTER_H__
 #define __JITTER_H__
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/light.cpp b/intern/cycles/scene/light.cpp
index 26f208d58e5..83e531f42ef 100644
--- a/intern/cycles/scene/light.cpp
+++ b/intern/cycles/scene/light.cpp
@@ -30,12 +30,12 @@
 
 #include "integrator/shader_eval.h"
 
-#include "util/util_foreach.h"
-#include "util/util_hash.h"
-#include "util/util_logging.h"
-#include "util/util_path.h"
-#include "util/util_progress.h"
-#include "util/util_task.h"
+#include "util/foreach.h"
+#include "util/hash.h"
+#include "util/log.h"
+#include "util/path.h"
+#include "util/progress.h"
+#include "util/task.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/light.h b/intern/cycles/scene/light.h
index 9820508d3a5..97ec9792860 100644
--- a/intern/cycles/scene/light.h
+++ b/intern/cycles/scene/light.h
@@ -17,7 +17,7 @@
 #ifndef __LIGHT_H__
 #define __LIGHT_H__
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
 #include "graph/node.h"
 
@@ -25,10 +25,10 @@
  * the right Node::set overload as it does not know that Shader is a Node */
 #include "scene/shader.h"
 
-#include "util/util_ies.h"
-#include "util/util_thread.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/ies.h"
+#include "util/thread.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/mesh.cpp b/intern/cycles/scene/mesh.cpp
index 1ed0eb4c30a..f47dab30869 100644
--- a/intern/cycles/scene/mesh.cpp
+++ b/intern/cycles/scene/mesh.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "bvh/build.h"
 #include "bvh/bvh.h"
-#include "bvh/bvh_build.h"
 
 #include "device/device.h"
 
@@ -25,13 +25,13 @@
 #include "scene/scene.h"
 #include "scene/shader_graph.h"
 
-#include "subd/subd_patch_table.h"
-#include "subd/subd_split.h"
+#include "subd/patch_table.h"
+#include "subd/split.h"
 
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_progress.h"
-#include "util/util_set.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/progress.h"
+#include "util/set.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/mesh.h b/intern/cycles/scene/mesh.h
index bc549fa55fa..d13b3003164 100644
--- a/intern/cycles/scene/mesh.h
+++ b/intern/cycles/scene/mesh.h
@@ -19,19 +19,19 @@
 
 #include "graph/node.h"
 
-#include "bvh/bvh_params.h"
+#include "bvh/params.h"
 #include "scene/attribute.h"
 #include "scene/geometry.h"
 #include "scene/shader.h"
 
-#include "util/util_array.h"
-#include "util/util_boundbox.h"
-#include "util/util_list.h"
-#include "util/util_map.h"
-#include "util/util_param.h"
-#include "util/util_set.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/array.h"
+#include "util/boundbox.h"
+#include "util/list.h"
+#include "util/map.h"
+#include "util/param.h"
+#include "util/set.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/mesh_displace.cpp b/intern/cycles/scene/mesh_displace.cpp
index c673d79f8fe..e69c2d1c3be 100644
--- a/intern/cycles/scene/mesh_displace.cpp
+++ b/intern/cycles/scene/mesh_displace.cpp
@@ -23,10 +23,10 @@
 #include "scene/scene.h"
 #include "scene/shader.h"
 
-#include "util/util_foreach.h"
-#include "util/util_map.h"
-#include "util/util_progress.h"
-#include "util/util_set.h"
+#include "util/foreach.h"
+#include "util/map.h"
+#include "util/progress.h"
+#include "util/set.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/mesh_subdivision.cpp b/intern/cycles/scene/mesh_subdivision.cpp
index 2b27d4b3b2a..a0c0bc68f8b 100644
--- a/intern/cycles/scene/mesh_subdivision.cpp
+++ b/intern/cycles/scene/mesh_subdivision.cpp
@@ -18,13 +18,13 @@
 #include "scene/camera.h"
 #include "scene/mesh.h"
 
-#include "subd/subd_patch.h"
-#include "subd/subd_patch_table.h"
-#include "subd/subd_split.h"
+#include "subd/patch.h"
+#include "subd/patch_table.h"
+#include "subd/split.h"
 
-#include "util/util_algorithm.h"
-#include "util/util_foreach.h"
-#include "util/util_hash.h"
+#include "util/algorithm.h"
+#include "util/foreach.h"
+#include "util/hash.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/object.cpp b/intern/cycles/scene/object.cpp
index 8b0cc752049..69a2365f17c 100644
--- a/intern/cycles/scene/object.cpp
+++ b/intern/cycles/scene/object.cpp
@@ -27,16 +27,16 @@
 #include "scene/stats.h"
 #include "scene/volume.h"
 
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_map.h"
-#include "util/util_murmurhash.h"
-#include "util/util_progress.h"
-#include "util/util_set.h"
-#include "util/util_task.h"
-#include "util/util_vector.h"
-
-#include "subd/subd_patch_table.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/map.h"
+#include "util/murmurhash.h"
+#include "util/progress.h"
+#include "util/set.h"
+#include "util/task.h"
+#include "util/vector.h"
+
+#include "subd/patch_table.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/object.h b/intern/cycles/scene/object.h
index d3909bb2b03..f6dc57ee8b9 100644
--- a/intern/cycles/scene/object.h
+++ b/intern/cycles/scene/object.h
@@ -25,13 +25,13 @@
 #include "scene/particles.h"
 #include "scene/scene.h"
 
-#include "util/util_array.h"
-#include "util/util_boundbox.h"
-#include "util/util_param.h"
-#include "util/util_thread.h"
-#include "util/util_transform.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/array.h"
+#include "util/boundbox.h"
+#include "util/param.h"
+#include "util/thread.h"
+#include "util/transform.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/osl.cpp b/intern/cycles/scene/osl.cpp
index c8ab83ab781..09626cb48bb 100644
--- a/intern/cycles/scene/osl.cpp
+++ b/intern/cycles/scene/osl.cpp
@@ -28,17 +28,17 @@
 
 #ifdef WITH_OSL
 
-#  include "kernel/osl/osl_globals.h"
-#  include "kernel/osl/osl_services.h"
-#  include "kernel/osl/osl_shader.h"
-
-#  include "util/util_aligned_malloc.h"
-#  include "util/util_foreach.h"
-#  include "util/util_logging.h"
-#  include "util/util_md5.h"
-#  include "util/util_path.h"
-#  include "util/util_progress.h"
-#  include "util/util_projection.h"
+#  include "kernel/osl/globals.h"
+#  include "kernel/osl/services.h"
+#  include "kernel/osl/shader.h"
+
+#  include "util/aligned_malloc.h"
+#  include "util/foreach.h"
+#  include "util/log.h"
+#  include "util/md5.h"
+#  include "util/path.h"
+#  include "util/progress.h"
+#  include "util/projection.h"
 
 #endif
 
diff --git a/intern/cycles/scene/osl.h b/intern/cycles/scene/osl.h
index 4161fe6ed67..d54040e1047 100644
--- a/intern/cycles/scene/osl.h
+++ b/intern/cycles/scene/osl.h
@@ -17,10 +17,10 @@
 #ifndef __OSL_H__
 #define __OSL_H__
 
-#include "util/util_array.h"
-#include "util/util_set.h"
-#include "util/util_string.h"
-#include "util/util_thread.h"
+#include "util/array.h"
+#include "util/set.h"
+#include "util/string.h"
+#include "util/thread.h"
 
 #include "scene/shader.h"
 #include "scene/shader_graph.h"
diff --git a/intern/cycles/scene/particles.cpp b/intern/cycles/scene/particles.cpp
index 8041c57ba02..92381171082 100644
--- a/intern/cycles/scene/particles.cpp
+++ b/intern/cycles/scene/particles.cpp
@@ -19,12 +19,12 @@
 #include "scene/scene.h"
 #include "scene/stats.h"
 
-#include "util/util_foreach.h"
-#include "util/util_hash.h"
-#include "util/util_logging.h"
-#include "util/util_map.h"
-#include "util/util_progress.h"
-#include "util/util_vector.h"
+#include "util/foreach.h"
+#include "util/hash.h"
+#include "util/log.h"
+#include "util/map.h"
+#include "util/progress.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/particles.h b/intern/cycles/scene/particles.h
index 8b59756f148..b958d12e4e3 100644
--- a/intern/cycles/scene/particles.h
+++ b/intern/cycles/scene/particles.h
@@ -17,8 +17,8 @@
 #ifndef __PARTICLES_H__
 #define __PARTICLES_H__
 
-#include "util/util_array.h"
-#include "util/util_types.h"
+#include "util/array.h"
+#include "util/types.h"
 
 #include "graph/node.h"
 
diff --git a/intern/cycles/scene/pass.cpp b/intern/cycles/scene/pass.cpp
index ee770ac8e58..791101e0940 100644
--- a/intern/cycles/scene/pass.cpp
+++ b/intern/cycles/scene/pass.cpp
@@ -16,8 +16,8 @@
 
 #include "scene/pass.h"
 
-#include "util/util_algorithm.h"
-#include "util/util_logging.h"
+#include "util/algorithm.h"
+#include "util/log.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/pass.h b/intern/cycles/scene/pass.h
index 82230c62cb0..7da07cfa562 100644
--- a/intern/cycles/scene/pass.h
+++ b/intern/cycles/scene/pass.h
@@ -18,10 +18,10 @@
 
 #include <ostream>  // NOLINT
 
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/string.h"
+#include "util/vector.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
 #include "graph/node.h"
 
diff --git a/intern/cycles/scene/procedural.cpp b/intern/cycles/scene/procedural.cpp
index abfc6c62ad4..f038c8b1023 100644
--- a/intern/cycles/scene/procedural.cpp
+++ b/intern/cycles/scene/procedural.cpp
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-#include "procedural.h"
-
+#include "scene/procedural.h"
 #include "scene/scene.h"
 #include "scene/stats.h"
 
-#include "util/util_foreach.h"
-#include "util/util_progress.h"
+#include "util/foreach.h"
+#include "util/progress.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/scene.cpp b/intern/cycles/scene/scene.cpp
index bc5737ec126..8cde4873eab 100644
--- a/intern/cycles/scene/scene.cpp
+++ b/intern/cycles/scene/scene.cpp
@@ -38,10 +38,10 @@
 #include "scene/volume.h"
 #include "session/session.h"
 
-#include "util/util_foreach.h"
-#include "util/util_guarded_allocator.h"
-#include "util/util_logging.h"
-#include "util/util_progress.h"
+#include "util/foreach.h"
+#include "util/guarded_allocator.h"
+#include "util/log.h"
+#include "util/progress.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/scene.h b/intern/cycles/scene/scene.h
index 9b2502c9361..fa7fc54602a 100644
--- a/intern/cycles/scene/scene.h
+++ b/intern/cycles/scene/scene.h
@@ -17,22 +17,22 @@
 #ifndef __SCENE_H__
 #define __SCENE_H__
 
-#include "bvh/bvh_params.h"
+#include "bvh/params.h"
 
 #include "scene/film.h"
 #include "scene/image.h"
 #include "scene/shader.h"
 
 #include "device/device.h"
-#include "device/device_memory.h"
-
-#include "util/util_param.h"
-#include "util/util_string.h"
-#include "util/util_system.h"
-#include "util/util_texture.h"
-#include "util/util_thread.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "device/memory.h"
+
+#include "util/param.h"
+#include "util/string.h"
+#include "util/system.h"
+#include "util/texture.h"
+#include "util/thread.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/shader.cpp b/intern/cycles/scene/shader.cpp
index 6b464a77401..0b286aba9cf 100644
--- a/intern/cycles/scene/shader.cpp
+++ b/intern/cycles/scene/shader.cpp
@@ -32,10 +32,10 @@
 #include "scene/svm.h"
 #include "scene/tables.h"
 
-#include "util/util_foreach.h"
-#include "util/util_murmurhash.h"
-#include "util/util_task.h"
-#include "util/util_transform.h"
+#include "util/foreach.h"
+#include "util/murmurhash.h"
+#include "util/task.h"
+#include "util/transform.h"
 
 #ifdef WITH_OCIO
 #  include <OpenColorIO/OpenColorIO.h>
diff --git a/intern/cycles/scene/shader.h b/intern/cycles/scene/shader.h
index 7ef3bda15d7..e9d26412ae8 100644
--- a/intern/cycles/scene/shader.h
+++ b/intern/cycles/scene/shader.h
@@ -19,20 +19,20 @@
 
 #ifdef WITH_OSL
 /* So no context pollution happens from indirectly included windows.h */
-#  include "util/util_windows.h"
+#  include "util/windows.h"
 #  include <OSL/oslexec.h>
 #endif
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 #include "scene/attribute.h"
 
 #include "graph/node.h"
 
-#include "util/util_map.h"
-#include "util/util_param.h"
-#include "util/util_string.h"
-#include "util/util_thread.h"
-#include "util/util_types.h"
+#include "util/map.h"
+#include "util/param.h"
+#include "util/string.h"
+#include "util/thread.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/shader_graph.cpp b/intern/cycles/scene/shader_graph.cpp
index 116d8335ef8..f99dfa141f6 100644
--- a/intern/cycles/scene/shader_graph.cpp
+++ b/intern/cycles/scene/shader_graph.cpp
@@ -21,11 +21,11 @@
 #include "scene/shader.h"
 #include "scene/shader_nodes.h"
 
-#include "util/util_algorithm.h"
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_md5.h"
-#include "util/util_queue.h"
+#include "util/algorithm.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/md5.h"
+#include "util/queue.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/shader_graph.h b/intern/cycles/scene/shader_graph.h
index 3584754fad1..8b525a7ec0b 100644
--- a/intern/cycles/scene/shader_graph.h
+++ b/intern/cycles/scene/shader_graph.h
@@ -20,14 +20,14 @@
 #include "graph/node.h"
 #include "graph/node_type.h"
 
-#include "kernel/kernel_types.h"
-
-#include "util/util_list.h"
-#include "util/util_map.h"
-#include "util/util_param.h"
-#include "util/util_set.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "kernel/types.h"
+
+#include "util/list.h"
+#include "util/map.h"
+#include "util/param.h"
+#include "util/set.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/shader_nodes.cpp b/intern/cycles/scene/shader_nodes.cpp
index d7fc7ae1c27..14d051350fb 100644
--- a/intern/cycles/scene/shader_nodes.cpp
+++ b/intern/cycles/scene/shader_nodes.cpp
@@ -29,15 +29,15 @@
 
 #include "sky_model.h"
 
-#include "util/util_color.h"
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_transform.h"
-
-#include "kernel/svm/svm_color_util.h"
-#include "kernel/svm/svm_mapping_util.h"
-#include "kernel/svm/svm_math_util.h"
-#include "kernel/svm/svm_ramp_util.h"
+#include "util/color.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/transform.h"
+
+#include "kernel/svm/color_util.h"
+#include "kernel/svm/mapping_util.h"
+#include "kernel/svm/math_util.h"
+#include "kernel/svm/ramp_util.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/shader_nodes.h b/intern/cycles/scene/shader_nodes.h
index b8a439fa9b9..64a2b1c7843 100644
--- a/intern/cycles/scene/shader_nodes.h
+++ b/intern/cycles/scene/shader_nodes.h
@@ -21,8 +21,8 @@
 #include "scene/image.h"
 #include "scene/shader_graph.h"
 
-#include "util/util_array.h"
-#include "util/util_string.h"
+#include "util/array.h"
+#include "util/string.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/sobol.cpp b/intern/cycles/scene/sobol.cpp
index 397c28814ca..09d10c3660e 100644
--- a/intern/cycles/scene/sobol.cpp
+++ b/intern/cycles/scene/sobol.cpp
@@ -45,13 +45,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 #include "scene/sobol.h"
 
 CCL_NAMESPACE_BEGIN
 
-#include "sobol.tables"
+#include "scene/sobol.tables"
 
 void sobol_generate_direction_vectors(uint vectors[][SOBOL_BITS], int dimensions)
 {
diff --git a/intern/cycles/scene/sobol.h b/intern/cycles/scene/sobol.h
index d38857d2b35..86b2a1616b8 100644
--- a/intern/cycles/scene/sobol.h
+++ b/intern/cycles/scene/sobol.h
@@ -17,7 +17,7 @@
 #ifndef __SOBOL_H__
 #define __SOBOL_H__
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/stats.cpp b/intern/cycles/scene/stats.cpp
index 5c3cff232f4..e2b00d16593 100644
--- a/intern/cycles/scene/stats.cpp
+++ b/intern/cycles/scene/stats.cpp
@@ -16,9 +16,9 @@
 
 #include "scene/stats.h"
 #include "scene/object.h"
-#include "util/util_algorithm.h"
-#include "util/util_foreach.h"
-#include "util/util_string.h"
+#include "util/algorithm.h"
+#include "util/foreach.h"
+#include "util/string.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/stats.h b/intern/cycles/scene/stats.h
index ffcc4d55235..d9095acc4c9 100644
--- a/intern/cycles/scene/stats.h
+++ b/intern/cycles/scene/stats.h
@@ -19,9 +19,9 @@
 
 #include "scene/scene.h"
 
-#include "util/util_stats.h"
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/stats.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/svm.cpp b/intern/cycles/scene/svm.cpp
index b0b7fb605d1..6da0df302ad 100644
--- a/intern/cycles/scene/svm.cpp
+++ b/intern/cycles/scene/svm.cpp
@@ -26,10 +26,10 @@
 #include "scene/stats.h"
 #include "scene/svm.h"
 
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_progress.h"
-#include "util/util_task.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/progress.h"
+#include "util/task.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/svm.h b/intern/cycles/scene/svm.h
index a3d215218fa..edfd71040e4 100644
--- a/intern/cycles/scene/svm.h
+++ b/intern/cycles/scene/svm.h
@@ -21,10 +21,10 @@
 #include "scene/shader.h"
 #include "scene/shader_graph.h"
 
-#include "util/util_array.h"
-#include "util/util_set.h"
-#include "util/util_string.h"
-#include "util/util_thread.h"
+#include "util/array.h"
+#include "util/set.h"
+#include "util/string.h"
+#include "util/thread.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/tables.cpp b/intern/cycles/scene/tables.cpp
index 39edc5d89cd..3544fea67d6 100644
--- a/intern/cycles/scene/tables.cpp
+++ b/intern/cycles/scene/tables.cpp
@@ -19,8 +19,8 @@
 #include "scene/scene.h"
 #include "scene/stats.h"
 
-#include "util/util_logging.h"
-#include "util/util_time.h"
+#include "util/log.h"
+#include "util/time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/tables.h b/intern/cycles/scene/tables.h
index de538e2af78..3e52544d1fb 100644
--- a/intern/cycles/scene/tables.h
+++ b/intern/cycles/scene/tables.h
@@ -17,8 +17,8 @@
 #ifndef __TABLES_H__
 #define __TABLES_H__
 
-#include "util/util_list.h"
-#include "util/util_vector.h"
+#include "util/list.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/scene/volume.cpp b/intern/cycles/scene/volume.cpp
index 757388a4491..509d0ecedf7 100644
--- a/intern/cycles/scene/volume.cpp
+++ b/intern/cycles/scene/volume.cpp
@@ -25,12 +25,12 @@
 #  include <openvdb/tools/Morphology.h>
 #endif
 
-#include "util/util_foreach.h"
-#include "util/util_hash.h"
-#include "util/util_logging.h"
-#include "util/util_openvdb.h"
-#include "util/util_progress.h"
-#include "util/util_types.h"
+#include "util/foreach.h"
+#include "util/hash.h"
+#include "util/log.h"
+#include "util/openvdb.h"
+#include "util/progress.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN