Cycles: remove prefix from source code file names

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

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

122 files changed, 335 insertions, 338 deletions

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