531 files changed, 2044 insertions, 1842 deletions

diff --git a/intern/cycles/app/cycles_server.cpp b/intern/cycles/app/cycles_server.cpp
index 1ad70a376ed..38771b8aed8 100644
--- a/intern/cycles/app/cycles_server.cpp
+++ b/intern/cycles/app/cycles_server.cpp
@@ -18,13 +18,13 @@
 
 #include "device/device.h"
 
-#include "util/util_args.h"
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_path.h"
-#include "util/util_stats.h"
-#include "util/util_string.h"
-#include "util/util_task.h"
+#include "util/args.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/path.h"
+#include "util/stats.h"
+#include "util/string.h"
+#include "util/task.h"
 
 using namespace ccl;
 
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index 800227ccf48..0032938b116 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -23,24 +23,24 @@
 #include "session/buffers.h"
 #include "session/session.h"
 
-#include "util/util_args.h"
-#include "util/util_foreach.h"
-#include "util/util_function.h"
-#include "util/util_image.h"
-#include "util/util_logging.h"
-#include "util/util_path.h"
-#include "util/util_progress.h"
-#include "util/util_string.h"
-#include "util/util_time.h"
-#include "util/util_transform.h"
-#include "util/util_unique_ptr.h"
-#include "util/util_version.h"
+#include "util/args.h"
+#include "util/foreach.h"
+#include "util/function.h"
+#include "util/image.h"
+#include "util/log.h"
+#include "util/path.h"
+#include "util/progress.h"
+#include "util/string.h"
+#include "util/time.h"
+#include "util/transform.h"
+#include "util/unique_ptr.h"
+#include "util/version.h"
 
 #include "app/cycles_xml.h"
 #include "app/oiio_output_driver.h"
 
 #ifdef WITH_CYCLES_STANDALONE_GUI
-#  include "util/util_view.h"
+#  include "util/view.h"
 #endif
 
 #include "app/cycles_xml.h"
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 1ced74b6136..6144d2c60a9 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -35,14 +35,14 @@
 #include "scene/shader_graph.h"
 #include "scene/shader_nodes.h"
 
-#include "subd/subd_patch.h"
-#include "subd/subd_split.h"
-
-#include "util/util_foreach.h"
-#include "util/util_path.h"
-#include "util/util_projection.h"
-#include "util/util_transform.h"
-#include "util/util_xml.h"
+#include "subd/patch.h"
+#include "subd/split.h"
+
+#include "util/foreach.h"
+#include "util/path.h"
+#include "util/projection.h"
+#include "util/transform.h"
+#include "util/xml.h"
 
 #include "app/cycles_xml.h"
 
diff --git a/intern/cycles/app/oiio_output_driver.h b/intern/cycles/app/oiio_output_driver.h
index a6984938fe7..a5c88e0e890 100644
--- a/intern/cycles/app/oiio_output_driver.h
+++ b/intern/cycles/app/oiio_output_driver.h
@@ -16,11 +16,11 @@
 
 #include "session/output_driver.h"
 
