Cycles: Header cleanup in BVH: move self header to be the first one

This makes us more sure that header files are more self-sufficient.

intern/cycles/bvh/bvh4.h

@@ -84,5 +84,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif /* __BVH_H__ */
-
+#endif /* __BVH4_H__ */

intern/cycles/bvh/bvh_binning.cpp

@@ -17,10 +17,10 @@
 
 //#define __KERNEL_SSE__
 
-#include <stdlib.h>
-
 #include "bvh/bvh_binning.h"
 
+#include <stdlib.h>
+
 #include "util/util_algorithm.h"
 #include "util/util_boundbox.h"
 #include "util/util_types.h"

intern/cycles/bvh/bvh_binning.h

@@ -111,5 +111,4 @@ protected:
 
 CCL_NAMESPACE_END
 
-#endif
-
+#endif  /* __BVH_BINNING_H__ */

intern/cycles/bvh/bvh_build.cpp

@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 
-#include "bvh/bvh_binning.h"
 #include "bvh/bvh_build.h"
+
+#include "bvh/bvh_binning.h"
 #include "bvh/bvh_node.h"
 #include "bvh/bvh_params.h"
 #include "bvh_split.h"

intern/cycles/bvh/bvh_build.h

@@ -20,17 +20,17 @@
 
 #include <float.h>
 
-#include "bvh/bvh.h"
-#include "bvh/bvh_binning.h"
+#include "bvh/bvh_params.h"
 #include "bvh/bvh_unaligned.h"
 
-#include "util/util_boundbox.h"
 #include "util/util_task.h"
 #include "util/util_vector.h"
 
 CCL_NAMESPACE_BEGIN
 
+class Boundbox;
 class BVHBuildTask;
+class BVHNode;
 class BVHSpatialSplitBuildTask;
 class BVHParams;
 class InnerNode;

intern/cycles/bvh/bvh_node.cpp

@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
+#include "bvh/bvh_node.h"
+
 #include "bvh/bvh.h"
 #include "bvh/bvh_build.h"
-#include "bvh/bvh_node.h"
 
 #include "util/util_debug.h"
 #include "util/util_vector.h"

intern/cycles/bvh/bvh_node.h

@@ -19,7 +19,6 @@
 #define __BVH_NODE_H__
 
 #include "util/util_boundbox.h"
-#include "util/util_debug.h"
 #include "util/util_types.h"
 
 CCL_NAMESPACE_BEGIN

intern/cycles/bvh/bvh_params.h

@@ -246,4 +246,3 @@ struct BVHSpatialStorage {
 CCL_NAMESPACE_END
 
 #endif /* __BVH_PARAMS_H__ */
-

intern/cycles/bvh/bvh_sort.cpp

@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-#include "bvh/bvh_build.h"
 #include "bvh/bvh_sort.h"
 
+#include "bvh/bvh_build.h"
+
 #include "util/util_algorithm.h"
 #include "util/util_debug.h"
 #include "util/util_task.h"

intern/cycles/bvh/bvh_sort.h

@@ -18,8 +18,11 @@
 #ifndef __BVH_SORT_H__
 #define __BVH_SORT_H__
 
+#include <cstddef>
+
 CCL_NAMESPACE_BEGIN
 
+class BVHReference;
 class BVHUnaligned;
 struct Transform;
 
@@ -33,4 +36,3 @@ void bvh_reference_sort(int start,
 CCL_NAMESPACE_END
 
 #endif /* __BVH_SORT_H__ */
-

intern/cycles/bvh/bvh_split.cpp

@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 
-#include "bvh/bvh_build.h"
 #include "bvh/bvh_split.h"
+
+#include "bvh/bvh_build.h"
 #include "bvh/bvh_sort.h"
 
 #include "render/mesh.h"

intern/cycles/bvh/bvh_unaligned.cpp

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 #include "bvh/bvh_unaligned.h"
 
 #include "render/mesh.h"

intern/cycles/bvh/bvh_unaligned.h

@@ -78,4 +78,3 @@ protected:
 CCL_NAMESPACE_END
 
 #endif /* __BVH_UNALIGNED_H__ */
-