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.

24 files changed, 103 insertions, 102 deletions

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