-#include "util/util_function.h"
-#include "util/util_image.h"
-#include "util/util_string.h"
-#include "util/util_unique_ptr.h"
-#include "util/util_vector.h"
+#include "util/function.h"
+#include "util/image.h"
+#include "util/string.h"
+#include "util/unique_ptr.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index d948f2b3118..149967ad331 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -29,39 +29,39 @@ set(INC_SYS
 )
 
 set(SRC
-  blender_camera.cpp
-  blender_device.cpp
-  blender_display_driver.cpp
-  blender_image.cpp
-  blender_geometry.cpp
-  blender_light.cpp
-  blender_mesh.cpp
-  blender_object.cpp
-  blender_object_cull.cpp
-  blender_output_driver.cpp
-  blender_particles.cpp
-  blender_curves.cpp
-  blender_logging.cpp
-  blender_python.cpp
-  blender_session.cpp
-  blender_shader.cpp
-  blender_sync.cpp
-  blender_texture.cpp
-  blender_viewport.cpp
-  blender_volume.cpp
+  camera.cpp
+  device.cpp
+  display_driver.cpp
+  image.cpp
+  geometry.cpp
+  light.cpp
+  mesh.cpp
+  object.cpp
+  object_cull.cpp
+  output_driver.cpp
+  particles.cpp
+  curves.cpp
+  logging.cpp
+  python.cpp
+  session.cpp
+  shader.cpp
+  sync.cpp
+  texture.cpp
+  viewport.cpp
+  volume.cpp
 
   CCL_api.h
-  blender_device.h
-  blender_display_driver.h
-  blender_id_map.h
-  blender_image.h
-  blender_object_cull.h
-  blender_output_driver.h
-  blender_sync.h
-  blender_session.h
-  blender_texture.h
-  blender_util.h
-  blender_viewport.h
+  device.h
+  display_driver.h
+  id_map.h
+  image.h
+  object_cull.h
+  output_driver.h
+  sync.h
+  session.h
+  texture.h
+  util.h
+  viewport.h
 )
 
 set(LIB
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/camera.cpp
index 670e25841f5..f87ebe39d21 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/camera.cpp
@@ -17,10 +17,10 @@
 #include "scene/camera.h"
 #include "scene/scene.h"
 
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
+#include "blender/sync.h"
+#include "blender/util.h"
 
-#include "util/util_logging.h"
+#include "util/log.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/curves.cpp
index 84333faaa23..fb2b329e61d 100644
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/curves.cpp
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#include "blender/sync.h"
+#include "blender/util.h"
+
 #include "scene/attribute.h"
 #include "scene/camera.h"
 #include "scene/curves.h"
@@ -21,13 +24,10 @@
 #include "scene/object.h"
 #include "scene/scene.h"
 
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
-
-#include "util/util_color.h"
-#include "util/util_foreach.h"
-#include "util/util_hash.h"
-#include "util/util_logging.h"
+#include "util/color.h"
+#include "util/foreach.h"
+#include "util/hash.h"
+#include "util/log.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_device.cpp b/intern/cycles/blender/device.cpp
index 7bed33855c2..9fabc33a96b 100644
--- a/intern/cycles/blender/blender_device.cpp
+++ b/intern/cycles/blender/device.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "blender/blender_device.h"
-#include "blender/blender_session.h"
-#include "blender/blender_util.h"
+#include "blender/device.h"
+#include "blender/session.h"
+#include "blender/util.h"
 
-#include "util/util_foreach.h"
+#include "util/foreach.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_device.h b/intern/cycles/blender/device.h
index 8d2ecac7483..8d2ecac7483 100644
--- a/intern/cycles/blender/blender_device.h
+++ b/intern/cycles/blender/device.h
diff --git a/intern/cycles/blender/blender_display_driver.cpp b/intern/cycles/blender/display_driver.cpp
index cdf175f91d0..d5f6d85251e 100644
--- a/intern/cycles/blender/blender_display_driver.cpp
+++ b/intern/cycles/blender/display_driver.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "blender/blender_display_driver.h"
+#include "blender/display_driver.h"
 
 #include "device/device.h"
-#include "util/util_logging.h"
-#include "util/util_opengl.h"
+#include "util/log.h"
+#include "util/opengl.h"
 
 extern "C" {
 struct RenderEngine;
diff --git a/intern/cycles/blender/blender_display_driver.h b/intern/cycles/blender/display_driver.h
index 800d0791041..66cfc8cffcc 100644
--- a/intern/cycles/blender/blender_display_driver.h
+++ b/intern/cycles/blender/display_driver.h
@@ -24,8 +24,8 @@
 
 #include "session/display_driver.h"
 
-#include "util/util_thread.h"
-#include "util/util_unique_ptr.h"
+#include "util/thread.h"
+#include "util/unique_ptr.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_geometry.cpp b/intern/cycles/blender/geometry.cpp
index b4b0d04d104..479e76f68bc 100644
--- a/intern/cycles/blender/blender_geometry.cpp
+++ b/intern/cycles/blender/geometry.cpp
@@ -21,11 +21,11 @@
 #include "scene/object.h"
 #include "scene/volume.h"
 
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
+#include "blender/sync.h"
+#include "blender/util.h"
 
-#include "util/util_foreach.h"
-#include "util/util_task.h"
+#include "util/foreach.h"
+#include "util/task.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_id_map.h b/intern/cycles/blender/id_map.h
index 27a53a90f12..c1b800026c3 100644
--- a/intern/cycles/blender/blender_id_map.h
+++ b/intern/cycles/blender/id_map.h
@@ -22,9 +22,9 @@
 #include "scene/geometry.h"
 #include "scene/scene.h"
 
-#include "util/util_map.h"
-#include "util/util_set.h"
-#include "util/util_vector.h"
+#include "util/map.h"
+#include "util/set.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_image.cpp b/intern/cycles/blender/image.cpp
index f27275bd457..3ea3a47c1f4 100644
--- a/intern/cycles/blender/blender_image.cpp
+++ b/intern/cycles/blender/image.cpp
@@ -16,9 +16,9 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "blender/blender_image.h"
-#include "blender/blender_session.h"
-#include "blender/blender_util.h"
+#include "blender/image.h"
+#include "blender/session.h"
+#include "blender/util.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_image.h b/intern/cycles/blender/image.h
index 6f1e72c21af..6f1e72c21af 100644
--- a/intern/cycles/blender/blender_image.h
+++ b/intern/cycles/blender/image.h
diff --git a/intern/cycles/blender/blender_light.cpp b/intern/cycles/blender/light.cpp
index aa0c6a964e4..1e4cc0f1d14 100644
--- a/intern/cycles/blender/blender_light.cpp
+++ b/intern/cycles/blender/light.cpp
@@ -18,10 +18,10 @@
 
 #include "scene/light.h"
 
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
+#include "blender/sync.h"
+#include "blender/util.h"
 
-#include "util/util_hash.h"
+#include "util/hash.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_logging.cpp b/intern/cycles/blender/logging.cpp
index b42a1f47821..613b4084aa8 100644
--- a/intern/cycles/blender/blender_logging.cpp
+++ b/intern/cycles/blender/logging.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "blender/CCL_api.h"
-#include "util/util_logging.h"
+#include "util/log.h"
 
 void CCL_init_logging(const char *argv0)
 {
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/mesh.cpp
index 992e17d6f79..b69bf88c213 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/mesh.cpp
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
+#include "blender/session.h"
+#include "blender/sync.h"
+#include "blender/util.h"
+
 #include "scene/camera.h"
 #include "scene/colorspace.h"
 #include "scene/mesh.h"
 #include "scene/object.h"
 #include "scene/scene.h"
 
-#include "blender/blender_session.h"
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
-
-#include "subd/subd_patch.h"
-#include "subd/subd_split.h"
+#include "subd/patch.h"
+#include "subd/split.h"
 
-#include "util/util_algorithm.h"
-#include "util/util_color.h"
-#include "util/util_disjoint_set.h"
-#include "util/util_foreach.h"
-#include "util/util_hash.h"
-#include "util/util_logging.h"
-#include "util/util_math.h"
+#include "util/algorithm.h"
+#include "util/color.h"
+#include "util/disjoint_set.h"
+#include "util/foreach.h"
+#include "util/hash.h"
+#include "util/log.h"
+#include "util/math.h"
 
 #include "mikktspace.h"
 
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/object.cpp
index 75311805fd8..9919b9d1836 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/object.cpp
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#include "blender/object_cull.h"
+#include "blender/sync.h"
+#include "blender/util.h"
+
 #include "scene/alembic.h"
 #include "scene/camera.h"
 #include "scene/integrator.h"
@@ -26,14 +30,10 @@
 #include "scene/shader_graph.h"
 #include "scene/shader_nodes.h"
 
-#include "blender/blender_object_cull.h"
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
-
-#include "util/util_foreach.h"
-#include "util/util_hash.h"
-#include "util/util_logging.h"
-#include "util/util_task.h"
+#include "util/foreach.h"
+#include "util/hash.h"
+#include "util/log.h"
+#include "util/task.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_object_cull.cpp b/intern/cycles/blender/object_cull.cpp
index 34cceb5a6e4..c2493be26dd 100644
--- a/intern/cycles/blender/blender_object_cull.cpp
+++ b/intern/cycles/blender/object_cull.cpp
@@ -18,8 +18,8 @@
 
 #include "scene/camera.h"
 
-#include "blender/blender_object_cull.h"
-#include "blender/blender_util.h"
+#include "blender/object_cull.h"
+#include "blender/util.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_object_cull.h b/intern/cycles/blender/object_cull.h
index 0879db4f802..be3068ef4e7 100644
--- a/intern/cycles/blender/blender_object_cull.h
+++ b/intern/cycles/blender/object_cull.h
@@ -17,8 +17,8 @@
 #ifndef __BLENDER_OBJECT_CULL_H__
 #define __BLENDER_OBJECT_CULL_H__
 
-#include "blender/blender_sync.h"
-#include "util/util_types.h"
+#include "blender/sync.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_output_driver.cpp b/intern/cycles/blender/output_driver.cpp
index 2f2844d4820..2b3586af668 100644
--- a/intern/cycles/blender/blender_output_driver.cpp
+++ b/intern/cycles/blender/output_driver.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "blender/blender_output_driver.h"
+#include "blender/output_driver.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_output_driver.h b/intern/cycles/blender/output_driver.h
index 1d016f8bcb9..1d016f8bcb9 100644
--- a/intern/cycles/blender/blender_output_driver.h
+++ b/intern/cycles/blender/output_driver.h
diff --git a/intern/cycles/blender/blender_particles.cpp b/intern/cycles/blender/particles.cpp
index f654998af62..3a2c1b0ecf9 100644
--- a/intern/cycles/blender/blender_particles.cpp
+++ b/intern/cycles/blender/particles.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
+#include "scene/particles.h"
 #include "scene/mesh.h"
 #include "scene/object.h"
-#include "scene/particles.h"
 
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
+#include "blender/sync.h"
+#include "blender/util.h"
 
-#include "util/util_foreach.h"
+#include "util/foreach.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/python.cpp
index 45e5394cf34..20bf6385999 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/python.cpp
@@ -18,25 +18,25 @@
 
 #include "blender/CCL_api.h"
 
-#include "blender/blender_device.h"
-#include "blender/blender_session.h"
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
+#include "blender/device.h"
+#include "blender/session.h"
+#include "blender/sync.h"
+#include "blender/util.h"
 
 #include "session/denoising.h"
 #include "session/merge.h"
 
-#include "util/util_debug.h"
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_md5.h"
-#include "util/util_opengl.h"
-#include "util/util_openimagedenoise.h"
-#include "util/util_path.h"
-#include "util/util_string.h"
-#include "util/util_task.h"
-#include "util/util_tbb.h"
-#include "util/util_types.h"
+#include "util/debug.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/md5.h"
+#include "util/opengl.h"
+#include "util/openimagedenoise.h"
+#include "util/path.h"
+#include "util/string.h"
+#include "util/task.h"
+#include "util/tbb.h"
+#include "util/types.h"
 
 #ifdef WITH_OSL
 #  include "scene/osl.h"
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/session.cpp
index 988a8159864..d9a2d3d3029 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/session.cpp
@@ -31,22 +31,22 @@
 #include "session/buffers.h"
 #include "session/session.h"
 
-#include "util/util_algorithm.h"
-#include "util/util_color.h"
-#include "util/util_foreach.h"
-#include "util/util_function.h"
-#include "util/util_hash.h"
-#include "util/util_logging.h"
-#include "util/util_murmurhash.h"
-#include "util/util_path.h"
-#include "util/util_progress.h"
-#include "util/util_time.h"
-
-#include "blender/blender_display_driver.h"
-#include "blender/blender_output_driver.h"
-#include "blender/blender_session.h"
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
+#include "util/algorithm.h"
+#include "util/color.h"
+#include "util/foreach.h"
+#include "util/function.h"
+#include "util/hash.h"
+#include "util/log.h"
+#include "util/murmurhash.h"
+#include "util/path.h"
+#include "util/progress.h"
+#include "util/time.h"
+
+#include "blender/display_driver.h"
+#include "blender/output_driver.h"
+#include "blender/session.h"
+#include "blender/sync.h"
+#include "blender/util.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/session.h
index 9bc685ec306..fa24b5f7467 100644
--- a/intern/cycles/blender/blender_session.h
+++ b/intern/cycles/blender/session.h
@@ -17,6 +17,8 @@
 #ifndef __BLENDER_SESSION_H__
 #define __BLENDER_SESSION_H__
 
+#include "MEM_guardedalloc.h"
+
 #include "RNA_blender_cpp.h"
 
 #include "device/device.h"
@@ -25,7 +27,7 @@
 #include "scene/scene.h"
 #include "session/session.h"
 
-#include "util/util_vector.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/shader.cpp
index 8d3bbb520c8..0cd9052b47a 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/shader.cpp
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
+#include "scene/shader.h"
 #include "scene/background.h"
 #include "scene/colorspace.h"
 #include "scene/integrator.h"
 #include "scene/light.h"
 #include "scene/osl.h"
 #include "scene/scene.h"
-#include "scene/shader.h"
 #include "scene/shader_graph.h"
 #include "scene/shader_nodes.h"
 
-#include "blender/blender_image.h"
-#include "blender/blender_sync.h"
-#include "blender/blender_texture.h"
-#include "blender/blender_util.h"
+#include "blender/image.h"
+#include "blender/sync.h"
+#include "blender/texture.h"
+#include "blender/util.h"
 
-#include "util/util_debug.h"
-#include "util/util_foreach.h"
-#include "util/util_set.h"
-#include "util/util_string.h"
-#include "util/util_task.h"
+#include "util/debug.h"
+#include "util/foreach.h"
+#include "util/set.h"
+#include "util/string.h"
+#include "util/task.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/sync.cpp
index 1725ea5ec93..73d3a4436b5 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/sync.cpp
@@ -30,17 +30,17 @@
 
 #include "device/device.h"
 
-#include "blender/blender_device.h"
-#include "blender/blender_session.h"
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
-
-#include "util/util_debug.h"
-#include "util/util_foreach.h"
-#include "util/util_hash.h"
-#include "util/util_logging.h"
-#include "util/util_opengl.h"
-#include "util/util_openimagedenoise.h"
+#include "blender/device.h"
+#include "blender/session.h"
+#include "blender/sync.h"
+#include "blender/util.h"
+
+#include "util/debug.h"
+#include "util/foreach.h"
+#include "util/hash.h"
+#include "util/log.h"
+#include "util/opengl.h"
+#include "util/openimagedenoise.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/sync.h
index 99e3f0bf02b..c2377406876 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/sync.h
@@ -22,17 +22,17 @@
 #include "RNA_blender_cpp.h"
 #include "RNA_types.h"
 
-#include "blender/blender_id_map.h"
-#include "blender/blender_util.h"
-#include "blender/blender_viewport.h"
+#include "blender/id_map.h"
+#include "blender/util.h"
+#include "blender/viewport.h"
 
 #include "scene/scene.h"
 #include "session/session.h"
 
-#include "util/util_map.h"
-#include "util/util_set.h"
-#include "util/util_transform.h"
-#include "util/util_vector.h"
+#include "util/map.h"
+#include "util/set.h"
+#include "util/transform.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_texture.cpp b/intern/cycles/blender/texture.cpp
index 0d593f2b385..43745bb8376 100644
--- a/intern/cycles/blender/blender_texture.cpp
+++ b/intern/cycles/blender/texture.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "blender/blender_texture.h"
+#include "blender/texture.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_texture.h b/intern/cycles/blender/texture.h
index 8ab061aaed9..ead0c4e631b 100644
--- a/intern/cycles/blender/blender_texture.h
+++ b/intern/cycles/blender/texture.h
@@ -17,7 +17,7 @@
 #ifndef __BLENDER_TEXTURE_H__
 #define __BLENDER_TEXTURE_H__
 
-#include "blender/blender_sync.h"
+#include "blender/sync.h"
 #include <stdlib.h>
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/util.h
index a3dd2349525..33fd2c416c8 100644
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/util.h
@@ -19,14 +19,14 @@
 
 #include "scene/mesh.h"
 
-#include "util/util_algorithm.h"
-#include "util/util_array.h"
-#include "util/util_map.h"
-#include "util/util_path.h"
-#include "util/util_set.h"
-#include "util/util_transform.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/algorithm.h"
+#include "util/array.h"
+#include "util/map.h"
+#include "util/path.h"
+#include "util/set.h"
+#include "util/transform.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 /* Hacks to hook into Blender API
  * todo: clean this up ... */
diff --git a/intern/cycles/blender/blender_viewport.cpp b/intern/cycles/blender/viewport.cpp
index b8deb77b621..2a6f7e3ecee 100644
--- a/intern/cycles/blender/blender_viewport.cpp
+++ b/intern/cycles/blender/viewport.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include "blender_viewport.h"
+#include "blender/viewport.h"
+#include "blender/util.h"
 
-#include "blender_util.h"
 #include "scene/pass.h"
-#include "util/util_logging.h"
+
+#include "util/log.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_viewport.h b/intern/cycles/blender/viewport.h
index a445973f4d2..a445973f4d2 100644
--- a/intern/cycles/blender/blender_viewport.h
+++ b/intern/cycles/blender/viewport.h
diff --git a/intern/cycles/blender/blender_volume.cpp b/intern/cycles/blender/volume.cpp
index 46083cb29dd..a41e15621a7 100644
--- a/intern/cycles/blender/blender_volume.cpp
+++ b/intern/cycles/blender/volume.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
+#include "scene/volume.h"
 #include "scene/colorspace.h"
 #include "scene/image.h"
 #include "scene/image_vdb.h"
 #include "scene/object.h"
-#include "scene/volume.h"
 
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
+#include "blender/sync.h"
+#include "blender/util.h"
 
 #ifdef WITH_OPENVDB
 #  include <openvdb/openvdb.h>
diff --git a/intern/cycles/bvh/CMakeLists.txt b/intern/cycles/bvh/CMakeLists.txt
index f7e47a8764d..9edc30cf9c4 100644
--- a/intern/cycles/bvh/CMakeLists.txt
+++ b/intern/cycles/bvh/CMakeLists.txt
@@ -22,30 +22,30 @@ set(INC_SYS
 set(SRC
   bvh.cpp
   bvh2.cpp
-  bvh_binning.cpp
-  bvh_build.cpp
-  bvh_embree.cpp
-  bvh_multi.cpp
-  bvh_node.cpp
-  bvh_optix.cpp
-  bvh_sort.cpp
-  bvh_split.cpp
-  bvh_unaligned.cpp
+  binning.cpp
+  build.cpp
+  embree.cpp
+  multi.cpp
+  node.cpp
+  optix.cpp
+  sort.cpp
+  split.cpp
+  unaligned.cpp
 )
 
 set(SRC_HEADERS
   bvh.h
   bvh2.h
-  bvh_binning.h
-  bvh_build.h
-  bvh_embree.h
-  bvh_multi.h
-  bvh_node.h
-  bvh_optix.h
-  bvh_params.h
-  bvh_sort.h
-  bvh_split.h
-  bvh_unaligned.h
+  binning.h
+  build.h
+  embree.h
+  multi.h
+  node.h
+  optix.h
+  params.h
+  sort.h
+  split.h
+  unaligned.h
 )
 
 set(LIB
diff --git a/intern/cycles/bvh/bvh_binning.cpp b/intern/cycles/bvh/binning.cpp
index 1cc38275d11..da591ef5cea 100644
--- a/intern/cycles/bvh/bvh_binning.cpp
+++ b/intern/cycles/bvh/binning.cpp
@@ -17,13 +17,13 @@
 
 //#define __KERNEL_SSE__
 
-#include "bvh/bvh_binning.h"
+#include "bvh/binning.h"
 
 #include <stdlib.h>
 
-#include "util/util_algorithm.h"
-#include "util/util_boundbox.h"
-#include "util/util_types.h"
+#include "util/algorithm.h"
+#include "util/boundbox.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_binning.h b/intern/cycles/bvh/binning.h
index ae6dba2805d..876500ec540 100644
--- a/intern/cycles/bvh/bvh_binning.h
+++ b/intern/cycles/bvh/binning.h
@@ -18,10 +18,10 @@
 #ifndef __BVH_BINNING_H__
 #define __BVH_BINNING_H__
 
-#include "bvh/bvh_params.h"
-#include "bvh/bvh_unaligned.h"
+#include "bvh/params.h"
+#include "bvh/unaligned.h"
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/build.cpp
index 9ae40b57bc3..3ce268dfb25 100644
--- a/intern/cycles/bvh/bvh_build.cpp
+++ b/intern/cycles/bvh/build.cpp
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-#include "bvh/bvh_build.h"
+#include "bvh/build.h"
 
-#include "bvh/bvh_binning.h"
-#include "bvh/bvh_node.h"
-#include "bvh/bvh_params.h"
-#include "bvh_split.h"
+#include "bvh/binning.h"
+#include "bvh/node.h"
+#include "bvh/params.h"
+#include "bvh/split.h"
 
 #include "scene/curves.h"
 #include "scene/hair.h"
@@ -28,14 +28,14 @@
 #include "scene/object.h"
 #include "scene/scene.h"
 
-#include "util/util_algorithm.h"
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_progress.h"
-#include "util/util_queue.h"
-#include "util/util_simd.h"
-#include "util/util_stack_allocator.h"
-#include "util/util_time.h"
+#include "util/algorithm.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/progress.h"
+#include "util/queue.h"
+#include "util/simd.h"
+#include "util/stack_allocator.h"
+#include "util/time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_build.h b/intern/cycles/bvh/build.h
index c35af083fbd..06b318f1ee0 100644
--- a/intern/cycles/bvh/bvh_build.h
+++ b/intern/cycles/bvh/build.h
@@ -20,12 +20,12 @@
 
 #include <float.h>
 
-#include "bvh/bvh_params.h"
-#include "bvh/bvh_unaligned.h"
+#include "bvh/params.h"
+#include "bvh/unaligned.h"
 
-#include "util/util_array.h"
-#include "util/util_task.h"
-#include "util/util_vector.h"
+#include "util/array.h"
+#include "util/task.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp
index 050e090bddf..ae6655eb27b 100644
--- a/intern/cycles/bvh/bvh.cpp
+++ b/intern/cycles/bvh/bvh.cpp
@@ -18,12 +18,12 @@
 #include "bvh/bvh.h"
 
 #include "bvh/bvh2.h"
-#include "bvh/bvh_embree.h"
-#include "bvh/bvh_multi.h"
-#include "bvh/bvh_optix.h"
+#include "bvh/embree.h"
+#include "bvh/multi.h"
+#include "bvh/optix.h"
 
-#include "util/util_logging.h"
-#include "util/util_progress.h"
+#include "util/log.h"
+#include "util/progress.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh.h b/intern/cycles/bvh/bvh.h
index b222dfb14ed..c1f55ee917e 100644
--- a/intern/cycles/bvh/bvh.h
+++ b/intern/cycles/bvh/bvh.h
@@ -18,10 +18,10 @@
 #ifndef __BVH_H__
 #define __BVH_H__
 
-#include "bvh/bvh_params.h"
-#include "util/util_array.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "bvh/params.h"
+#include "util/array.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh2.cpp b/intern/cycles/bvh/bvh2.cpp
index 3b864859f31..04290602145 100644
--- a/intern/cycles/bvh/bvh2.cpp
+++ b/intern/cycles/bvh/bvh2.cpp
@@ -21,12 +21,12 @@
 #include "scene/mesh.h"
 #include "scene/object.h"
 
-#include "bvh/bvh_build.h"
-#include "bvh/bvh_node.h"
-#include "bvh/bvh_unaligned.h"
+#include "bvh/build.h"
+#include "bvh/node.h"
+#include "bvh/unaligned.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/bvh/bvh2.h b/intern/cycles/bvh/bvh2.h
index 1030a0f76c7..7937288f271 100644
--- a/intern/cycles/bvh/bvh2.h
+++ b/intern/cycles/bvh/bvh2.h
@@ -19,10 +19,10 @@
 #define __BVH2_H__
 
 #include "bvh/bvh.h"
-#include "bvh/bvh_params.h"
+#include "bvh/params.h"
 
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/embree.cpp
index 59a72f27294..944a84ce0da 100644
--- a/intern/cycles/bvh/bvh_embree.cpp
+++ b/intern/cycles/bvh/embree.cpp
@@ -32,24 +32,24 @@
 
 #  include <embree3/rtcore_geometry.h>
 
-#  include "bvh/bvh_embree.h"
+#  include "bvh/embree.h"
 
 /* Kernel includes are necessary so that the filter function for Embree can access the packed BVH.
  */
-#  include "kernel/bvh/bvh_embree.h"
-#  include "kernel/bvh/bvh_util.h"
+#  include "kernel/bvh/embree.h"
+#  include "kernel/bvh/util.h"
 #  include "kernel/device/cpu/compat.h"
 #  include "kernel/device/cpu/globals.h"
-#  include "kernel/sample/sample_lcg.h"
+#  include "kernel/sample/lcg.h"
 
 #  include "scene/hair.h"
 #  include "scene/mesh.h"
 #  include "scene/object.h"
 
-#  include "util/util_foreach.h"
-#  include "util/util_logging.h"
-#  include "util/util_progress.h"
-#  include "util/util_stats.h"
+#  include "util/foreach.h"
+#  include "util/log.h"
+#  include "util/progress.h"
+#  include "util/stats.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_embree.h b/intern/cycles/bvh/embree.h
index 01636fbd1dc..746ca97b504 100644
--- a/intern/cycles/bvh/bvh_embree.h
+++ b/intern/cycles/bvh/embree.h
@@ -23,11 +23,11 @@
 #  include <embree3/rtcore_scene.h>
 
 #  include "bvh/bvh.h"
-#  include "bvh/bvh_params.h"
+#  include "bvh/params.h"
 
-#  include "util/util_thread.h"
-#  include "util/util_types.h"
-#  include "util/util_vector.h"
+#  include "util/thread.h"
+#  include "util/types.h"
+#  include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_multi.cpp b/intern/cycles/bvh/multi.cpp
index a9e771f20f1..db0ff5c7847 100644
--- a/intern/cycles/bvh/bvh_multi.cpp
+++ b/intern/cycles/bvh/multi.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "bvh/bvh_multi.h"
+#include "bvh/multi.h"
 
-#include "util/util_foreach.h"
+#include "util/foreach.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_multi.h b/intern/cycles/bvh/multi.h
index 840438c5d0c..88a459605c3 100644
--- a/intern/cycles/bvh/bvh_multi.h
+++ b/intern/cycles/bvh/multi.h
@@ -18,7 +18,7 @@
 #define __BVH_MULTI_H__
 
 #include "bvh/bvh.h"
-#include "bvh/bvh_params.h"
+#include "bvh/params.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_node.cpp b/intern/cycles/bvh/node.cpp
index 38b554acfbf..d3a665adfe7 100644
--- a/intern/cycles/bvh/bvh_node.cpp
+++ b/intern/cycles/bvh/node.cpp
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-#include "bvh/bvh_node.h"
+#include "bvh/node.h"
 
+#include "bvh/build.h"
 #include "bvh/bvh.h"
-#include "bvh/bvh_build.h"
 
-#include "util/util_vector.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_node.h b/intern/cycles/bvh/node.h
index b3b5c43a394..d5de9e062fc 100644
--- a/intern/cycles/bvh/bvh_node.h
+++ b/intern/cycles/bvh/node.h
@@ -18,8 +18,8 @@
 #ifndef __BVH_NODE_H__
 #define __BVH_NODE_H__
 
-#include "util/util_boundbox.h"
-#include "util/util_types.h"
+#include "util/boundbox.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_optix.cpp b/intern/cycles/bvh/optix.cpp
index cd266f72f89..ebc3fa68b97 100644
--- a/intern/cycles/bvh/bvh_optix.cpp
+++ b/intern/cycles/bvh/optix.cpp
@@ -19,7 +19,7 @@
 
 #  include "device/device.h"
 
-#  include "bvh/bvh_optix.h"
+#  include "bvh/optix.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_optix.h b/intern/cycles/bvh/optix.h
index ba5d90471d1..037e54980bd 100644
--- a/intern/cycles/bvh/bvh_optix.h
+++ b/intern/cycles/bvh/optix.h
@@ -21,8 +21,9 @@
 #ifdef WITH_OPTIX
 
 #  include "bvh/bvh.h"
-#  include "bvh/bvh_params.h"
-#  include "device/device_memory.h"
+#  include "bvh/params.h"
+
+#  include "device/memory.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_params.h b/intern/cycles/bvh/params.h
index 31b3971c110..8f185a2640f 100644
--- a/intern/cycles/bvh/bvh_params.h
+++ b/intern/cycles/bvh/params.h
@@ -18,9 +18,9 @@
 #ifndef __BVH_PARAMS_H__
 #define __BVH_PARAMS_H__
 
-#include "util/util_boundbox.h"
+#include "util/boundbox.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_sort.cpp b/intern/cycles/bvh/sort.cpp
index b01785b547a..a9975ce6bb2 100644
--- a/intern/cycles/bvh/bvh_sort.cpp
+++ b/intern/cycles/bvh/sort.cpp
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-#include "bvh/bvh_sort.h"
+#include "bvh/sort.h"
 
-#include "bvh/bvh_build.h"
+#include "bvh/build.h"
 
-#include "util/util_algorithm.h"
-#include "util/util_task.h"
+#include "util/algorithm.h"
+#include "util/task.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_sort.h b/intern/cycles/bvh/sort.h
index 936401d8607..936401d8607 100644
--- a/intern/cycles/bvh/bvh_sort.h
+++ b/intern/cycles/bvh/sort.h
diff --git a/intern/cycles/bvh/bvh_split.cpp b/intern/cycles/bvh/split.cpp
index 0e7d36983e7..102c50e2979 100644
--- a/intern/cycles/bvh/bvh_split.cpp
+++ b/intern/cycles/bvh/split.cpp
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-#include "bvh/bvh_split.h"
+#include "bvh/split.h"
 
-#include "bvh/bvh_build.h"
-#include "bvh/bvh_sort.h"
+#include "bvh/build.h"
+#include "bvh/sort.h"
 
 #include "scene/hair.h"
 #include "scene/mesh.h"
 #include "scene/object.h"
 
-#include "util/util_algorithm.h"
+#include "util/algorithm.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_split.h b/intern/cycles/bvh/split.h
index 5582d90bf83..2650a500ea9 100644
--- a/intern/cycles/bvh/bvh_split.h
+++ b/intern/cycles/bvh/split.h
@@ -18,8 +18,8 @@
 #ifndef __BVH_SPLIT_H__
 #define __BVH_SPLIT_H__
 
-#include "bvh/bvh_build.h"
-#include "bvh/bvh_params.h"
+#include "bvh/build.h"
+#include "bvh/params.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_unaligned.cpp b/intern/cycles/bvh/unaligned.cpp
index ce95aa7aa74..3c4a600fe58 100644
--- a/intern/cycles/bvh/bvh_unaligned.cpp
+++ b/intern/cycles/bvh/unaligned.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include "bvh/bvh_unaligned.h"
+#include "bvh/unaligned.h"
 
 #include "scene/hair.h"
 #include "scene/object.h"
 
-#include "bvh/bvh_binning.h"
-#include "bvh_params.h"
+#include "bvh/binning.h"
+#include "bvh/params.h"
 
-#include "util/util_boundbox.h"
-#include "util/util_transform.h"
+#include "util/boundbox.h"
+#include "util/transform.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_unaligned.h b/intern/cycles/bvh/unaligned.h
index e8a9a25daa8..33e584ea8ed 100644
--- a/intern/cycles/bvh/bvh_unaligned.h
+++ b/intern/cycles/bvh/unaligned.h
@@ -17,7 +17,7 @@
 #ifndef __BVH_UNALIGNED_H__
 #define __BVH_UNALIGNED_H__
 
-#include "util/util_vector.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index 6d33a6f107f..39de4bec799 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -45,11 +45,11 @@ endif()
 
 set(SRC
   device.cpp
-  device_denoise.cpp
-  device_graphics_interop.cpp
-  device_kernel.cpp
-  device_memory.cpp
-  device_queue.cpp
+  denoise.cpp
+  graphics_interop.cpp
+  kernel.cpp
+  memory.cpp
+  queue.cpp
 )
 
 set(SRC_CPU
@@ -116,11 +116,11 @@ set(SRC_OPTIX
 
 set(SRC_HEADERS
   device.h
-  device_denoise.h
-  device_graphics_interop.h
-  device_memory.h
-  device_kernel.h
-  device_queue.h
+  denoise.h
+  graphics_interop.h
+  memory.h
+  kernel.h
+  queue.h
 )
 
 set(LIB
diff --git a/intern/cycles/device/cpu/device.cpp b/intern/cycles/device/cpu/device.cpp
index 68ca8e8bb22..f11b49ef65f 100644
--- a/intern/cycles/device/cpu/device.cpp
+++ b/intern/cycles/device/cpu/device.cpp
@@ -20,7 +20,7 @@
 /* Used for `info.denoisers`. */
 /* TODO(sergey): The denoisers are probably to be moved completely out of the device into their
  * own class. But until then keep API consistent with how it used to work before. */
-#include "util/util_openimagedenoise.h"
+#include "util/openimagedenoise.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/cpu/device.h b/intern/cycles/device/cpu/device.h
index 9cb2e80068d..c53bc338127 100644
--- a/intern/cycles/device/cpu/device.h
+++ b/intern/cycles/device/cpu/device.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/cpu/device_impl.cpp b/intern/cycles/device/cpu/device_impl.cpp
index 98d637b5f8a..dbad332f896 100644
--- a/intern/cycles/device/cpu/device_impl.cpp
+++ b/intern/cycles/device/cpu/device_impl.cpp
@@ -22,7 +22,7 @@
 /* So ImathMath is included before our kernel_cpu_compat. */
 #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
 
@@ -39,27 +39,27 @@
 #include "kernel/device/cpu/compat.h"
 #include "kernel/device/cpu/globals.h"
 #include "kernel/device/cpu/kernel.h"
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
-#include "kernel/osl/osl_shader.h"
-#include "kernel/osl/osl_globals.h"
+#include "kernel/osl/shader.h"
+#include "kernel/osl/globals.h"
 // clang-format on
 
-#include "bvh/bvh_embree.h"
+#include "bvh/embree.h"
 
 #include "session/buffers.h"
 
-#include "util/util_debug.h"
-#include "util/util_foreach.h"
-#include "util/util_function.h"
-#include "util/util_logging.h"
-#include "util/util_map.h"
-#include "util/util_openimagedenoise.h"
-#include "util/util_optimization.h"
-#include "util/util_progress.h"
-#include "util/util_system.h"
-#include "util/util_task.h"
-#include "util/util_thread.h"
+#include "util/debug.h"
+#include "util/foreach.h"
+#include "util/function.h"
+#include "util/log.h"
+#include "util/map.h"
+#include "util/openimagedenoise.h"
+#include "util/optimization.h"
+#include "util/progress.h"
+#include "util/system.h"
+#include "util/task.h"
+#include "util/thread.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/cpu/device_impl.h b/intern/cycles/device/cpu/device_impl.h
index 944c61e29f7..553728ccc3b 100644
--- a/intern/cycles/device/cpu/device_impl.h
+++ b/intern/cycles/device/cpu/device_impl.h
@@ -19,7 +19,7 @@
 /* So ImathMath is included before our kernel_cpu_compat. */
 #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
 
@@ -29,15 +29,15 @@
 
 #include "device/cpu/kernel.h"
 #include "device/device.h"
-#include "device/device_memory.h"
+#include "device/memory.h"
 
 // clang-format off
 #include "kernel/device/cpu/compat.h"
 #include "kernel/device/cpu/kernel.h"
 #include "kernel/device/cpu/globals.h"
 
-#include "kernel/osl/osl_shader.h"
-#include "kernel/osl/osl_globals.h"
+#include "kernel/osl/shader.h"
+#include "kernel/osl/globals.h"
 // clang-format on
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/device/cpu/kernel.h b/intern/cycles/device/cpu/kernel.h
index 5f9cb85389f..5beeaf148a1 100644
--- a/intern/cycles/device/cpu/kernel.h
+++ b/intern/cycles/device/cpu/kernel.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "device/cpu/kernel_function.h"
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/cpu/kernel_function.h b/intern/cycles/device/cpu/kernel_function.h
index aa18720cc24..5ff55499d48 100644
--- a/intern/cycles/device/cpu/kernel_function.h
+++ b/intern/cycles/device/cpu/kernel_function.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/util_debug.h"
-#include "util/util_system.h"
+#include "util/debug.h"
+#include "util/system.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/cpu/kernel_thread_globals.cpp b/intern/cycles/device/cpu/kernel_thread_globals.cpp
index 44735beb88d..739b6460318 100644
--- a/intern/cycles/device/cpu/kernel_thread_globals.cpp
+++ b/intern/cycles/device/cpu/kernel_thread_globals.cpp
@@ -17,11 +17,11 @@
 #include "device/cpu/kernel_thread_globals.h"
 
 // clang-format off
-#include "kernel/osl/osl_shader.h"
-#include "kernel/osl/osl_globals.h"
+#include "kernel/osl/shader.h"
+#include "kernel/osl/globals.h"
 // clang-format on
 
-#include "util/util_profiling.h"
+#include "util/profiling.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/cuda/device.cpp b/intern/cycles/device/cuda/device.cpp
index 84becd6d081..af2bdc6e29c 100644
--- a/intern/cycles/device/cuda/device.cpp
+++ b/intern/cycles/device/cuda/device.cpp
@@ -16,14 +16,14 @@
 
 #include "device/cuda/device.h"
 
-#include "util/util_logging.h"
+#include "util/log.h"
 
 #ifdef WITH_CUDA
 #  include "device/cuda/device_impl.h"
 #  include "device/device.h"
 
-#  include "util/util_string.h"
-#  include "util/util_windows.h"
+#  include "util/string.h"
+#  include "util/windows.h"
 #endif /* WITH_CUDA */
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/device/cuda/device.h b/intern/cycles/device/cuda/device.h
index b0484904d1a..7142ad19857 100644
--- a/intern/cycles/device/cuda/device.h
+++ b/intern/cycles/device/cuda/device.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/cuda/device_impl.cpp b/intern/cycles/device/cuda/device_impl.cpp
index 40f407b4fb3..2f9a1394ad8 100644
--- a/intern/cycles/device/cuda/device_impl.cpp
+++ b/intern/cycles/device/cuda/device_impl.cpp
@@ -24,17 +24,17 @@
 
 #  include "device/cuda/device_impl.h"
 
-#  include "util/util_debug.h"
-#  include "util/util_foreach.h"
-#  include "util/util_logging.h"
-#  include "util/util_map.h"
-#  include "util/util_md5.h"
-#  include "util/util_path.h"
-#  include "util/util_string.h"
-#  include "util/util_system.h"
-#  include "util/util_time.h"
-#  include "util/util_types.h"
-#  include "util/util_windows.h"
+#  include "util/debug.h"
+#  include "util/foreach.h"
+#  include "util/log.h"
+#  include "util/map.h"
+#  include "util/md5.h"
+#  include "util/path.h"
+#  include "util/string.h"
+#  include "util/system.h"
+#  include "util/time.h"
+#  include "util/types.h"
+#  include "util/windows.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/cuda/device_impl.h b/intern/cycles/device/cuda/device_impl.h
index c0316d18ba0..72d4108d1bf 100644
--- a/intern/cycles/device/cuda/device_impl.h
+++ b/intern/cycles/device/cuda/device_impl.h
@@ -21,7 +21,7 @@
 #  include "device/cuda/util.h"
 #  include "device/device.h"
 
-#  include "util/util_map.h"
+#  include "util/map.h"
 
 #  ifdef WITH_CUDA_DYNLOAD
 #    include "cuew.h"
diff --git a/intern/cycles/device/cuda/graphics_interop.h b/intern/cycles/device/cuda/graphics_interop.h
index ec480f20c86..a00a837efea 100644
--- a/intern/cycles/device/cuda/graphics_interop.h
+++ b/intern/cycles/device/cuda/graphics_interop.h
@@ -16,7 +16,7 @@
 
 #ifdef WITH_CUDA
 
-#  include "device/device_graphics_interop.h"
+#  include "device/graphics_interop.h"
 
 #  ifdef WITH_CUDA_DYNLOAD
 #    include "cuew.h"
diff --git a/intern/cycles/device/cuda/kernel.h b/intern/cycles/device/cuda/kernel.h
index b489547a350..e1650ea5b5b 100644
--- a/intern/cycles/device/cuda/kernel.h
+++ b/intern/cycles/device/cuda/kernel.h
@@ -18,7 +18,7 @@
 
 #ifdef WITH_CUDA
 
-#  include "device/device_kernel.h"
+#  include "device/kernel.h"
 
 #  ifdef WITH_CUDA_DYNLOAD
 #    include "cuew.h"
diff --git a/intern/cycles/device/cuda/queue.h b/intern/cycles/device/cuda/queue.h
index 4d1995ed69e..28613cda071 100644
--- a/intern/cycles/device/cuda/queue.h
+++ b/intern/cycles/device/cuda/queue.h
@@ -18,9 +18,9 @@
 
 #ifdef WITH_CUDA
 
-#  include "device/device_kernel.h"
-#  include "device/device_memory.h"
-#  include "device/device_queue.h"
+#  include "device/kernel.h"
+#  include "device/memory.h"
+#  include "device/queue.h"
 
 #  include "device/cuda/util.h"
 
diff --git a/intern/cycles/device/device_denoise.cpp b/intern/cycles/device/denoise.cpp
index aea7868f65d..c291a7a0adb 100644
--- a/intern/cycles/device/device_denoise.cpp
+++ b/intern/cycles/device/denoise.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "device/device_denoise.h"
+#include "device/denoise.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/device_denoise.h b/intern/cycles/device/denoise.h
index 4e09f1a1ba3..3f30506ae06 100644
--- a/intern/cycles/device/device_denoise.h
+++ b/intern/cycles/device/denoise.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "device/device_memory.h"
+#include "device/memory.h"
 #include "graph/node.h"
 #include "session/buffers.h"
 
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index 81574e8b184..5179f3bacdb 100644
--- a/intern/cycles/device/device.cpp
+++ b/intern/cycles/device/device.cpp
@@ -20,7 +20,7 @@
 #include "bvh/bvh2.h"
 
 #include "device/device.h"
-#include "device/device_queue.h"
+#include "device/queue.h"
 
 #include "device/cpu/device.h"
 #include "device/cuda/device.h"
@@ -29,15 +29,15 @@
 #include "device/multi/device.h"
 #include "device/optix/device.h"
 
-#include "util/util_foreach.h"
-#include "util/util_half.h"
-#include "util/util_logging.h"
-#include "util/util_math.h"
-#include "util/util_string.h"
-#include "util/util_system.h"
-#include "util/util_time.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/foreach.h"
+#include "util/half.h"
+#include "util/log.h"
+#include "util/math.h"
+#include "util/string.h"
+#include "util/system.h"
+#include "util/time.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index c73d74cdccc..3cb177adde7 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -19,21 +19,21 @@
 
 #include <stdlib.h>
 
-#include "bvh/bvh_params.h"
-
-#include "device/device_denoise.h"
-#include "device/device_memory.h"
-
-#include "util/util_function.h"
-#include "util/util_list.h"
-#include "util/util_logging.h"
-#include "util/util_stats.h"
-#include "util/util_string.h"
-#include "util/util_texture.h"
-#include "util/util_thread.h"
-#include "util/util_types.h"
-#include "util/util_unique_ptr.h"
-#include "util/util_vector.h"
+#include "bvh/params.h"
+
+#include "device/denoise.h"
+#include "device/memory.h"
+
+#include "util/function.h"
+#include "util/list.h"
+#include "util/log.h"
+#include "util/stats.h"
+#include "util/string.h"
+#include "util/texture.h"
+#include "util/thread.h"
+#include "util/types.h"
+#include "util/unique_ptr.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/dummy/device.cpp b/intern/cycles/device/dummy/device.cpp
index e3cea272300..64f6b0eb58c 100644
--- a/intern/cycles/device/dummy/device.cpp
+++ b/intern/cycles/device/dummy/device.cpp
@@ -17,7 +17,7 @@
 #include "device/dummy/device.h"
 
 #include "device/device.h"
-#include "device/device_queue.h"
+#include "device/queue.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/dummy/device.h b/intern/cycles/device/dummy/device.h
index 832a9568129..c45eb036ca5 100644
--- a/intern/cycles/device/dummy/device.h
+++ b/intern/cycles/device/dummy/device.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/device_graphics_interop.cpp b/intern/cycles/device/graphics_interop.cpp
index a80a236759f..0b092711b61 100644
--- a/intern/cycles/device/device_graphics_interop.cpp
+++ b/intern/cycles/device/graphics_interop.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "device/device_graphics_interop.h"
+#include "device/graphics_interop.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/device_graphics_interop.h b/intern/cycles/device/graphics_interop.h
index e5c97fe5a1e..f1661146ddd 100644
--- a/intern/cycles/device/device_graphics_interop.h
+++ b/intern/cycles/device/graphics_interop.h
@@ -18,7 +18,7 @@
 
 #include "session/display_driver.h"
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/hip/device.cpp b/intern/cycles/device/hip/device.cpp
index 90028ac7f10..f71732d14bb 100644
--- a/intern/cycles/device/hip/device.cpp
+++ b/intern/cycles/device/hip/device.cpp
@@ -16,14 +16,14 @@
 
 #include "device/hip/device.h"
 
-#include "util/util_logging.h"
+#include "util/log.h"
 
 #ifdef WITH_HIP
 #  include "device/device.h"
 #  include "device/hip/device_impl.h"
 
-#  include "util/util_string.h"
-#  include "util/util_windows.h"
+#  include "util/string.h"
+#  include "util/windows.h"
 #endif /* WITH_HIP */
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/device/hip/device.h b/intern/cycles/device/hip/device.h
index 965fd9e484b..cdbe364b2b3 100644
--- a/intern/cycles/device/hip/device.h
+++ b/intern/cycles/device/hip/device.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/hip/device_impl.cpp b/intern/cycles/device/hip/device_impl.cpp
index 9ffeb9724a1..31b7b07383b 100644
--- a/intern/cycles/device/hip/device_impl.cpp
+++ b/intern/cycles/device/hip/device_impl.cpp
@@ -24,18 +24,18 @@
 
 #  include "device/hip/device_impl.h"
 
-#  include "util/util_debug.h"
-#  include "util/util_foreach.h"
-#  include "util/util_logging.h"
-#  include "util/util_map.h"
-#  include "util/util_md5.h"
-#  include "util/util_opengl.h"
-#  include "util/util_path.h"
-#  include "util/util_string.h"
-#  include "util/util_system.h"
-#  include "util/util_time.h"
-#  include "util/util_types.h"
-#  include "util/util_windows.h"
+#  include "util/debug.h"
+#  include "util/foreach.h"
+#  include "util/log.h"
+#  include "util/map.h"
+#  include "util/md5.h"
+#  include "util/opengl.h"
+#  include "util/path.h"
+#  include "util/string.h"
+#  include "util/system.h"
+#  include "util/time.h"
+#  include "util/types.h"
+#  include "util/windows.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/hip/device_impl.h b/intern/cycles/device/hip/device_impl.h
index 1d138ee9856..8d81291d15e 100644
--- a/intern/cycles/device/hip/device_impl.h
+++ b/intern/cycles/device/hip/device_impl.h
@@ -21,12 +21,12 @@
 #  include "device/hip/queue.h"
 #  include "device/hip/util.h"
 
-#  include "util/util_map.h"
+#  include "util/map.h"
 
 #  ifdef WITH_HIP_DYNLOAD
 #    include "hipew.h"
 #  else
-#    include "util/util_opengl.h"
+#    include "util/opengl.h"
 #  endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/device/hip/graphics_interop.h b/intern/cycles/device/hip/graphics_interop.h
index 2b2d287ff6c..8314405e670 100644
--- a/intern/cycles/device/hip/graphics_interop.h
+++ b/intern/cycles/device/hip/graphics_interop.h
@@ -16,7 +16,7 @@
 
 #ifdef WITH_HIP
 
-#  include "device/device_graphics_interop.h"
+#  include "device/graphics_interop.h"
 
 #  ifdef WITH_HIP_DYNLOAD
 #    include "hipew.h"
diff --git a/intern/cycles/device/hip/kernel.h b/intern/cycles/device/hip/kernel.h
index 3301731f56e..f1378f8eebf 100644
--- a/intern/cycles/device/hip/kernel.h
+++ b/intern/cycles/device/hip/kernel.h
@@ -18,7 +18,7 @@
 
 #ifdef WITH_HIP
 
-#  include "device/device_kernel.h"
+#  include "device/kernel.h"
 
 #  ifdef WITH_HIP_DYNLOAD
 #    include "hipew.h"
diff --git a/intern/cycles/device/hip/queue.h b/intern/cycles/device/hip/queue.h
index b92f7de7e4b..95d1afaff0f 100644
--- a/intern/cycles/device/hip/queue.h
+++ b/intern/cycles/device/hip/queue.h
@@ -18,9 +18,9 @@
 
 #ifdef WITH_HIP
 
-#  include "device/device_kernel.h"
-#  include "device/device_memory.h"
-#  include "device/device_queue.h"
+#  include "device/kernel.h"
+#  include "device/memory.h"
+#  include "device/queue.h"
 
 #  include "device/hip/util.h"
 
diff --git a/intern/cycles/device/device_kernel.cpp b/intern/cycles/device/kernel.cpp
index 1e282aac57e..1e4f0c48f18 100644
--- a/intern/cycles/device/device_kernel.cpp
+++ b/intern/cycles/device/kernel.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "device/device_kernel.h"
+#include "device/kernel.h"
 
-#include "util/util_logging.h"
+#include "util/log.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/device_kernel.h b/intern/cycles/device/kernel.h
index 83d959ca87b..780ead2d28a 100644
--- a/intern/cycles/device/device_kernel.h
+++ b/intern/cycles/device/kernel.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
-#include "util/util_string.h"
+#include "util/string.h"
 
 #include <ostream>  // NOLINT
 
diff --git a/intern/cycles/device/device_memory.cpp b/intern/cycles/device/memory.cpp
index c0ab2e17cae..f162b00d9f7 100644
--- a/intern/cycles/device/device_memory.cpp
+++ b/intern/cycles/device/memory.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "device/device_memory.h"
+#include "device/memory.h"
 #include "device/device.h"
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/memory.h
index be6123e09b2..281c54cc6a5 100644
--- a/intern/cycles/device/device_memory.h
+++ b/intern/cycles/device/memory.h
@@ -21,12 +21,12 @@
  *
  * Data types for allocating, copying and freeing device memory. */
 
-#include "util/util_array.h"
-#include "util/util_half.h"
-#include "util/util_string.h"
-#include "util/util_texture.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/array.h"
+#include "util/half.h"
+#include "util/string.h"
+#include "util/texture.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/multi/device.cpp b/intern/cycles/device/multi/device.cpp
index 330a1ed06ef..56efec3e131 100644
--- a/intern/cycles/device/multi/device.cpp
+++ b/intern/cycles/device/multi/device.cpp
@@ -19,18 +19,18 @@
 #include <sstream>
 #include <stdlib.h>
 
-#include "bvh/bvh_multi.h"
+#include "bvh/multi.h"
 
 #include "device/device.h"
-#include "device/device_queue.h"
+#include "device/queue.h"
 
 #include "scene/geometry.h"
 
-#include "util/util_foreach.h"
-#include "util/util_list.h"
-#include "util/util_logging.h"
-#include "util/util_map.h"
-#include "util/util_time.h"
+#include "util/foreach.h"
+#include "util/list.h"
+#include "util/log.h"
+#include "util/map.h"
+#include "util/time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/multi/device.h b/intern/cycles/device/multi/device.h
index 6e121014a1f..ac77f6574ef 100644
--- a/intern/cycles/device/multi/device.h
+++ b/intern/cycles/device/multi/device.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/optix/device.cpp b/intern/cycles/device/optix/device.cpp
index 13f23bd229a..a00169e719f 100644
--- a/intern/cycles/device/optix/device.cpp
+++ b/intern/cycles/device/optix/device.cpp
@@ -19,7 +19,8 @@
 
 #include "device/cuda/device.h"
 #include "device/optix/device_impl.h"
-#include "util/util_logging.h"
+
+#include "util/log.h"
 
 #ifdef WITH_OPTIX
 #  include <optix_function_table_definition.h>
diff --git a/intern/cycles/device/optix/device.h b/intern/cycles/device/optix/device.h
index 29fa729c2e4..dd60a7aa6e2 100644
--- a/intern/cycles/device/optix/device.h
+++ b/intern/cycles/device/optix/device.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/optix/device_impl.cpp b/intern/cycles/device/optix/device_impl.cpp
index 55c3fbd88f2..e9164cc0a76 100644
--- a/intern/cycles/device/optix/device_impl.cpp
+++ b/intern/cycles/device/optix/device_impl.cpp
@@ -20,7 +20,7 @@
 #  include "device/optix/device_impl.h"
 
 #  include "bvh/bvh.h"
-#  include "bvh/bvh_optix.h"
+#  include "bvh/optix.h"
 
 #  include "integrator/pass_accessor_gpu.h"
 
@@ -30,12 +30,12 @@
 #  include "scene/pass.h"
 #  include "scene/scene.h"
 
-#  include "util/util_debug.h"
-#  include "util/util_logging.h"
-#  include "util/util_md5.h"
-#  include "util/util_path.h"
-#  include "util/util_progress.h"
-#  include "util/util_time.h"
+#  include "util/debug.h"
+#  include "util/log.h"
+#  include "util/md5.h"
+#  include "util/path.h"
+#  include "util/progress.h"
+#  include "util/time.h"
 
 #  undef __KERNEL_CPU__
 #  define __KERNEL_OPTIX__
@@ -1574,7 +1574,7 @@ void OptiXDevice::const_copy_to(const char *name, void *host, size_t size)
       return; \
     }
   KERNEL_TEX(IntegratorStateGPU, __integrator_state)
-#  include "kernel/kernel_textures.h"
+#  include "kernel/textures.h"
 #  undef KERNEL_TEX
 }
 
diff --git a/intern/cycles/device/optix/device_impl.h b/intern/cycles/device/optix/device_impl.h
index b20d42f8c61..3ec98098eb7 100644
--- a/intern/cycles/device/optix/device_impl.h
+++ b/intern/cycles/device/optix/device_impl.h
@@ -22,7 +22,7 @@
 #  include "device/cuda/device_impl.h"
 #  include "device/optix/queue.h"
 #  include "device/optix/util.h"
-#  include "kernel/kernel_types.h"
+#  include "kernel/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/optix/queue.cpp b/intern/cycles/device/optix/queue.cpp
index 458ed70baa8..f5bfd916ccf 100644
--- a/intern/cycles/device/optix/queue.cpp
+++ b/intern/cycles/device/optix/queue.cpp
@@ -19,7 +19,7 @@
 #  include "device/optix/queue.h"
 #  include "device/optix/device_impl.h"
 
-#  include "util/util_time.h"
+#  include "util/time.h"
 
 #  undef __KERNEL_CPU__
 #  define __KERNEL_OPTIX__
diff --git a/intern/cycles/device/device_queue.cpp b/intern/cycles/device/queue.cpp
index f2b2f3496e0..556dc97f23b 100644
--- a/intern/cycles/device/device_queue.cpp
+++ b/intern/cycles/device/queue.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "device/device_queue.h"
+#include "device/queue.h"
 
-#include "util/util_algorithm.h"
-#include "util/util_logging.h"
-#include "util/util_time.h"
+#include "util/algorithm.h"
+#include "util/log.h"
+#include "util/time.h"
 
 #include <iomanip>
 
diff --git a/intern/cycles/device/device_queue.h b/intern/cycles/device/queue.h
index e6835b787cf..188162f4b74 100644
--- a/intern/cycles/device/device_queue.h
+++ b/intern/cycles/device/queue.h
@@ -16,13 +16,13 @@
 
 #pragma once
 
-#include "device/device_kernel.h"
+#include "device/kernel.h"
 
-#include "device/device_graphics_interop.h"
-#include "util/util_logging.h"
-#include "util/util_map.h"
-#include "util/util_string.h"
-#include "util/util_unique_ptr.h"
+#include "device/graphics_interop.h"
+#include "util/log.h"
+#include "util/map.h"
+#include "util/string.h"
+#include "util/unique_ptr.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/graph/node.cpp b/intern/cycles/graph/node.cpp
index 8294e716ebe..a3d75e53afd 100644
--- a/intern/cycles/graph/node.cpp
+++ b/intern/cycles/graph/node.cpp
@@ -17,10 +17,10 @@
 #include "graph/node.h"
 #include "graph/node_type.h"
 
-#include "util/util_foreach.h"
-#include "util/util_md5.h"
-#include "util/util_param.h"
-#include "util/util_transform.h"
+#include "util/foreach.h"
+#include "util/md5.h"
+#include "util/param.h"
+#include "util/transform.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/graph/node.h b/intern/cycles/graph/node.h
index 8f27a82d37b..a00162a3b9a 100644
--- a/intern/cycles/graph/node.h
+++ b/intern/cycles/graph/node.h
@@ -20,9 +20,9 @@
 
 #include "graph/node_type.h"
 
-#include "util/util_array.h"
-#include "util/util_map.h"
-#include "util/util_param.h"
+#include "util/array.h"
+#include "util/map.h"
+#include "util/param.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/graph/node_enum.h b/intern/cycles/graph/node_enum.h
index d3ed0928a4f..831c6e4a9c4 100644
--- a/intern/cycles/graph/node_enum.h
+++ b/intern/cycles/graph/node_enum.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#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/graph/node_type.cpp b/intern/cycles/graph/node_type.cpp
index 4efbd6725ee..bce98c694e1 100644
--- a/intern/cycles/graph/node_type.cpp
+++ b/intern/cycles/graph/node_type.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "graph/node_type.h"
-#include "util/util_foreach.h"
-#include "util/util_transform.h"
+#include "util/foreach.h"
+#include "util/transform.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/graph/node_type.h b/intern/cycles/graph/node_type.h
index 8b37398fa17..71639341617 100644
--- a/intern/cycles/graph/node_type.h
+++ b/intern/cycles/graph/node_type.h
@@ -17,11 +17,11 @@
 #pragma once
 
 #include "graph/node_enum.h"
-#include "util/util_array.h"
-#include "util/util_map.h"
-#include "util/util_param.h"
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/array.h"
+#include "util/map.h"
+#include "util/param.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/graph/node_xml.cpp b/intern/cycles/graph/node_xml.cpp
index 43462662b6a..b0c863ad4b5 100644
--- a/intern/cycles/graph/node_xml.cpp
+++ b/intern/cycles/graph/node_xml.cpp
@@ -16,9 +16,9 @@
 
 #include "graph/node_xml.h"
 
-#include "util/util_foreach.h"
-#include "util/util_string.h"
-#include "util/util_transform.h"
+#include "util/foreach.h"
+#include "util/string.h"
+#include "util/transform.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/graph/node_xml.h b/intern/cycles/graph/node_xml.h
index 15bbf5d5621..ddbc5213ab1 100644
--- a/intern/cycles/graph/node_xml.h
+++ b/intern/cycles/graph/node_xml.h
@@ -18,9 +18,9 @@
 
 #include "graph/node.h"
 
-#include "util/util_map.h"
-#include "util/util_string.h"
-#include "util/util_xml.h"
+#include "util/map.h"
+#include "util/string.h"
+#include "util/xml.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/adaptive_sampling.cpp b/intern/cycles/integrator/adaptive_sampling.cpp
index 23fbcfea5c2..253879d67e3 100644
--- a/intern/cycles/integrator/adaptive_sampling.cpp
+++ b/intern/cycles/integrator/adaptive_sampling.cpp
@@ -16,7 +16,7 @@
 
 #include "integrator/adaptive_sampling.h"
 
-#include "util/util_math.h"
+#include "util/math.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/denoiser.cpp b/intern/cycles/integrator/denoiser.cpp
index 45f967b38eb..b6ca96faebf 100644
--- a/intern/cycles/integrator/denoiser.cpp
+++ b/intern/cycles/integrator/denoiser.cpp
@@ -20,8 +20,8 @@
 #include "integrator/denoiser_oidn.h"
 #include "integrator/denoiser_optix.h"
 #include "session/buffers.h"
-#include "util/util_logging.h"
-#include "util/util_progress.h"
+#include "util/log.h"
+#include "util/progress.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/denoiser.h b/intern/cycles/integrator/denoiser.h
index b02bcbeb046..8d7a644f8d9 100644
--- a/intern/cycles/integrator/denoiser.h
+++ b/intern/cycles/integrator/denoiser.h
@@ -19,10 +19,10 @@
 /* TODO(sergey): The integrator folder might not be the best. Is easy to move files around if the
  * better place is figured out. */
 
+#include "device/denoise.h"
 #include "device/device.h"
-#include "device/device_denoise.h"
-#include "util/util_function.h"
-#include "util/util_unique_ptr.h"
+#include "util/function.h"
+#include "util/unique_ptr.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/denoiser_device.cpp b/intern/cycles/integrator/denoiser_device.cpp
index 1afd8d46866..2121dee500a 100644
--- a/intern/cycles/integrator/denoiser_device.cpp
+++ b/intern/cycles/integrator/denoiser_device.cpp
@@ -16,13 +16,13 @@
 
 #include "integrator/denoiser_device.h"
 
+#include "device/denoise.h"
 #include "device/device.h"
-#include "device/device_denoise.h"
-#include "device/device_memory.h"
-#include "device/device_queue.h"
+#include "device/memory.h"
+#include "device/queue.h"
 #include "session/buffers.h"
-#include "util/util_logging.h"
-#include "util/util_progress.h"
+#include "util/log.h"
+#include "util/progress.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/denoiser_device.h b/intern/cycles/integrator/denoiser_device.h
index 0fd934dba79..2bacecaa2a2 100644
--- a/intern/cycles/integrator/denoiser_device.h
+++ b/intern/cycles/integrator/denoiser_device.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "integrator/denoiser.h"
-#include "util/util_unique_ptr.h"
+#include "util/unique_ptr.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/denoiser_oidn.cpp b/intern/cycles/integrator/denoiser_oidn.cpp
index c3555008699..b09b95a11b0 100644
--- a/intern/cycles/integrator/denoiser_oidn.cpp
+++ b/intern/cycles/integrator/denoiser_oidn.cpp
@@ -19,12 +19,12 @@
 #include <array>
 
 #include "device/device.h"
-#include "device/device_queue.h"
+#include "device/queue.h"
 #include "integrator/pass_accessor_cpu.h"
 #include "session/buffers.h"
-#include "util/util_array.h"
-#include "util/util_logging.h"
-#include "util/util_openimagedenoise.h"
+#include "util/array.h"
+#include "util/log.h"
+#include "util/openimagedenoise.h"
 
 #include "kernel/device/cpu/compat.h"
 #include "kernel/device/cpu/kernel.h"
diff --git a/intern/cycles/integrator/denoiser_oidn.h b/intern/cycles/integrator/denoiser_oidn.h
index 566e761ae79..a0ec3e26b9c 100644
--- a/intern/cycles/integrator/denoiser_oidn.h
+++ b/intern/cycles/integrator/denoiser_oidn.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include "integrator/denoiser.h"
-#include "util/util_thread.h"
-#include "util/util_unique_ptr.h"
+#include "util/thread.h"
+#include "util/unique_ptr.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/denoiser_optix.cpp b/intern/cycles/integrator/denoiser_optix.cpp
index 5f9de23bfe6..ebd95d62ae4 100644
--- a/intern/cycles/integrator/denoiser_optix.cpp
+++ b/intern/cycles/integrator/denoiser_optix.cpp
@@ -16,8 +16,8 @@
 
 #include "integrator/denoiser_optix.h"
 
+#include "device/denoise.h"
 #include "device/device.h"
-#include "device/device_denoise.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/pass_accessor.cpp b/intern/cycles/integrator/pass_accessor.cpp
index 0a8c445eca7..7e19de51daa 100644
--- a/intern/cycles/integrator/pass_accessor.cpp
+++ b/intern/cycles/integrator/pass_accessor.cpp
@@ -17,11 +17,11 @@
 #include "integrator/pass_accessor.h"
 
 #include "session/buffers.h"
-#include "util/util_logging.h"
+#include "util/log.h"
 
 // clang-format off
 #include "kernel/device/cpu/compat.h"
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 // clang-format on
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/integrator/pass_accessor.h b/intern/cycles/integrator/pass_accessor.h
index c9cf3ba8956..09eae0156c9 100644
--- a/intern/cycles/integrator/pass_accessor.h
+++ b/intern/cycles/integrator/pass_accessor.h
@@ -17,9 +17,9 @@
 #pragma once
 
 #include "scene/pass.h"
-#include "util/util_half.h"
-#include "util/util_string.h"
-#include "util/util_types.h"
+#include "util/half.h"
+#include "util/string.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/pass_accessor_cpu.cpp b/intern/cycles/integrator/pass_accessor_cpu.cpp
index f3ca38c667d..820da757be0 100644
--- a/intern/cycles/integrator/pass_accessor_cpu.cpp
+++ b/intern/cycles/integrator/pass_accessor_cpu.cpp
@@ -17,14 +17,14 @@
 #include "integrator/pass_accessor_cpu.h"
 
 #include "session/buffers.h"
-#include "util/util_logging.h"
-#include "util/util_tbb.h"
+#include "util/log.h"
+#include "util/tbb.h"
 
 // clang-format off
 #include "kernel/device/cpu/compat.h"
 #include "kernel/device/cpu/globals.h"
-#include "kernel/kernel_types.h"
-#include "kernel/film/film_read.h"
+#include "kernel/types.h"
+#include "kernel/film/read.h"
 // clang-format on
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/integrator/pass_accessor_gpu.cpp b/intern/cycles/integrator/pass_accessor_gpu.cpp
index 3b4290a89e6..c03ef64a2b2 100644
--- a/intern/cycles/integrator/pass_accessor_gpu.cpp
+++ b/intern/cycles/integrator/pass_accessor_gpu.cpp
@@ -16,9 +16,9 @@
 
 #include "integrator/pass_accessor_gpu.h"
 
-#include "device/device_queue.h"
+#include "device/queue.h"
 #include "session/buffers.h"
-#include "util/util_logging.h"
+#include "util/log.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/pass_accessor_gpu.h b/intern/cycles/integrator/pass_accessor_gpu.h
index bc37e4387f3..f3442d90013 100644
--- a/intern/cycles/integrator/pass_accessor_gpu.h
+++ b/intern/cycles/integrator/pass_accessor_gpu.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "integrator/pass_accessor.h"
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/path_trace.cpp b/intern/cycles/integrator/path_trace.cpp
index 94687f7bc95..daf270d6686 100644
--- a/intern/cycles/integrator/path_trace.cpp
+++ b/intern/cycles/integrator/path_trace.cpp
@@ -25,11 +25,11 @@
 #include "scene/pass.h"
 #include "scene/scene.h"
 #include "session/tile.h"
-#include "util/util_algorithm.h"
-#include "util/util_logging.h"
-#include "util/util_progress.h"
-#include "util/util_tbb.h"
-#include "util/util_time.h"
+#include "util/algorithm.h"
+#include "util/log.h"
+#include "util/progress.h"
+#include "util/tbb.h"
+#include "util/time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/path_trace.h b/intern/cycles/integrator/path_trace.h
index 89fa5fa8eaf..9b079352a63 100644
--- a/intern/cycles/integrator/path_trace.h
+++ b/intern/cycles/integrator/path_trace.h
@@ -21,10 +21,10 @@
 #include "integrator/path_trace_work.h"
 #include "integrator/work_balancer.h"
 #include "session/buffers.h"
-#include "util/util_function.h"
-#include "util/util_thread.h"
-#include "util/util_unique_ptr.h"
-#include "util/util_vector.h"
+#include "util/function.h"
+#include "util/thread.h"
+#include "util/unique_ptr.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/path_trace_display.cpp b/intern/cycles/integrator/path_trace_display.cpp
index 7455a107ae6..c1cade923b1 100644
--- a/intern/cycles/integrator/path_trace_display.cpp
+++ b/intern/cycles/integrator/path_trace_display.cpp
@@ -18,7 +18,7 @@
 
 #include "session/buffers.h"
 
-#include "util/util_logging.h"
+#include "util/log.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/path_trace_display.h b/intern/cycles/integrator/path_trace_display.h
index d40e45e7ead..b69ee85fbbc 100644
--- a/intern/cycles/integrator/path_trace_display.h
+++ b/intern/cycles/integrator/path_trace_display.h
@@ -18,10 +18,10 @@
 
 #include "session/display_driver.h"
 
-#include "util/util_half.h"
-#include "util/util_thread.h"
-#include "util/util_types.h"
-#include "util/util_unique_ptr.h"
+#include "util/half.h"
+#include "util/thread.h"
+#include "util/types.h"
+#include "util/unique_ptr.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/path_trace_work.cpp b/intern/cycles/integrator/path_trace_work.cpp
index e08c410a579..b0c40cfe15c 100644
--- a/intern/cycles/integrator/path_trace_work.cpp
+++ b/intern/cycles/integrator/path_trace_work.cpp
@@ -24,7 +24,7 @@
 #include "scene/scene.h"
 #include "session/buffers.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/path_trace_work.h b/intern/cycles/integrator/path_trace_work.h
index 6b2a6c71e81..0dc7cd2f896 100644
--- a/intern/cycles/integrator/path_trace_work.h
+++ b/intern/cycles/integrator/path_trace_work.h
@@ -19,8 +19,8 @@
 #include "integrator/pass_accessor.h"
 #include "scene/pass.h"
 #include "session/buffers.h"
-#include "util/util_types.h"
-#include "util/util_unique_ptr.h"
+#include "util/types.h"
+#include "util/unique_ptr.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/path_trace_work_cpu.cpp b/intern/cycles/integrator/path_trace_work_cpu.cpp
index 1e59682a64c..541a7eca02f 100644
--- a/intern/cycles/integrator/path_trace_work_cpu.cpp
+++ b/intern/cycles/integrator/path_trace_work_cpu.cpp
@@ -19,7 +19,7 @@
 #include "device/cpu/kernel.h"
 #include "device/device.h"
 
-#include "kernel/integrator/integrator_path_state.h"
+#include "kernel/integrator/path_state.h"
 
 #include "integrator/pass_accessor_cpu.h"
 #include "integrator/path_trace_display.h"
@@ -27,9 +27,9 @@
 #include "scene/scene.h"
 #include "session/buffers.h"
 
-#include "util/util_atomic.h"
-#include "util/util_logging.h"
-#include "util/util_tbb.h"
+#include "util/atomic.h"
+#include "util/log.h"
+#include "util/tbb.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/path_trace_work_cpu.h b/intern/cycles/integrator/path_trace_work_cpu.h
index 91c024f4e4a..6e734690811 100644
--- a/intern/cycles/integrator/path_trace_work_cpu.h
+++ b/intern/cycles/integrator/path_trace_work_cpu.h
@@ -16,14 +16,14 @@
 
 #pragma once
 
-#include "kernel/integrator/integrator_state.h"
+#include "kernel/integrator/state.h"
 
 #include "device/cpu/kernel_thread_globals.h"
-#include "device/device_queue.h"
+#include "device/queue.h"
 
 #include "integrator/path_trace_work.h"
 
-#include "util/util_vector.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/path_trace_work_gpu.cpp b/intern/cycles/integrator/path_trace_work_gpu.cpp
index 67e5ae70316..b7dc4e5d181 100644
--- a/intern/cycles/integrator/path_trace_work_gpu.cpp
+++ b/intern/cycles/integrator/path_trace_work_gpu.cpp
@@ -22,12 +22,12 @@
 #include "integrator/pass_accessor_gpu.h"
 #include "scene/scene.h"
 #include "session/buffers.h"
-#include "util/util_logging.h"
-#include "util/util_string.h"
-#include "util/util_tbb.h"
-#include "util/util_time.h"
+#include "util/log.h"
+#include "util/string.h"
+#include "util/tbb.h"
+#include "util/time.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -53,9 +53,9 @@ static size_t estimate_single_state_size()
  * rely on this. */
 #define KERNEL_STRUCT_VOLUME_STACK_SIZE 4
 
-#include "kernel/integrator/integrator_state_template.h"
+#include "kernel/integrator/state_template.h"
 
-#include "kernel/integrator/integrator_shadow_state_template.h"
+#include "kernel/integrator/shadow_state_template.h"
 
 #undef KERNEL_STRUCT_BEGIN
 #undef KERNEL_STRUCT_MEMBER
@@ -146,9 +146,9 @@ void PathTraceWorkGPU::alloc_integrator_soa()
   }
 #define KERNEL_STRUCT_VOLUME_STACK_SIZE (integrator_state_soa_volume_stack_size_)
 
-#include "kernel/integrator/integrator_state_template.h"
+#include "kernel/integrator/state_template.h"
 
-#include "kernel/integrator/integrator_shadow_state_template.h"
+#include "kernel/integrator/shadow_state_template.h"
 
 #undef KERNEL_STRUCT_BEGIN
 #undef KERNEL_STRUCT_MEMBER
diff --git a/intern/cycles/integrator/path_trace_work_gpu.h b/intern/cycles/integrator/path_trace_work_gpu.h
index 8734d2c2852..c5e291e72db 100644
--- a/intern/cycles/integrator/path_trace_work_gpu.h
+++ b/intern/cycles/integrator/path_trace_work_gpu.h
@@ -16,16 +16,16 @@
 
 #pragma once
 
-#include "kernel/integrator/integrator_state.h"
+#include "kernel/integrator/state.h"
 
-#include "device/device_graphics_interop.h"
-#include "device/device_memory.h"
-#include "device/device_queue.h"
+#include "device/graphics_interop.h"
+#include "device/memory.h"
+#include "device/queue.h"
 
 #include "integrator/path_trace_work.h"
 #include "integrator/work_tile_scheduler.h"
 
-#include "util/util_vector.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/render_scheduler.cpp b/intern/cycles/integrator/render_scheduler.cpp
index 3c64cba5feb..f776d01ef67 100644
--- a/intern/cycles/integrator/render_scheduler.cpp
+++ b/intern/cycles/integrator/render_scheduler.cpp
@@ -18,9 +18,9 @@
 
 #include "session/session.h"
 #include "session/tile.h"
-#include "util/util_logging.h"
-#include "util/util_math.h"
-#include "util/util_time.h"
+#include "util/log.h"
+#include "util/math.h"
+#include "util/time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/render_scheduler.h b/intern/cycles/integrator/render_scheduler.h
index a2c1e75d3b6..d7b7413ae31 100644
--- a/intern/cycles/integrator/render_scheduler.h
+++ b/intern/cycles/integrator/render_scheduler.h
@@ -19,7 +19,7 @@
 #include "integrator/adaptive_sampling.h"
 #include "integrator/denoiser.h" /* For DenoiseParams. */
 #include "session/buffers.h"
-#include "util/util_string.h"
+#include "util/string.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/shader_eval.cpp b/intern/cycles/integrator/shader_eval.cpp
index 3de7bb6fd16..42cbf87f254 100644
--- a/intern/cycles/integrator/shader_eval.cpp
+++ b/intern/cycles/integrator/shader_eval.cpp
@@ -17,14 +17,14 @@
 #include "integrator/shader_eval.h"
 
 #include "device/device.h"
-#include "device/device_queue.h"
+#include "device/queue.h"
 
 #include "device/cpu/kernel.h"
 #include "device/cpu/kernel_thread_globals.h"
 
-#include "util/util_logging.h"
-#include "util/util_progress.h"
-#include "util/util_tbb.h"
+#include "util/log.h"
+#include "util/progress.h"
+#include "util/tbb.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/shader_eval.h b/intern/cycles/integrator/shader_eval.h
index 43b6b1bdd47..3ae63b84d04 100644
--- a/intern/cycles/integrator/shader_eval.h
+++ b/intern/cycles/integrator/shader_eval.h
@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "device/device_memory.h"
+#include "device/memory.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
-#include "util/util_function.h"
+#include "util/function.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/tile.cpp b/intern/cycles/integrator/tile.cpp
index 3387b7bedf1..7ea73451d80 100644
--- a/intern/cycles/integrator/tile.cpp
+++ b/intern/cycles/integrator/tile.cpp
@@ -16,8 +16,8 @@
 
 #include "integrator/tile.h"
 
-#include "util/util_logging.h"
-#include "util/util_math.h"
+#include "util/log.h"
+#include "util/math.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/tile.h b/intern/cycles/integrator/tile.h
index d0824843ddb..879c68b875c 100644
--- a/intern/cycles/integrator/tile.h
+++ b/intern/cycles/integrator/tile.h
@@ -18,7 +18,7 @@
 
 #include <ostream>
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/work_balancer.cpp b/intern/cycles/integrator/work_balancer.cpp
index 9f96fe3632b..4c6fa341f35 100644
--- a/intern/cycles/integrator/work_balancer.cpp
+++ b/intern/cycles/integrator/work_balancer.cpp
@@ -16,9 +16,9 @@
 
 #include "integrator/work_balancer.h"
 
-#include "util/util_math.h"
+#include "util/math.h"
 
-#include "util/util_logging.h"
+#include "util/log.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/work_balancer.h b/intern/cycles/integrator/work_balancer.h
index fc5e561845e..86ff9335f91 100644
--- a/intern/cycles/integrator/work_balancer.h
+++ b/intern/cycles/integrator/work_balancer.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "util/util_vector.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/work_tile_scheduler.cpp b/intern/cycles/integrator/work_tile_scheduler.cpp
index a6775f27b65..c874dffde91 100644
--- a/intern/cycles/integrator/work_tile_scheduler.cpp
+++ b/intern/cycles/integrator/work_tile_scheduler.cpp
@@ -16,11 +16,11 @@
 
 #include "integrator/work_tile_scheduler.h"
 
-#include "device/device_queue.h"
+#include "device/queue.h"
 #include "integrator/tile.h"
 #include "session/buffers.h"
-#include "util/util_atomic.h"
-#include "util/util_logging.h"
+#include "util/atomic.h"
+#include "util/log.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/integrator/work_tile_scheduler.h b/intern/cycles/integrator/work_tile_scheduler.h
index 85f11b601c7..155bba5cb68 100644
--- a/intern/cycles/integrator/work_tile_scheduler.h
+++ b/intern/cycles/integrator/work_tile_scheduler.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "integrator/tile.h"
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index f27bcb41d3d..6d57eff3d22 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -47,41 +47,41 @@ set(SRC_DEVICE_OPTIX
 set(SRC_HEADERS
   bake/bake.h
   bvh/bvh.h
-  bvh/bvh_nodes.h
-  bvh/bvh_shadow_all.h
-  bvh/bvh_local.h
-  bvh/bvh_traversal.h
-  bvh/bvh_types.h
-  bvh/bvh_util.h
-  bvh/bvh_volume.h
-  bvh/bvh_volume_all.h
-  bvh/bvh_embree.h
+  bvh/nodes.h
+  bvh/shadow_all.h
+  bvh/local.h
+  bvh/traversal.h
+  bvh/types.h
+  bvh/util.h
+  bvh/volume.h
+  bvh/volume_all.h
+  bvh/embree.h
   camera/camera.h
-  camera/camera_projection.h
-  film/film_accumulate.h
-  film/film_adaptive_sampling.h
-  film/film_id_passes.h
-  film/film_passes.h
-  film/film_read.h
-  film/film_write_passes.h
-  integrator/integrator_path_state.h
-  integrator/integrator_shader_eval.h
-  integrator/integrator_shadow_catcher.h
-  kernel_textures.h
-  kernel_types.h
+  camera/projection.h
+  film/accumulate.h
+  film/adaptive_sampling.h
+  film/id_passes.h
+  film/passes.h
+  film/read.h
+  film/write_passes.h
+  integrator/path_state.h
+  integrator/shader_eval.h
+  integrator/shadow_catcher.h
+  textures.h
+  types.h
   light/light.h
-  light/light_background.h
-  light/light_common.h
-  light/light_sample.h
-  sample/sample_jitter.h
-  sample/sample_lcg.h
-  sample/sample_mapping.h
-  sample/sample_mis.h
-  sample/sample_pattern.h
-  util/util_color.h
-  util/util_differential.h
-  util/util_lookup_table.h
-  util/util_profiling.h
+  light/background.h
+  light/common.h
+  light/sample.h
+  sample/jitter.h
+  sample/lcg.h
+  sample/mapping.h
+  sample/mis.h
+  sample/pattern.h
+  util/color.h
+  util/differential.h
+  util/lookup_table.h
+  util/profiling.h
 )
 
 set(SRC_DEVICE_CPU_HEADERS
@@ -147,155 +147,155 @@ set(SRC_CLOSURE_HEADERS
 
 set(SRC_SVM_HEADERS
   svm/svm.h
-  svm/svm_ao.h
-  svm/svm_aov.h
-  svm/svm_attribute.h
-  svm/svm_bevel.h
-  svm/svm_blackbody.h
-  svm/svm_bump.h
-  svm/svm_camera.h
-  svm/svm_clamp.h
-  svm/svm_closure.h
-  svm/svm_convert.h
-  svm/svm_checker.h
-  svm/svm_color_util.h
-  svm/svm_brick.h
-  svm/svm_displace.h
-  svm/svm_fresnel.h
-  svm/svm_wireframe.h
-  svm/svm_wavelength.h
-  svm/svm_gamma.h
-  svm/svm_brightness.h
-  svm/svm_geometry.h
-  svm/svm_gradient.h
-  svm/svm_hsv.h
-  svm/svm_ies.h
-  svm/svm_image.h
-  svm/svm_invert.h
-  svm/svm_light_path.h
-  svm/svm_magic.h
-  svm/svm_map_range.h
-  svm/svm_mapping.h
-  svm/svm_mapping_util.h
-  svm/svm_math.h
-  svm/svm_math_util.h
-  svm/svm_mix.h
-  svm/svm_musgrave.h
-  svm/svm_noise.h
-  svm/svm_noisetex.h
-  svm/svm_normal.h
-  svm/svm_ramp.h
-  svm/svm_ramp_util.h
-  svm/svm_sepcomb_hsv.h
-  svm/svm_sepcomb_vector.h
-  svm/svm_sky.h
-  svm/svm_tex_coord.h
-  svm/svm_fractal_noise.h
-  svm/svm_types.h
-  svm/svm_value.h
-  svm/svm_vector_rotate.h
-  svm/svm_vector_transform.h
-  svm/svm_voronoi.h
-  svm/svm_voxel.h
-  svm/svm_wave.h
-  svm/svm_white_noise.h
-  svm/svm_vertex_color.h
+  svm/ao.h
+  svm/aov.h
+  svm/attribute.h
+  svm/bevel.h
+  svm/blackbody.h
+  svm/bump.h
+  svm/camera.h
+  svm/clamp.h
+  svm/closure.h
+  svm/convert.h
+  svm/checker.h
+  svm/color_util.h
+  svm/brick.h
+  svm/displace.h
+  svm/fresnel.h
+  svm/wireframe.h
+  svm/wavelength.h
+  svm/gamma.h
+  svm/brightness.h
+  svm/geometry.h
+  svm/gradient.h
+  svm/hsv.h
+  svm/ies.h
+  svm/image.h
+  svm/invert.h
+  svm/light_path.h
+  svm/magic.h
+  svm/map_range.h
+  svm/mapping.h
+  svm/mapping_util.h
+  svm/math.h
+  svm/math_util.h
+  svm/mix.h
+  svm/musgrave.h
+  svm/noise.h
+  svm/noisetex.h
+  svm/normal.h
+  svm/ramp.h
+  svm/ramp_util.h
+  svm/sepcomb_hsv.h
+  svm/sepcomb_vector.h
+  svm/sky.h
+  svm/tex_coord.h
+  svm/fractal_noise.h
+  svm/types.h
+  svm/value.h
+  svm/vector_rotate.h
+  svm/vector_transform.h
+  svm/voronoi.h
+  svm/voxel.h
+  svm/wave.h
+  svm/white_noise.h
+  svm/vertex_color.h
 )
 
 set(SRC_GEOM_HEADERS
   geom/geom.h
-  geom/geom_attribute.h
-  geom/geom_curve.h
-  geom/geom_curve_intersect.h
-  geom/geom_motion_curve.h
-  geom/geom_motion_triangle.h
-  geom/geom_motion_triangle_intersect.h
-  geom/geom_motion_triangle_shader.h
-  geom/geom_object.h
-  geom/geom_patch.h
-  geom/geom_primitive.h
-  geom/geom_shader_data.h
-  geom/geom_subd_triangle.h
-  geom/geom_triangle.h
-  geom/geom_triangle_intersect.h
-  geom/geom_volume.h
+  geom/attribute.h
+  geom/curve.h
+  geom/curve_intersect.h
+  geom/motion_curve.h
+  geom/motion_triangle.h
+  geom/motion_triangle_intersect.h
+  geom/motion_triangle_shader.h
+  geom/object.h
+  geom/patch.h
+  geom/primitive.h
+  geom/shader_data.h
+  geom/subd_triangle.h
+  geom/triangle.h
+  geom/triangle_intersect.h
+  geom/volume.h
 )
 
 set(SRC_INTEGRATOR_HEADERS
-  integrator/integrator_init_from_bake.h
-  integrator/integrator_init_from_camera.h
-  integrator/integrator_intersect_closest.h
-  integrator/integrator_intersect_shadow.h
-  integrator/integrator_intersect_subsurface.h
-  integrator/integrator_intersect_volume_stack.h
-  integrator/integrator_megakernel.h
-  integrator/integrator_shade_background.h
-  integrator/integrator_shade_light.h
-  integrator/integrator_shade_shadow.h
-  integrator/integrator_shade_surface.h
-  integrator/integrator_shade_volume.h
-  integrator/integrator_shadow_state_template.h
-  integrator/integrator_state.h
-  integrator/integrator_state_flow.h
-  integrator/integrator_state_template.h
-  integrator/integrator_state_util.h
-  integrator/integrator_subsurface.h
-  integrator/integrator_subsurface_disk.h
-  integrator/integrator_subsurface_random_walk.h
-  integrator/integrator_volume_stack.h
+  integrator/init_from_bake.h
+  integrator/init_from_camera.h
+  integrator/intersect_closest.h
+  integrator/intersect_shadow.h
+  integrator/intersect_subsurface.h
+  integrator/intersect_volume_stack.h
+  integrator/megakernel.h
+  integrator/shade_background.h
+  integrator/shade_light.h
+  integrator/shade_shadow.h
+  integrator/shade_surface.h
+  integrator/shade_volume.h
+  integrator/shadow_state_template.h
+  integrator/state.h
+  integrator/state_flow.h
+  integrator/state_template.h
+  integrator/state_util.h
+  integrator/subsurface.h
+  integrator/subsurface_disk.h
+  integrator/subsurface_random_walk.h
+  integrator/volume_stack.h
 )
 
 set(SRC_UTIL_HEADERS
-  ../util/util_atomic.h
-  ../util/util_color.h
-  ../util/util_defines.h
-  ../util/util_half.h
-  ../util/util_hash.h
-  ../util/util_math.h
-  ../util/util_math_fast.h
-  ../util/util_math_intersect.h
-  ../util/util_math_float2.h
-  ../util/util_math_float3.h
-  ../util/util_math_float4.h
-  ../util/util_math_int2.h
-  ../util/util_math_int3.h
-  ../util/util_math_int4.h
-  ../util/util_math_matrix.h
-  ../util/util_projection.h
-  ../util/util_rect.h
-  ../util/util_static_assert.h
-  ../util/util_transform.h
-  ../util/util_texture.h
-  ../util/util_types.h
-  ../util/util_types_float2.h
-  ../util/util_types_float2_impl.h
-  ../util/util_types_float3.h
-  ../util/util_types_float3_impl.h
-  ../util/util_types_float4.h
-  ../util/util_types_float4_impl.h
-  ../util/util_types_float8.h
-  ../util/util_types_float8_impl.h
-  ../util/util_types_int2.h
-  ../util/util_types_int2_impl.h
-  ../util/util_types_int3.h
-  ../util/util_types_int3_impl.h
-  ../util/util_types_int4.h
-  ../util/util_types_int4_impl.h
-  ../util/util_types_uchar2.h
-  ../util/util_types_uchar2_impl.h
-  ../util/util_types_uchar3.h
-  ../util/util_types_uchar3_impl.h
-  ../util/util_types_uchar4.h
-  ../util/util_types_uchar4_impl.h
-  ../util/util_types_uint2.h
-  ../util/util_types_uint2_impl.h
-  ../util/util_types_uint3.h
-  ../util/util_types_uint3_impl.h
-  ../util/util_types_uint4.h
-  ../util/util_types_uint4_impl.h
-  ../util/util_types_ushort4.h
-  ../util/util_types_vector3.h
-  ../util/util_types_vector3_impl.h
+  ../util/atomic.h
+  ../util/color.h
+  ../util/defines.h
+  ../util/half.h
+  ../util/hash.h
+  ../util/math.h
+  ../util/math_fast.h
+  ../util/math_intersect.h
+  ../util/math_float2.h
+  ../util/math_float3.h
+  ../util/math_float4.h
+  ../util/math_int2.h
+  ../util/math_int3.h
+  ../util/math_int4.h
+  ../util/math_matrix.h
+  ../util/projection.h
+  ../util/rect.h
+  ../util/static_assert.h
+  ../util/transform.h
+  ../util/texture.h
+  ../util/types.h
+  ../util/types_float2.h
+  ../util/types_float2_impl.h
+  ../util/types_float3.h
+  ../util/types_float3_impl.h
+  ../util/types_float4.h
+  ../util/types_float4_impl.h
+  ../util/types_float8.h
+  ../util/types_float8_impl.h
+  ../util/types_int2.h
+  ../util/types_int2_impl.h
+  ../util/types_int3.h
+  ../util/types_int3_impl.h
+  ../util/types_int4.h
+  ../util/types_int4_impl.h
+  ../util/types_uchar2.h
+  ../util/types_uchar2_impl.h
+  ../util/types_uchar3.h
+  ../util/types_uchar3_impl.h
+  ../util/types_uchar4.h
+  ../util/types_uchar4_impl.h
+  ../util/types_uint2.h
+  ../util/types_uint2_impl.h
+  ../util/types_uint3.h
+  ../util/types_uint3_impl.h
+  ../util/types_uint4.h
+  ../util/types_uint4_impl.h
+  ../util/types_ushort4.h
+  ../util/types_vector3.h
+  ../util/types_vector3_impl.h
 )
 
 set(LIB
diff --git a/intern/cycles/kernel/bake/bake.h b/intern/cycles/kernel/bake/bake.h
index e234d56bd3c..0a78a635d75 100644
--- a/intern/cycles/kernel/bake/bake.h
+++ b/intern/cycles/kernel/bake/bake.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "kernel/camera/camera_projection.h"
-#include "kernel/integrator/integrator_shader_eval.h"
+#include "kernel/camera/projection.h"
+#include "kernel/integrator/shader_eval.h"
 
 #include "kernel/geom/geom.h"
 
diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h
index 813ac15711e..0e083812355 100644
--- a/intern/cycles/kernel/bvh/bvh.h
+++ b/intern/cycles/kernel/bvh/bvh.h
@@ -28,13 +28,13 @@
 #pragma once
 
 #ifdef __EMBREE__
-#  include "kernel/bvh/bvh_embree.h"
+#  include "kernel/bvh/embree.h"
 #endif
 
-#include "kernel/bvh/bvh_types.h"
-#include "kernel/bvh/bvh_util.h"
+#include "kernel/bvh/types.h"
+#include "kernel/bvh/util.h"
 
-#include "kernel/integrator/integrator_state_util.h"
+#include "kernel/integrator/state_util.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -42,28 +42,28 @@ CCL_NAMESPACE_BEGIN
 
 /* Regular BVH traversal */
 
-#  include "kernel/bvh/bvh_nodes.h"
+#  include "kernel/bvh/nodes.h"
 
 #  define BVH_FUNCTION_NAME bvh_intersect
 #  define BVH_FUNCTION_FEATURES 0
-#  include "kernel/bvh/bvh_traversal.h"
+#  include "kernel/bvh/traversal.h"
 
 #  if defined(__HAIR__)
 #    define BVH_FUNCTION_NAME bvh_intersect_hair
 #    define BVH_FUNCTION_FEATURES BVH_HAIR
-#    include "kernel/bvh/bvh_traversal.h"
+#    include "kernel/bvh/traversal.h"
 #  endif
 
 #  if defined(__OBJECT_MOTION__)
 #    define BVH_FUNCTION_NAME bvh_intersect_motion
 #    define BVH_FUNCTION_FEATURES BVH_MOTION
-#    include "kernel/bvh/bvh_traversal.h"
+#    include "kernel/bvh/traversal.h"
 #  endif
 
 #  if defined(__HAIR__) && defined(__OBJECT_MOTION__)
 #    define BVH_FUNCTION_NAME bvh_intersect_hair_motion
 #    define BVH_FUNCTION_FEATURES BVH_HAIR | BVH_MOTION
-#    include "kernel/bvh/bvh_traversal.h"
+#    include "kernel/bvh/traversal.h"
 #  endif
 
 /* Subsurface scattering BVH traversal */
@@ -71,12 +71,12 @@ CCL_NAMESPACE_BEGIN
 #  if defined(__BVH_LOCAL__)
 #    define BVH_FUNCTION_NAME bvh_intersect_local
 #    define BVH_FUNCTION_FEATURES BVH_HAIR
-#    include "kernel/bvh/bvh_local.h"
+#    include "kernel/bvh/local.h"
 
 #    if defined(__OBJECT_MOTION__)
 #      define BVH_FUNCTION_NAME bvh_intersect_local_motion
 #      define BVH_FUNCTION_FEATURES BVH_MOTION | BVH_HAIR
-#      include "kernel/bvh/bvh_local.h"
+#      include "kernel/bvh/local.h"
 #    endif
 #  endif /* __BVH_LOCAL__ */
 
@@ -85,12 +85,12 @@ CCL_NAMESPACE_BEGIN
 #  if defined(__VOLUME__)
 #    define BVH_FUNCTION_NAME bvh_intersect_volume
 #    define BVH_FUNCTION_FEATURES BVH_HAIR
-#    include "kernel/bvh/bvh_volume.h"
+#    include "kernel/bvh/volume.h"
 
 #    if defined(__OBJECT_MOTION__)
 #      define BVH_FUNCTION_NAME bvh_intersect_volume_motion
 #      define BVH_FUNCTION_FEATURES BVH_MOTION | BVH_HAIR
-#      include "kernel/bvh/bvh_volume.h"
+#      include "kernel/bvh/volume.h"
 #    endif
 #  endif /* __VOLUME__ */
 
@@ -99,24 +99,24 @@ CCL_NAMESPACE_BEGIN
 #  if defined(__SHADOW_RECORD_ALL__)
 #    define BVH_FUNCTION_NAME bvh_intersect_shadow_all
 #    define BVH_FUNCTION_FEATURES 0
-#    include "kernel/bvh/bvh_shadow_all.h"
+#    include "kernel/bvh/shadow_all.h"
 
 #    if defined(__HAIR__)
 #      define BVH_FUNCTION_NAME bvh_intersect_shadow_all_hair
 #      define BVH_FUNCTION_FEATURES BVH_HAIR
-#      include "kernel/bvh/bvh_shadow_all.h"
+#      include "kernel/bvh/shadow_all.h"
 #    endif
 
 #    if defined(__OBJECT_MOTION__)
 #      define BVH_FUNCTION_NAME bvh_intersect_shadow_all_motion
 #      define BVH_FUNCTION_FEATURES BVH_MOTION
-#      include "kernel/bvh/bvh_shadow_all.h"
+#      include "kernel/bvh/shadow_all.h"
 #    endif
 
 #    if defined(__HAIR__) && defined(__OBJECT_MOTION__)
 #      define BVH_FUNCTION_NAME bvh_intersect_shadow_all_hair_motion
 #      define BVH_FUNCTION_FEATURES BVH_HAIR | BVH_MOTION
-#      include "kernel/bvh/bvh_shadow_all.h"
+#      include "kernel/bvh/shadow_all.h"
 #    endif
 #  endif /* __SHADOW_RECORD_ALL__ */
 
@@ -125,12 +125,12 @@ CCL_NAMESPACE_BEGIN
 #  if defined(__VOLUME_RECORD_ALL__)
 #    define BVH_FUNCTION_NAME bvh_intersect_volume_all
 #    define BVH_FUNCTION_FEATURES BVH_HAIR
-#    include "kernel/bvh/bvh_volume_all.h"
+#    include "kernel/bvh/volume_all.h"
 
 #    if defined(__OBJECT_MOTION__)
 #      define BVH_FUNCTION_NAME bvh_intersect_volume_all_motion
 #      define BVH_FUNCTION_FEATURES BVH_MOTION | BVH_HAIR
-#      include "kernel/bvh/bvh_volume_all.h"
+#      include "kernel/bvh/volume_all.h"
 #    endif
 #  endif /* __VOLUME_RECORD_ALL__ */
 
diff --git a/intern/cycles/kernel/bvh/bvh_embree.h b/intern/cycles/kernel/bvh/embree.h
index 321e0f28dae..9edd4f90a7e 100644
--- a/intern/cycles/kernel/bvh/bvh_embree.h
+++ b/intern/cycles/kernel/bvh/embree.h
@@ -22,7 +22,7 @@
 #include "kernel/device/cpu/compat.h"
 #include "kernel/device/cpu/globals.h"
 
-#include "util/util_vector.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/bvh/bvh_local.h b/intern/cycles/kernel/bvh/local.h
index 79cde69699e..79cde69699e 100644
--- a/intern/cycles/kernel/bvh/bvh_local.h
+++ b/intern/cycles/kernel/bvh/local.h
diff --git a/intern/cycles/kernel/bvh/bvh_nodes.h b/intern/cycles/kernel/bvh/nodes.h
index 71122085f69..71122085f69 100644
--- a/intern/cycles/kernel/bvh/bvh_nodes.h
+++ b/intern/cycles/kernel/bvh/nodes.h
diff --git a/intern/cycles/kernel/bvh/bvh_shadow_all.h b/intern/cycles/kernel/bvh/shadow_all.h
index 049c6a03fe0..049c6a03fe0 100644
--- a/intern/cycles/kernel/bvh/bvh_shadow_all.h
+++ b/intern/cycles/kernel/bvh/shadow_all.h
diff --git a/intern/cycles/kernel/bvh/bvh_traversal.h b/intern/cycles/kernel/bvh/traversal.h
index 1c17ebf767f..1c17ebf767f 100644
--- a/intern/cycles/kernel/bvh/bvh_traversal.h
+++ b/intern/cycles/kernel/bvh/traversal.h
diff --git a/intern/cycles/kernel/bvh/bvh_types.h b/intern/cycles/kernel/bvh/types.h
index 6039e707fc3..6039e707fc3 100644
--- a/intern/cycles/kernel/bvh/bvh_types.h
+++ b/intern/cycles/kernel/bvh/types.h
diff --git a/intern/cycles/kernel/bvh/bvh_util.h b/intern/cycles/kernel/bvh/util.h
index 8686f887021..8686f887021 100644
--- a/intern/cycles/kernel/bvh/bvh_util.h
+++ b/intern/cycles/kernel/bvh/util.h
diff --git a/intern/cycles/kernel/bvh/bvh_volume.h b/intern/cycles/kernel/bvh/volume.h
index fa56bd02bef..fa56bd02bef 100644
--- a/intern/cycles/kernel/bvh/bvh_volume.h
+++ b/intern/cycles/kernel/bvh/volume.h
diff --git a/intern/cycles/kernel/bvh/bvh_volume_all.h b/intern/cycles/kernel/bvh/volume_all.h
index 1d7d942e736..1d7d942e736 100644
--- a/intern/cycles/kernel/bvh/bvh_volume_all.h
+++ b/intern/cycles/kernel/bvh/volume_all.h
diff --git a/intern/cycles/kernel/camera/camera.h b/intern/cycles/kernel/camera/camera.h
index 66bc25bb879..e966e9e1596 100644
--- a/intern/cycles/kernel/camera/camera.h
+++ b/intern/cycles/kernel/camera/camera.h
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include "kernel/camera/camera_projection.h"
-#include "kernel/sample/sample_mapping.h"
-#include "kernel/util/util_differential.h"
-#include "kernel/util/util_lookup_table.h"
+#include "kernel/camera/projection.h"
+#include "kernel/sample/mapping.h"
+#include "kernel/util/differential.h"
+#include "kernel/util/lookup_table.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/camera/camera_projection.h b/intern/cycles/kernel/camera/projection.h
index 0aea82fa812..0aea82fa812 100644
--- a/intern/cycles/kernel/camera/camera_projection.h
+++ b/intern/cycles/kernel/camera/projection.h
diff --git a/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h b/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
index fa88c66f536..b2a9c9555c3 100644
--- a/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
+++ b/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#include "kernel/sample/sample_mapping.h"
+#include "kernel/sample/mapping.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/closure/bsdf_diffuse.h b/intern/cycles/kernel/closure/bsdf_diffuse.h
index dd3b4500b1f..3139cb612fa 100644
--- a/intern/cycles/kernel/closure/bsdf_diffuse.h
+++ b/intern/cycles/kernel/closure/bsdf_diffuse.h
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#include "kernel/sample/sample_mapping.h"
+#include "kernel/sample/mapping.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
index 1e70d3e534e..fbb82617dad 100644
--- a/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
+++ b/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#include "kernel/sample/sample_mapping.h"
+#include "kernel/sample/mapping.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/closure/bsdf_hair_principled.h b/intern/cycles/kernel/closure/bsdf_hair_principled.h
index ff554d4a60e..f55ea0f6a2e 100644
--- a/intern/cycles/kernel/closure/bsdf_hair_principled.h
+++ b/intern/cycles/kernel/closure/bsdf_hair_principled.h
@@ -20,7 +20,7 @@
 #  include <fenv.h>
 #endif
 
-#include "kernel/util/util_color.h"
+#include "kernel/util/color.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h
index 28aac368f2b..83242a73685 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet.h
@@ -32,8 +32,11 @@
 
 #pragma once
 
-#include "kernel/sample/sample_pattern.h"
-#include "kernel/util/util_lookup_table.h"
+#include "kernel/closure/bsdf_util.h"
+
+#include "kernel/sample/pattern.h"
+
+#include "kernel/util/lookup_table.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
index b1ab8d7ffd0..77370fbec4e 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet_multi.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "kernel/sample/sample_lcg.h"
-#include "kernel/sample/sample_mapping.h"
+#include "kernel/sample/lcg.h"
+#include "kernel/sample/mapping.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/closure/bsdf_principled_diffuse.h b/intern/cycles/kernel/closure/bsdf_principled_diffuse.h
index 0e3b21117b5..69376c1294d 100644
--- a/intern/cycles/kernel/closure/bsdf_principled_diffuse.h
+++ b/intern/cycles/kernel/closure/bsdf_principled_diffuse.h
@@ -27,7 +27,7 @@
 
 #include "kernel/closure/bsdf_util.h"
 
-#include "kernel/sample/sample_mapping.h"
+#include "kernel/sample/mapping.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/device/cpu/compat.h b/intern/cycles/kernel/device/cpu/compat.h
index 888c0d5d872..5ccca52255f 100644
--- a/intern/cycles/kernel/device/cpu/compat.h
+++ b/intern/cycles/kernel/device/cpu/compat.h
@@ -26,11 +26,11 @@
 #  pragma GCC diagnostic ignored "-Wuninitialized"
 #endif
 
-#include "util/util_half.h"
-#include "util/util_math.h"
-#include "util/util_simd.h"
-#include "util/util_texture.h"
-#include "util/util_types.h"
+#include "util/half.h"
+#include "util/math.h"
+#include "util/simd.h"
+#include "util/texture.h"
+#include "util/types.h"
 
 /* On x86_64, versions of glibc < 2.16 have an issue where expf is
  * much slower than the double version.  This was fixed in glibc 2.16.
diff --git a/intern/cycles/kernel/device/cpu/globals.h b/intern/cycles/kernel/device/cpu/globals.h
index f3e530a9edc..dd0327b3f94 100644
--- a/intern/cycles/kernel/device/cpu/globals.h
+++ b/intern/cycles/kernel/device/cpu/globals.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "kernel/kernel_types.h"
-#include "kernel/util/util_profiling.h"
+#include "kernel/types.h"
+#include "kernel/util/profiling.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -36,7 +36,7 @@ struct OSLShadingSystem;
 
 typedef struct KernelGlobalsCPU {
 #define KERNEL_TEX(type, name) texture<type> name;
-#include "kernel/kernel_textures.h"
+#include "kernel/textures.h"
 
   KernelData __data;
 
diff --git a/intern/cycles/kernel/device/cpu/kernel.cpp b/intern/cycles/kernel/device/cpu/kernel.cpp
index 8519b77aa08..a16c637d5ac 100644
--- a/intern/cycles/kernel/device/cpu/kernel.cpp
+++ b/intern/cycles/kernel/device/cpu/kernel.cpp
@@ -85,7 +85,7 @@ void kernel_global_memory_copy(KernelGlobalsCPU *kg, const char *name, void *mem
     kg->tname.data = (type *)mem; \
     kg->tname.width = size; \
   }
-#include "kernel/kernel_textures.h"
+#include "kernel/textures.h"
   else {
     assert(0);
   }
diff --git a/intern/cycles/kernel/device/cpu/kernel.h b/intern/cycles/kernel/device/cpu/kernel.h
index 28337a58898..c49d7ca445a 100644
--- a/intern/cycles/kernel/device/cpu/kernel.h
+++ b/intern/cycles/kernel/device/cpu/kernel.h
@@ -18,9 +18,9 @@
 
 /* CPU Kernel Interface */
 
-#include "util/util_types.h"
+#include "util/types.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/device/cpu/kernel_arch_impl.h b/intern/cycles/kernel/device/cpu/kernel_arch_impl.h
index 148b6a33cb5..6df5d7787fc 100644
--- a/intern/cycles/kernel/device/cpu/kernel_arch_impl.h
+++ b/intern/cycles/kernel/device/cpu/kernel_arch_impl.h
@@ -29,26 +29,26 @@
 #    include "kernel/device/cpu/globals.h"
 #    include "kernel/device/cpu/image.h"
 
-#    include "kernel/integrator/integrator_state.h"
-#    include "kernel/integrator/integrator_state_flow.h"
-#    include "kernel/integrator/integrator_state_util.h"
-
-#    include "kernel/integrator/integrator_init_from_camera.h"
-#    include "kernel/integrator/integrator_init_from_bake.h"
-#    include "kernel/integrator/integrator_intersect_closest.h"
-#    include "kernel/integrator/integrator_intersect_shadow.h"
-#    include "kernel/integrator/integrator_intersect_subsurface.h"
-#    include "kernel/integrator/integrator_intersect_volume_stack.h"
-#    include "kernel/integrator/integrator_shade_background.h"
-#    include "kernel/integrator/integrator_shade_light.h"
-#    include "kernel/integrator/integrator_shade_shadow.h"
-#    include "kernel/integrator/integrator_shade_surface.h"
-#    include "kernel/integrator/integrator_shade_volume.h"
-#    include "kernel/integrator/integrator_megakernel.h"
-
-#    include "kernel/film/film_adaptive_sampling.h"
-#    include "kernel/film/film_read.h"
-#    include "kernel/film/film_id_passes.h"
+#    include "kernel/integrator/state.h"
+#    include "kernel/integrator/state_flow.h"
+#    include "kernel/integrator/state_util.h"
+
+#    include "kernel/integrator/init_from_camera.h"
+#    include "kernel/integrator/init_from_bake.h"
+#    include "kernel/integrator/intersect_closest.h"
+#    include "kernel/integrator/intersect_shadow.h"
+#    include "kernel/integrator/intersect_subsurface.h"
+#    include "kernel/integrator/intersect_volume_stack.h"
+#    include "kernel/integrator/shade_background.h"
+#    include "kernel/integrator/shade_light.h"
+#    include "kernel/integrator/shade_shadow.h"
+#    include "kernel/integrator/shade_surface.h"
+#    include "kernel/integrator/shade_volume.h"
+#    include "kernel/integrator/megakernel.h"
+
+#    include "kernel/film/adaptive_sampling.h"
+#    include "kernel/film/read.h"
+#    include "kernel/film/id_passes.h"
 
 #    include "kernel/bake/bake.h"
 
diff --git a/intern/cycles/kernel/device/cpu/kernel_avx.cpp b/intern/cycles/kernel/device/cpu/kernel_avx.cpp
index 220768036ab..cece750a255 100644
--- a/intern/cycles/kernel/device/cpu/kernel_avx.cpp
+++ b/intern/cycles/kernel/device/cpu/kernel_avx.cpp
@@ -18,7 +18,7 @@
  * optimization flags and nearly all functions inlined, while kernel.cpp
  * is compiled without for other CPU's. */
 
-#include "util/util_optimization.h"
+#include "util/optimization.h"
 
 #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_AVX
 #  define KERNEL_STUB
diff --git a/intern/cycles/kernel/device/cpu/kernel_avx2.cpp b/intern/cycles/kernel/device/cpu/kernel_avx2.cpp
index 90c05113cbe..fad4581236e 100644
--- a/intern/cycles/kernel/device/cpu/kernel_avx2.cpp
+++ b/intern/cycles/kernel/device/cpu/kernel_avx2.cpp
@@ -18,7 +18,7 @@
  * optimization flags and nearly all functions inlined, while kernel.cpp
  * is compiled without for other CPU's. */
 
-#include "util/util_optimization.h"
+#include "util/optimization.h"
 
 #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2
 #  define KERNEL_STUB
diff --git a/intern/cycles/kernel/device/cpu/kernel_sse2.cpp b/intern/cycles/kernel/device/cpu/kernel_sse2.cpp
index fb85ef5b0d0..5fb4849ac08 100644
--- a/intern/cycles/kernel/device/cpu/kernel_sse2.cpp
+++ b/intern/cycles/kernel/device/cpu/kernel_sse2.cpp
@@ -18,7 +18,7 @@
  * optimization flags and nearly all functions inlined, while kernel.cpp
  * is compiled without for other CPU's. */
 
-#include "util/util_optimization.h"
+#include "util/optimization.h"
 
 #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2
 #  define KERNEL_STUB
diff --git a/intern/cycles/kernel/device/cpu/kernel_sse3.cpp b/intern/cycles/kernel/device/cpu/kernel_sse3.cpp
index 87baf04258a..c9424682fd4 100644
--- a/intern/cycles/kernel/device/cpu/kernel_sse3.cpp
+++ b/intern/cycles/kernel/device/cpu/kernel_sse3.cpp
@@ -18,7 +18,7 @@
  * optimization flags and nearly all functions inlined, while kernel.cpp
  * is compiled without for other CPU's. */
 
-#include "util/util_optimization.h"
+#include "util/optimization.h"
 
 #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3
 #  define KERNEL_STUB
diff --git a/intern/cycles/kernel/device/cpu/kernel_sse41.cpp b/intern/cycles/kernel/device/cpu/kernel_sse41.cpp
index bb421d58815..849ebf51989 100644
--- a/intern/cycles/kernel/device/cpu/kernel_sse41.cpp
+++ b/intern/cycles/kernel/device/cpu/kernel_sse41.cpp
@@ -18,7 +18,7 @@
  * optimization flags and nearly all functions inlined, while kernel.cpp
  * is compiled without for other CPU's. */
 
-#include "util/util_optimization.h"
+#include "util/optimization.h"
 
 #ifndef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41
 #  define KERNEL_STUB
diff --git a/intern/cycles/kernel/device/cuda/compat.h b/intern/cycles/kernel/device/cuda/compat.h
index 8a50eb1a3d5..1ee82e6eb7c 100644
--- a/intern/cycles/kernel/device/cuda/compat.h
+++ b/intern/cycles/kernel/device/cuda/compat.h
@@ -137,5 +137,5 @@ __device__ float __half2float(const half h)
 
 /* Types */
 
-#include "util/util_half.h"
-#include "util/util_types.h"
+#include "util/half.h"
+#include "util/types.h"
diff --git a/intern/cycles/kernel/device/cuda/globals.h b/intern/cycles/kernel/device/cuda/globals.h
index cde935198b3..e5023fad40c 100644
--- a/intern/cycles/kernel/device/cuda/globals.h
+++ b/intern/cycles/kernel/device/cuda/globals.h
@@ -18,11 +18,11 @@
 
 #pragma once
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
-#include "kernel/integrator/integrator_state.h"
+#include "kernel/integrator/state.h"
 
-#include "kernel/util/util_profiling.h"
+#include "kernel/util/profiling.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -36,7 +36,7 @@ typedef ccl_global const KernelGlobalsGPU *ccl_restrict KernelGlobals;
 /* Global scene data and textures */
 __constant__ KernelData __data;
 #define KERNEL_TEX(type, name) const __constant__ __device__ type *name;
-#include "kernel/kernel_textures.h"
+#include "kernel/textures.h"
 
 /* Integrator state */
 __constant__ IntegratorStateGPU __integrator_state;
diff --git a/intern/cycles/kernel/device/gpu/kernel.h b/intern/cycles/kernel/device/gpu/kernel.h
index aa360b3016a..f86a8c692aa 100644
--- a/intern/cycles/kernel/device/gpu/kernel.h
+++ b/intern/cycles/kernel/device/gpu/kernel.h
@@ -21,26 +21,26 @@
 #include "kernel/device/gpu/parallel_sorted_index.h"
 #include "kernel/device/gpu/work_stealing.h"
 
-#include "kernel/integrator/integrator_state.h"
-#include "kernel/integrator/integrator_state_flow.h"
-#include "kernel/integrator/integrator_state_util.h"
-
-#include "kernel/integrator/integrator_init_from_bake.h"
-#include "kernel/integrator/integrator_init_from_camera.h"
-#include "kernel/integrator/integrator_intersect_closest.h"
-#include "kernel/integrator/integrator_intersect_shadow.h"
-#include "kernel/integrator/integrator_intersect_subsurface.h"
-#include "kernel/integrator/integrator_intersect_volume_stack.h"
-#include "kernel/integrator/integrator_shade_background.h"
-#include "kernel/integrator/integrator_shade_light.h"
-#include "kernel/integrator/integrator_shade_shadow.h"
-#include "kernel/integrator/integrator_shade_surface.h"
-#include "kernel/integrator/integrator_shade_volume.h"
+#include "kernel/integrator/state.h"
+#include "kernel/integrator/state_flow.h"
+#include "kernel/integrator/state_util.h"
+
+#include "kernel/integrator/init_from_bake.h"
+#include "kernel/integrator/init_from_camera.h"
+#include "kernel/integrator/intersect_closest.h"
+#include "kernel/integrator/intersect_shadow.h"
+#include "kernel/integrator/intersect_subsurface.h"
+#include "kernel/integrator/intersect_volume_stack.h"
+#include "kernel/integrator/shade_background.h"
+#include "kernel/integrator/shade_light.h"
+#include "kernel/integrator/shade_shadow.h"
+#include "kernel/integrator/shade_surface.h"
+#include "kernel/integrator/shade_volume.h"
 
 #include "kernel/bake/bake.h"
 
-#include "kernel/film/film_adaptive_sampling.h"
-#include "kernel/film/film_read.h"
+#include "kernel/film/adaptive_sampling.h"
+#include "kernel/film/read.h"
 
 /* --------------------------------------------------------------------
  * Integrator.
diff --git a/intern/cycles/kernel/device/gpu/parallel_active_index.h b/intern/cycles/kernel/device/gpu/parallel_active_index.h
index db4a4bf71e0..d7416beb783 100644
--- a/intern/cycles/kernel/device/gpu/parallel_active_index.h
+++ b/intern/cycles/kernel/device/gpu/parallel_active_index.h
@@ -23,7 +23,7 @@ CCL_NAMESPACE_BEGIN
  *
  * Shared memory requirement is `sizeof(int) * (number_of_warps + 1)`. */
 
-#include "util/util_atomic.h"
+#include "util/atomic.h"
 
 #ifdef __HIP__
 #  define GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE 1024
diff --git a/intern/cycles/kernel/device/gpu/parallel_prefix_sum.h b/intern/cycles/kernel/device/gpu/parallel_prefix_sum.h
index aabe6e2e27a..6de3a022569 100644
--- a/intern/cycles/kernel/device/gpu/parallel_prefix_sum.h
+++ b/intern/cycles/kernel/device/gpu/parallel_prefix_sum.h
@@ -25,7 +25,7 @@ CCL_NAMESPACE_BEGIN
  * This is used for an array the size of the number of shaders in the scene
  * which is not usually huge, so might not be a significant bottleneck. */
 
-#include "util/util_atomic.h"
+#include "util/atomic.h"
 
 #ifdef __HIP__
 #  define GPU_PARALLEL_PREFIX_SUM_DEFAULT_BLOCK_SIZE 1024
diff --git a/intern/cycles/kernel/device/gpu/parallel_sorted_index.h b/intern/cycles/kernel/device/gpu/parallel_sorted_index.h
index 7570c5a6bbd..c06d7be444f 100644
--- a/intern/cycles/kernel/device/gpu/parallel_sorted_index.h
+++ b/intern/cycles/kernel/device/gpu/parallel_sorted_index.h
@@ -24,7 +24,7 @@ CCL_NAMESPACE_BEGIN
  *
  * TODO: there may be ways to optimize this to avoid this many atomic ops? */
 
-#include "util/util_atomic.h"
+#include "util/atomic.h"
 
 #ifdef __HIP__
 #  define GPU_PARALLEL_SORTED_INDEX_DEFAULT_BLOCK_SIZE 1024
diff --git a/intern/cycles/kernel/device/hip/compat.h b/intern/cycles/kernel/device/hip/compat.h
index 089976d84e4..282c3eca641 100644
--- a/intern/cycles/kernel/device/hip/compat.h
+++ b/intern/cycles/kernel/device/hip/compat.h
@@ -116,5 +116,5 @@ ccl_device_forceinline T ccl_gpu_tex_object_read_3D(const ccl_gpu_tex_object tex
 
 /* Types */
 
-#include "util/util_half.h"
-#include "util/util_types.h"
+#include "util/half.h"
+#include "util/types.h"
diff --git a/intern/cycles/kernel/device/hip/globals.h b/intern/cycles/kernel/device/hip/globals.h
index 079944bd8f2..d9a560d668b 100644
--- a/intern/cycles/kernel/device/hip/globals.h
+++ b/intern/cycles/kernel/device/hip/globals.h
@@ -18,11 +18,11 @@
 
 #pragma once
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
-#include "kernel/integrator/integrator_state.h"
+#include "kernel/integrator/state.h"
 
-#include "kernel/util/util_profiling.h"
+#include "kernel/util/profiling.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -36,7 +36,7 @@ typedef ccl_global const KernelGlobalsGPU *ccl_restrict KernelGlobals;
 /* Global scene data and textures */
 __constant__ KernelData __data;
 #define KERNEL_TEX(type, name) __attribute__((used)) const __constant__ __device__ type *name;
-#include "kernel/kernel_textures.h"
+#include "kernel/textures.h"
 
 /* Integrator state */
 __constant__ IntegratorStateGPU __integrator_state;
diff --git a/intern/cycles/kernel/device/optix/compat.h b/intern/cycles/kernel/device/optix/compat.h
index d27b7d55475..835e4621d47 100644
--- a/intern/cycles/kernel/device/optix/compat.h
+++ b/intern/cycles/kernel/device/optix/compat.h
@@ -129,5 +129,5 @@ __device__ float __half2float(const half h)
 
 /* Types */
 
-#include "util/util_half.h"
-#include "util/util_types.h"
+#include "util/half.h"
+#include "util/types.h"
diff --git a/intern/cycles/kernel/device/optix/globals.h b/intern/cycles/kernel/device/optix/globals.h
index e038bc1797a..e9b72369cd5 100644
--- a/intern/cycles/kernel/device/optix/globals.h
+++ b/intern/cycles/kernel/device/optix/globals.h
@@ -18,11 +18,11 @@
 
 #pragma once
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
-#include "kernel/integrator/integrator_state.h"
+#include "kernel/integrator/state.h"
 
-#include "kernel/util/util_profiling.h"
+#include "kernel/util/profiling.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -42,7 +42,7 @@ struct KernelParamsOptiX {
   /* Global scene data and textures */
   KernelData data;
 #define KERNEL_TEX(type, name) const type *name;
-#include "kernel/kernel_textures.h"
+#include "kernel/textures.h"
 
   /* Integrator state */
   IntegratorStateGPU __integrator_state;
diff --git a/intern/cycles/kernel/device/optix/kernel.cu b/intern/cycles/kernel/device/optix/kernel.cu
index a3bafb9846c..6989219cd9f 100644
--- a/intern/cycles/kernel/device/optix/kernel.cu
+++ b/intern/cycles/kernel/device/optix/kernel.cu
@@ -21,14 +21,14 @@
 
 #include "kernel/device/gpu/image.h"  /* Texture lookup uses normal CUDA intrinsics. */
 
-#include "kernel/integrator/integrator_state.h"
-#include "kernel/integrator/integrator_state_flow.h"
-#include "kernel/integrator/integrator_state_util.h"
-
-#include "kernel/integrator/integrator_intersect_closest.h"
-#include "kernel/integrator/integrator_intersect_shadow.h"
-#include "kernel/integrator/integrator_intersect_subsurface.h"
-#include "kernel/integrator/integrator_intersect_volume_stack.h"
+#include "kernel/integrator/state.h"
+#include "kernel/integrator/state_flow.h"
+#include "kernel/integrator/state_util.h"
+
+#include "kernel/integrator/intersect_closest.h"
+#include "kernel/integrator/intersect_shadow.h"
+#include "kernel/integrator/intersect_subsurface.h"
+#include "kernel/integrator/intersect_volume_stack.h"
 
 // clang-format on
 
diff --git a/intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu b/intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu
index bf787e29eaa..071e9deae0b 100644
--- a/intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu
+++ b/intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu
@@ -18,7 +18,8 @@
  * much longer to compiler. This is only loaded when needed by the scene. */
 
 #include "kernel/device/optix/kernel.cu"
-#include "kernel/integrator/integrator_shade_surface.h"
+
+#include "kernel/integrator/shade_surface.h"
 
 extern "C" __global__ void __raygen__kernel_optix_integrator_shade_surface_raytrace()
 {
diff --git a/intern/cycles/kernel/film/film_accumulate.h b/intern/cycles/kernel/film/accumulate.h
index 91424fdbe21..30e1afea751 100644
--- a/intern/cycles/kernel/film/film_accumulate.h
+++ b/intern/cycles/kernel/film/accumulate.h
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include "kernel/film/film_adaptive_sampling.h"
-#include "kernel/film/film_write_passes.h"
+#include "kernel/film/adaptive_sampling.h"
+#include "kernel/film/write_passes.h"
 
-#include "kernel/integrator/integrator_shadow_catcher.h"
+#include "kernel/integrator/shadow_catcher.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/film/film_adaptive_sampling.h b/intern/cycles/kernel/film/adaptive_sampling.h
index c78b5f6b707..468c5d4486e 100644
--- a/intern/cycles/kernel/film/film_adaptive_sampling.h
+++ b/intern/cycles/kernel/film/adaptive_sampling.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "kernel/film/film_write_passes.h"
+#include "kernel/film/write_passes.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/film/film_id_passes.h b/intern/cycles/kernel/film/id_passes.h
index d5b8c90a828..d5b8c90a828 100644
--- a/intern/cycles/kernel/film/film_id_passes.h
+++ b/intern/cycles/kernel/film/id_passes.h
diff --git a/intern/cycles/kernel/film/film_passes.h b/intern/cycles/kernel/film/passes.h
index 6c124247f89..3a91d1653fe 100644
--- a/intern/cycles/kernel/film/film_passes.h
+++ b/intern/cycles/kernel/film/passes.h
@@ -18,8 +18,8 @@
 
 #include "kernel/geom/geom.h"
 
-#include "kernel/film/film_id_passes.h"
-#include "kernel/film/film_write_passes.h"
+#include "kernel/film/id_passes.h"
+#include "kernel/film/write_passes.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/film/film_read.h b/intern/cycles/kernel/film/read.h
index a87eff3832e..a87eff3832e 100644
--- a/intern/cycles/kernel/film/film_read.h
+++ b/intern/cycles/kernel/film/read.h
diff --git a/intern/cycles/kernel/film/film_write_passes.h b/intern/cycles/kernel/film/write_passes.h
index 9d379495629..9d379495629 100644
--- a/intern/cycles/kernel/film/film_write_passes.h
+++ b/intern/cycles/kernel/film/write_passes.h
diff --git a/intern/cycles/kernel/geom/geom_attribute.h b/intern/cycles/kernel/geom/attribute.h
index 848e0430caa..848e0430caa 100644
--- a/intern/cycles/kernel/geom/geom_attribute.h
+++ b/intern/cycles/kernel/geom/attribute.h
diff --git a/intern/cycles/kernel/geom/geom_curve.h b/intern/cycles/kernel/geom/curve.h
index 7271193eef8..7271193eef8 100644
--- a/intern/cycles/kernel/geom/geom_curve.h
+++ b/intern/cycles/kernel/geom/curve.h
diff --git a/intern/cycles/kernel/geom/geom_curve_intersect.h b/intern/cycles/kernel/geom/curve_intersect.h
index fb0b80b281f..fb0b80b281f 100644
--- a/intern/cycles/kernel/geom/geom_curve_intersect.h
+++ b/intern/cycles/kernel/geom/curve_intersect.h
diff --git a/intern/cycles/kernel/geom/geom.h b/intern/cycles/kernel/geom/geom.h
index 4de824cc277..9d023375a35 100644
--- a/intern/cycles/kernel/geom/geom.h
+++ b/intern/cycles/kernel/geom/geom.h
@@ -17,21 +17,21 @@
 #pragma once
 
 // clang-format off
-#include "kernel/geom/geom_attribute.h"
-#include "kernel/geom/geom_object.h"
+#include "kernel/geom/attribute.h"
+#include "kernel/geom/object.h"
 #ifdef __PATCH_EVAL__
-#  include "kernel/geom/geom_patch.h"
+#  include "kernel/geom/patch.h"
 #endif
-#include "kernel/geom/geom_triangle.h"
-#include "kernel/geom/geom_subd_triangle.h"
-#include "kernel/geom/geom_triangle_intersect.h"
-#include "kernel/geom/geom_motion_triangle.h"
-#include "kernel/geom/geom_motion_triangle_intersect.h"
-#include "kernel/geom/geom_motion_triangle_shader.h"
-#include "kernel/geom/geom_motion_curve.h"
-#include "kernel/geom/geom_curve.h"
-#include "kernel/geom/geom_curve_intersect.h"
-#include "kernel/geom/geom_volume.h"
-#include "kernel/geom/geom_primitive.h"
-#include "kernel/geom/geom_shader_data.h"
+#include "kernel/geom/triangle.h"
+#include "kernel/geom/subd_triangle.h"
+#include "kernel/geom/triangle_intersect.h"
+#include "kernel/geom/motion_triangle.h"
+#include "kernel/geom/motion_triangle_intersect.h"
+#include "kernel/geom/motion_triangle_shader.h"
+#include "kernel/geom/motion_curve.h"
+#include "kernel/geom/curve.h"
+#include "kernel/geom/curve_intersect.h"
+#include "kernel/geom/volume.h"
+#include "kernel/geom/primitive.h"
+#include "kernel/geom/shader_data.h"
 // clang-format on
diff --git a/intern/cycles/kernel/geom/geom_motion_curve.h b/intern/cycles/kernel/geom/motion_curve.h
index 2dd213d43f6..2dd213d43f6 100644
--- a/intern/cycles/kernel/geom/geom_motion_curve.h
+++ b/intern/cycles/kernel/geom/motion_curve.h
diff --git a/intern/cycles/kernel/geom/geom_motion_triangle.h b/intern/cycles/kernel/geom/motion_triangle.h
index 69d15f950ec..43f894938e0 100644
--- a/intern/cycles/kernel/geom/geom_motion_triangle.h
+++ b/intern/cycles/kernel/geom/motion_triangle.h
@@ -27,7 +27,7 @@
 
 #pragma once
 
-#include "kernel/bvh/bvh_util.h"
+#include "kernel/bvh/util.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/geom/geom_motion_triangle_intersect.h b/intern/cycles/kernel/geom/motion_triangle_intersect.h
index 256e7add21e..256e7add21e 100644
--- a/intern/cycles/kernel/geom/geom_motion_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/motion_triangle_intersect.h
diff --git a/intern/cycles/kernel/geom/geom_motion_triangle_shader.h b/intern/cycles/kernel/geom/motion_triangle_shader.h
index fc7c181882e..fc7c181882e 100644
--- a/intern/cycles/kernel/geom/geom_motion_triangle_shader.h
+++ b/intern/cycles/kernel/geom/motion_triangle_shader.h
diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/object.h
index 34a9d639d9d..34a9d639d9d 100644
--- a/intern/cycles/kernel/geom/geom_object.h
+++ b/intern/cycles/kernel/geom/object.h
diff --git a/intern/cycles/kernel/geom/geom_patch.h b/intern/cycles/kernel/geom/patch.h
index bf1a06220aa..7d24937a41e 100644
--- a/intern/cycles/kernel/geom/geom_patch.h
+++ b/intern/cycles/kernel/geom/patch.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include "util/util_color.h"
+#include "util/color.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/geom/geom_primitive.h b/intern/cycles/kernel/geom/primitive.h
index bc559e3c812..7a8921b6d6e 100644
--- a/intern/cycles/kernel/geom/geom_primitive.h
+++ b/intern/cycles/kernel/geom/primitive.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "kernel/camera/camera_projection.h"
+#include "kernel/camera/projection.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/geom/geom_shader_data.h b/intern/cycles/kernel/geom/shader_data.h
index 46bda2b656c..46bda2b656c 100644
--- a/intern/cycles/kernel/geom/geom_shader_data.h
+++ b/intern/cycles/kernel/geom/shader_data.h
diff --git a/intern/cycles/kernel/geom/geom_subd_triangle.h b/intern/cycles/kernel/geom/subd_triangle.h
index 8a9a3f71231..8a9a3f71231 100644
--- a/intern/cycles/kernel/geom/geom_subd_triangle.h
+++ b/intern/cycles/kernel/geom/subd_triangle.h
diff --git a/intern/cycles/kernel/geom/geom_triangle.h b/intern/cycles/kernel/geom/triangle.h
index 233e901c7ca..233e901c7ca 100644
--- a/intern/cycles/kernel/geom/geom_triangle.h
+++ b/intern/cycles/kernel/geom/triangle.h
diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/triangle_intersect.h
index 440dc23d124..faff8a85a93 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/triangle_intersect.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "kernel/sample/sample_lcg.h"
+#include "kernel/sample/lcg.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/geom/geom_volume.h b/intern/cycles/kernel/geom/volume.h
index 4e83ad6acb3..4e83ad6acb3 100644
--- a/intern/cycles/kernel/geom/geom_volume.h
+++ b/intern/cycles/kernel/geom/volume.h
diff --git a/intern/cycles/kernel/integrator/integrator_init_from_bake.h b/intern/cycles/kernel/integrator/init_from_bake.h
index 5790cfd3f22..4e30563e21b 100644
--- a/intern/cycles/kernel/integrator/integrator_init_from_bake.h
+++ b/intern/cycles/kernel/integrator/init_from_bake.h
@@ -18,12 +18,12 @@
 
 #include "kernel/camera/camera.h"
 
-#include "kernel/film/film_accumulate.h"
-#include "kernel/film/film_adaptive_sampling.h"
+#include "kernel/film/accumulate.h"
+#include "kernel/film/adaptive_sampling.h"
 
-#include "kernel/integrator/integrator_path_state.h"
+#include "kernel/integrator/path_state.h"
 
-#include "kernel/sample/sample_pattern.h"
+#include "kernel/sample/pattern.h"
 
 #include "kernel/geom/geom.h"
 
diff --git a/intern/cycles/kernel/integrator/integrator_init_from_camera.h b/intern/cycles/kernel/integrator/init_from_camera.h
index 499a72ffbc4..f0ba77bd9a6 100644
--- a/intern/cycles/kernel/integrator/integrator_init_from_camera.h
+++ b/intern/cycles/kernel/integrator/init_from_camera.h
@@ -18,13 +18,13 @@
 
 #include "kernel/camera/camera.h"
 
-#include "kernel/film/film_accumulate.h"
-#include "kernel/film/film_adaptive_sampling.h"
+#include "kernel/film/accumulate.h"
+#include "kernel/film/adaptive_sampling.h"
 
-#include "kernel/integrator/integrator_path_state.h"
-#include "kernel/integrator/integrator_shadow_catcher.h"
+#include "kernel/integrator/path_state.h"
+#include "kernel/integrator/shadow_catcher.h"
 
-#include "kernel/sample/sample_pattern.h"
+#include "kernel/sample/pattern.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_intersect_closest.h b/intern/cycles/kernel/integrator/intersect_closest.h
index 41d3dfde41a..d5a9df9669b 100644
--- a/intern/cycles/kernel/integrator/integrator_intersect_closest.h
+++ b/intern/cycles/kernel/integrator/intersect_closest.h
@@ -16,14 +16,14 @@
 
 #pragma once
 
-#include "kernel/camera/camera_projection.h"
+#include "kernel/camera/projection.h"
 
-#include "kernel/integrator/integrator_path_state.h"
-#include "kernel/integrator/integrator_shadow_catcher.h"
+#include "kernel/integrator/path_state.h"
+#include "kernel/integrator/shadow_catcher.h"
 
 #include "kernel/light/light.h"
 
-#include "kernel/util/util_differential.h"
+#include "kernel/util/differential.h"
 
 #include "kernel/geom/geom.h"
 
diff --git a/intern/cycles/kernel/integrator/integrator_intersect_shadow.h b/intern/cycles/kernel/integrator/intersect_shadow.h
index 90422445fad..90422445fad 100644
--- a/intern/cycles/kernel/integrator/integrator_intersect_shadow.h
+++ b/intern/cycles/kernel/integrator/intersect_shadow.h
diff --git a/intern/cycles/kernel/integrator/integrator_intersect_subsurface.h b/intern/cycles/kernel/integrator/intersect_subsurface.h
index b575e7fd1e6..27b8e1e5f5a 100644
--- a/intern/cycles/kernel/integrator/integrator_intersect_subsurface.h
+++ b/intern/cycles/kernel/integrator/intersect_subsurface.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "kernel/integrator/integrator_subsurface.h"
+#include "kernel/integrator/subsurface.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_intersect_volume_stack.h b/intern/cycles/kernel/integrator/intersect_volume_stack.h
index 505d9687948..1c91318ff9c 100644
--- a/intern/cycles/kernel/integrator/integrator_intersect_volume_stack.h
+++ b/intern/cycles/kernel/integrator/intersect_volume_stack.h
@@ -18,8 +18,8 @@
 
 #include "kernel/bvh/bvh.h"
 #include "kernel/geom/geom.h"
-#include "kernel/integrator/integrator_shader_eval.h"
-#include "kernel/integrator/integrator_volume_stack.h"
+#include "kernel/integrator/shader_eval.h"
+#include "kernel/integrator/volume_stack.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_megakernel.h b/intern/cycles/kernel/integrator/megakernel.h
index 21a483a792b..d8cc794dc7a 100644
--- a/intern/cycles/kernel/integrator/integrator_megakernel.h
+++ b/intern/cycles/kernel/integrator/megakernel.h
@@ -16,16 +16,16 @@
 
 #pragma once
 
-#include "kernel/integrator/integrator_init_from_camera.h"
-#include "kernel/integrator/integrator_intersect_closest.h"
-#include "kernel/integrator/integrator_intersect_shadow.h"
-#include "kernel/integrator/integrator_intersect_subsurface.h"
-#include "kernel/integrator/integrator_intersect_volume_stack.h"
-#include "kernel/integrator/integrator_shade_background.h"
-#include "kernel/integrator/integrator_shade_light.h"
-#include "kernel/integrator/integrator_shade_shadow.h"
-#include "kernel/integrator/integrator_shade_surface.h"
-#include "kernel/integrator/integrator_shade_volume.h"
+#include "kernel/integrator/init_from_camera.h"
+#include "kernel/integrator/intersect_closest.h"
+#include "kernel/integrator/intersect_shadow.h"
+#include "kernel/integrator/intersect_subsurface.h"
+#include "kernel/integrator/intersect_volume_stack.h"
+#include "kernel/integrator/shade_background.h"
+#include "kernel/integrator/shade_light.h"
+#include "kernel/integrator/shade_shadow.h"
+#include "kernel/integrator/shade_surface.h"
+#include "kernel/integrator/shade_volume.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_path_state.h b/intern/cycles/kernel/integrator/path_state.h
index 73062b26682..8311b97dedb 100644
--- a/intern/cycles/kernel/integrator/integrator_path_state.h
+++ b/intern/cycles/kernel/integrator/path_state.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "kernel/sample/sample_pattern.h"
+#include "kernel/sample/pattern.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_shade_background.h b/intern/cycles/kernel/integrator/shade_background.h
index b3bef9a234e..71a590749bd 100644
--- a/intern/cycles/kernel/integrator/integrator_shade_background.h
+++ b/intern/cycles/kernel/integrator/shade_background.h
@@ -16,11 +16,11 @@
 
 #pragma once
 
-#include "kernel/film/film_accumulate.h"
-#include "kernel/integrator/integrator_shader_eval.h"
+#include "kernel/film/accumulate.h"
+#include "kernel/integrator/shader_eval.h"
 #include "kernel/light/light.h"
-#include "kernel/light/light_sample.h"
-#include "kernel/sample/sample_mis.h"
+#include "kernel/light/sample.h"
+#include "kernel/sample/mis.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_shade_light.h b/intern/cycles/kernel/integrator/shade_light.h
index 7d220006322..7dad3b4e49d 100644
--- a/intern/cycles/kernel/integrator/integrator_shade_light.h
+++ b/intern/cycles/kernel/integrator/shade_light.h
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include "kernel/film/film_accumulate.h"
-#include "kernel/integrator/integrator_shader_eval.h"
+#include "kernel/film/accumulate.h"
+#include "kernel/integrator/shader_eval.h"
 #include "kernel/light/light.h"
-#include "kernel/light/light_sample.h"
+#include "kernel/light/sample.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_shade_shadow.h b/intern/cycles/kernel/integrator/shade_shadow.h
index 0c4eeb8d10d..1de890aae29 100644
--- a/intern/cycles/kernel/integrator/integrator_shade_shadow.h
+++ b/intern/cycles/kernel/integrator/shade_shadow.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "kernel/integrator/integrator_shade_volume.h"
-#include "kernel/integrator/integrator_volume_stack.h"
-#include "kernel/integrator/integrator_shader_eval.h"
+#include "kernel/integrator/shade_volume.h"
+#include "kernel/integrator/shader_eval.h"
+#include "kernel/integrator/volume_stack.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_shade_surface.h b/intern/cycles/kernel/integrator/shade_surface.h
index 70dce1c4913..cce591eb219 100644
--- a/intern/cycles/kernel/integrator/integrator_shade_surface.h
+++ b/intern/cycles/kernel/integrator/shade_surface.h
@@ -16,18 +16,18 @@
 
 #pragma once
 
-#include "kernel/film/film_accumulate.h"
-#include "kernel/film/film_passes.h"
+#include "kernel/film/accumulate.h"
+#include "kernel/film/passes.h"
 
-#include "kernel/integrator/integrator_path_state.h"
-#include "kernel/integrator/integrator_shader_eval.h"
-#include "kernel/integrator/integrator_subsurface.h"
-#include "kernel/integrator/integrator_volume_stack.h"
+#include "kernel/integrator/path_state.h"
+#include "kernel/integrator/shader_eval.h"
+#include "kernel/integrator/subsurface.h"
+#include "kernel/integrator/volume_stack.h"
 
 #include "kernel/light/light.h"
-#include "kernel/light/light_sample.h"
+#include "kernel/light/sample.h"
 
-#include "kernel/sample/sample_mis.h"
+#include "kernel/sample/mis.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_shade_volume.h b/intern/cycles/kernel/integrator/shade_volume.h
index 44ef4803575..f455152dcf9 100644
--- a/intern/cycles/kernel/integrator/integrator_shade_volume.h
+++ b/intern/cycles/kernel/integrator/shade_volume.h
@@ -16,18 +16,18 @@
 
 #pragma once
 
-#include "kernel/film/film_accumulate.h"
-#include "kernel/film/film_passes.h"
+#include "kernel/film/accumulate.h"
+#include "kernel/film/passes.h"
 
-#include "kernel/integrator/integrator_path_state.h"
-#include "kernel/integrator/integrator_shader_eval.h"
-#include "kernel/integrator/integrator_intersect_closest.h"
-#include "kernel/integrator/integrator_volume_stack.h"
+#include "kernel/integrator/intersect_closest.h"
+#include "kernel/integrator/path_state.h"
+#include "kernel/integrator/shader_eval.h"
+#include "kernel/integrator/volume_stack.h"
 
 #include "kernel/light/light.h"
-#include "kernel/light/light_sample.h"
+#include "kernel/light/sample.h"
 
-#include "kernel/sample/sample_mis.h"
+#include "kernel/sample/mis.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_shader_eval.h b/intern/cycles/kernel/integrator/shader_eval.h
index 04a3a965fd3..68f1ef8c118 100644
--- a/intern/cycles/kernel/integrator/integrator_shader_eval.h
+++ b/intern/cycles/kernel/integrator/shader_eval.h
@@ -19,16 +19,16 @@
 #pragma once
 
 #include "kernel/closure/alloc.h"
-#include "kernel/closure/bsdf_util.h"
 #include "kernel/closure/bsdf.h"
+#include "kernel/closure/bsdf_util.h"
 #include "kernel/closure/emissive.h"
 
-#include "kernel/film/film_accumulate.h"
+#include "kernel/film/accumulate.h"
 
 #include "kernel/svm/svm.h"
 
 #ifdef __OSL__
-#  include "kernel/osl/osl_shader.h"
+#  include "kernel/osl/shader.h"
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/kernel/integrator/integrator_shadow_catcher.h b/intern/cycles/kernel/integrator/shadow_catcher.h
index 24d03466393..7beae235dbc 100644
--- a/intern/cycles/kernel/integrator/integrator_shadow_catcher.h
+++ b/intern/cycles/kernel/integrator/shadow_catcher.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "kernel/integrator/integrator_path_state.h"
-#include "kernel/integrator/integrator_state_util.h"
+#include "kernel/integrator/path_state.h"
+#include "kernel/integrator/state_util.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_shadow_state_template.h b/intern/cycles/kernel/integrator/shadow_state_template.h
index 1fbadde2642..1fbadde2642 100644
--- a/intern/cycles/kernel/integrator/integrator_shadow_state_template.h
+++ b/intern/cycles/kernel/integrator/shadow_state_template.h
diff --git a/intern/cycles/kernel/integrator/integrator_state.h b/intern/cycles/kernel/integrator/state.h
index 09b399ff1b8..86dac0a65cf 100644
--- a/intern/cycles/kernel/integrator/integrator_state.h
+++ b/intern/cycles/kernel/integrator/state.h
@@ -40,9 +40,9 @@
  * INTEGRATOR_STATE_NULL: use to pass empty state to other functions.
  */
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 #pragma once
 
@@ -64,7 +64,7 @@ typedef struct IntegratorShadowStateCPU {
   } \
   name[cpu_size];
 #define KERNEL_STRUCT_VOLUME_STACK_SIZE MAX_VOLUME_STACK_SIZE
-#include "kernel/integrator/integrator_shadow_state_template.h"
+#include "kernel/integrator/shadow_state_template.h"
 #undef KERNEL_STRUCT_BEGIN
 #undef KERNEL_STRUCT_MEMBER
 #undef KERNEL_STRUCT_ARRAY_MEMBER
@@ -83,7 +83,7 @@ typedef struct IntegratorStateCPU {
   } \
   name[cpu_size];
 #define KERNEL_STRUCT_VOLUME_STACK_SIZE MAX_VOLUME_STACK_SIZE
-#include "kernel/integrator/integrator_state_template.h"
+#include "kernel/integrator/state_template.h"
 #undef KERNEL_STRUCT_BEGIN
 #undef KERNEL_STRUCT_MEMBER
 #undef KERNEL_STRUCT_ARRAY_MEMBER
@@ -118,9 +118,9 @@ typedef struct IntegratorStateGPU {
   name[gpu_size];
 #define KERNEL_STRUCT_VOLUME_STACK_SIZE MAX_VOLUME_STACK_SIZE
 
-#include "kernel/integrator/integrator_state_template.h"
+#include "kernel/integrator/state_template.h"
 
-#include "kernel/integrator/integrator_shadow_state_template.h"
+#include "kernel/integrator/shadow_state_template.h"
 
 #undef KERNEL_STRUCT_BEGIN
 #undef KERNEL_STRUCT_MEMBER
diff --git a/intern/cycles/kernel/integrator/integrator_state_flow.h b/intern/cycles/kernel/integrator/state_flow.h
index 1569bf68e24..38a2b396847 100644
--- a/intern/cycles/kernel/integrator/integrator_state_flow.h
+++ b/intern/cycles/kernel/integrator/state_flow.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "kernel/kernel_types.h"
-#include "util/util_atomic.h"
+#include "kernel/types.h"
+#include "util/atomic.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_state_template.h b/intern/cycles/kernel/integrator/state_template.h
index b1a6fd36fae..b1a6fd36fae 100644
--- a/intern/cycles/kernel/integrator/integrator_state_template.h
+++ b/intern/cycles/kernel/integrator/state_template.h
diff --git a/intern/cycles/kernel/integrator/integrator_state_util.h b/intern/cycles/kernel/integrator/state_util.h
index 0b1f67daa92..dafe06e7009 100644
--- a/intern/cycles/kernel/integrator/integrator_state_util.h
+++ b/intern/cycles/kernel/integrator/state_util.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "kernel/integrator/integrator_state.h"
+#include "kernel/integrator/state.h"
 
-#include "kernel/util/util_differential.h"
+#include "kernel/util/differential.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -247,7 +247,7 @@ ccl_device_inline void integrator_state_copy_only(KernelGlobals kg,
 
 #  define KERNEL_STRUCT_VOLUME_STACK_SIZE kernel_data.volume_stack_size
 
-#  include "kernel/integrator/integrator_state_template.h"
+#  include "kernel/integrator/state_template.h"
 
 #  undef KERNEL_STRUCT_BEGIN
 #  undef KERNEL_STRUCT_MEMBER
@@ -303,7 +303,7 @@ ccl_device_inline void integrator_shadow_state_copy_only(KernelGlobals kg,
 
 #  define KERNEL_STRUCT_VOLUME_STACK_SIZE kernel_data.volume_stack_size
 
-#  include "kernel/integrator/integrator_shadow_state_template.h"
+#  include "kernel/integrator/shadow_state_template.h"
 
 #  undef KERNEL_STRUCT_BEGIN
 #  undef KERNEL_STRUCT_MEMBER
diff --git a/intern/cycles/kernel/integrator/integrator_subsurface.h b/intern/cycles/kernel/integrator/subsurface.h
index 9560641c460..49466112387 100644
--- a/intern/cycles/kernel/integrator/integrator_subsurface.h
+++ b/intern/cycles/kernel/integrator/subsurface.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "kernel/camera/camera_projection.h"
+#include "kernel/camera/projection.h"
 
 #include "kernel/bvh/bvh.h"
 
@@ -26,11 +26,11 @@
 #include "kernel/closure/bssrdf.h"
 #include "kernel/closure/volume.h"
 
-#include "kernel/integrator/integrator_intersect_volume_stack.h"
-#include "kernel/integrator/integrator_path_state.h"
-#include "kernel/integrator/integrator_shader_eval.h"
-#include "kernel/integrator/integrator_subsurface_disk.h"
-#include "kernel/integrator/integrator_subsurface_random_walk.h"
+#include "kernel/integrator/intersect_volume_stack.h"
+#include "kernel/integrator/path_state.h"
+#include "kernel/integrator/shader_eval.h"
+#include "kernel/integrator/subsurface_disk.h"
+#include "kernel/integrator/subsurface_random_walk.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/integrator/integrator_subsurface_disk.h b/intern/cycles/kernel/integrator/subsurface_disk.h
index e1cce13fb30..e1cce13fb30 100644
--- a/intern/cycles/kernel/integrator/integrator_subsurface_disk.h
+++ b/intern/cycles/kernel/integrator/subsurface_disk.h
diff --git a/intern/cycles/kernel/integrator/integrator_subsurface_random_walk.h b/intern/cycles/kernel/integrator/subsurface_random_walk.h
index b98acda1f4d..f0712758174 100644
--- a/intern/cycles/kernel/integrator/integrator_subsurface_random_walk.h
+++ b/intern/cycles/kernel/integrator/subsurface_random_walk.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "kernel/camera/camera_projection.h"
+#include "kernel/camera/projection.h"
 
 #include "kernel/bvh/bvh.h"
 
diff --git a/intern/cycles/kernel/integrator/integrator_volume_stack.h b/intern/cycles/kernel/integrator/volume_stack.h
index cf69826ffff..cf69826ffff 100644
--- a/intern/cycles/kernel/integrator/integrator_volume_stack.h
+++ b/intern/cycles/kernel/integrator/volume_stack.h
diff --git a/intern/cycles/kernel/light/light_background.h b/intern/cycles/kernel/light/background.h
index 78f8c94f7a3..d801cc94393 100644
--- a/intern/cycles/kernel/light/light_background.h
+++ b/intern/cycles/kernel/light/background.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "kernel/light/light_common.h"
+#include "kernel/light/common.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/light/light_common.h b/intern/cycles/kernel/light/common.h
index 207e89090cc..75331d32d44 100644
--- a/intern/cycles/kernel/light/light_common.h
+++ b/intern/cycles/kernel/light/common.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "kernel/sample/sample_mapping.h"
+#include "kernel/sample/mapping.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/light/light.h b/intern/cycles/kernel/light/light.h
index facbbe23d0f..746c7747569 100644
--- a/intern/cycles/kernel/light/light.h
+++ b/intern/cycles/kernel/light/light.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include "kernel/geom/geom.h"
-#include "kernel/light/light_background.h"
-#include "kernel/sample/sample_mapping.h"
+#include "kernel/light/background.h"
+#include "kernel/sample/mapping.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/light/light_sample.h b/intern/cycles/kernel/light/sample.h
index 4ae5d9e1944..6b643a95250 100644
--- a/intern/cycles/kernel/light/light_sample.h
+++ b/intern/cycles/kernel/light/sample.h
@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include "kernel/integrator/integrator_path_state.h"
-#include "kernel/integrator/integrator_shader_eval.h"
+#include "kernel/integrator/path_state.h"
+#include "kernel/integrator/shader_eval.h"
 
 #include "kernel/light/light.h"
 
-#include "kernel/sample/sample_mapping.h"
+#include "kernel/sample/mapping.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt
index 7be1b7129e0..f226c95766f 100644
--- a/intern/cycles/kernel/osl/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/CMakeLists.txt
@@ -25,17 +25,17 @@ set(SRC
   bsdf_diffuse_ramp.cpp
   bsdf_phong_ramp.cpp
   emissive.cpp
-  osl_bssrdf.cpp
-  osl_closures.cpp
-  osl_services.cpp
-  osl_shader.cpp
+  bssrdf.cpp
+  closures.cpp
+  services.cpp
+  shader.cpp
 )
 
 set(HEADER_SRC
-  osl_closures.h
-  osl_globals.h
-  osl_services.h
-  osl_shader.h
+  closures.h
+  globals.h
+  services.h
+  shader.h
 )
 
 set(LIB
diff --git a/intern/cycles/kernel/osl/background.cpp b/intern/cycles/kernel/osl/background.cpp
index bb290a5ced2..540180f99e8 100644
--- a/intern/cycles/kernel/osl/background.cpp
+++ b/intern/cycles/kernel/osl/background.cpp
@@ -34,7 +34,7 @@
 
 #include <OSL/genclosure.h>
 
-#include "kernel/osl/osl_closures.h"
+#include "kernel/osl/closures.h"
 
 // clang-format off
 #include "kernel/device/cpu/compat.h"
diff --git a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
index 2ec7f14c0fa..768531a0bf9 100644
--- a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
+++ b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
@@ -35,10 +35,10 @@
 #include <OSL/genclosure.h>
 
 #include "kernel/device/cpu/compat.h"
-#include "kernel/osl/osl_closures.h"
+#include "kernel/osl/closures.h"
 
 // clang-format off
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 #include "kernel/closure/alloc.h"
 #include "kernel/closure/bsdf_diffuse_ramp.h"
 // clang-format on
diff --git a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
index 90160fba962..d34a33216a0 100644
--- a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
+++ b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
@@ -35,10 +35,10 @@
 #include <OSL/genclosure.h>
 
 #include "kernel/device/cpu/compat.h"
-#include "kernel/osl/osl_closures.h"
+#include "kernel/osl/closures.h"
 
 // clang-format off
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 #include "kernel/closure/alloc.h"
 #include "kernel/closure/bsdf_phong_ramp.h"
 // clang-format on
diff --git a/intern/cycles/kernel/osl/osl_bssrdf.cpp b/intern/cycles/kernel/osl/bssrdf.cpp
index 3b8661ce45d..7c7f1ce157f 100644
--- a/intern/cycles/kernel/osl/osl_bssrdf.cpp
+++ b/intern/cycles/kernel/osl/bssrdf.cpp
@@ -33,10 +33,10 @@
 #include <OSL/genclosure.h>
 
 #include "kernel/device/cpu/compat.h"
-#include "kernel/osl/osl_closures.h"
+#include "kernel/osl/closures.h"
 
 // clang-format off
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
 #include "kernel/closure/alloc.h"
 #include "kernel/closure/bsdf_util.h"
diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/closures.cpp
index 89bab35b60b..adc0f50aefb 100644
--- a/intern/cycles/kernel/osl/osl_closures.cpp
+++ b/intern/cycles/kernel/osl/closures.cpp
@@ -33,17 +33,17 @@
 #include <OSL/genclosure.h>
 #include <OSL/oslclosure.h>
 
-#include "kernel/osl/osl_closures.h"
-#include "kernel/osl/osl_shader.h"
+#include "kernel/osl/closures.h"
+#include "kernel/osl/shader.h"
 
-#include "util/util_math.h"
-#include "util/util_param.h"
+#include "util/math.h"
+#include "util/param.h"
 
 // clang-format off
 #include "kernel/device/cpu/compat.h"
 #include "kernel/device/cpu/globals.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
 #include "kernel/closure/alloc.h"
 #include "kernel/closure/bsdf_util.h"
diff --git a/intern/cycles/kernel/osl/osl_closures.h b/intern/cycles/kernel/osl/closures.h
index 7869d793737..8f573e89734 100644
--- a/intern/cycles/kernel/osl/osl_closures.h
+++ b/intern/cycles/kernel/osl/closures.h
@@ -33,8 +33,8 @@
 #ifndef __OSL_CLOSURES_H__
 #define __OSL_CLOSURES_H__
 
-#include "kernel/kernel_types.h"
-#include "util/util_types.h"
+#include "kernel/types.h"
+#include "util/types.h"
 
 #include <OSL/genclosure.h>
 #include <OSL/oslclosure.h>
diff --git a/intern/cycles/kernel/osl/emissive.cpp b/intern/cycles/kernel/osl/emissive.cpp
index 5a7fe14b22e..2615e300a92 100644
--- a/intern/cycles/kernel/osl/emissive.cpp
+++ b/intern/cycles/kernel/osl/emissive.cpp
@@ -34,11 +34,11 @@
 
 #include <OSL/genclosure.h>
 
-#include "kernel/osl/osl_closures.h"
+#include "kernel/osl/closures.h"
 
 // clang-format off
 #include "kernel/device/cpu/compat.h"
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 #include "kernel/closure/alloc.h"
 #include "kernel/closure/emissive.h"
 // clang-format on
diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/globals.h
index f1789f0d7eb..126ace0086e 100644
--- a/intern/cycles/kernel/osl/osl_globals.h
+++ b/intern/cycles/kernel/osl/globals.h
@@ -24,11 +24,11 @@
 #  include <OpenImageIO/refcnt.h>
 #  include <OpenImageIO/unordered_map_concurrent.h>
 
-#  include "util/util_map.h"
-#  include "util/util_param.h"
-#  include "util/util_thread.h"
-#  include "util/util_unique_ptr.h"
-#  include "util/util_vector.h"
+#  include "util/map.h"
+#  include "util/param.h"
+#  include "util/thread.h"
+#  include "util/unique_ptr.h"
+#  include "util/vector.h"
 
 #  ifndef WIN32
 using std::isfinite;
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/services.cpp
index 56b04fd280e..ca0a5a068b3 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/services.cpp
@@ -30,36 +30,36 @@
 #include "scene/object.h"
 #include "scene/scene.h"
 
-#include "kernel/osl/osl_closures.h"
-#include "kernel/osl/osl_globals.h"
-#include "kernel/osl/osl_services.h"
-#include "kernel/osl/osl_shader.h"
+#include "kernel/osl/closures.h"
+#include "kernel/osl/globals.h"
+#include "kernel/osl/services.h"
+#include "kernel/osl/shader.h"
 
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_string.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/string.h"
 
 // clang-format off
 #include "kernel/device/cpu/compat.h"
 #include "kernel/device/cpu/globals.h"
 #include "kernel/device/cpu/image.h"
 
-#include "kernel/util/util_differential.h"
+#include "kernel/util/differential.h"
 
-#include "kernel/integrator/integrator_state.h"
-#include "kernel/integrator/integrator_state_flow.h"
+#include "kernel/integrator/state.h"
+#include "kernel/integrator/state_flow.h"
 
 #include "kernel/geom/geom.h"
 
 #include "kernel/bvh/bvh.h"
 
 #include "kernel/camera/camera.h"
-#include "kernel/camera/camera_projection.h"
+#include "kernel/camera/projection.h"
 
-#include "kernel/integrator/integrator_path_state.h"
-#include "kernel/integrator/integrator_shader_eval.h"
+#include "kernel/integrator/path_state.h"
+#include "kernel/integrator/shader_eval.h"
 
-#include "kernel/util/util_color.h"
+#include "kernel/util/color.h"
 // clang-format on
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/services.h
index d9f57c642ad..d9f57c642ad 100644
--- a/intern/cycles/kernel/osl/osl_services.h
+++ b/intern/cycles/kernel/osl/services.h
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/shader.cpp
index 6426a09b33d..33633c69e29 100644
--- a/intern/cycles/kernel/osl/osl_shader.cpp
+++ b/intern/cycles/kernel/osl/shader.cpp
@@ -20,16 +20,16 @@
 #include "kernel/device/cpu/compat.h"
 #include "kernel/device/cpu/globals.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
-#include "kernel/geom/geom_object.h"
+#include "kernel/geom/object.h"
 
-#include "kernel/integrator/integrator_state.h"
+#include "kernel/integrator/state.h"
 
-#include "kernel/osl/osl_closures.h"
-#include "kernel/osl/osl_globals.h"
-#include "kernel/osl/osl_services.h"
-#include "kernel/osl/osl_shader.h"
+#include "kernel/osl/closures.h"
+#include "kernel/osl/globals.h"
+#include "kernel/osl/services.h"
+#include "kernel/osl/shader.h"
 // clang-format on
 
 #include "scene/attribute.h"
diff --git a/intern/cycles/kernel/osl/osl_shader.h b/intern/cycles/kernel/osl/shader.h
index 037a18a1f19..7d68d4eae7f 100644
--- a/intern/cycles/kernel/osl/osl_shader.h
+++ b/intern/cycles/kernel/osl/shader.h
@@ -29,7 +29,7 @@
  * This means no thread state must be passed along in the kernel itself.
  */
 
-#  include "kernel/kernel_types.h"
+#  include "kernel/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/sample/sample_jitter.h b/intern/cycles/kernel/sample/jitter.h
index b62ec7fda42..b62ec7fda42 100644
--- a/intern/cycles/kernel/sample/sample_jitter.h
+++ b/intern/cycles/kernel/sample/jitter.h
diff --git a/intern/cycles/kernel/sample/lcg.h b/intern/cycles/kernel/sample/lcg.h
new file mode 100644
index 00000000000..92cfff639b4
--- /dev/null
+++ b/intern/cycles/kernel/sample/lcg.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2011-2013 Blender Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#pragma once
+
+CCL_NAMESPACE_BEGIN
+
+/* Linear Congruential Generator */
+
+ccl_device uint lcg_step_uint(uint *rng)
+{
+  /* implicit mod 2^32 */
+  *rng = (1103515245 * (*rng) + 12345);
+  return *rng;
+}
+
+ccl_device float lcg_step_float(uint *rng)
+{
+  /* implicit mod 2^32 */
+  *rng = (1103515245 * (*rng) + 12345);
+  return (float)*rng * (1.0f / (float)0xFFFFFFFF);
+}
+
+ccl_device uint lcg_init(uint seed)
+{
+  uint rng = seed;
+  lcg_step_uint(&rng);
+  return rng;
+}
+
+ccl_device_inline uint lcg_state_init(const uint rng_hash,
+                                      const uint rng_offset,
+                                      const uint sample,
+                                      const uint scramble)
+{
+  return lcg_init(rng_hash + rng_offset + sample * scramble);
+}
+
+CCL_NAMESPACE_END
diff --git a/intern/cycles/kernel/sample/sample_mapping.h b/intern/cycles/kernel/sample/mapping.h
index 3297aa2a29a..3297aa2a29a 100644
--- a/intern/cycles/kernel/sample/sample_mapping.h
+++ b/intern/cycles/kernel/sample/mapping.h
diff --git a/intern/cycles/kernel/sample/mis.h b/intern/cycles/kernel/sample/mis.h
new file mode 100644
index 00000000000..0878b3aac36
--- /dev/null
+++ b/intern/cycles/kernel/sample/mis.h
@@ -0,0 +1,64 @@
+/*
+ * Parts adapted from Open Shading Language with this license:
+ *
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
+ *
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of Sony Pictures Imageworks nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+CCL_NAMESPACE_BEGIN
+
+/* Multiple importance sampling utilities. */
+
+ccl_device float balance_heuristic(float a, float b)
+{
+  return (a) / (a + b);
+}
+
+ccl_device float balance_heuristic_3(float a, float b, float c)
+{
+  return (a) / (a + b + c);
+}
+
+ccl_device float power_heuristic(float a, float b)
+{
+  return (a * a) / (a * a + b * b);
+}
+
+ccl_device float power_heuristic_3(float a, float b, float c)
+{
+  return (a * a) / (a * a + b * b + c * c);
+}
+
+ccl_device float max_heuristic(float a, float b)
+{
+  return (a > b) ? 1.0f : 0.0f;
+}
+
+CCL_NAMESPACE_END
diff --git a/intern/cycles/kernel/sample/sample_pattern.h b/intern/cycles/kernel/sample/pattern.h
index 95635c2c855..191b24a5f2a 100644
--- a/intern/cycles/kernel/sample/sample_pattern.h
+++ b/intern/cycles/kernel/sample/pattern.h
@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include "kernel/sample/sample_jitter.h"
-#include "util/util_hash.h"
+#include "kernel/sample/jitter.h"
+#include "util/hash.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/svm/svm_ao.h b/intern/cycles/kernel/svm/ao.h
index 4cfef7bc204..678f49c8ccd 100644
--- a/intern/cycles/kernel/svm/svm_ao.h
+++ b/intern/cycles/kernel/svm/ao.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 #include "kernel/bvh/bvh.h"
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/kernel/svm/svm_aov.h b/intern/cycles/kernel/svm/aov.h
index 92be7fb6906..21ee7af7639 100644
--- a/intern/cycles/kernel/svm/svm_aov.h
+++ b/intern/cycles/kernel/svm/aov.h
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-#include "kernel/film/film_write_passes.h"
+#pragma once
+
+#include "kernel/film/write_passes.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/svm/svm_attribute.h b/intern/cycles/kernel/svm/attribute.h
index b3c66d29f5c..e9de0164c7a 100644
--- a/intern/cycles/kernel/svm/svm_attribute.h
+++ b/intern/cycles/kernel/svm/attribute.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Attribute Node */
diff --git a/intern/cycles/kernel/svm/svm_bevel.h b/intern/cycles/kernel/svm/bevel.h
index 0a30822aa68..37c7caf1372 100644
--- a/intern/cycles/kernel/svm/svm_bevel.h
+++ b/intern/cycles/kernel/svm/bevel.h
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
+#pragma once
+
 #include "kernel/bvh/bvh.h"
-#include "kernel/sample/sample_mapping.h"
-#include "kernel/sample/sample_pattern.h"
+#include "kernel/sample/mapping.h"
+#include "kernel/sample/pattern.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/svm/svm_blackbody.h b/intern/cycles/kernel/svm/blackbody.h
index f1adb0e76af..da15550f918 100644
--- a/intern/cycles/kernel/svm/svm_blackbody.h
+++ b/intern/cycles/kernel/svm/blackbody.h
@@ -30,6 +30,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#pragma once
+
+#include "kernel/svm/math_util.h"
+
 CCL_NAMESPACE_BEGIN
 
 /* Blackbody Node */
diff --git a/intern/cycles/kernel/svm/svm_brick.h b/intern/cycles/kernel/svm/brick.h
index 9dc31ef37ec..3c8729fa027 100644
--- a/intern/cycles/kernel/svm/svm_brick.h
+++ b/intern/cycles/kernel/svm/brick.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Brick */
diff --git a/intern/cycles/kernel/svm/svm_brightness.h b/intern/cycles/kernel/svm/brightness.h
index 0a44ffe6359..5c82a4347cd 100644
--- a/intern/cycles/kernel/svm/svm_brightness.h
+++ b/intern/cycles/kernel/svm/brightness.h
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#pragma once
+
+#include "kernel/svm/color_util.h"
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device_noinline void svm_node_brightness(
diff --git a/intern/cycles/kernel/svm/svm_bump.h b/intern/cycles/kernel/svm/bump.h
index 66e5b665532..2fae06fa54b 100644
--- a/intern/cycles/kernel/svm/svm_bump.h
+++ b/intern/cycles/kernel/svm/bump.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Bump Eval Nodes */
diff --git a/intern/cycles/kernel/svm/svm_camera.h b/intern/cycles/kernel/svm/camera.h
index 787f11f38b5..c71c02e6b19 100644
--- a/intern/cycles/kernel/svm/svm_camera.h
+++ b/intern/cycles/kernel/svm/camera.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device_noinline void svm_node_camera(KernelGlobals kg,
diff --git a/intern/cycles/kernel/svm/svm_checker.h b/intern/cycles/kernel/svm/checker.h
index 9251d90c0e1..a79b1651f44 100644
--- a/intern/cycles/kernel/svm/svm_checker.h
+++ b/intern/cycles/kernel/svm/checker.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Checker */
diff --git a/intern/cycles/kernel/svm/svm_clamp.h b/intern/cycles/kernel/svm/clamp.h
index 5b5ea784f4a..c07c0206d29 100644
--- a/intern/cycles/kernel/svm/svm_clamp.h
+++ b/intern/cycles/kernel/svm/clamp.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Clamp Node */
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/closure.h
index 3378832c233..1dcfe003f74 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/closure.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Closure Nodes */
diff --git a/intern/cycles/kernel/svm/svm_color_util.h b/intern/cycles/kernel/svm/color_util.h
index 1a0fa03305e..82024b61ba4 100644
--- a/intern/cycles/kernel/svm/svm_color_util.h
+++ b/intern/cycles/kernel/svm/color_util.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device float3 svm_mix_blend(float t, float3 col1, float3 col2)
diff --git a/intern/cycles/kernel/svm/svm_convert.h b/intern/cycles/kernel/svm/convert.h
index ec5745dc78a..427ffd97f59 100644
--- a/intern/cycles/kernel/svm/svm_convert.h
+++ b/intern/cycles/kernel/svm/convert.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Conversion Nodes */
diff --git a/intern/cycles/kernel/svm/svm_displace.h b/intern/cycles/kernel/svm/displace.h
index 8429fe1d3e0..cea1436f36d 100644
--- a/intern/cycles/kernel/svm/svm_displace.h
+++ b/intern/cycles/kernel/svm/displace.h
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-#include "kernel/sample/sample_mapping.h"
+#pragma once
+
+#include "kernel/sample/mapping.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/svm/svm_fractal_noise.h b/intern/cycles/kernel/svm/fractal_noise.h
index 57fa8c690ac..b955d626dde 100644
--- a/intern/cycles/kernel/svm/svm_fractal_noise.h
+++ b/intern/cycles/kernel/svm/fractal_noise.h
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#pragma once
+
+#include "kernel/svm/noise.h"
+
 CCL_NAMESPACE_BEGIN
 
 /* The fractal_noise_[1-4] functions are all exactly the same except for the input type. */
diff --git a/intern/cycles/kernel/svm/svm_fresnel.h b/intern/cycles/kernel/svm/fresnel.h
index 449ec84370f..9dd68c3e38f 100644
--- a/intern/cycles/kernel/svm/svm_fresnel.h
+++ b/intern/cycles/kernel/svm/fresnel.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Fresnel Node */
diff --git a/intern/cycles/kernel/svm/svm_gamma.h b/intern/cycles/kernel/svm/gamma.h
index 7ec6c31065d..9f89e780be9 100644
--- a/intern/cycles/kernel/svm/svm_gamma.h
+++ b/intern/cycles/kernel/svm/gamma.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device_noinline void svm_node_gamma(ccl_private ShaderData *sd,
diff --git a/intern/cycles/kernel/svm/svm_geometry.h b/intern/cycles/kernel/svm/geometry.h
index b29bfdbed07..772942e0c08 100644
--- a/intern/cycles/kernel/svm/svm_geometry.h
+++ b/intern/cycles/kernel/svm/geometry.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Geometry Node */
diff --git a/intern/cycles/kernel/svm/svm_gradient.h b/intern/cycles/kernel/svm/gradient.h
index 8cc37be606f..852196b73dc 100644
--- a/intern/cycles/kernel/svm/svm_gradient.h
+++ b/intern/cycles/kernel/svm/gradient.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Gradient */
diff --git a/intern/cycles/kernel/svm/svm_hsv.h b/intern/cycles/kernel/svm/hsv.h
index 978c4c2d781..f6881fd4512 100644
--- a/intern/cycles/kernel/svm/svm_hsv.h
+++ b/intern/cycles/kernel/svm/hsv.h
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef __SVM_HSV_H__
-#define __SVM_HSV_H__
+#pragma once
 
 CCL_NAMESPACE_BEGIN
 
@@ -60,5 +59,3 @@ ccl_device_noinline void svm_node_hsv(KernelGlobals kg,
 }
 
 CCL_NAMESPACE_END
-
-#endif /* __SVM_HSV_H__ */
diff --git a/intern/cycles/kernel/svm/svm_ies.h b/intern/cycles/kernel/svm/ies.h
index 0215670d062..f0923720878 100644
--- a/intern/cycles/kernel/svm/svm_ies.h
+++ b/intern/cycles/kernel/svm/ies.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* IES Light */
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/image.h
index 68374fcfb0d..6ddf98a6ef1 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/image.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device float4 svm_image_texture(KernelGlobals kg, int id, float x, float y, uint flags)
diff --git a/intern/cycles/kernel/svm/svm_invert.h b/intern/cycles/kernel/svm/invert.h
index 60668ec00f1..5a88e9df2c9 100644
--- a/intern/cycles/kernel/svm/svm_invert.h
+++ b/intern/cycles/kernel/svm/invert.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device float invert(float color, float factor)
diff --git a/intern/cycles/kernel/svm/svm_light_path.h b/intern/cycles/kernel/svm/light_path.h
index 5e1fc4f671c..44a35b568fa 100644
--- a/intern/cycles/kernel/svm/svm_light_path.h
+++ b/intern/cycles/kernel/svm/light_path.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Light Path Node */
diff --git a/intern/cycles/kernel/svm/svm_magic.h b/intern/cycles/kernel/svm/magic.h
index d3a429fec56..f103a8eebcc 100644
--- a/intern/cycles/kernel/svm/svm_magic.h
+++ b/intern/cycles/kernel/svm/magic.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Magic */
diff --git a/intern/cycles/kernel/svm/svm_map_range.h b/intern/cycles/kernel/svm/map_range.h
index 5e89947c6c7..fdbfc6531c4 100644
--- a/intern/cycles/kernel/svm/svm_map_range.h
+++ b/intern/cycles/kernel/svm/map_range.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Map Range Node */
diff --git a/intern/cycles/kernel/svm/svm_mapping.h b/intern/cycles/kernel/svm/mapping.h
index ed420e5bc3d..19f79471ad2 100644
--- a/intern/cycles/kernel/svm/svm_mapping.h
+++ b/intern/cycles/kernel/svm/mapping.h
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#pragma once
+
+#include "kernel/svm/mapping_util.h"
+
 CCL_NAMESPACE_BEGIN
 
 /* Mapping Node */
diff --git a/intern/cycles/kernel/svm/svm_mapping_util.h b/intern/cycles/kernel/svm/mapping_util.h
index ec2c84e0791..51b13c0c264 100644
--- a/intern/cycles/kernel/svm/svm_mapping_util.h
+++ b/intern/cycles/kernel/svm/mapping_util.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device float3
diff --git a/intern/cycles/kernel/svm/svm_math.h b/intern/cycles/kernel/svm/math.h
index 97f7d486c09..ff0f3683ea3 100644
--- a/intern/cycles/kernel/svm/svm_math.h
+++ b/intern/cycles/kernel/svm/math.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device_noinline void svm_node_math(KernelGlobals kg,
diff --git a/intern/cycles/kernel/svm/svm_math_util.h b/intern/cycles/kernel/svm/math_util.h
index d3225b55ef0..b2e539cdd1f 100644
--- a/intern/cycles/kernel/svm/svm_math_util.h
+++ b/intern/cycles/kernel/svm/math_util.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device void svm_vector_math(ccl_private float *value,
diff --git a/intern/cycles/kernel/svm/svm_mix.h b/intern/cycles/kernel/svm/mix.h
index 568dda3dddc..96e5b3f5b5e 100644
--- a/intern/cycles/kernel/svm/svm_mix.h
+++ b/intern/cycles/kernel/svm/mix.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Node */
diff --git a/intern/cycles/kernel/svm/svm_musgrave.h b/intern/cycles/kernel/svm/musgrave.h
index decd29bbe13..4225c3d2d71 100644
--- a/intern/cycles/kernel/svm/svm_musgrave.h
+++ b/intern/cycles/kernel/svm/musgrave.h
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#pragma once
+
+#include "kernel/svm/noise.h"
+
 CCL_NAMESPACE_BEGIN
 
 /* 1D Musgrave fBm
diff --git a/intern/cycles/kernel/svm/svm_noise.h b/intern/cycles/kernel/svm/noise.h
index ecb4df6afdf..0a1616226db 100644
--- a/intern/cycles/kernel/svm/svm_noise.h
+++ b/intern/cycles/kernel/svm/noise.h
@@ -30,6 +30,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* **** Perlin Noise **** */
diff --git a/intern/cycles/kernel/svm/svm_noisetex.h b/intern/cycles/kernel/svm/noisetex.h
index 3fe33f72b59..c43c3b9f9d2 100644
--- a/intern/cycles/kernel/svm/svm_noisetex.h
+++ b/intern/cycles/kernel/svm/noisetex.h
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#pragma once
+
+#include "kernel/svm/fractal_noise.h"
+
 CCL_NAMESPACE_BEGIN
 
 /* The following offset functions generate random offsets to be added to texture
diff --git a/intern/cycles/kernel/svm/svm_normal.h b/intern/cycles/kernel/svm/normal.h
index 9bf64ed8823..6a2d88b68a6 100644
--- a/intern/cycles/kernel/svm/svm_normal.h
+++ b/intern/cycles/kernel/svm/normal.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device_noinline int svm_node_normal(KernelGlobals kg,
diff --git a/intern/cycles/kernel/svm/svm_ramp.h b/intern/cycles/kernel/svm/ramp.h
index d2dddf4c6eb..1dc3383956d 100644
--- a/intern/cycles/kernel/svm/svm_ramp.h
+++ b/intern/cycles/kernel/svm/ramp.h
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef __SVM_RAMP_H__
-#define __SVM_RAMP_H__
+#pragma once
 
 CCL_NAMESPACE_BEGIN
 
@@ -164,5 +163,3 @@ ccl_device_noinline int svm_node_curve(
 }
 
 CCL_NAMESPACE_END
-
-#endif /* __SVM_RAMP_H__ */
diff --git a/intern/cycles/kernel/svm/svm_ramp_util.h b/intern/cycles/kernel/svm/ramp_util.h
index 202596c1fe3..f5951f7e283 100644
--- a/intern/cycles/kernel/svm/svm_ramp_util.h
+++ b/intern/cycles/kernel/svm/ramp_util.h
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef __SVM_RAMP_UTIL_H__
-#define __SVM_RAMP_UTIL_H__
+#pragma once
 
 CCL_NAMESPACE_BEGIN
 
@@ -86,5 +85,3 @@ ccl_device float float_ramp_lookup(
 }
 
 CCL_NAMESPACE_END
-
-#endif /* __SVM_RAMP_UTIL_H__ */
diff --git a/intern/cycles/kernel/svm/svm_sepcomb_hsv.h b/intern/cycles/kernel/svm/sepcomb_hsv.h
index bafa0456342..941a83e85b3 100644
--- a/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
+++ b/intern/cycles/kernel/svm/sepcomb_hsv.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device_noinline int svm_node_combine_hsv(KernelGlobals kg,
diff --git a/intern/cycles/kernel/svm/svm_sepcomb_vector.h b/intern/cycles/kernel/svm/sepcomb_vector.h
index 11e440f2cbf..acdea741aed 100644
--- a/intern/cycles/kernel/svm/svm_sepcomb_vector.h
+++ b/intern/cycles/kernel/svm/sepcomb_vector.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Vector combine / separate, used for the RGB and XYZ nodes */
diff --git a/intern/cycles/kernel/svm/svm_sky.h b/intern/cycles/kernel/svm/sky.h
index 3ab7bc89c66..867fdfc2a3f 100644
--- a/intern/cycles/kernel/svm/svm_sky.h
+++ b/intern/cycles/kernel/svm/sky.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Sky texture */
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h
index 472f3517839..62ba5bf04e3 100644
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef __SVM_H__
-#define __SVM_H__
+#pragma once
 
 /* Shader Virtual Machine
  *
@@ -38,7 +37,7 @@
  * mostly taken care of in the SVM compiler.
  */
 
-#include "kernel/svm/svm_types.h"
+#include "kernel/svm/types.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -165,61 +164,54 @@ CCL_NAMESPACE_END
 
 /* Nodes */
 
-#include "kernel/svm/svm_noise.h"
-#include "svm_fractal_noise.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_aov.h"
-#include "kernel/svm/svm_attribute.h"
-#include "kernel/svm/svm_blackbody.h"
-#include "kernel/svm/svm_brick.h"
-#include "kernel/svm/svm_brightness.h"
-#include "kernel/svm/svm_bump.h"
-#include "kernel/svm/svm_camera.h"
-#include "kernel/svm/svm_checker.h"
-#include "kernel/svm/svm_clamp.h"
-#include "kernel/svm/svm_closure.h"
-#include "kernel/svm/svm_convert.h"
-#include "kernel/svm/svm_displace.h"
-#include "kernel/svm/svm_fresnel.h"
-#include "kernel/svm/svm_gamma.h"
-#include "kernel/svm/svm_geometry.h"
-#include "kernel/svm/svm_gradient.h"
-#include "kernel/svm/svm_hsv.h"
-#include "kernel/svm/svm_ies.h"
-#include "kernel/svm/svm_image.h"
-#include "kernel/svm/svm_invert.h"
-#include "kernel/svm/svm_light_path.h"
-#include "kernel/svm/svm_magic.h"
-#include "kernel/svm/svm_map_range.h"
-#include "kernel/svm/svm_mapping.h"
-#include "kernel/svm/svm_math.h"
-#include "kernel/svm/svm_mix.h"
-#include "kernel/svm/svm_musgrave.h"
-#include "kernel/svm/svm_noisetex.h"
-#include "kernel/svm/svm_normal.h"
-#include "kernel/svm/svm_ramp.h"
-#include "kernel/svm/svm_sepcomb_hsv.h"
-#include "kernel/svm/svm_sepcomb_vector.h"
-#include "kernel/svm/svm_sky.h"
-#include "kernel/svm/svm_tex_coord.h"
-#include "kernel/svm/svm_value.h"
-#include "kernel/svm/svm_vector_rotate.h"
-#include "kernel/svm/svm_vector_transform.h"
-#include "kernel/svm/svm_vertex_color.h"
-#include "kernel/svm/svm_voronoi.h"
-#include "kernel/svm/svm_voxel.h"
-#include "kernel/svm/svm_wave.h"
-#include "kernel/svm/svm_wavelength.h"
-#include "kernel/svm/svm_white_noise.h"
-#include "kernel/svm/svm_wireframe.h"
+#include "kernel/svm/aov.h"
+#include "kernel/svm/attribute.h"
+#include "kernel/svm/blackbody.h"
+#include "kernel/svm/brick.h"
+#include "kernel/svm/brightness.h"
+#include "kernel/svm/bump.h"
+#include "kernel/svm/camera.h"
+#include "kernel/svm/checker.h"
+#include "kernel/svm/clamp.h"
+#include "kernel/svm/closure.h"
+#include "kernel/svm/convert.h"
+#include "kernel/svm/displace.h"
+#include "kernel/svm/fresnel.h"
+#include "kernel/svm/gamma.h"
+#include "kernel/svm/geometry.h"
+#include "kernel/svm/gradient.h"
+#include "kernel/svm/hsv.h"
+#include "kernel/svm/ies.h"
+#include "kernel/svm/image.h"
+#include "kernel/svm/invert.h"
+#include "kernel/svm/light_path.h"
+#include "kernel/svm/magic.h"
+#include "kernel/svm/map_range.h"
+#include "kernel/svm/mapping.h"
+#include "kernel/svm/math.h"
+#include "kernel/svm/mix.h"
+#include "kernel/svm/musgrave.h"
+#include "kernel/svm/noisetex.h"
+#include "kernel/svm/normal.h"
+#include "kernel/svm/ramp.h"
+#include "kernel/svm/sepcomb_hsv.h"
+#include "kernel/svm/sepcomb_vector.h"
+#include "kernel/svm/sky.h"
+#include "kernel/svm/tex_coord.h"
+#include "kernel/svm/value.h"
+#include "kernel/svm/vector_rotate.h"
+#include "kernel/svm/vector_transform.h"
+#include "kernel/svm/vertex_color.h"
+#include "kernel/svm/voronoi.h"
+#include "kernel/svm/voxel.h"
+#include "kernel/svm/wave.h"
+#include "kernel/svm/wavelength.h"
+#include "kernel/svm/white_noise.h"
+#include "kernel/svm/wireframe.h"
 
 #ifdef __SHADER_RAYTRACE__
-#  include "kernel/svm/svm_ao.h"
-#  include "kernel/svm/svm_bevel.h"
+#  include "kernel/svm/ao.h"
+#  include "kernel/svm/bevel.h"
 #endif
 
 CCL_NAMESPACE_BEGIN
@@ -607,5 +599,3 @@ ccl_device void svm_eval_nodes(KernelGlobals kg,
 }
 
 CCL_NAMESPACE_END
-
-#endif /* __SVM_H__ */
diff --git a/intern/cycles/kernel/svm/svm_tex_coord.h b/intern/cycles/kernel/svm/tex_coord.h
index 9af0a818cad..5e0debc968a 100644
--- a/intern/cycles/kernel/svm/svm_tex_coord.h
+++ b/intern/cycles/kernel/svm/tex_coord.h
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
+#pragma once
+
 #include "kernel/camera/camera.h"
 #include "kernel/geom/geom.h"
-#include "kernel/sample/sample_mapping.h"
+#include "kernel/sample/mapping.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/types.h
index 6f6c101fb69..8c95c571815 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/types.h
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef __SVM_TYPES_H__
-#define __SVM_TYPES_H__
+#pragma once
 
 CCL_NAMESPACE_BEGIN
 
@@ -600,5 +599,3 @@ typedef enum ClosureType {
 #define CLOSURE_WEIGHT_CUTOFF 1e-5f
 
 CCL_NAMESPACE_END
-
-#endif /*  __SVM_TYPES_H__ */
diff --git a/intern/cycles/kernel/svm/svm_value.h b/intern/cycles/kernel/svm/value.h
index cc72961d0f6..cc62f1e2a82 100644
--- a/intern/cycles/kernel/svm/svm_value.h
+++ b/intern/cycles/kernel/svm/value.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Value Nodes */
diff --git a/intern/cycles/kernel/svm/svm_vector_rotate.h b/intern/cycles/kernel/svm/vector_rotate.h
index c20f9b2556f..2a0d331734c 100644
--- a/intern/cycles/kernel/svm/svm_vector_rotate.h
+++ b/intern/cycles/kernel/svm/vector_rotate.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Vector Rotate */
diff --git a/intern/cycles/kernel/svm/svm_vector_transform.h b/intern/cycles/kernel/svm/vector_transform.h
index 4e0d36647da..d7a51078cea 100644
--- a/intern/cycles/kernel/svm/svm_vector_transform.h
+++ b/intern/cycles/kernel/svm/vector_transform.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Vector Transform */
diff --git a/intern/cycles/kernel/svm/svm_vertex_color.h b/intern/cycles/kernel/svm/vertex_color.h
index a5fa15ee085..b676a28c0e3 100644
--- a/intern/cycles/kernel/svm/svm_vertex_color.h
+++ b/intern/cycles/kernel/svm/vertex_color.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device_noinline void svm_node_vertex_color(KernelGlobals kg,
diff --git a/intern/cycles/kernel/svm/svm_voronoi.h b/intern/cycles/kernel/svm/voronoi.h
index b8067520770..730965b6aed 100644
--- a/intern/cycles/kernel/svm/svm_voronoi.h
+++ b/intern/cycles/kernel/svm/voronoi.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /*
diff --git a/intern/cycles/kernel/svm/svm_voxel.h b/intern/cycles/kernel/svm/voxel.h
index be4bb315145..43947fbc54f 100644
--- a/intern/cycles/kernel/svm/svm_voxel.h
+++ b/intern/cycles/kernel/svm/voxel.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* TODO(sergey): Think of making it more generic volume-type attribute
diff --git a/intern/cycles/kernel/svm/svm_wave.h b/intern/cycles/kernel/svm/wave.h
index d04b7aa3476..40e71b9d5df 100644
--- a/intern/cycles/kernel/svm/svm_wave.h
+++ b/intern/cycles/kernel/svm/wave.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Wave */
diff --git a/intern/cycles/kernel/svm/svm_wavelength.h b/intern/cycles/kernel/svm/wavelength.h
index 4ef041f68d5..28fd172abc7 100644
--- a/intern/cycles/kernel/svm/svm_wavelength.h
+++ b/intern/cycles/kernel/svm/wavelength.h
@@ -30,6 +30,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Wavelength to RGB */
diff --git a/intern/cycles/kernel/svm/svm_white_noise.h b/intern/cycles/kernel/svm/white_noise.h
index 6c2c3d6a683..d275a3f7068 100644
--- a/intern/cycles/kernel/svm/svm_white_noise.h
+++ b/intern/cycles/kernel/svm/white_noise.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 ccl_device_noinline void svm_node_tex_white_noise(KernelGlobals kg,
diff --git a/intern/cycles/kernel/svm/svm_wireframe.h b/intern/cycles/kernel/svm/wireframe.h
index d75976d23e1..530a9601bce 100644
--- a/intern/cycles/kernel/svm/svm_wireframe.h
+++ b/intern/cycles/kernel/svm/wireframe.h
@@ -30,6 +30,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#pragma once
+
 CCL_NAMESPACE_BEGIN
 
 /* Wireframe Node */
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/textures.h
index 464ecb183cb..464ecb183cb 100644
--- a/intern/cycles/kernel/kernel_textures.h
+++ b/intern/cycles/kernel/textures.h
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/types.h
index 4312c1b67d2..4109dd6a486 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/types.h
@@ -22,15 +22,15 @@
 #  define __EMBREE__
 #endif
 
-#include "util/util_math.h"
-#include "util/util_math_fast.h"
-#include "util/util_math_intersect.h"
-#include "util/util_projection.h"
-#include "util/util_texture.h"
-#include "util/util_transform.h"
-#include "util/util_static_assert.h"
-
-#include "kernel/svm/svm_types.h"
+#include "util/math.h"
+#include "util/math_fast.h"
+#include "util/math_intersect.h"
+#include "util/projection.h"
+#include "util/static_assert.h"
+#include "util/texture.h"
+#include "util/transform.h"
+
+#include "kernel/svm/types.h"
 
 #ifndef __KERNEL_GPU__
 #  define __KERNEL_CPU__
diff --git a/intern/cycles/kernel/util/util_color.h b/intern/cycles/kernel/util/color.h
index 0d7bfecd5f3..6d17647c9f8 100644
--- a/intern/cycles/kernel/util/util_color.h
+++ b/intern/cycles/kernel/util/color.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "util/util_color.h"
+#include "util/color.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/util/util_differential.h b/intern/cycles/kernel/util/differential.h
index 17187083019..17187083019 100644
--- a/intern/cycles/kernel/util/util_differential.h
+++ b/intern/cycles/kernel/util/differential.h
diff --git a/intern/cycles/kernel/util/util_lookup_table.h b/intern/cycles/kernel/util/lookup_table.h
index 2c26e668d7b..2c26e668d7b 100644
--- a/intern/cycles/kernel/util/util_lookup_table.h
+++ b/intern/cycles/kernel/util/lookup_table.h
diff --git a/intern/cycles/kernel/util/util_profiling.h b/intern/cycles/kernel/util/profiling.h
index db8644005ea..12ce441ccbf 100644
--- a/intern/cycles/kernel/util/util_profiling.h
+++ b/intern/cycles/kernel/util/profiling.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #ifdef __KERNEL_CPU__
-#  include "util/util_profiling.h"
+#  include "util/profiling.h"
 #endif
 
 CCL_NAMESPACE_BEGIN
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
 
diff --git a/intern/cycles/session/buffers.cpp b/intern/cycles/session/buffers.cpp
index 439c0f826ea..51d9c1e5d8f 100644
--- a/intern/cycles/session/buffers.cpp
+++ b/intern/cycles/session/buffers.cpp
@@ -19,11 +19,11 @@
 #include "device/device.h"
 #include "session/buffers.h"
 
-#include "util/util_foreach.h"
-#include "util/util_hash.h"
-#include "util/util_math.h"
-#include "util/util_time.h"
-#include "util/util_types.h"
+#include "util/foreach.h"
+#include "util/hash.h"
+#include "util/math.h"
+#include "util/time.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/session/buffers.h b/intern/cycles/session/buffers.h
index 4c261430bb6..67022bb5b6b 100644
--- a/intern/cycles/session/buffers.h
+++ b/intern/cycles/session/buffers.h
@@ -17,16 +17,16 @@
 #ifndef __BUFFERS_H__
 #define __BUFFERS_H__
 
-#include "device/device_memory.h"
+#include "device/memory.h"
 #include "graph/node.h"
 #include "scene/pass.h"
 
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
 
-#include "util/util_half.h"
-#include "util/util_string.h"
-#include "util/util_thread.h"
-#include "util/util_types.h"
+#include "util/half.h"
+#include "util/string.h"
+#include "util/thread.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/session/display_driver.h b/intern/cycles/session/display_driver.h
index 85f305034d7..77f89326fd0 100644
--- a/intern/cycles/session/display_driver.h
+++ b/intern/cycles/session/display_driver.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "util/util_half.h"
-#include "util/util_types.h"
+#include "util/half.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/session/merge.cpp b/intern/cycles/session/merge.cpp
index 97e9c75d5f7..5890c15f48c 100644
--- a/intern/cycles/session/merge.cpp
+++ b/intern/cycles/session/merge.cpp
@@ -16,11 +16,11 @@
 
 #include "session/merge.h"
 
-#include "util/util_array.h"
-#include "util/util_map.h"
-#include "util/util_system.h"
-#include "util/util_time.h"
-#include "util/util_unique_ptr.h"
+#include "util/array.h"
+#include "util/map.h"
+#include "util/system.h"
+#include "util/time.h"
+#include "util/unique_ptr.h"
 
 #include <OpenImageIO/filesystem.h>
 #include <OpenImageIO/imageio.h>
diff --git a/intern/cycles/session/merge.h b/intern/cycles/session/merge.h
index 87e5d2d4723..be03a69b27a 100644
--- a/intern/cycles/session/merge.h
+++ b/intern/cycles/session/merge.h
@@ -17,8 +17,8 @@
 #ifndef __MERGE_H__
 #define __MERGE_H__
 
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/session/output_driver.h b/intern/cycles/session/output_driver.h
index b7e980d71d4..95e15ed875b 100644
--- a/intern/cycles/session/output_driver.h
+++ b/intern/cycles/session/output_driver.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "util/util_math.h"
-#include "util/util_string.h"
-#include "util/util_types.h"
+#include "util/math.h"
+#include "util/string.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/session/session.cpp b/intern/cycles/session/session.cpp
index f8fc892f127..b228939689c 100644
--- a/intern/cycles/session/session.cpp
+++ b/intern/cycles/session/session.cpp
@@ -35,12 +35,12 @@
 #include "session/output_driver.h"
 #include "session/session.h"
 
-#include "util/util_foreach.h"
-#include "util/util_function.h"
-#include "util/util_logging.h"
-#include "util/util_math.h"
-#include "util/util_task.h"
-#include "util/util_time.h"
+#include "util/foreach.h"
+#include "util/function.h"
+#include "util/log.h"
+#include "util/math.h"
+#include "util/task.h"
+#include "util/time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/session/session.h b/intern/cycles/session/session.h
index 5aa6df79ef1..1ec0c6e9bb1 100644
--- a/intern/cycles/session/session.h
+++ b/intern/cycles/session/session.h
@@ -24,11 +24,11 @@
 #include "session/buffers.h"
 #include "session/tile.h"
 
-#include "util/util_progress.h"
-#include "util/util_stats.h"
-#include "util/util_thread.h"
-#include "util/util_unique_ptr.h"
-#include "util/util_vector.h"
+#include "util/progress.h"
+#include "util/stats.h"
+#include "util/thread.h"
+#include "util/unique_ptr.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/session/tile.cpp b/intern/cycles/session/tile.cpp
index 59332530596..816bf4d5fa0 100644
--- a/intern/cycles/session/tile.cpp
+++ b/intern/cycles/session/tile.cpp
@@ -23,13 +23,13 @@
 #include "scene/film.h"
 #include "scene/integrator.h"
 #include "scene/scene.h"
-#include "util/util_algorithm.h"
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_path.h"
-#include "util/util_string.h"
-#include "util/util_system.h"
-#include "util/util_types.h"
+#include "util/algorithm.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/path.h"
+#include "util/string.h"
+#include "util/system.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/session/tile.h b/intern/cycles/session/tile.h
index 37a02081a53..eace148eb0a 100644
--- a/intern/cycles/session/tile.h
+++ b/intern/cycles/session/tile.h
@@ -17,9 +17,9 @@
 #pragma once
 
 #include "session/buffers.h"
-#include "util/util_image.h"
-#include "util/util_string.h"
-#include "util/util_unique_ptr.h"
+#include "util/image.h"
+#include "util/string.h"
+#include "util/unique_ptr.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/subd/CMakeLists.txt b/intern/cycles/subd/CMakeLists.txt
index c697ddb9891..4bf5503dc4b 100644
--- a/intern/cycles/subd/CMakeLists.txt
+++ b/intern/cycles/subd/CMakeLists.txt
@@ -21,18 +21,18 @@ set(INC_SYS
 )
 
 set(SRC
-  subd_dice.cpp
-  subd_patch.cpp
-  subd_split.cpp
-  subd_patch_table.cpp
+  dice.cpp
+  patch.cpp
+  split.cpp
+  patch_table.cpp
 )
 
 set(SRC_HEADERS
-  subd_dice.h
-  subd_patch.h
-  subd_patch_table.h
-  subd_split.h
-  subd_subpatch.h
+  dice.h
+  patch.h
+  patch_table.h
+  split.h
+  subpatch.h
 )
 
 set(LIB
diff --git a/intern/cycles/subd/subd_dice.cpp b/intern/cycles/subd/dice.cpp
index a4019a5d639..461fa0bcd9c 100644
--- a/intern/cycles/subd/subd_dice.cpp
+++ b/intern/cycles/subd/dice.cpp
@@ -17,8 +17,8 @@
 #include "scene/camera.h"
 #include "scene/mesh.h"
 
-#include "subd/subd_dice.h"
-#include "subd/subd_patch.h"
+#include "subd/dice.h"
+#include "subd/patch.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/subd/subd_dice.h b/intern/cycles/subd/dice.h
index ee63403d40c..7510aae775c 100644
--- a/intern/cycles/subd/subd_dice.h
+++ b/intern/cycles/subd/dice.h
@@ -22,10 +22,10 @@
  * DiagSplit. For more algorithm details, see the DiagSplit paper or the
  * ARB_tessellation_shader OpenGL extension, Section 2.X.2. */
 
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/types.h"
+#include "util/vector.h"
 
-#include "subd/subd_subpatch.h"
+#include "subd/subpatch.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/subd/subd_patch.cpp b/intern/cycles/subd/patch.cpp
index 23b3e6d5136..4d73f334c1b 100644
--- a/intern/cycles/subd/subd_patch.cpp
+++ b/intern/cycles/subd/patch.cpp
@@ -18,10 +18,10 @@
 
 #include "scene/mesh.h"
 
-#include "subd/subd_patch.h"
+#include "subd/patch.h"
 
-#include "util/util_math.h"
-#include "util/util_types.h"
+#include "util/math.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/subd/subd_patch.h b/intern/cycles/subd/patch.h
index 8fe423bc94d..ad4dc1bd8e9 100644
--- a/intern/cycles/subd/subd_patch.h
+++ b/intern/cycles/subd/patch.h
@@ -17,8 +17,8 @@
 #ifndef __SUBD_PATCH_H__
 #define __SUBD_PATCH_H__
 
-#include "util/util_boundbox.h"
-#include "util/util_types.h"
+#include "util/boundbox.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/subd/subd_patch_table.cpp b/intern/cycles/subd/patch_table.cpp
index 4e873375725..d215dfaa1dd 100644
--- a/intern/cycles/subd/subd_patch_table.cpp
+++ b/intern/cycles/subd/patch_table.cpp
@@ -24,10 +24,10 @@
  * language governing permissions and limitations under the Apache License.
  */
 
-#include "subd/subd_patch_table.h"
-#include "kernel/kernel_types.h"
+#include "subd/patch_table.h"
+#include "kernel/types.h"
 
-#include "util/util_math.h"
+#include "util/math.h"
 
 #ifdef WITH_OPENSUBDIV
 #  include <opensubdiv/far/patchTable.h>
diff --git a/intern/cycles/subd/subd_patch_table.h b/intern/cycles/subd/patch_table.h
index 118d410f8f0..b5fd5923f31 100644
--- a/intern/cycles/subd/subd_patch_table.h
+++ b/intern/cycles/subd/patch_table.h
@@ -17,8 +17,8 @@
 #ifndef __SUBD_PATCH_TABLE_H__
 #define __SUBD_PATCH_TABLE_H__
 
-#include "util/util_array.h"
-#include "util/util_types.h"
+#include "util/array.h"
+#include "util/types.h"
 
 #ifdef WITH_OPENSUBDIV
 #  ifdef _MSC_VER
diff --git a/intern/cycles/subd/subd_split.cpp b/intern/cycles/subd/split.cpp
index 6b352ab02c3..2b29f3a5a78 100644
--- a/intern/cycles/subd/subd_split.cpp
+++ b/intern/cycles/subd/split.cpp
@@ -17,15 +17,15 @@
 #include "scene/camera.h"
 #include "scene/mesh.h"
 
-#include "subd/subd_dice.h"
-#include "subd/subd_patch.h"
-#include "subd/subd_split.h"
-
-#include "util/util_algorithm.h"
-#include "util/util_foreach.h"
-#include "util/util_hash.h"
-#include "util/util_math.h"
-#include "util/util_types.h"
+#include "subd/dice.h"
+#include "subd/patch.h"
+#include "subd/split.h"
+
+#include "util/algorithm.h"
+#include "util/foreach.h"
+#include "util/hash.h"
+#include "util/math.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/subd/subd_split.h b/intern/cycles/subd/split.h
index 7416b2fbbf8..e876f34c419 100644
--- a/intern/cycles/subd/subd_split.h
+++ b/intern/cycles/subd/split.h
@@ -22,12 +22,12 @@
  * evaluation at arbitrary points is required for this to work. See the paper
  * for more details. */
 
-#include "subd/subd_dice.h"
-#include "subd/subd_subpatch.h"
+#include "subd/dice.h"
+#include "subd/subpatch.h"
 
-#include "util/util_deque.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/deque.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 #include <deque>
 
diff --git a/intern/cycles/subd/subd_subpatch.h b/intern/cycles/subd/subpatch.h
index cdaa310916a..0ba8ed88aa8 100644
--- a/intern/cycles/subd/subd_subpatch.h
+++ b/intern/cycles/subd/subpatch.h
@@ -17,8 +17,8 @@
 #ifndef __SUBD_SUBPATCH_H__
 #define __SUBD_SUBPATCH_H__
 
-#include "util/util_map.h"
-#include "util/util_types.h"
+#include "util/map.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt
index efd9cecb877..86a830b2b65 100644
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -20,13 +20,7 @@ if(WITH_GTESTS)
 endif()
 
 set(INC
-  .
   ..
-  ../device
-  ../graph
-  ../kernel
-  ../scene
-  ../util
 )
 
 set(ALL_CYCLES_LIBRARIES
diff --git a/intern/cycles/test/integrator_adaptive_sampling_test.cpp b/intern/cycles/test/integrator_adaptive_sampling_test.cpp
index 3ed6a23125d..30688605e44 100644
--- a/intern/cycles/test/integrator_adaptive_sampling_test.cpp
+++ b/intern/cycles/test/integrator_adaptive_sampling_test.cpp
@@ -17,7 +17,7 @@
 #include "testing/testing.h"
 
 #include "integrator/adaptive_sampling.h"
-#include "util/util_vector.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/integrator_tile_test.cpp b/intern/cycles/test/integrator_tile_test.cpp
index 5bb57b48c3c..e5ffa7c153d 100644
--- a/intern/cycles/test/integrator_tile_test.cpp
+++ b/intern/cycles/test/integrator_tile_test.cpp
@@ -17,7 +17,7 @@
 #include "testing/testing.h"
 
 #include "integrator/tile.h"
-#include "util/util_math.h"
+#include "util/math.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp
index 4a87a382130..4207b437a41 100644
--- a/intern/cycles/test/render_graph_finalize_test.cpp
+++ b/intern/cycles/test/render_graph_finalize_test.cpp
@@ -23,11 +23,11 @@
 #include "scene/shader_graph.h"
 #include "scene/shader_nodes.h"
 
-#include "util/util_array.h"
-#include "util/util_logging.h"
-#include "util/util_stats.h"
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/array.h"
+#include "util/log.h"
+#include "util/stats.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 using testing::_;
 using testing::AnyNumber;
diff --git a/intern/cycles/test/util_aligned_malloc_test.cpp b/intern/cycles/test/util_aligned_malloc_test.cpp
index 8829c422a0f..2748db520eb 100644
--- a/intern/cycles/test/util_aligned_malloc_test.cpp
+++ b/intern/cycles/test/util_aligned_malloc_test.cpp
@@ -16,7 +16,7 @@
 
 #include "testing/testing.h"
 
-#include "util/util_aligned_malloc.h"
+#include "util/aligned_malloc.h"
 
 #define CHECK_ALIGNMENT(ptr, align) EXPECT_EQ((size_t)ptr % align, 0)
 
diff --git a/intern/cycles/test/util_avxf_test.h b/intern/cycles/test/util_avxf_test.h
index 64825200c9e..b178a0450d0 100644
--- a/intern/cycles/test/util_avxf_test.h
+++ b/intern/cycles/test/util_avxf_test.h
@@ -15,8 +15,8 @@
  */
 
 #include "testing/testing.h"
-#include "util/util_system.h"
-#include "util/util_types.h"
+#include "util/system.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/util_math_test.cpp b/intern/cycles/test/util_math_test.cpp
index b6ce3ef0cf3..adbedf7adbe 100644
--- a/intern/cycles/test/util_math_test.cpp
+++ b/intern/cycles/test/util_math_test.cpp
@@ -16,7 +16,7 @@
 
 #include "testing/testing.h"
 
-#include "util/util_math.h"
+#include "util/math.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/util_path_test.cpp b/intern/cycles/test/util_path_test.cpp
index 76d48dc241d..7afdd1150a4 100644
--- a/intern/cycles/test/util_path_test.cpp
+++ b/intern/cycles/test/util_path_test.cpp
@@ -16,7 +16,7 @@
 
 #include "testing/testing.h"
 
-#include "util/util_path.h"
+#include "util/path.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/util_string_test.cpp b/intern/cycles/test/util_string_test.cpp
index c9022d1b132..f558dda9e47 100644
--- a/intern/cycles/test/util_string_test.cpp
+++ b/intern/cycles/test/util_string_test.cpp
@@ -16,7 +16,7 @@
 
 #include "testing/testing.h"
 
-#include "util/util_string.h"
+#include "util/string.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/util_task_test.cpp b/intern/cycles/test/util_task_test.cpp
index a8b4dfc3a37..17cfe4ff9b2 100644
--- a/intern/cycles/test/util_task_test.cpp
+++ b/intern/cycles/test/util_task_test.cpp
@@ -16,7 +16,7 @@
 
 #include "testing/testing.h"
 
-#include "util/util_task.h"
+#include "util/task.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/util_time_test.cpp b/intern/cycles/test/util_time_test.cpp
index ab5ead2c7b1..97a0134df67 100644
--- a/intern/cycles/test/util_time_test.cpp
+++ b/intern/cycles/test/util_time_test.cpp
@@ -16,7 +16,7 @@
 
 #include "testing/testing.h"
 
-#include "util/util_time.h"
+#include "util/time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/test/util_transform_test.cpp b/intern/cycles/test/util_transform_test.cpp
index a5267df9fb7..11dd71ea0c2 100644
--- a/intern/cycles/test/util_transform_test.cpp
+++ b/intern/cycles/test/util_transform_test.cpp
@@ -16,8 +16,8 @@
 
 #include "testing/testing.h"
 
-#include "util/util_transform.h"
-#include "util/util_vector.h"
+#include "util/transform.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index 18e14913884..b68646a44d5 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -22,23 +22,23 @@ set(INC_SYS
 )
 
 set(SRC
-  util_aligned_malloc.cpp
-  util_debug.cpp
-  util_ies.cpp
-  util_logging.cpp
-  util_math_cdf.cpp
-  util_md5.cpp
-  util_murmurhash.cpp
-  util_path.cpp
-  util_profiling.cpp
-  util_string.cpp
-  util_simd.cpp
-  util_system.cpp
-  util_task.cpp
-  util_thread.cpp
-  util_time.cpp
-  util_transform.cpp
-  util_windows.cpp
+  aligned_malloc.cpp
+  debug.cpp
+  ies.cpp
+  log.cpp
+  math_cdf.cpp
+  md5.cpp
+  murmurhash.cpp
+  path.cpp
+  profiling.cpp
+  string.cpp
+  simd.cpp
+  system.cpp
+  task.cpp
+  thread.cpp
+  time.cpp
+  transform.cpp
+  windows.cpp
 )
 
 set(LIB
@@ -48,7 +48,7 @@ set(LIB
 if(WITH_CYCLES_STANDALONE)
   if(WITH_CYCLES_STANDALONE_GUI)
     list(APPEND SRC
-      util_view.cpp
+      view.cpp
     )
   endif()
 endif()
@@ -64,108 +64,108 @@ else()
 endif()
 
 set(SRC_HEADERS
-  util_algorithm.h
-  util_aligned_malloc.h
-  util_args.h
-  util_array.h
-  util_atomic.h
-  util_boundbox.h
-  util_debug.h
-  util_defines.h
-  util_deque.h
-  util_disjoint_set.h
-  util_guarded_allocator.cpp
-  util_foreach.h
-  util_function.h
-  util_guarded_allocator.h
-  util_half.h
-  util_hash.h
-  util_ies.h
-  util_image.h
-  util_image_impl.h
-  util_list.h
-  util_logging.h
-  util_map.h
-  util_math.h
-  util_math_cdf.h
-  util_math_fast.h
-  util_math_intersect.h
-  util_math_float2.h
-  util_math_float3.h
-  util_math_float4.h
-  util_math_int2.h
-  util_math_int3.h
-  util_math_int4.h
-  util_math_matrix.h
-  util_md5.h
-  util_murmurhash.h
-  util_openimagedenoise.h
-  util_opengl.h
-  util_openvdb.h
-  util_optimization.h
-  util_param.h
-  util_path.h
-  util_profiling.h
-  util_progress.h
-  util_projection.h
-  util_queue.h
-  util_rect.h
-  util_set.h
-  util_simd.h
-  util_avxf.h
-  util_avxb.h
-  util_avxi.h
-  util_semaphore.h
-  util_sseb.h
-  util_ssef.h
-  util_ssei.h
-  util_stack_allocator.h
-  util_static_assert.h
-  util_stats.h
-  util_string.h
-  util_system.h
-  util_task.h
-  util_tbb.h
-  util_texture.h
-  util_thread.h
-  util_time.h
-  util_transform.h
-  util_types.h
-  util_types_float2.h
-  util_types_float2_impl.h
-  util_types_float3.h
-  util_types_float3_impl.h
-  util_types_float4.h
-  util_types_float4_impl.h
-  util_types_float8.h
-  util_types_float8_impl.h
-  util_types_int2.h
-  util_types_int2_impl.h
-  util_types_int3.h
-  util_types_int3_impl.h
-  util_types_int4.h
-  util_types_int4_impl.h
-  util_types_uchar2.h
-  util_types_uchar2_impl.h
-  util_types_uchar3.h
-  util_types_uchar3_impl.h
-  util_types_uchar4.h
-  util_types_uchar4_impl.h
-  util_types_uint2.h
-  util_types_uint2_impl.h
-  util_types_uint3.h
-  util_types_uint3_impl.h
-  util_types_uint4.h
-  util_types_uint4_impl.h
-  util_types_ushort4.h
-  util_types_vector3.h
-  util_types_vector3_impl.h
-  util_unique_ptr.h
-  util_vector.h
-  util_version.h
-  util_view.h
-  util_windows.h
-  util_xml.h
+  algorithm.h
+  aligned_malloc.h
+  args.h
+  array.h
+  atomic.h
+  boundbox.h
+  debug.h
+  defines.h
+  deque.h
+  disjoint_set.h
+  guarded_allocator.cpp
+  foreach.h
+  function.h
+  guarded_allocator.h
+  half.h
+  hash.h
+  ies.h
+  image.h
+  image_impl.h
+  list.h
+  log.h
+  map.h
+  math.h
+  math_cdf.h
+  math_fast.h
+  math_intersect.h
+  math_float2.h
+  math_float3.h
+  math_float4.h
+  math_int2.h
+  math_int3.h
+  math_int4.h
+  math_matrix.h
+  md5.h
+  murmurhash.h
+  openimagedenoise.h
+  opengl.h
+  openvdb.h
+  optimization.h
+  param.h
+  path.h
+  profiling.h
+  progress.h
+  projection.h
+  queue.h
+  rect.h
+  set.h
+  simd.h
+  avxf.h
+  avxb.h
+  avxi.h
+  semaphore.h
+  sseb.h
+  ssef.h
+  ssei.h
+  stack_allocator.h
+  static_assert.h
+  stats.h
+  string.h
+  system.h
+  task.h
+  tbb.h
+  texture.h
+  thread.h
+  time.h
+  transform.h
+  types.h
+  types_float2.h
+  types_float2_impl.h
+  types_float3.h
+  types_float3_impl.h
+  types_float4.h
+  types_float4_impl.h
+  types_float8.h
+  types_float8_impl.h
+  types_int2.h
+  types_int2_impl.h
+  types_int3.h
+  types_int3_impl.h
+  types_int4.h
+  types_int4_impl.h
+  types_uchar2.h
+  types_uchar2_impl.h
+  types_uchar3.h
+  types_uchar3_impl.h
+  types_uchar4.h
+  types_uchar4_impl.h
+  types_uint2.h
+  types_uint2_impl.h
+  types_uint3.h
+  types_uint3_impl.h
+  types_uint4.h
+  types_uint4_impl.h
+  types_ushort4.h
+  types_vector3.h
+  types_vector3_impl.h
+  unique_ptr.h
+  vector.h
+  version.h
+  view.h
+  windows.h
+  xml.h
 )
 
 include_directories(${INC})
diff --git a/intern/cycles/util/util_algorithm.h b/intern/cycles/util/algorithm.h
index 63abd4e92a3..63abd4e92a3 100644
--- a/intern/cycles/util/util_algorithm.h
+++ b/intern/cycles/util/algorithm.h
diff --git a/intern/cycles/util/util_aligned_malloc.cpp b/intern/cycles/util/aligned_malloc.cpp
index 9b729cd4fc4..2b05559b55f 100644
--- a/intern/cycles/util/util_aligned_malloc.cpp
+++ b/intern/cycles/util/aligned_malloc.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "util/util_aligned_malloc.h"
-#include "util/util_guarded_allocator.h"
+#include "util/aligned_malloc.h"
+#include "util/guarded_allocator.h"
 
 #include <cassert>
 
diff --git a/intern/cycles/util/util_aligned_malloc.h b/intern/cycles/util/aligned_malloc.h
index df7d93c056d..66c2ac1c593 100644
--- a/intern/cycles/util/util_aligned_malloc.h
+++ b/intern/cycles/util/aligned_malloc.h
@@ -17,7 +17,7 @@
 #ifndef __UTIL_ALIGNED_MALLOC_H__
 #define __UTIL_ALIGNED_MALLOC_H__
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_args.h b/intern/cycles/util/args.h
index be6f2c2b9f1..be6f2c2b9f1 100644
--- a/intern/cycles/util/util_args.h
+++ b/intern/cycles/util/args.h
diff --git a/intern/cycles/util/util_array.h b/intern/cycles/util/array.h
index 73f7d6cf7f8..4c905b09138 100644
--- a/intern/cycles/util/util_array.h
+++ b/intern/cycles/util/array.h
@@ -20,10 +20,10 @@
 #include <cassert>
 #include <cstring>
 
-#include "util/util_aligned_malloc.h"
-#include "util/util_guarded_allocator.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/aligned_malloc.h"
+#include "util/guarded_allocator.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_atomic.h b/intern/cycles/util/atomic.h
index faba411c769..faba411c769 100644
--- a/intern/cycles/util/util_atomic.h
+++ b/intern/cycles/util/atomic.h
diff --git a/intern/cycles/util/util_avxb.h b/intern/cycles/util/avxb.h
index 15215d04ca3..15215d04ca3 100644
--- a/intern/cycles/util/util_avxb.h
+++ b/intern/cycles/util/avxb.h
diff --git a/intern/cycles/util/util_avxf.h b/intern/cycles/util/avxf.h
index 1fb3ded422f..1fb3ded422f 100644
--- a/intern/cycles/util/util_avxf.h
+++ b/intern/cycles/util/avxf.h
diff --git a/intern/cycles/util/util_avxi.h b/intern/cycles/util/avxi.h
index 0ae4bf271c8..0ae4bf271c8 100644
--- a/intern/cycles/util/util_avxi.h
+++ b/intern/cycles/util/avxi.h
diff --git a/intern/cycles/util/util_boundbox.h b/intern/cycles/util/boundbox.h
index 7fab7bd5a15..ed81e4cf8c3 100644
--- a/intern/cycles/util/util_boundbox.h
+++ b/intern/cycles/util/boundbox.h
@@ -20,10 +20,10 @@
 #include <float.h>
 #include <math.h>
 
-#include "util/util_math.h"
-#include "util/util_string.h"
-#include "util/util_transform.h"
-#include "util/util_types.h"
+#include "util/math.h"
+#include "util/string.h"
+#include "util/transform.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_color.h b/intern/cycles/util/color.h
index 361c36d9061..e2a5c5b9c4a 100644
--- a/intern/cycles/util/util_color.h
+++ b/intern/cycles/util/color.h
@@ -17,11 +17,11 @@
 #ifndef __UTIL_COLOR_H__
 #define __UTIL_COLOR_H__
 
-#include "util/util_math.h"
-#include "util/util_types.h"
+#include "util/math.h"
+#include "util/types.h"
 
 #if !defined(__KERNEL_GPU__) && defined(__KERNEL_SSE2__)
-#  include "util/util_simd.h"
+#  include "util/simd.h"
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_debug.cpp b/intern/cycles/util/debug.cpp
index 2245668d02f..b49df3d42bc 100644
--- a/intern/cycles/util/util_debug.cpp
+++ b/intern/cycles/util/debug.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "util/util_debug.h"
+#include "util/debug.h"
 
 #include <stdlib.h>
 
-#include "bvh/bvh_params.h"
+#include "bvh/params.h"
 
-#include "util/util_logging.h"
-#include "util/util_string.h"
+#include "util/log.h"
+#include "util/string.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_debug.h b/intern/cycles/util/debug.h
index 81677201790..58b2b047261 100644
--- a/intern/cycles/util/util_debug.h
+++ b/intern/cycles/util/debug.h
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <iostream>
 
-#include "bvh/bvh_params.h"
+#include "bvh/params.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_defines.h b/intern/cycles/util/defines.h
index 9b1698d461a..9b1698d461a 100644
--- a/intern/cycles/util/util_defines.h
+++ b/intern/cycles/util/defines.h
diff --git a/intern/cycles/util/util_deque.h b/intern/cycles/util/deque.h
index ccac961aa7d..ccac961aa7d 100644
--- a/intern/cycles/util/util_deque.h
+++ b/intern/cycles/util/deque.h
diff --git a/intern/cycles/util/util_disjoint_set.h b/intern/cycles/util/disjoint_set.h
index 946632371d2..5226423d7cd 100644
--- a/intern/cycles/util/util_disjoint_set.h
+++ b/intern/cycles/util/disjoint_set.h
@@ -17,7 +17,7 @@
 #ifndef __UTIL_DISJOINT_SET_H__
 #define __UTIL_DISJOINT_SET_H__
 
-#include "util_array.h"
+#include "util/array.h"
 #include <utility>
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_foreach.h b/intern/cycles/util/foreach.h
index d907974be91..d907974be91 100644
--- a/intern/cycles/util/util_foreach.h
+++ b/intern/cycles/util/foreach.h
diff --git a/intern/cycles/util/util_function.h b/intern/cycles/util/function.h
index f3cc00329ad..f3cc00329ad 100644
--- a/intern/cycles/util/util_function.h
+++ b/intern/cycles/util/function.h
diff --git a/intern/cycles/util/util_guarded_allocator.cpp b/intern/cycles/util/guarded_allocator.cpp
index 1cb466a1ffa..4063b301331 100644
--- a/intern/cycles/util/util_guarded_allocator.cpp
+++ b/intern/cycles/util/guarded_allocator.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "util/util_guarded_allocator.h"
-#include "util/util_stats.h"
+#include "util/guarded_allocator.h"
+#include "util/stats.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_guarded_allocator.h b/intern/cycles/util/guarded_allocator.h
index f78cc5f5da9..f78cc5f5da9 100644
--- a/intern/cycles/util/util_guarded_allocator.h
+++ b/intern/cycles/util/guarded_allocator.h
diff --git a/intern/cycles/util/util_half.h b/intern/cycles/util/half.h
index 0db5acd319a..016975e3c25 100644
--- a/intern/cycles/util/util_half.h
+++ b/intern/cycles/util/half.h
@@ -17,11 +17,11 @@
 #ifndef __UTIL_HALF_H__
 #define __UTIL_HALF_H__
 
-#include "util/util_math.h"
-#include "util/util_types.h"
+#include "util/math.h"
+#include "util/types.h"
 
 #if !defined(__KERNEL_GPU__) && defined(__KERNEL_SSE2__)
-#  include "util/util_simd.h"
+#  include "util/simd.h"
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_hash.h b/intern/cycles/util/hash.h
index 0021eec169b..013a0f90a27 100644
--- a/intern/cycles/util/util_hash.h
+++ b/intern/cycles/util/hash.h
@@ -17,7 +17,7 @@
 #ifndef __UTIL_HASH_H__
 #define __UTIL_HASH_H__
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_ies.cpp b/intern/cycles/util/ies.cpp
index 62d3d42186d..5e879478df5 100644
--- a/intern/cycles/util/util_ies.cpp
+++ b/intern/cycles/util/ies.cpp
@@ -16,10 +16,10 @@
 
 #include <algorithm>
 
-#include "util/util_foreach.h"
-#include "util/util_ies.h"
-#include "util/util_math.h"
-#include "util/util_string.h"
+#include "util/foreach.h"
+#include "util/ies.h"
+#include "util/math.h"
+#include "util/string.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_ies.h b/intern/cycles/util/ies.h
index 95473103614..7be072dd5f5 100644
--- a/intern/cycles/util/util_ies.h
+++ b/intern/cycles/util/ies.h
@@ -17,8 +17,8 @@
 #ifndef __UTIL_IES_H__
 #define __UTIL_IES_H__
 
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_image.h b/intern/cycles/util/image.h
index b082b971613..69fc3a50c1d 100644
--- a/intern/cycles/util/util_image.h
+++ b/intern/cycles/util/image.h
@@ -21,8 +21,8 @@
 
 #  include <OpenImageIO/imageio.h>
 
-#  include "util/util_half.h"
-#  include "util/util_vector.h"
+#  include "util/half.h"
+#  include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -95,4 +95,4 @@ CCL_NAMESPACE_END
 
 #endif /* __UTIL_IMAGE_H__ */
 
-#include "util/util_image_impl.h"
+#include "util/image_impl.h"
diff --git a/intern/cycles/util/util_image_impl.h b/intern/cycles/util/image_impl.h
index 3eb30d070ea..3d8eed80775 100644
--- a/intern/cycles/util/util_image_impl.h
+++ b/intern/cycles/util/image_impl.h
@@ -17,9 +17,9 @@
 #ifndef __UTIL_IMAGE_IMPL_H__
 #define __UTIL_IMAGE_IMPL_H__
 
-#include "util/util_algorithm.h"
-#include "util/util_half.h"
-#include "util/util_image.h"
+#include "util/algorithm.h"
+#include "util/half.h"
+#include "util/image.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_list.h b/intern/cycles/util/list.h
index f555b001186..f555b001186 100644
--- a/intern/cycles/util/util_list.h
+++ b/intern/cycles/util/list.h
diff --git a/intern/cycles/util/util_logging.cpp b/intern/cycles/util/log.cpp
index 8272728a7a0..68a5a3f576f 100644
--- a/intern/cycles/util/util_logging.cpp
+++ b/intern/cycles/util/log.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "util/util_logging.h"
+#include "util/log.h"
 
-#include "util/util_math.h"
-#include "util/util_string.h"
+#include "util/math.h"
+#include "util/string.h"
 
 #include <stdio.h>
 #ifdef _MSC_VER
diff --git a/intern/cycles/util/util_logging.h b/intern/cycles/util/log.h
index 35c2d436d09..35c2d436d09 100644
--- a/intern/cycles/util/util_logging.h
+++ b/intern/cycles/util/log.h
diff --git a/intern/cycles/util/util_map.h b/intern/cycles/util/map.h
index f1b2522362f..f1b2522362f 100644
--- a/intern/cycles/util/util_map.h
+++ b/intern/cycles/util/map.h
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/math.h
index 535b6881d3f..e7fc492733f 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/math.h
@@ -34,7 +34,7 @@
 #include <math.h>
 #include <stdio.h>
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -474,15 +474,15 @@ ccl_device_inline float cubic_interp(float a, float b, float c, float d, float x
 
 CCL_NAMESPACE_END
 
-#include "util/util_math_int2.h"
-#include "util/util_math_int3.h"
-#include "util/util_math_int4.h"
+#include "util/math_int2.h"
+#include "util/math_int3.h"
+#include "util/math_int4.h"
 
-#include "util/util_math_float2.h"
-#include "util/util_math_float3.h"
-#include "util/util_math_float4.h"
+#include "util/math_float2.h"
+#include "util/math_float3.h"
+#include "util/math_float4.h"
 
-#include "util/util_rect.h"
+#include "util/rect.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_math_cdf.cpp b/intern/cycles/util/math_cdf.cpp
index a58bab188ef..02c6646f824 100644
--- a/intern/cycles/util/util_math_cdf.cpp
+++ b/intern/cycles/util/math_cdf.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "util/util_math_cdf.h"
+#include "util/math_cdf.h"
 
-#include "util/util_algorithm.h"
-#include "util/util_math.h"
+#include "util/algorithm.h"
+#include "util/math.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_math_cdf.h b/intern/cycles/util/math_cdf.h
index 43995204263..4c57dac4bbe 100644
--- a/intern/cycles/util/util_math_cdf.h
+++ b/intern/cycles/util/math_cdf.h
@@ -17,9 +17,9 @@
 #ifndef __UTIL_MATH_CDF_H__
 #define __UTIL_MATH_CDF_H__
 
-#include "util/util_algorithm.h"
-#include "util/util_math.h"
-#include "util/util_vector.h"
+#include "util/algorithm.h"
+#include "util/math.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_math_fast.h b/intern/cycles/util/math_fast.h
index cc924f36a71..cc924f36a71 100644
--- a/intern/cycles/util/util_math_fast.h
+++ b/intern/cycles/util/math_fast.h
diff --git a/intern/cycles/util/util_math_float2.h b/intern/cycles/util/math_float2.h
index 25eda840214..87141d5bc37 100644
--- a/intern/cycles/util/util_math_float2.h
+++ b/intern/cycles/util/math_float2.h
@@ -18,7 +18,7 @@
 #define __UTIL_MATH_FLOAT2_H__
 
 #ifndef __UTIL_MATH_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_math_float3.h b/intern/cycles/util/math_float3.h
index c3230a8068c..e780d7e0a7c 100644
--- a/intern/cycles/util/util_math_float3.h
+++ b/intern/cycles/util/math_float3.h
@@ -18,7 +18,7 @@
 #define __UTIL_MATH_FLOAT3_H__
 
 #ifndef __UTIL_MATH_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_math_float4.h b/intern/cycles/util/math_float4.h
index f30a78cfc69..c76959ee7ff 100644
--- a/intern/cycles/util/util_math_float4.h
+++ b/intern/cycles/util/math_float4.h
@@ -18,7 +18,7 @@
 #define __UTIL_MATH_FLOAT4_H__
 
 #ifndef __UTIL_MATH_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_math_int2.h b/intern/cycles/util/math_int2.h
index 5782b878801..5b04be92152 100644
--- a/intern/cycles/util/util_math_int2.h
+++ b/intern/cycles/util/math_int2.h
@@ -18,7 +18,7 @@
 #define __UTIL_MATH_INT2_H__
 
 #ifndef __UTIL_MATH_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_math_int3.h b/intern/cycles/util/math_int3.h
index e0dfae7c015..128f2cb53b8 100644
--- a/intern/cycles/util/util_math_int3.h
+++ b/intern/cycles/util/math_int3.h
@@ -18,7 +18,7 @@
 #define __UTIL_MATH_INT3_H__
 
 #ifndef __UTIL_MATH_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_math_int4.h b/intern/cycles/util/math_int4.h
index 186cc58489b..9e3f001efc2 100644
--- a/intern/cycles/util/util_math_int4.h
+++ b/intern/cycles/util/math_int4.h
@@ -18,7 +18,7 @@
 #define __UTIL_MATH_INT4_H__
 
 #ifndef __UTIL_MATH_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_math_intersect.h b/intern/cycles/util/math_intersect.h
index 0c431a36afb..0c431a36afb 100644
--- a/intern/cycles/util/util_math_intersect.h
+++ b/intern/cycles/util/math_intersect.h
diff --git a/intern/cycles/util/util_math_matrix.h b/intern/cycles/util/math_matrix.h
index bff7ddb4cee..bff7ddb4cee 100644
--- a/intern/cycles/util/util_math_matrix.h
+++ b/intern/cycles/util/math_matrix.h
diff --git a/intern/cycles/util/util_md5.cpp b/intern/cycles/util/md5.cpp
index 0df521c2b58..47e489b1aed 100644
--- a/intern/cycles/util/util_md5.cpp
+++ b/intern/cycles/util/md5.cpp
@@ -23,8 +23,8 @@
 
 /* Minor modifications done to remove some code and change style. */
 
-#include "util_md5.h"
-#include "util_path.h"
+#include "util/md5.h"
+#include "util/path.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/intern/cycles/util/util_md5.h b/intern/cycles/util/md5.h
index 3102a0f4bad..cc7cbef6a49 100644
--- a/intern/cycles/util/util_md5.h
+++ b/intern/cycles/util/md5.h
@@ -30,8 +30,8 @@
 #ifndef __UTIL_MD5_H__
 #define __UTIL_MD5_H__
 
-#include "util/util_string.h"
-#include "util/util_types.h"
+#include "util/string.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_murmurhash.cpp b/intern/cycles/util/murmurhash.cpp
index 5d728769fe9..9ba0a282cc2 100644
--- a/intern/cycles/util/util_murmurhash.cpp
+++ b/intern/cycles/util/murmurhash.cpp
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "util/util_algorithm.h"
-#include "util/util_murmurhash.h"
+#include "util/algorithm.h"
+#include "util/murmurhash.h"
 
 #if defined(_MSC_VER)
 #  define ROTL32(x, y) _rotl(x, y)
diff --git a/intern/cycles/util/util_murmurhash.h b/intern/cycles/util/murmurhash.h
index 2ec87efd87a..7c303db6ffa 100644
--- a/intern/cycles/util/util_murmurhash.h
+++ b/intern/cycles/util/murmurhash.h
@@ -17,7 +17,7 @@
 #ifndef __UTIL_MURMURHASH_H__
 #define __UTIL_MURMURHASH_H__
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_opengl.h b/intern/cycles/util/opengl.h
index 7a8d5eec1f9..7a8d5eec1f9 100644
--- a/intern/cycles/util/util_opengl.h
+++ b/intern/cycles/util/opengl.h
diff --git a/intern/cycles/util/util_openimagedenoise.h b/intern/cycles/util/openimagedenoise.h
index 898c634141e..cc7b14ae18f 100644
--- a/intern/cycles/util/util_openimagedenoise.h
+++ b/intern/cycles/util/openimagedenoise.h
@@ -21,7 +21,7 @@
 #  include <OpenImageDenoise/oidn.hpp>
 #endif
 
-#include "util_system.h"
+#include "util/system.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_openvdb.h b/intern/cycles/util/openvdb.h
index ae5326e3199..ae5326e3199 100644
--- a/intern/cycles/util/util_openvdb.h
+++ b/intern/cycles/util/openvdb.h
diff --git a/intern/cycles/util/util_optimization.h b/intern/cycles/util/optimization.h
index 7ecd3893cf4..7ecd3893cf4 100644
--- a/intern/cycles/util/util_optimization.h
+++ b/intern/cycles/util/optimization.h
diff --git a/intern/cycles/util/util_param.h b/intern/cycles/util/param.h
index 3f8e2d6d700..3f8e2d6d700 100644
--- a/intern/cycles/util/util_param.h
+++ b/intern/cycles/util/param.h
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/path.cpp
index c78f4615013..5704c4ef8ef 100644
--- a/intern/cycles/util/util_path.cpp
+++ b/intern/cycles/util/path.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "util/util_path.h"
-#include "util/util_md5.h"
-#include "util/util_string.h"
+#include "util/path.h"
+#include "util/md5.h"
+#include "util/string.h"
 
 #include <OpenImageIO/filesystem.h>
 #include <OpenImageIO/strutil.h>
@@ -44,8 +44,8 @@ OIIO_NAMESPACE_USING
 #  include <shlwapi.h>
 #endif
 
-#include "util/util_map.h"
-#include "util/util_windows.h"
+#include "util/map.h"
+#include "util/windows.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_path.h b/intern/cycles/util/path.h
index f899bc2e01c..a1394555302 100644
--- a/intern/cycles/util/util_path.h
+++ b/intern/cycles/util/path.h
@@ -24,10 +24,10 @@
 
 #include <stdio.h>
 
-#include "util/util_set.h"
-#include "util/util_string.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
+#include "util/set.h"
+#include "util/string.h"
+#include "util/types.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_profiling.cpp b/intern/cycles/util/profiling.cpp
index 5343f076e22..55b35b7320f 100644
--- a/intern/cycles/util/util_profiling.cpp
+++ b/intern/cycles/util/profiling.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "util/util_profiling.h"
-#include "util/util_algorithm.h"
-#include "util/util_foreach.h"
-#include "util/util_set.h"
+#include "util/profiling.h"
+#include "util/algorithm.h"
+#include "util/foreach.h"
+#include "util/set.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_profiling.h b/intern/cycles/util/profiling.h
index 96bb682c50e..b30aac90879 100644
--- a/intern/cycles/util/util_profiling.h
+++ b/intern/cycles/util/profiling.h
@@ -19,9 +19,9 @@
 
 #include <atomic>
 
-#include "util/util_map.h"
-#include "util/util_thread.h"
-#include "util/util_vector.h"
+#include "util/map.h"
+#include "util/thread.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_progress.h b/intern/cycles/util/progress.h
index 176ee11e1e9..4b0ff08aa7e 100644
--- a/intern/cycles/util/util_progress.h
+++ b/intern/cycles/util/progress.h
@@ -23,10 +23,10 @@
  * update notifications from a job running in another thread. All methods
  * except for the constructor/destructor are thread safe. */
 
-#include "util/util_function.h"
-#include "util/util_string.h"
-#include "util/util_thread.h"
-#include "util/util_time.h"
+#include "util/function.h"
+#include "util/string.h"
+#include "util/thread.h"
+#include "util/time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_projection.h b/intern/cycles/util/projection.h
index 04b4574d75b..8d822a3777d 100644
--- a/intern/cycles/util/util_projection.h
+++ b/intern/cycles/util/projection.h
@@ -17,7 +17,7 @@
 #ifndef __UTIL_PROJECTION_H__
 #define __UTIL_PROJECTION_H__
 
-#include "util/util_transform.h"
+#include "util/transform.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_queue.h b/intern/cycles/util/queue.h
index 622f4fe3e47..622f4fe3e47 100644
--- a/intern/cycles/util/util_queue.h
+++ b/intern/cycles/util/queue.h
diff --git a/intern/cycles/util/util_rect.h b/intern/cycles/util/rect.h
index 32df9327cbd..79d64b917b7 100644
--- a/intern/cycles/util/util_rect.h
+++ b/intern/cycles/util/rect.h
@@ -17,7 +17,7 @@
 #ifndef __UTIL_RECT_H__
 #define __UTIL_RECT_H__
 
-#include "util/util_types.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_semaphore.h b/intern/cycles/util/semaphore.h
index d995b0732b8..8da8a232ba2 100644
--- a/intern/cycles/util/util_semaphore.h
+++ b/intern/cycles/util/semaphore.h
@@ -17,7 +17,7 @@
 #ifndef __UTIL_SEMAPHORE_H__
 #define __UTIL_SEMAPHORE_H__
 
-#include "util/util_thread.h"
+#include "util/thread.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_set.h b/intern/cycles/util/set.h
index 298e1f7729a..298e1f7729a 100644
--- a/intern/cycles/util/util_set.h
+++ b/intern/cycles/util/set.h
diff --git a/intern/cycles/util/util_simd.cpp b/intern/cycles/util/simd.cpp
index 861dcf1fe36..089444bb6cc 100644
--- a/intern/cycles/util/util_simd.cpp
+++ b/intern/cycles/util/simd.cpp
@@ -18,7 +18,7 @@
 #if (defined(WITH_KERNEL_SSE2)) || (defined(WITH_KERNEL_NATIVE) && defined(__SSE2__))
 
 #  define __KERNEL_SSE2__
-#  include "util/util_simd.h"
+#  include "util/simd.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/simd.h
index b4a153c329f..cc4950891d0 100644
--- a/intern/cycles/util/util_simd.h
+++ b/intern/cycles/util/simd.h
@@ -21,7 +21,7 @@
 #include <limits>
 #include <stdint.h>
 
-#include "util/util_defines.h"
+#include "util/defines.h"
 
 /* SSE Intrinsics includes
  *
@@ -30,7 +30,7 @@
  * MinGW64 has conflicting declarations for these SSE headers in <windows.h>.
  * Since we can't avoid including <windows.h>, better only include that */
 #if defined(FREE_WINDOWS64)
-#  include "util/util_windows.h"
+#  include "util/windows.h"
 #elif defined(_MSC_VER)
 #  include <intrin.h>
 #elif (defined(__x86_64__) || defined(__i386__))
diff --git a/intern/cycles/util/util_sseb.h b/intern/cycles/util/sseb.h
index 6afce4f8909..6afce4f8909 100644
--- a/intern/cycles/util/util_sseb.h
+++ b/intern/cycles/util/sseb.h
diff --git a/intern/cycles/util/util_ssef.h b/intern/cycles/util/ssef.h
index 0c81ed87553..ea5e78b54d2 100644
--- a/intern/cycles/util/util_ssef.h
+++ b/intern/cycles/util/ssef.h
@@ -18,7 +18,7 @@
 #ifndef __UTIL_SSEF_H__
 #define __UTIL_SSEF_H__
 
-#include "util_ssei.h"
+#include "util/ssei.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_ssei.h b/intern/cycles/util/ssei.h
index 94412fb77e7..94412fb77e7 100644
--- a/intern/cycles/util/util_ssei.h
+++ b/intern/cycles/util/ssei.h
diff --git a/intern/cycles/util/util_stack_allocator.h b/intern/cycles/util/stack_allocator.h
index ef31c0fe5e2..ef31c0fe5e2 100644
--- a/intern/cycles/util/util_stack_allocator.h
+++ b/intern/cycles/util/stack_allocator.h
diff --git a/intern/cycles/util/util_static_assert.h b/intern/cycles/util/static_assert.h
index 7df52d462b7..7df52d462b7 100644
--- a/intern/cycles/util/util_static_assert.h
+++ b/intern/cycles/util/static_assert.h
diff --git a/intern/cycles/util/util_stats.h b/intern/cycles/util/stats.h
index 15cf836de3c..590973f1cbc 100644
--- a/intern/cycles/util/util_stats.h
+++ b/intern/cycles/util/stats.h
@@ -17,8 +17,8 @@
 #ifndef __UTIL_STATS_H__
 #define __UTIL_STATS_H__
 
-#include "util/util_atomic.h"
-#include "util/util_profiling.h"
+#include "util/atomic.h"
+#include "util/profiling.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_string.cpp b/intern/cycles/util/string.cpp
index 0fc9cb4ae77..b98272f7759 100644
--- a/intern/cycles/util/util_string.cpp
+++ b/intern/cycles/util/string.cpp
@@ -20,9 +20,9 @@
 #include <algorithm>
 #include <cctype>
 
-#include "util/util_foreach.h"
-#include "util/util_string.h"
-#include "util/util_windows.h"
+#include "util/foreach.h"
+#include "util/string.h"
+#include "util/windows.h"
 
 #ifdef _WIN32
 #  ifndef vsnprintf
diff --git a/intern/cycles/util/util_string.h b/intern/cycles/util/string.h
index 55462cfd8b8..cc20a6df120 100644
--- a/intern/cycles/util/util_string.h
+++ b/intern/cycles/util/string.h
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef __UTIL_STRING_H__
-#define __UTIL_STRING_H__
+#pragma once
 
 #include <sstream>
 #include <string.h>
@@ -26,7 +25,7 @@
  * namespace OIIO as it causes symbol collision. */
 #include <OpenImageIO/string_view.h>
 
-#include "util/util_vector.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -80,5 +79,3 @@ string string_human_readable_size(size_t size);
 string string_human_readable_number(size_t num);
 
 CCL_NAMESPACE_END
-
-#endif /* __UTIL_STRING_H__ */
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/system.cpp
index be8c2fb505a..f12e15e756f 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/system.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "util/util_system.h"
+#include "util/system.h"
 
-#include "util/util_logging.h"
-#include "util/util_string.h"
-#include "util/util_types.h"
+#include "util/log.h"
+#include "util/string.h"
+#include "util/types.h"
 
 #include <numaapi.h>
 
@@ -29,7 +29,7 @@ OIIO_NAMESPACE_USING
 #  if (!defined(FREE_WINDOWS))
 #    include <intrin.h>
 #  endif
-#  include "util_windows.h"
+#  include "util/windows.h"
 #elif defined(__APPLE__)
 #  include <sys/ioctl.h>
 #  include <sys/sysctl.h>
diff --git a/intern/cycles/util/util_system.h b/intern/cycles/util/system.h
index a1797e6ca44..425c7255cbe 100644
--- a/intern/cycles/util/util_system.h
+++ b/intern/cycles/util/system.h
@@ -17,8 +17,8 @@
 #ifndef __UTIL_SYSTEM_H__
 #define __UTIL_SYSTEM_H__
 
-#include "util/util_string.h"
-#include "util/util_vector.h"
+#include "util/string.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/task.cpp
index 949ba0a7b4d..ce61bf8d6c4 100644
--- a/intern/cycles/util/util_task.cpp
+++ b/intern/cycles/util/task.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "util/util_task.h"
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_system.h"
-#include "util/util_time.h"
+#include "util/task.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/system.h"
+#include "util/time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/task.h
index ec45dfa8040..1a8f512b83a 100644
--- a/intern/cycles/util/util_task.h
+++ b/intern/cycles/util/task.h
@@ -17,11 +17,11 @@
 #ifndef __UTIL_TASK_H__
 #define __UTIL_TASK_H__
 
-#include "util/util_list.h"
-#include "util/util_string.h"
-#include "util/util_tbb.h"
-#include "util/util_thread.h"
-#include "util/util_vector.h"
+#include "util/list.h"
+#include "util/string.h"
+#include "util/tbb.h"
+#include "util/thread.h"
+#include "util/vector.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_tbb.h b/intern/cycles/util/tbb.h
index 8f84377ac8c..6fc3b8daad3 100644
--- a/intern/cycles/util/util_tbb.h
+++ b/intern/cycles/util/tbb.h
@@ -19,7 +19,7 @@
 
 /* TBB includes <windows.h>, do it ourselves first so we are sure
  * WIN32_LEAN_AND_MEAN and similar are defined beforehand. */
-#include "util_windows.h"
+#include "util/windows.h"
 
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/parallel_for.h>
diff --git a/intern/cycles/util/util_texture.h b/intern/cycles/util/texture.h
index 4de66bf5f46..5e37b79e340 100644
--- a/intern/cycles/util/util_texture.h
+++ b/intern/cycles/util/texture.h
@@ -17,7 +17,7 @@
 #ifndef __UTIL_TEXTURE_H__
 #define __UTIL_TEXTURE_H__
 
-#include "util_transform.h"
+#include "util/transform.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_thread.cpp b/intern/cycles/util/thread.cpp
index cccde5ae7d5..24a0600425d 100644
--- a/intern/cycles/util/util_thread.cpp
+++ b/intern/cycles/util/thread.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "util/util_thread.h"
+#include "util/thread.h"
 
-#include "util/util_system.h"
-#include "util/util_windows.h"
+#include "util/system.h"
+#include "util/windows.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/thread.h
index 29f9becbefe..09686e4b23f 100644
--- a/intern/cycles/util/util_thread.h
+++ b/intern/cycles/util/thread.h
@@ -24,7 +24,7 @@
 #include <thread>
 
 #ifdef _WIN32
-#  include "util_windows.h"
+#  include "util/windows.h"
 #else
 #  include <pthread.h>
 #endif
@@ -33,7 +33,7 @@
  * functionality requires RTTI, which is disabled for OSL kernel. */
 #include <tbb/spin_mutex.h>
 
-#include "util/util_function.h"
+#include "util/function.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_time.cpp b/intern/cycles/util/time.cpp
index 1641395d07e..62d14b063be 100644
--- a/intern/cycles/util/util_time.cpp
+++ b/intern/cycles/util/time.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "util/util_time.h"
+#include "util/time.h"
 
 #include <stdlib.h>
 
@@ -23,9 +23,9 @@
 #  include <unistd.h>
 #endif
 
-#include "util/util_math.h"
-#include "util/util_string.h"
-#include "util/util_windows.h"
+#include "util/math.h"
+#include "util/string.h"
+#include "util/windows.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_time.h b/intern/cycles/util/time.h
index a82d400a0d7..380921664e8 100644
--- a/intern/cycles/util/util_time.h
+++ b/intern/cycles/util/time.h
@@ -17,8 +17,8 @@
 #ifndef __UTIL_TIME_H__
 #define __UTIL_TIME_H__
 
-#include "util/util_function.h"
-#include "util/util_string.h"
+#include "util/function.h"
+#include "util/string.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_transform.cpp b/intern/cycles/util/transform.cpp
index e8233b7fe6d..bd990cb0f79 100644
--- a/intern/cycles/util/util_transform.cpp
+++ b/intern/cycles/util/transform.cpp
@@ -46,11 +46,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "util/util_transform.h"
-#include "util/util_projection.h"
+#include "util/transform.h"
+#include "util/projection.h"
 
-#include "util/util_boundbox.h"
-#include "util/util_math.h"
+#include "util/boundbox.h"
+#include "util/math.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_transform.h b/intern/cycles/util/transform.h
index fc04f9aab46..7bfe747fcfb 100644
--- a/intern/cycles/util/util_transform.h
+++ b/intern/cycles/util/transform.h
@@ -21,8 +21,8 @@
 #  include <string.h>
 #endif
 
-#include "util/util_math.h"
-#include "util/util_types.h"
+#include "util/math.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/types.h
index 442c32b3a3d..697dc2b44ea 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/types.h
@@ -25,11 +25,11 @@
 #  include <stdint.h>
 #endif
 
-#include "util/util_defines.h"
+#include "util/defines.h"
 
 #ifndef __KERNEL_GPU__
-#  include "util/util_optimization.h"
-#  include "util/util_simd.h"
+#  include "util/optimization.h"
+#  include "util/simd.h"
 #endif
 
 CCL_NAMESPACE_BEGIN
@@ -82,56 +82,56 @@ ccl_device_inline bool is_power_of_two(size_t x)
 CCL_NAMESPACE_END
 
 /* Vectorized types declaration. */
-#include "util/util_types_uchar2.h"
-#include "util/util_types_uchar3.h"
-#include "util/util_types_uchar4.h"
+#include "util/types_uchar2.h"
+#include "util/types_uchar3.h"
+#include "util/types_uchar4.h"
 
-#include "util/util_types_int2.h"
-#include "util/util_types_int3.h"
-#include "util/util_types_int4.h"
+#include "util/types_int2.h"
+#include "util/types_int3.h"
+#include "util/types_int4.h"
 
-#include "util/util_types_uint2.h"
-#include "util/util_types_uint3.h"
-#include "util/util_types_uint4.h"
+#include "util/types_uint2.h"
+#include "util/types_uint3.h"
+#include "util/types_uint4.h"
 
-#include "util/util_types_ushort4.h"
+#include "util/types_ushort4.h"
 
-#include "util/util_types_float2.h"
-#include "util/util_types_float3.h"
-#include "util/util_types_float4.h"
-#include "util/util_types_float8.h"
+#include "util/types_float2.h"
+#include "util/types_float3.h"
+#include "util/types_float4.h"
+#include "util/types_float8.h"
 
-#include "util/util_types_vector3.h"
+#include "util/types_vector3.h"
 
 /* Vectorized types implementation. */
-#include "util/util_types_uchar2_impl.h"
-#include "util/util_types_uchar3_impl.h"
-#include "util/util_types_uchar4_impl.h"
+#include "util/types_uchar2_impl.h"
+#include "util/types_uchar3_impl.h"
+#include "util/types_uchar4_impl.h"
 
-#include "util/util_types_int2_impl.h"
-#include "util/util_types_int3_impl.h"
-#include "util/util_types_int4_impl.h"
+#include "util/types_int2_impl.h"
+#include "util/types_int3_impl.h"
+#include "util/types_int4_impl.h"
 
-#include "util/util_types_uint2_impl.h"
-#include "util/util_types_uint3_impl.h"
-#include "util/util_types_uint4_impl.h"
+#include "util/types_uint2_impl.h"
+#include "util/types_uint3_impl.h"
+#include "util/types_uint4_impl.h"
 
-#include "util/util_types_float2_impl.h"
-#include "util/util_types_float3_impl.h"
-#include "util/util_types_float4_impl.h"
-#include "util/util_types_float8_impl.h"
+#include "util/types_float2_impl.h"
+#include "util/types_float3_impl.h"
+#include "util/types_float4_impl.h"
+#include "util/types_float8_impl.h"
 
-#include "util/util_types_vector3_impl.h"
+#include "util/types_vector3_impl.h"
 
 /* SSE types. */
 #ifndef __KERNEL_GPU__
-#  include "util/util_sseb.h"
-#  include "util/util_ssef.h"
-#  include "util/util_ssei.h"
+#  include "util/sseb.h"
+#  include "util/ssef.h"
+#  include "util/ssei.h"
 #  if defined(__KERNEL_AVX__) || defined(__KERNEL_AVX2__)
-#    include "util/util_avxb.h"
-#    include "util/util_avxf.h"
-#    include "util/util_avxi.h"
+#    include "util/avxb.h"
+#    include "util/avxf.h"
+#    include "util/avxi.h"
 #  endif
 #endif
 
diff --git a/intern/cycles/util/util_types_float2.h b/intern/cycles/util/types_float2.h
index 3760bf579b6..e71204bef5b 100644
--- a/intern/cycles/util/util_types_float2.h
+++ b/intern/cycles/util/types_float2.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_FLOAT2_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_float2_impl.h b/intern/cycles/util/types_float2_impl.h
index 7810d2a8781..c02c13f8c47 100644
--- a/intern/cycles/util/util_types_float2_impl.h
+++ b/intern/cycles/util/types_float2_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_FLOAT2_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 #ifndef __KERNEL_GPU__
diff --git a/intern/cycles/util/util_types_float3.h b/intern/cycles/util/types_float3.h
index 694a600bf5c..f990367e7b8 100644
--- a/intern/cycles/util/util_types_float3.h
+++ b/intern/cycles/util/types_float3.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_FLOAT3_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_float3_impl.h b/intern/cycles/util/types_float3_impl.h
index ab25fb4c975..76a9067acc7 100644
--- a/intern/cycles/util/util_types_float3_impl.h
+++ b/intern/cycles/util/types_float3_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_FLOAT3_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 #ifndef __KERNEL_GPU__
diff --git a/intern/cycles/util/util_types_float4.h b/intern/cycles/util/types_float4.h
index c29e6e15bc3..8d4e07e7e4d 100644
--- a/intern/cycles/util/util_types_float4.h
+++ b/intern/cycles/util/types_float4.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_FLOAT4_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_float4_impl.h b/intern/cycles/util/types_float4_impl.h
index 05a1feee5b2..d75715332e5 100644
--- a/intern/cycles/util/util_types_float4_impl.h
+++ b/intern/cycles/util/types_float4_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_FLOAT4_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 #ifndef __KERNEL_GPU__
diff --git a/intern/cycles/util/util_types_float8.h b/intern/cycles/util/types_float8.h
index 27da120a4ba..cf1f66b7622 100644
--- a/intern/cycles/util/util_types_float8.h
+++ b/intern/cycles/util/types_float8.h
@@ -30,7 +30,7 @@
 #define __UTIL_TYPES_FLOAT8_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_float8_impl.h b/intern/cycles/util/types_float8_impl.h
index 4e4ea28c6a4..a795666adc7 100644
--- a/intern/cycles/util/util_types_float8_impl.h
+++ b/intern/cycles/util/types_float8_impl.h
@@ -30,7 +30,7 @@
 #define __UTIL_TYPES_FLOAT8_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 #ifndef __KERNEL_GPU__
diff --git a/intern/cycles/util/util_types_int2.h b/intern/cycles/util/types_int2.h
index 8811e5ec7c2..75970577d77 100644
--- a/intern/cycles/util/util_types_int2.h
+++ b/intern/cycles/util/types_int2.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_INT2_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_int2_impl.h b/intern/cycles/util/types_int2_impl.h
index ce95d4f14e5..efa63cdfd2a 100644
--- a/intern/cycles/util/util_types_int2_impl.h
+++ b/intern/cycles/util/types_int2_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_INT2_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_int3.h b/intern/cycles/util/types_int3.h
index 09edc09dff3..071a886136e 100644
--- a/intern/cycles/util/util_types_int3.h
+++ b/intern/cycles/util/types_int3.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_INT3_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_int3_impl.h b/intern/cycles/util/types_int3_impl.h
index 080c892640b..c91c64b804e 100644
--- a/intern/cycles/util/util_types_int3_impl.h
+++ b/intern/cycles/util/types_int3_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_INT3_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 #ifndef __KERNEL_GPU__
diff --git a/intern/cycles/util/util_types_int4.h b/intern/cycles/util/types_int4.h
index 5c7917cf5d6..cb497d70035 100644
--- a/intern/cycles/util/util_types_int4.h
+++ b/intern/cycles/util/types_int4.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_INT4_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_int4_impl.h b/intern/cycles/util/types_int4_impl.h
index c6f6ff23a17..258b42c029e 100644
--- a/intern/cycles/util/util_types_int4_impl.h
+++ b/intern/cycles/util/types_int4_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_INT4_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 #ifndef __KERNEL_GPU__
diff --git a/intern/cycles/util/util_types_uchar2.h b/intern/cycles/util/types_uchar2.h
index 8cc486e3e48..0dc1d46bf29 100644
--- a/intern/cycles/util/util_types_uchar2.h
+++ b/intern/cycles/util/types_uchar2.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_UCHAR2_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_uchar2_impl.h b/intern/cycles/util/types_uchar2_impl.h
index 16968c32dd9..234a71a2247 100644
--- a/intern/cycles/util/util_types_uchar2_impl.h
+++ b/intern/cycles/util/types_uchar2_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_UCHAR2_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_uchar3.h b/intern/cycles/util/types_uchar3.h
index 5838c437c70..d3913afb3a2 100644
--- a/intern/cycles/util/util_types_uchar3.h
+++ b/intern/cycles/util/types_uchar3.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_UCHAR3_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_uchar3_impl.h b/intern/cycles/util/types_uchar3_impl.h
index aa31b725731..90f510e3b28 100644
--- a/intern/cycles/util/util_types_uchar3_impl.h
+++ b/intern/cycles/util/types_uchar3_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_UCHAR3_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_uchar4.h b/intern/cycles/util/types_uchar4.h
index 22b6a1ac705..bfe1c06acd8 100644
--- a/intern/cycles/util/util_types_uchar4.h
+++ b/intern/cycles/util/types_uchar4.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_UCHAR4_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_uchar4_impl.h b/intern/cycles/util/types_uchar4_impl.h
index 79879f176a6..d15c74bed03 100644
--- a/intern/cycles/util/util_types_uchar4_impl.h
+++ b/intern/cycles/util/types_uchar4_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_UCHAR4_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_uint2.h b/intern/cycles/util/types_uint2.h
index abcb8ee5346..7419977040b 100644
--- a/intern/cycles/util/util_types_uint2.h
+++ b/intern/cycles/util/types_uint2.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_UINT2_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_uint2_impl.h b/intern/cycles/util/types_uint2_impl.h
index db62bd99b89..8427f9694b5 100644
--- a/intern/cycles/util/util_types_uint2_impl.h
+++ b/intern/cycles/util/types_uint2_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_UINT2_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_uint3.h b/intern/cycles/util/types_uint3.h
index 436d870b621..1e97e7f2d36 100644
--- a/intern/cycles/util/util_types_uint3.h
+++ b/intern/cycles/util/types_uint3.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_UINT3_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_uint3_impl.h b/intern/cycles/util/types_uint3_impl.h
index d188fa06e2a..ba83cffe9a8 100644
--- a/intern/cycles/util/util_types_uint3_impl.h
+++ b/intern/cycles/util/types_uint3_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_UINT3_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_uint4.h b/intern/cycles/util/types_uint4.h
index 57f2859fedf..b135877b890 100644
--- a/intern/cycles/util/util_types_uint4.h
+++ b/intern/cycles/util/types_uint4.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_UINT4_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_uint4_impl.h b/intern/cycles/util/types_uint4_impl.h
index bac8d23030d..b860fbfc49a 100644
--- a/intern/cycles/util/util_types_uint4_impl.h
+++ b/intern/cycles/util/types_uint4_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_UINT4_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_ushort4.h b/intern/cycles/util/types_ushort4.h
index 476ceec622c..8d080bcc1b9 100644
--- a/intern/cycles/util/util_types_ushort4.h
+++ b/intern/cycles/util/types_ushort4.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_USHORT4_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_vector3.h b/intern/cycles/util/types_vector3.h
index 728c7ca62a1..d46a0266855 100644
--- a/intern/cycles/util/util_types_vector3.h
+++ b/intern/cycles/util/types_vector3.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_VECTOR3_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_types_vector3_impl.h b/intern/cycles/util/types_vector3_impl.h
index 33ba53e20b2..ff6dcd85b12 100644
--- a/intern/cycles/util/util_types_vector3_impl.h
+++ b/intern/cycles/util/types_vector3_impl.h
@@ -18,7 +18,7 @@
 #define __UTIL_TYPES_VECTOR3_IMPL_H__
 
 #ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
+#  error "Do not include this file directly, include util/types.h instead."
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_unique_ptr.h b/intern/cycles/util/unique_ptr.h
index 3181eafd43d..3181eafd43d 100644
--- a/intern/cycles/util/util_unique_ptr.h
+++ b/intern/cycles/util/unique_ptr.h
diff --git a/intern/cycles/util/util_vector.h b/intern/cycles/util/vector.h
index 87cd4de8438..db35f198dc1 100644
--- a/intern/cycles/util/util_vector.h
+++ b/intern/cycles/util/vector.h
@@ -21,9 +21,9 @@
 #include <cstring>
 #include <vector>
 
-#include "util/util_aligned_malloc.h"
-#include "util/util_guarded_allocator.h"
-#include "util/util_types.h"
+#include "util/aligned_malloc.h"
+#include "util/guarded_allocator.h"
+#include "util/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_version.h b/intern/cycles/util/version.h
index 8bce5ff85aa..8bce5ff85aa 100644
--- a/intern/cycles/util/util_version.h
+++ b/intern/cycles/util/version.h
diff --git a/intern/cycles/util/util_view.cpp b/intern/cycles/util/view.cpp
index 9d9ff451b3b..1c70cea1a8b 100644
--- a/intern/cycles/util/util_view.cpp
+++ b/intern/cycles/util/view.cpp
@@ -17,11 +17,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "util/util_opengl.h"
-#include "util/util_string.h"
-#include "util/util_time.h"
-#include "util/util_version.h"
-#include "util/util_view.h"
+#include "util/opengl.h"
+#include "util/string.h"
+#include "util/time.h"
+#include "util/version.h"
+#include "util/view.h"
 
 #ifdef __APPLE__
 #  include <GLUT/glut.h>
diff --git a/intern/cycles/util/util_view.h b/intern/cycles/util/view.h
index ad5c53ee5d5..ad5c53ee5d5 100644
--- a/intern/cycles/util/util_view.h
+++ b/intern/cycles/util/view.h
diff --git a/intern/cycles/util/util_windows.cpp b/intern/cycles/util/windows.cpp
index 807a5adc84a..96944d07390 100644
--- a/intern/cycles/util/util_windows.cpp
+++ b/intern/cycles/util/windows.cpp
@@ -18,7 +18,7 @@
 #  include <windows.h>
 #endif
 
-#include "util_windows.h"
+#include "util/windows.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_windows.h b/intern/cycles/util/windows.h
index 9cbf91a23a7..9cbf91a23a7 100644
--- a/intern/cycles/util/util_windows.h
+++ b/intern/cycles/util/windows.h
diff --git a/intern/cycles/util/util_xml.h b/intern/cycles/util/xml.h
index 6f06f17937b..6f06f17937b 100644
--- a/intern/cycles/util/util_xml.h
+++ b/intern/cycles/util/xml.h