10 files changed, 44 insertions, 44 deletions
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