10 files changed, 46 insertions, 46 deletions
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 4efdb98aa0f..461fa0bcd9c 100644
--- a/intern/cycles/subd/subd_dice.cpp
+++ b/intern/cycles/subd/dice.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "render/camera.h"
-#include "render/mesh.h"
+#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 a975b7b6342..4d73f334c1b 100644
--- a/intern/cycles/subd/subd_patch.cpp
+++ b/intern/cycles/subd/patch.cpp
@@ -16,12 +16,12 @@
 
 /* Parts adapted from code in the public domain in NVidia Mesh Tools. */
 
-#include "render/mesh.h"
+#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 4d648eb1f77..2b29f3a5a78 100644
--- a/intern/cycles/subd/subd_split.cpp
+++ b/intern/cycles/subd/split.cpp
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-#include "render/camera.h"
-#include "render/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 "scene/camera.h"
+#include "scene/mesh.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