Cleanup: `make format` after SortedIncludes change

201 files changed, 357 insertions, 358 deletions

diff --git a/intern/atomic/intern/atomic_ops_msvc.h b/intern/atomic/intern/atomic_ops_msvc.h
index d9655defa81..9c68d74995d 100644
--- a/intern/atomic/intern/atomic_ops_msvc.h
+++ b/intern/atomic/intern/atomic_ops_msvc.h
@@ -37,8 +37,8 @@
 #endif
 #define WIN32_LEAN_AND_MEAN
 
-#include <windows.h>
 #include <intrin.h>
+#include <windows.h>
 
 #if defined(__clang__)
 #  pragma GCC diagnostic push
diff --git a/intern/atomic/intern/atomic_ops_utils.h b/intern/atomic/intern/atomic_ops_utils.h
index b54e12eb49d..57e5b74dd72 100644
--- a/intern/atomic/intern/atomic_ops_utils.h
+++ b/intern/atomic/intern/atomic_ops_utils.h
@@ -47,10 +47,10 @@
 #ifndef __ATOMIC_OPS_UTILS_H__
 #define __ATOMIC_OPS_UTILS_H__
 
-#include <stdint.h>
+#include <limits.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
-#include <limits.h>
 
 #include <assert.h>
 
diff --git a/intern/audaspace/intern/AUD_PyInit.cpp b/intern/audaspace/intern/AUD_PyInit.cpp
index 843fe1e6cf1..47dc4d51c87 100644
--- a/intern/audaspace/intern/AUD_PyInit.cpp
+++ b/intern/audaspace/intern/AUD_PyInit.cpp
@@ -25,8 +25,8 @@
 #include "AUD_PyInit.h"
 
 #include <AUD_Sound.h>
-#include <python/PySound.h>
 #include <python/PyAPI.h>
+#include <python/PySound.h>
 
 extern "C" {
 extern void *BKE_sound_get_factory(void *sound);
diff --git a/intern/clog/clog.c b/intern/clog/clog.c
index 9074e0f85e1..921ee17a672 100644
--- a/intern/clog/clog.c
+++ b/intern/clog/clog.c
@@ -18,23 +18,23 @@
  * \ingroup clog
  */
 
+#include <assert.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
-#include <assert.h>
 
 /* Disable for small single threaded programs
  * to avoid having to link with pthreads. */
 #ifdef WITH_CLOG_PTHREADS
-#  include <pthread.h>
 #  include "atomic_ops.h"
+#  include <pthread.h>
 #endif
 
 /* For 'isatty' to check for color. */
 #if defined(__unix__) || defined(__APPLE__) || defined(__HAIKU__)
-#  include <unistd.h>
 #  include <sys/time.h>
+#  include <unistd.h>
 #endif
 
 #if defined(_MSC_VER)
diff --git a/intern/cycles/app/cycles_cubin_cc.cpp b/intern/cycles/app/cycles_cubin_cc.cpp
index 774c18f4219..9d4d52b34ac 100644
--- a/intern/cycles/app/cycles_cubin_cc.cpp
+++ b/intern/cycles/app/cycles_cubin_cc.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
 
 #include <string>
 #include <vector>
diff --git a/intern/cycles/app/cycles_server.cpp b/intern/cycles/app/cycles_server.cpp
index c5a4c9b375b..1ad70a376ed 100644
--- a/intern/cycles/app/cycles_server.cpp
+++ b/intern/cycles/app/cycles_server.cpp
@@ -20,11 +20,11 @@
 
 #include "util/util_args.h"
 #include "util/util_foreach.h"
+#include "util/util_logging.h"
 #include "util/util_path.h"
 #include "util/util_stats.h"
 #include "util/util_string.h"
 #include "util/util_task.h"
-#include "util/util_logging.h"
 
 using namespace ccl;
 
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index d2d112e8d7e..e45c37be494 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -16,12 +16,12 @@
 
 #include <stdio.h>
 
+#include "device/device.h"
 #include "render/buffers.h"
 #include "render/camera.h"
-#include "device/device.h"
+#include "render/integrator.h"
 #include "render/scene.h"
 #include "render/session.h"
-#include "render/integrator.h"
 
 #include "util/util_args.h"
 #include "util/util_foreach.h"
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 11db5b1a07d..aec00f845f3 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -16,9 +16,9 @@
 
 #include <stdio.h>
 
-#include <sstream>
 #include <algorithm>
 #include <iterator>
+#include <sstream>
 
 #include "graph/node_xml.h"
 
@@ -32,8 +32,8 @@
 #include "render/nodes.h"
 #include "render/object.h"
 #include "render/osl.h"
-#include "render/shader.h"
 #include "render/scene.h"
+#include "render/shader.h"
 
 #include "subd/subd_patch.h"
 #include "subd/subd_split.h"
diff --git a/intern/cycles/blender/blender_device.h b/intern/cycles/blender/blender_device.h
index fd6c045c966..8d2ecac7483 100644
--- a/intern/cycles/blender/blender_device.h
+++ b/intern/cycles/blender/blender_device.h
@@ -18,9 +18,9 @@
 #define __BLENDER_DEVICE_H__
 
 #include "MEM_guardedalloc.h"
-#include "RNA_types.h"
 #include "RNA_access.h"
 #include "RNA_blender_cpp.h"
+#include "RNA_types.h"
 
 #include "device/device.h"
 
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 075c9250e8c..a6f380a9ae7 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
+#include "render/camera.h"
 #include "render/colorspace.h"
 #include "render/mesh.h"
 #include "render/object.h"
 #include "render/scene.h"
-#include "render/camera.h"
 
-#include "blender/blender_sync.h"
 #include "blender/blender_session.h"
+#include "blender/blender_sync.h"
 #include "blender/blender_util.h"
 
 #include "subd/subd_patch.h"
 #include "subd/subd_split.h"
 
 #include "util/util_algorithm.h"
+#include "util/util_disjoint_set.h"
 #include "util/util_foreach.h"
 #include "util/util_hash.h"
 #include "util/util_logging.h"
 #include "util/util_math.h"
-#include "util/util_disjoint_set.h"
 
 #include "mikktspace.h"
 
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 4e488f12d0d..4b29c28913b 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -15,14 +15,14 @@
  */
 
 #include "render/camera.h"
-#include "render/integrator.h"
 #include "render/graph.h"
+#include "render/integrator.h"
 #include "render/light.h"
 #include "render/mesh.h"
-#include "render/object.h"
-#include "render/scene.h"
 #include "render/nodes.h"
+#include "render/object.h"
 #include "render/particles.h"
+#include "render/scene.h"
 #include "render/shader.h"
 
 #include "blender/blender_object_cull.h"
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp
index 816b4552fff..89bcebda193 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -19,8 +19,8 @@
 #include "blender/CCL_api.h"
 
 #include "blender/blender_device.h"
-#include "blender/blender_sync.h"
 #include "blender/blender_session.h"
+#include "blender/blender_sync.h"
 #include "blender/blender_util.h"
 
 #include "render/denoising.h"
@@ -38,8 +38,8 @@
 #ifdef WITH_OSL
 #  include "render/osl.h"
 
-#  include <OSL/oslquery.h>
 #  include <OSL/oslconfig.h>
+#  include <OSL/oslquery.h>
 #endif
 
 #ifdef WITH_OPENCL
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 8e01ad9a96d..5ea96d6bdfd 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -41,8 +41,8 @@
 #include "util/util_progress.h"
 #include "util/util_time.h"
 
-#include "blender/blender_sync.h"
 #include "blender/blender_session.h"
+#include "blender/blender_sync.h"
 #include "blender/blender_util.h"
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 59c1539d207..edde1fd243e 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -24,14 +24,14 @@
 #include "render/shader.h"
 
 #include "blender/blender_image.h"
-#include "blender/blender_texture.h"
 #include "blender/blender_sync.h"
+#include "blender/blender_texture.h"
 #include "blender/blender_util.h"
 
 #include "util/util_debug.h"
 #include "util/util_foreach.h"
-#include "util/util_string.h"
 #include "util/util_set.h"
+#include "util/util_string.h"
 #include "util/util_task.h"
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 9f7797efb97..91d715af7e2 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -16,6 +16,7 @@
 
 #include "render/background.h"
 #include "render/camera.h"
+#include "render/curves.h"
 #include "render/film.h"
 #include "render/graph.h"
 #include "render/integrator.h"
@@ -25,19 +26,18 @@
 #include "render/object.h"
 #include "render/scene.h"
 #include "render/shader.h"
-#include "render/curves.h"
 
 #include "device/device.h"
 
 #include "blender/blender_device.h"
-#include "blender/blender_sync.h"
 #include "blender/blender_session.h"
+#include "blender/blender_sync.h"
 #include "blender/blender_util.h"
 
 #include "util/util_debug.h"
 #include "util/util_foreach.h"
-#include "util/util_opengl.h"
 #include "util/util_hash.h"
+#include "util/util_opengl.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index 25e933dc599..650b4f5bb4e 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -18,9 +18,9 @@
 #define __BLENDER_SYNC_H__
 
 #include "MEM_guardedalloc.h"
-#include "RNA_types.h"
 #include "RNA_access.h"
 #include "RNA_blender_cpp.h"
+#include "RNA_types.h"
 
 #include "blender/blender_id_map.h"
 #include "blender/blender_viewport.h"
diff --git a/intern/cycles/blender/blender_texture.h b/intern/cycles/blender/blender_texture.h
index 896bf62da70..8ab061aaed9 100644
--- a/intern/cycles/blender/blender_texture.h
+++ b/intern/cycles/blender/blender_texture.h
@@ -17,8 +17,8 @@
 #ifndef __BLENDER_TEXTURE_H__
 #define __BLENDER_TEXTURE_H__
 
-#include <stdlib.h>
 #include "blender/blender_sync.h"
+#include <stdlib.h>
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/blender/blender_viewport.h b/intern/cycles/blender/blender_viewport.h
index d2b55358c27..3e44e552f1d 100644
--- a/intern/cycles/blender/blender_viewport.h
+++ b/intern/cycles/blender/blender_viewport.h
@@ -18,9 +18,9 @@
 #define __BLENDER_VIEWPORT_H__
 
 #include "MEM_guardedalloc.h"
-#include "RNA_types.h"
 #include "RNA_access.h"
 #include "RNA_blender_cpp.h"
+#include "RNA_types.h"
 
 #include "render/film.h"
 #include "util/util_param.h"
diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp
index b472c55d156..db156219f09 100644
--- a/intern/cycles/bvh/bvh_build.cpp
+++ b/intern/cycles/bvh/bvh_build.cpp
@@ -22,20 +22,20 @@
 #include "bvh/bvh_params.h"
 #include "bvh_split.h"
 
+#include "render/curves.h"
 #include "render/hair.h"
 #include "render/mesh.h"
 #include "render/object.h"
 #include "render/scene.h"
-#include "render/curves.h"
 
 #include "util/util_algorithm.h"
 #include "util/util_foreach.h"
 #include "util/util_logging.h"
 #include "util/util_progress.h"
-#include "util/util_stack_allocator.h"
+#include "util/util_queue.h"
 #include "util/util_simd.h"
+#include "util/util_stack_allocator.h"
 #include "util/util_time.h"
-#include "util/util_queue.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp
index 639dfe3cee2..9356adf3ea5 100644
--- a/intern/cycles/bvh/bvh_embree.cpp
+++ b/intern/cycles/bvh/bvh_embree.cpp
@@ -35,9 +35,9 @@
 
 #ifdef WITH_EMBREE
 
+#  include <embree3/rtcore_geometry.h>
 #  include <pmmintrin.h>
 #  include <xmmintrin.h>
-#  include <embree3/rtcore_geometry.h>
 
 #  include "bvh/bvh_embree.h"
 
@@ -45,9 +45,9 @@
  */
 #  include "kernel/bvh/bvh_embree.h"
 #  include "kernel/kernel_compat_cpu.h"
-#  include "kernel/split/kernel_split_data_types.h"
 #  include "kernel/kernel_globals.h"
 #  include "kernel/kernel_random.h"
+#  include "kernel/split/kernel_split_data_types.h"
 
 #  include "render/hair.h"
 #  include "render/mesh.h"
diff --git a/intern/cycles/bvh/bvh_optix.cpp b/intern/cycles/bvh/bvh_optix.cpp
index da548e9c0db..26b64c24db5 100644
--- a/intern/cycles/bvh/bvh_optix.cpp
+++ b/intern/cycles/bvh/bvh_optix.cpp
@@ -18,8 +18,8 @@
 #ifdef WITH_OPTIX
 
 #  include "bvh/bvh_optix.h"
-#  include "render/hair.h"
 #  include "render/geometry.h"
+#  include "render/hair.h"
 #  include "render/mesh.h"
 #  include "render/object.h"
 #  include "util/util_foreach.h"
diff --git a/intern/cycles/device/cuda/device_cuda_impl.cpp b/intern/cycles/device/cuda/device_cuda_impl.cpp
index a4e7bc2f64a..0f261ef2f70 100644
--- a/intern/cycles/device/cuda/device_cuda_impl.cpp
+++ b/intern/cycles/device/cuda/device_cuda_impl.cpp
@@ -39,8 +39,8 @@
 #  include "util/util_path.h"
 #  include "util/util_string.h"
 #  include "util/util_system.h"
-#  include "util/util_types.h"
 #  include "util/util_time.h"
+#  include "util/util_types.h"
 #  include "util/util_windows.h"
 
 #  include "kernel/split/kernel_split_data_types.h"
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index c0d02e0605f..d94d409175b 100644
--- a/intern/cycles/device/device.cpp
+++ b/intern/cycles/device/device.cpp
@@ -25,11 +25,11 @@
 #include "util/util_logging.h"
 #include "util/util_math.h"
 #include "util/util_opengl.h"
-#include "util/util_time.h"
+#include "util/util_string.h"
 #include "util/util_system.h"
+#include "util/util_time.h"
 #include "util/util_types.h"
 #include "util/util_vector.h"
-#include "util/util_string.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index 2aeed3f0e89..a98ac171709 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -27,8 +27,8 @@
 #include "util/util_list.h"
 #include "util/util_stats.h"
 #include "util/util_string.h"
-#include "util/util_thread.h"
 #include "util/util_texture.h"
+#include "util/util_thread.h"
 #include "util/util_types.h"
 #include "util/util_vector.h"
 
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 6957adb478f..9a703b45c0a 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -16,9 +16,9 @@
 
 #ifdef WITH_CUDA
 
+#  include "device/cuda/device_cuda.h"
 #  include "device/device.h"
 #  include "device/device_intern.h"
-#  include "device/cuda/device_cuda.h"
 
 #  include "util/util_logging.h"
 #  include "util/util_string.h"
diff --git a/intern/cycles/device/device_memory.cpp b/intern/cycles/device/device_memory.cpp
index 3c4f68cfc77..671cd7c29f3 100644
--- a/intern/cycles/device/device_memory.cpp
+++ b/intern/cycles/device/device_memory.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "device/device.h"
 #include "device/device_memory.h"
+#include "device/device.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp
index 631c4169e2e..3636ecaa7a1 100644
--- a/intern/cycles/device/device_multi.cpp
+++ b/intern/cycles/device/device_multi.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <stdlib.h>
 #include <sstream>
+#include <stdlib.h>
 
 #include "device/device.h"
 #include "device/device_intern.h"
diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp
index 80334ad8f22..2742cbf53aa 100644
--- a/intern/cycles/device/device_network.cpp
+++ b/intern/cycles/device/device_network.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "device/device_network.h"
 #include "device/device.h"
 #include "device/device_intern.h"
-#include "device/device_network.h"
 
 #include "util/util_foreach.h"
 #include "util/util_logging.h"
diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h
index 5b69b815cc6..e74c4508ab6 100644
--- a/intern/cycles/device/device_network.h
+++ b/intern/cycles/device/device_network.h
@@ -19,19 +19,19 @@
 
 #ifdef WITH_NETWORK
 
-#  include <boost/archive/text_iarchive.hpp>
-#  include <boost/archive/text_oarchive.hpp>
 #  include <boost/archive/binary_iarchive.hpp>
 #  include <boost/archive/binary_oarchive.hpp>
+#  include <boost/archive/text_iarchive.hpp>
+#  include <boost/archive/text_oarchive.hpp>
 #  include <boost/array.hpp>
 #  include <boost/asio.hpp>
 #  include <boost/bind.hpp>
 #  include <boost/serialization/vector.hpp>
 #  include <boost/thread.hpp>
 
+#  include <deque>
 #  include <iostream>
 #  include <sstream>
-#  include <deque>
 
 #  include "render/buffers.h"
 
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index ccfc53d5a21..891b73351a0 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -16,9 +16,9 @@
 
 #ifdef WITH_OPENCL
 
+#  include "device/opencl/device_opencl.h"
 #  include "device/device.h"
 #  include "device/device_intern.h"
-#  include "device/opencl/device_opencl.h"
 
 #  include "util/util_foreach.h"
 #  include "util/util_logging.h"
diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp
index 329876ce6f6..c23732839b6 100644
--- a/intern/cycles/device/device_optix.cpp
+++ b/intern/cycles/device/device_optix.cpp
@@ -17,28 +17,28 @@
 
 #ifdef WITH_OPTIX
 
+#  include "bvh/bvh.h"
 #  include "device/cuda/device_cuda.h"
-#  include "device/device_intern.h"
 #  include "device/device_denoising.h"
-#  include "bvh/bvh.h"
-#  include "render/scene.h"
+#  include "device/device_intern.h"
+#  include "render/buffers.h"
 #  include "render/hair.h"
 #  include "render/mesh.h"
 #  include "render/object.h"
-#  include "render/buffers.h"
+#  include "render/scene.h"
+#  include "util/util_debug.h"
+#  include "util/util_logging.h"
 #  include "util/util_md5.h"
 #  include "util/util_path.h"
 #  include "util/util_time.h"
-#  include "util/util_debug.h"
-#  include "util/util_logging.h"
 
 #  ifdef WITH_CUDA_DYNLOAD
 #    include <cuew.h>
 // Do not use CUDA SDK headers when using CUEW
 #    define OPTIX_DONT_INCLUDE_CUDA
 #  endif
-#  include <optix_stubs.h>
 #  include <optix_function_table_definition.h>
+#  include <optix_stubs.h>
 
 // TODO(pmours): Disable this once drivers have native support
 #  define OPTIX_DENOISER_NO_PIXEL_STRIDE 1
diff --git a/intern/cycles/device/opencl/memory_manager.h b/intern/cycles/device/opencl/memory_manager.h
index 2fbc97a0756..23624f837a6 100644
--- a/intern/cycles/device/opencl/memory_manager.h
+++ b/intern/cycles/device/opencl/memory_manager.h
@@ -19,8 +19,8 @@
 #include "device/device.h"
 
 #include "util/util_map.h"
-#include "util/util_vector.h"
 #include "util/util_string.h"
+#include "util/util_vector.h"
 
 #include "clew.h"
 
diff --git a/intern/cycles/device/opencl/opencl_util.cpp b/intern/cycles/device/opencl/opencl_util.cpp
index f59f109db70..580a73f6e8b 100644
--- a/intern/cycles/device/opencl/opencl_util.cpp
+++ b/intern/cycles/device/opencl/opencl_util.cpp
@@ -16,15 +16,15 @@
 
 #ifdef WITH_OPENCL
 
-#  include "device/opencl/device_opencl.h"
 #  include "device/device_intern.h"
+#  include "device/opencl/device_opencl.h"
 
 #  include "util/util_debug.h"
 #  include "util/util_logging.h"
 #  include "util/util_md5.h"
 #  include "util/util_path.h"
-#  include "util/util_time.h"
 #  include "util/util_system.h"
+#  include "util/util_time.h"
 
 using std::cerr;
 using std::endl;
diff --git a/intern/cycles/kernel/kernel.h b/intern/cycles/kernel/kernel.h
index 3debfc76fbb..b907c6a2bac 100644
--- a/intern/cycles/kernel/kernel.h
+++ b/intern/cycles/kernel/kernel.h
@@ -19,8 +19,8 @@
 
 /* CPU Kernel Interface */
 
-#include "util/util_types.h"
 #include "kernel/kernel_types.h"
+#include "util/util_types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h
index 006dd00dd73..88f6a264a5a 100644
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -35,11 +35,11 @@
 #  define __NODES_FEATURES__ NODE_FEATURE_ALL
 #endif
 
+#include "util/util_half.h"
 #include "util/util_math.h"
 #include "util/util_simd.h"
-#include "util/util_half.h"
-#include "util/util_types.h"
 #include "util/util_texture.h"
+#include "util/util_types.h"
 
 #define ccl_addr_space
 
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h
index a440021b6b9..c186e8560eb 100644
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -22,8 +22,8 @@
 #include "kernel/kernel_profiling.h"
 
 #ifdef __KERNEL_CPU__
-#  include "util/util_vector.h"
 #  include "util/util_map.h"
+#  include "util/util_vector.h"
 #endif
 
 #ifdef __KERNEL_OPENCL__
diff --git a/intern/cycles/kernel/osl/osl_closures.h b/intern/cycles/kernel/osl/osl_closures.h
index d3db6b71f5c..d12afdb80dd 100644
--- a/intern/cycles/kernel/osl/osl_closures.h
+++ b/intern/cycles/kernel/osl/osl_closures.h
@@ -33,12 +33,12 @@
 #ifndef __OSL_CLOSURES_H__
 #define __OSL_CLOSURES_H__
 
-#include "util/util_types.h"
 #include "kernel/kernel_types.h"
+#include "util/util_types.h"
 
+#include <OSL/genclosure.h>
 #include <OSL/oslclosure.h>
 #include <OSL/oslexec.h>
-#include <OSL/genclosure.h>
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/osl_globals.h
index 0e6c8d21534..c06c9abd4c1 100644
--- a/intern/cycles/kernel/osl/osl_globals.h
+++ b/intern/cycles/kernel/osl/osl_globals.h
@@ -27,8 +27,8 @@
 #  include "util/util_map.h"
 #  include "util/util_param.h"
 #  include "util/util_thread.h"
-#  include "util/util_vector.h"
 #  include "util/util_unique_ptr.h"
+#  include "util/util_vector.h"
 
 #  ifndef WIN32
 using std::isfinite;
diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h
index 469c5188730..d32dace23bf 100644
--- a/intern/cycles/kernel/osl/osl_services.h
+++ b/intern/cycles/kernel/osl/osl_services.h
@@ -25,8 +25,8 @@
  * attributes.
  */
 
-#include <OSL/oslexec.h>
 #include <OSL/oslclosure.h>
+#include <OSL/oslexec.h>
 
 #ifdef WITH_PTEX
 class PtexCache;
diff --git a/intern/cycles/kernel/shaders/node_environment_texture.osl b/intern/cycles/kernel/shaders/node_environment_texture.osl
index 2bae30c785c..d04743eb368 100644
--- a/intern/cycles/kernel/shaders/node_environment_texture.osl
+++ b/intern/cycles/kernel/shaders/node_environment_texture.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_color.h"
+#include "stdcycles.h"
 
 vector environment_texture_direction_to_equirectangular(vector dir)
 {
diff --git a/intern/cycles/kernel/shaders/node_fresnel.osl b/intern/cycles/kernel/shaders/node_fresnel.osl
index 1658debf82c..cff084c344d 100644
--- a/intern/cycles/kernel/shaders/node_fresnel.osl
+++ b/intern/cycles/kernel/shaders/node_fresnel.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_fresnel.h"
+#include "stdcycles.h"
 
 shader node_fresnel(float IOR = 1.45, normal Normal = N, output float Fac = 0.0)
 {
diff --git a/intern/cycles/kernel/shaders/node_glass_bsdf.osl b/intern/cycles/kernel/shaders/node_glass_bsdf.osl
index 120d57c37dd..0042d573f8d 100644
--- a/intern/cycles/kernel/shaders/node_glass_bsdf.osl
+++ b/intern/cycles/kernel/shaders/node_glass_bsdf.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_fresnel.h"
+#include "stdcycles.h"
 
 shader node_glass_bsdf(color Color = 0.8,
                        string distribution = "sharp",
diff --git a/intern/cycles/kernel/shaders/node_glossy_bsdf.osl b/intern/cycles/kernel/shaders/node_glossy_bsdf.osl
index a93b013c1d6..c73604d3650 100644
--- a/intern/cycles/kernel/shaders/node_glossy_bsdf.osl
+++ b/intern/cycles/kernel/shaders/node_glossy_bsdf.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_fresnel.h"
+#include "stdcycles.h"
 
 shader node_glossy_bsdf(color Color = 0.8,
                         string distribution = "GGX",
diff --git a/intern/cycles/kernel/shaders/node_hsv.osl b/intern/cycles/kernel/shaders/node_hsv.osl
index 40bef11977e..4417057b10f 100644
--- a/intern/cycles/kernel/shaders/node_hsv.osl
+++ b/intern/cycles/kernel/shaders/node_hsv.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_color.h"
+#include "stdcycles.h"
 
 shader node_hsv(float Hue = 0.5,
                 float Saturation = 1.0,
diff --git a/intern/cycles/kernel/shaders/node_image_texture.osl b/intern/cycles/kernel/shaders/node_image_texture.osl
index bfaab514321..22d34a1082c 100644
--- a/intern/cycles/kernel/shaders/node_image_texture.osl
+++ b/intern/cycles/kernel/shaders/node_image_texture.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_color.h"
+#include "stdcycles.h"
 
 point texco_remap_square(point co)
 {
diff --git a/intern/cycles/kernel/shaders/node_layer_weight.osl b/intern/cycles/kernel/shaders/node_layer_weight.osl
index 4da69b62d2e..1662be2cad1 100644
--- a/intern/cycles/kernel/shaders/node_layer_weight.osl
+++ b/intern/cycles/kernel/shaders/node_layer_weight.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_fresnel.h"
+#include "stdcycles.h"
 
 shader node_layer_weight(float Blend = 0.5,
                          normal Normal = N,
diff --git a/intern/cycles/kernel/shaders/node_math.osl b/intern/cycles/kernel/shaders/node_math.osl
index 6c3dd1547a6..dbaa7ccb60e 100644
--- a/intern/cycles/kernel/shaders/node_math.osl
+++ b/intern/cycles/kernel/shaders/node_math.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_math.h"
+#include "stdcycles.h"
 
 /* OSL asin, acos, and pow functions are safe by default. */
 shader node_math(string type = "add",
diff --git a/intern/cycles/kernel/shaders/node_mix.osl b/intern/cycles/kernel/shaders/node_mix.osl
index a296b139af5..a13b4bb7b96 100644
--- a/intern/cycles/kernel/shaders/node_mix.osl
+++ b/intern/cycles/kernel/shaders/node_mix.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_color.h"
+#include "stdcycles.h"
 
 color node_mix_blend(float t, color col1, color col2)
 {
diff --git a/intern/cycles/kernel/shaders/node_musgrave_texture.osl b/intern/cycles/kernel/shaders/node_musgrave_texture.osl
index cd054102968..d03b84c1ab4 100644
--- a/intern/cycles/kernel/shaders/node_musgrave_texture.osl
+++ b/intern/cycles/kernel/shaders/node_musgrave_texture.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_noise.h"
+#include "stdcycles.h"
 #include "vector2.h"
 #include "vector4.h"
 
diff --git a/intern/cycles/kernel/shaders/node_noise_texture.osl b/intern/cycles/kernel/shaders/node_noise_texture.osl
index ab8f304c80d..4121b415673 100644
--- a/intern/cycles/kernel/shaders/node_noise_texture.osl
+++ b/intern/cycles/kernel/shaders/node_noise_texture.osl
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include "node_noise.h"
 #include "stdcycles.h"
 #include "vector2.h"
 #include "vector4.h"
-#include "node_noise.h"
 
 #define vector3 point
 
diff --git a/intern/cycles/kernel/shaders/node_principled_bsdf.osl b/intern/cycles/kernel/shaders/node_principled_bsdf.osl
index 7fb562ffe47..1711811ac65 100644
--- a/intern/cycles/kernel/shaders/node_principled_bsdf.osl
+++ b/intern/cycles/kernel/shaders/node_principled_bsdf.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_fresnel.h"
+#include "stdcycles.h"
 
 shader node_principled_bsdf(string distribution = "Multiscatter GGX",
                             string subsurface_method = "burley",
diff --git a/intern/cycles/kernel/shaders/node_rgb_curves.osl b/intern/cycles/kernel/shaders/node_rgb_curves.osl
index 1aca7966257..8850040d580 100644
--- a/intern/cycles/kernel/shaders/node_rgb_curves.osl
+++ b/intern/cycles/kernel/shaders/node_rgb_curves.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_ramp_util.h"
+#include "stdcycles.h"
 
 shader node_rgb_curves(color ramp[] = {0.0},
                        float min_x = 0.0,
diff --git a/intern/cycles/kernel/shaders/node_rgb_ramp.osl b/intern/cycles/kernel/shaders/node_rgb_ramp.osl
index 5d4e13cbca6..2131edb2688 100644
--- a/intern/cycles/kernel/shaders/node_rgb_ramp.osl
+++ b/intern/cycles/kernel/shaders/node_rgb_ramp.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_ramp_util.h"
+#include "stdcycles.h"
 
 shader node_rgb_ramp(color ramp_color[] = {0.0},
                      float ramp_alpha[] = {0.0},
diff --git a/intern/cycles/kernel/shaders/node_separate_hsv.osl b/intern/cycles/kernel/shaders/node_separate_hsv.osl
index ad1d7ae70d7..2f902b72dbc 100644
--- a/intern/cycles/kernel/shaders/node_separate_hsv.osl
+++ b/intern/cycles/kernel/shaders/node_separate_hsv.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_color.h"
+#include "stdcycles.h"
 
 shader node_separate_hsv(color Color = 0.8,
                          output float H = 0.0,
diff --git a/intern/cycles/kernel/shaders/node_sky_texture.osl b/intern/cycles/kernel/shaders/node_sky_texture.osl
index 145a95800b2..4def237a2e0 100644
--- a/intern/cycles/kernel/shaders/node_sky_texture.osl
+++ b/intern/cycles/kernel/shaders/node_sky_texture.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_color.h"
+#include "stdcycles.h"
 
 float sky_angle_between(float thetav, float phiv, float theta, float phi)
 {
diff --git a/intern/cycles/kernel/shaders/node_vector_curves.osl b/intern/cycles/kernel/shaders/node_vector_curves.osl
index 41993fd8b56..9d3a2b82b0a 100644
--- a/intern/cycles/kernel/shaders/node_vector_curves.osl
+++ b/intern/cycles/kernel/shaders/node_vector_curves.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_ramp_util.h"
+#include "stdcycles.h"
 
 shader node_vector_curves(color ramp[] = {0.0},
                           float min_x = 0.0,
diff --git a/intern/cycles/kernel/shaders/node_vector_math.osl b/intern/cycles/kernel/shaders/node_vector_math.osl
index 7f3ea781f38..218851598b4 100644
--- a/intern/cycles/kernel/shaders/node_vector_math.osl
+++ b/intern/cycles/kernel/shaders/node_vector_math.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_math.h"
+#include "stdcycles.h"
 
 shader node_vector_math(string type = "add",
                         vector Vector1 = vector(0.0, 0.0, 0.0),
diff --git a/intern/cycles/kernel/shaders/node_vector_rotate.osl b/intern/cycles/kernel/shaders/node_vector_rotate.osl
index d32733b0966..2efe3470ae2 100644
--- a/intern/cycles/kernel/shaders/node_vector_rotate.osl
+++ b/intern/cycles/kernel/shaders/node_vector_rotate.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_math.h"
+#include "stdcycles.h"
 
 shader node_vector_rotate(int invert = 0,
                           string type = "axis",
diff --git a/intern/cycles/kernel/shaders/node_velvet_bsdf.osl b/intern/cycles/kernel/shaders/node_velvet_bsdf.osl
index 2a35a3da5a5..299acef35ee 100644
--- a/intern/cycles/kernel/shaders/node_velvet_bsdf.osl
+++ b/intern/cycles/kernel/shaders/node_velvet_bsdf.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_fresnel.h"
+#include "stdcycles.h"
 
 shader node_velvet_bsdf(color Color = 0.8,
                         float Sigma = 0.0,
diff --git a/intern/cycles/kernel/shaders/node_voronoi_texture.osl b/intern/cycles/kernel/shaders/node_voronoi_texture.osl
index 7a24cde95fc..04d61c32f8a 100644
--- a/intern/cycles/kernel/shaders/node_voronoi_texture.osl
+++ b/intern/cycles/kernel/shaders/node_voronoi_texture.osl
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include "node_hash.h"
 #include "stdcycles.h"
 #include "vector2.h"
 #include "vector4.h"
-#include "node_hash.h"
 
 #define vector3 point
 
diff --git a/intern/cycles/kernel/shaders/node_wave_texture.osl b/intern/cycles/kernel/shaders/node_wave_texture.osl
index 5cc77aac75a..f17397be243 100644
--- a/intern/cycles/kernel/shaders/node_wave_texture.osl
+++ b/intern/cycles/kernel/shaders/node_wave_texture.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "node_noise.h"
+#include "stdcycles.h"
 
 /* Wave */
 
diff --git a/intern/cycles/kernel/shaders/node_white_noise_texture.osl b/intern/cycles/kernel/shaders/node_white_noise_texture.osl
index 03b791b04ef..94735a019d5 100644
--- a/intern/cycles/kernel/shaders/node_white_noise_texture.osl
+++ b/intern/cycles/kernel/shaders/node_white_noise_texture.osl
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include "node_hash.h"
 #include "stdcycles.h"
 #include "vector2.h"
 #include "vector4.h"
-#include "node_hash.h"
 
 #define vector3 point
 
diff --git a/intern/cycles/kernel/shaders/node_wireframe.osl b/intern/cycles/kernel/shaders/node_wireframe.osl
index d5d5b63ade8..673a451c928 100644
--- a/intern/cycles/kernel/shaders/node_wireframe.osl
+++ b/intern/cycles/kernel/shaders/node_wireframe.osl
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "stdcycles.h"
 #include "oslutil.h"
+#include "stdcycles.h"
 
 shader node_wireframe(string bump_offset = "center",
                       int use_pixel_size = 0,
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h
index 88c9dbf5838..02c0cb48108 100644
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -161,53 +161,53 @@ CCL_NAMESPACE_END
 #include "svm_fractal_noise.h"
 
 #include "kernel/svm/svm_color_util.h"
-#include "kernel/svm/svm_math_util.h"
 #include "kernel/svm/svm_mapping_util.h"
+#include "kernel/svm/svm_math_util.h"
 
 #include "kernel/svm/svm_aov.h"
 #include "kernel/svm/svm_attribute.h"
-#include "kernel/svm/svm_gradient.h"
 #include "kernel/svm/svm_blackbody.h"
+#include "kernel/svm/svm_brick.h"
+#include "kernel/svm/svm_brightness.h"
+#include "kernel/svm/svm_bump.h"
+#include "kernel/svm/svm_camera.h"
+#include "kernel/svm/svm_checker.h"
+#include "kernel/svm/svm_clamp.h"
 #include "kernel/svm/svm_closure.h"
-#include "kernel/svm/svm_noisetex.h"
 #include "kernel/svm/svm_convert.h"
 #include "kernel/svm/svm_displace.h"
 #include "kernel/svm/svm_fresnel.h"
-#include "kernel/svm/svm_wireframe.h"
-#include "kernel/svm/svm_wavelength.h"
-#include "kernel/svm/svm_camera.h"
+#include "kernel/svm/svm_gamma.h"
 #include "kernel/svm/svm_geometry.h"
+#include "kernel/svm/svm_gradient.h"
 #include "kernel/svm/svm_hsv.h"
 #include "kernel/svm/svm_ies.h"
 #include "kernel/svm/svm_image.h"
-#include "kernel/svm/svm_gamma.h"
-#include "kernel/svm/svm_brightness.h"
 #include "kernel/svm/svm_invert.h"
 #include "kernel/svm/svm_light_path.h"
 #include "kernel/svm/svm_magic.h"
+#include "kernel/svm/svm_map_range.h"
 #include "kernel/svm/svm_mapping.h"
-#include "kernel/svm/svm_normal.h"
-#include "kernel/svm/svm_wave.h"
 #include "kernel/svm/svm_math.h"
 #include "kernel/svm/svm_mix.h"
+#include "kernel/svm/svm_musgrave.h"
+#include "kernel/svm/svm_noisetex.h"
+#include "kernel/svm/svm_normal.h"
 #include "kernel/svm/svm_ramp.h"
 #include "kernel/svm/svm_sepcomb_hsv.h"
 #include "kernel/svm/svm_sepcomb_vector.h"
-#include "kernel/svm/svm_musgrave.h"
 #include "kernel/svm/svm_sky.h"
 #include "kernel/svm/svm_tex_coord.h"
 #include "kernel/svm/svm_value.h"
-#include "kernel/svm/svm_voronoi.h"
-#include "kernel/svm/svm_checker.h"
-#include "kernel/svm/svm_brick.h"
 #include "kernel/svm/svm_vector_rotate.h"
 #include "kernel/svm/svm_vector_transform.h"
+#include "kernel/svm/svm_vertex_color.h"
+#include "kernel/svm/svm_voronoi.h"
 #include "kernel/svm/svm_voxel.h"
-#include "kernel/svm/svm_bump.h"
-#include "kernel/svm/svm_map_range.h"
-#include "kernel/svm/svm_clamp.h"
+#include "kernel/svm/svm_wave.h"
+#include "kernel/svm/svm_wavelength.h"
 #include "kernel/svm/svm_white_noise.h"
-#include "kernel/svm/svm_vertex_color.h"
+#include "kernel/svm/svm_wireframe.h"
 
 #ifdef __SHADER_RAYTRACE__
 #  include "kernel/svm/svm_ao.h"
diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp
index d0d9888ac88..a3d3c1c2bda 100644
--- a/intern/cycles/render/attribute.cpp
+++ b/intern/cycles/render/attribute.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "render/image.h"
+#include "render/attribute.h"
 #include "render/hair.h"
+#include "render/image.h"
 #include "render/mesh.h"
-#include "render/attribute.h"
 
 #include "util/util_foreach.h"
 #include "util/util_transform.h"
diff --git a/intern/cycles/render/background.cpp b/intern/cycles/render/background.cpp
index 25ec0d3f0ba..694bb640995 100644
--- a/intern/cycles/render/background.cpp
+++ b/intern/cycles/render/background.cpp
@@ -16,8 +16,8 @@
 
 #include "render/background.h"
 #include "device/device.h"
-#include "render/integrator.h"
 #include "render/graph.h"
+#include "render/integrator.h"
 #include "render/nodes.h"
 #include "render/scene.h"
 #include "render/shader.h"
diff --git a/intern/cycles/render/bake.cpp b/intern/cycles/render/bake.cpp
index 11ccfc95293..35f942b3e9b 100644
--- a/intern/cycles/render/bake.cpp
+++ b/intern/cycles/render/bake.cpp
@@ -15,10 +15,10 @@
  */
 
 #include "render/bake.h"
+#include "render/integrator.h"
 #include "render/mesh.h"
 #include "render/object.h"
 #include "render/shader.h"
-#include "render/integrator.h"
 
 #include "util/util_foreach.h"
 
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp
index 19d3f00bf82..2d89fb9ffba 100644
--- a/intern/cycles/render/buffers.cpp
+++ b/intern/cycles/render/buffers.cpp
@@ -16,8 +16,8 @@
 
 #include <stdlib.h>
 
-#include "render/buffers.h"
 #include "device/device.h"
+#include "render/buffers.h"
 
 #include "util/util_foreach.h"
 #include "util/util_hash.h"
diff --git a/intern/cycles/render/colorspace.cpp b/intern/cycles/render/colorspace.cpp
index 7684d48756f..7605fcaf5ff 100644
--- a/intern/cycles/render/colorspace.cpp
+++ b/intern/cycles/render/colorspace.cpp
@@ -17,8 +17,8 @@
 #include "render/colorspace.h"
 
 #include "util/util_color.h"
-#include "util/util_image.h"
 #include "util/util_half.h"
+#include "util/util_image.h"
 #include "util/util_logging.h"
 #include "util/util_math.h"
 #include "util/util_thread.h"
diff --git a/intern/cycles/render/constant_fold.h b/intern/cycles/render/constant_fold.h
index 7f622488a88..fec4123c361 100644
--- a/intern/cycles/render/constant_fold.h
+++ b/intern/cycles/render/constant_fold.h
@@ -17,8 +17,8 @@
 #ifndef __CONSTANT_FOLD_H__
 #define __CONSTANT_FOLD_H__
 
-#include "util/util_types.h"
 #include "kernel/svm/svm_types.h"
+#include "util/util_types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/render/curves.cpp b/intern/cycles/render/curves.cpp
index 66fbc9eb4a8..1907bb33d06 100644
--- a/intern/cycles/render/curves.cpp
+++ b/intern/cycles/render/curves.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "device/device.h"
 #include "render/curves.h"
+#include "device/device.h"
 #include "render/mesh.h"
 #include "render/object.h"
 #include "render/scene.h"
diff --git a/intern/cycles/render/denoising.h b/intern/cycles/render/denoising.h
index c234d00eb49..5c6f913cb38 100644
--- a/intern/cycles/render/denoising.h
+++ b/intern/cycles/render/denoising.h
@@ -23,8 +23,8 @@
 #include "render/buffers.h"
 
 #include "util/util_string.h"
-#include "util/util_vector.h"
 #include "util/util_unique_ptr.h"
+#include "util/util_vector.h"
 
 #include <OpenImageIO/imageio.h>
 
diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp
index 48d9c97e0fb..d1e2ef66c2c 100644
--- a/intern/cycles/render/film.cpp
+++ b/intern/cycles/render/film.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "render/camera.h"
-#include "device/device.h"
 #include "render/film.h"
+#include "device/device.h"
+#include "render/camera.h"
 #include "render/integrator.h"
 #include "render/mesh.h"
 #include "render/scene.h"
diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp
index 748a8f7cf67..d46ed430c4f 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -33,8 +33,8 @@
 #include "render/shader.h"
 #include "render/stats.h"
 
-#include "subd/subd_split.h"
 #include "subd/subd_patch_table.h"
+#include "subd/subd_split.h"
 
 #include "kernel/osl/osl_globals.h"
 
diff --git a/intern/cycles/render/geometry.h b/intern/cycles/render/geometry.h
index 82f539d391d..b0284304843 100644
--- a/intern/cycles/render/geometry.h
+++ b/intern/cycles/render/geometry.h
@@ -24,8 +24,8 @@
 #include "render/attribute.h"
 
 #include "util/util_boundbox.h"
-#include "util/util_transform.h"
 #include "util/util_set.h"
+#include "util/util_transform.h"
 #include "util/util_types.h"
 #include "util/util_vector.h"
 
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index 0e520c700a7..d2db59894ea 100644
--- a/intern/cycles/render/graph.cpp
+++ b/intern/cycles/render/graph.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "render/attribute.h"
 #include "render/graph.h"
+#include "render/attribute.h"
+#include "render/constant_fold.h"
 #include "render/nodes.h"
 #include "render/scene.h"
 #include "render/shader.h"
-#include "render/constant_fold.h"
 
 #include "util/util_algorithm.h"
 #include "util/util_foreach.h"
diff --git a/intern/cycles/render/hair.cpp b/intern/cycles/render/hair.cpp
index 7220fe7093b..3daa4cc1e35 100644
--- a/intern/cycles/render/hair.cpp
+++ b/intern/cycles/render/hair.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "render/curves.h"
 #include "render/hair.h"
+#include "render/curves.h"
 #include "render/scene.h"
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 23f97ba5aa3..40fdf4b4119 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -15,9 +15,9 @@
  */
 
 #include "render/image.h"
-#include "render/image_oiio.h"
 #include "device/device.h"
 #include "render/colorspace.h"
+#include "render/image_oiio.h"
 #include "render/scene.h"
 #include "render/stats.h"
 
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index d856f7a300f..2f9d088899e 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "render/integrator.h"
 #include "device/device.h"
 #include "render/background.h"
-#include "render/integrator.h"
 #include "render/film.h"
 #include "render/jitter.h"
 #include "render/light.h"
@@ -27,8 +27,8 @@
 #include "kernel/kernel_types.h"
 
 #include "util/util_foreach.h"
-#include "util/util_logging.h"
 #include "util/util_hash.h"
+#include "util/util_logging.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp
index 8263f68fa9c..9adf8e5341a 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "render/background.h"
+#include "render/light.h"
 #include "device/device.h"
-#include "render/integrator.h"
+#include "render/background.h"
 #include "render/film.h"
 #include "render/graph.h"
-#include "render/light.h"
+#include "render/integrator.h"
 #include "render/mesh.h"
 #include "render/nodes.h"
 #include "render/object.h"
@@ -28,9 +28,9 @@
 
 #include "util/util_foreach.h"
 #include "util/util_hash.h"
+#include "util/util_logging.h"
 #include "util/util_path.h"
 #include "util/util_progress.h"
-#include "util/util_logging.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/render/merge.cpp b/intern/cycles/render/merge.cpp
index cac07e59fe3..3ea3952b96c 100644
--- a/intern/cycles/render/merge.cpp
+++ b/intern/cycles/render/merge.cpp
@@ -22,8 +22,8 @@
 #include "util/util_time.h"
 #include "util/util_unique_ptr.h"
 
-#include <OpenImageIO/imageio.h>
 #include <OpenImageIO/filesystem.h>
+#include <OpenImageIO/imageio.h>
 
 OIIO_NAMESPACE_USING
 
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index f855697b889..c262d770331 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -25,8 +25,8 @@
 #include "render/object.h"
 #include "render/scene.h"
 
-#include "subd/subd_split.h"
 #include "subd/subd_patch_table.h"
+#include "subd/subd_split.h"
 
 #include "util/util_foreach.h"
 #include "util/util_logging.h"
diff --git a/intern/cycles/render/mesh_subdivision.cpp b/intern/cycles/render/mesh_subdivision.cpp
index 40dd658eadd..3d72b2fab91 100644
--- a/intern/cycles/render/mesh_subdivision.cpp
+++ b/intern/cycles/render/mesh_subdivision.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include "render/mesh.h"
 #include "render/attribute.h"
 #include "render/camera.h"
+#include "render/mesh.h"
 
-#include "subd/subd_split.h"
 #include "subd/subd_patch.h"
 #include "subd/subd_patch_table.h"
+#include "subd/subd_split.h"
 
-#include "util/util_foreach.h"
 #include "util/util_algorithm.h"
+#include "util/util_foreach.h"
 #include "util/util_hash.h"
 
 CCL_NAMESPACE_BEGIN
@@ -32,10 +32,10 @@ CCL_NAMESPACE_BEGIN
 
 CCL_NAMESPACE_END
 
-#  include <opensubdiv/far/topologyRefinerFactory.h>
-#  include <opensubdiv/far/primvarRefiner.h>
-#  include <opensubdiv/far/patchTableFactory.h>
 #  include <opensubdiv/far/patchMap.h>
+#  include <opensubdiv/far/patchTableFactory.h>
+#  include <opensubdiv/far/primvarRefiner.h>
+#  include <opensubdiv/far/topologyRefinerFactory.h>
 
 /* specializations of TopologyRefinerFactory for ccl::Mesh */
 
diff --git a/intern/cycles/render/mesh_volume.cpp b/intern/cycles/render/mesh_volume.cpp
index 241be2d7592..d73ba3b06dd 100644
--- a/intern/cycles/render/mesh_volume.cpp
+++ b/intern/cycles/render/mesh_volume.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "render/mesh.h"
 #include "render/attribute.h"
+#include "render/mesh.h"
 #include "render/scene.h"
 
 #include "util/util_foreach.h"
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 26b816b65e9..ac07d91c4ca 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
+#include "render/nodes.h"
 #include "render/colorspace.h"
+#include "render/constant_fold.h"
 #include "render/film.h"
 #include "render/image.h"
 #include "render/integrator.h"
 #include "render/light.h"
 #include "render/mesh.h"
-#include "render/nodes.h"
+#include "render/osl.h"
 #include "render/scene.h"
 #include "render/svm.h"
-#include "render/osl.h"
-#include "render/constant_fold.h"
 
 #include "util/util_foreach.h"
 #include "util/util_logging.h"
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index 1f52a2a49ab..e79de34bc2c 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -17,9 +17,9 @@
 #ifndef __NODES_H__
 #define __NODES_H__
 
+#include "graph/node.h"
 #include "render/graph.h"
 #include "render/image.h"
-#include "graph/node.h"
 
 #include "util/util_array.h"
 #include "util/util_string.h"
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 342a641c0be..90a1d90019d 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-#include "render/camera.h"
+#include "render/object.h"
 #include "device/device.h"
+#include "render/camera.h"
+#include "render/curves.h"
 #include "render/hair.h"
 #include "render/integrator.h"
 #include "render/light.h"
 #include "render/mesh.h"
-#include "render/curves.h"
-#include "render/object.h"
 #include "render/particles.h"
 #include "render/scene.h"
 
 #include "util/util_foreach.h"
 #include "util/util_logging.h"
 #include "util/util_map.h"
+#include "util/util_murmurhash.h"
 #include "util/util_progress.h"
 #include "util/util_set.h"
 #include "util/util_vector.h"
-#include "util/util_murmurhash.h"
 
 #include "subd/subd_patch_table.h"
 
diff --git a/intern/cycles/render/object.h b/intern/cycles/render/object.h
index 2c2870cd0f2..7c84c2de4fb 100644
--- a/intern/cycles/render/object.h
+++ b/intern/cycles/render/object.h
@@ -23,8 +23,8 @@
 #include "util/util_array.h"
 #include "util/util_boundbox.h"
 #include "util/util_param.h"
-#include "util/util_transform.h"
 #include "util/util_thread.h"
+#include "util/util_transform.h"
 #include "util/util_types.h"
 #include "util/util_vector.h"
 
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 74eb61e2dff..06d832a29ca 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -20,10 +20,10 @@
 #include "render/colorspace.h"
 #include "render/graph.h"
 #include "render/light.h"
+#include "render/nodes.h"
 #include "render/osl.h"
 #include "render/scene.h"
 #include "render/shader.h"
-#include "render/nodes.h"
 
 #ifdef WITH_OSL
 
diff --git a/intern/cycles/render/particles.cpp b/intern/cycles/render/particles.cpp
index 8335404b197..ec9276eff86 100644
--- a/intern/cycles/render/particles.cpp
+++ b/intern/cycles/render/particles.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "device/device.h"
 #include "render/particles.h"
+#include "device/device.h"
 #include "render/scene.h"
 
 #include "util/util_foreach.h"
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index e827a424c3c..f5b68d5a4fe 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -16,11 +16,11 @@
 
 #include <stdlib.h>
 
+#include "device/device.h"
 #include "render/background.h"
 #include "render/bake.h"
 #include "render/camera.h"
 #include "render/curves.h"
-#include "device/device.h"
 #include "render/film.h"
 #include "render/integrator.h"
 #include "render/light.h"
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index b5d434a604c..b1b30979b0e 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-#include <string.h>
 #include <limits.h>
+#include <string.h>
 
+#include "device/device.h"
+#include "render/bake.h"
 #include "render/buffers.h"
 #include "render/camera.h"
-#include "device/device.h"
 #include "render/graph.h"
 #include "render/integrator.h"
 #include "render/light.h"
@@ -27,7 +28,6 @@
 #include "render/object.h"
 #include "render/scene.h"
 #include "render/session.h"
-#include "render/bake.h"
 
 #include "util/util_foreach.h"
 #include "util/util_function.h"
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h
index 8053e46b12e..61970d87e9c 100644
--- a/intern/cycles/render/session.h
+++ b/intern/cycles/render/session.h
@@ -17,8 +17,8 @@
 #ifndef __SESSION_H__
 #define __SESSION_H__
 
-#include "render/buffers.h"
 #include "device/device.h"
+#include "render/buffers.h"
 #include "render/shader.h"
 #include "render/stats.h"
 #include "render/tile.h"
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h
index 1509150228f..7801fd29276 100644
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -23,8 +23,8 @@
 #  include <OSL/oslexec.h>
 #endif
 
-#include "render/attribute.h"
 #include "kernel/kernel_types.h"
+#include "render/attribute.h"
 
 #include "graph/node.h"
 
diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp
index c4218f7df1e..b4858f488c3 100644
--- a/intern/cycles/render/svm.cpp
+++ b/intern/cycles/render/svm.cpp
@@ -25,8 +25,8 @@
 #include "render/shader.h"
 #include "render/svm.h"
 
-#include "util/util_logging.h"
 #include "util/util_foreach.h"
+#include "util/util_logging.h"
 #include "util/util_progress.h"
 #include "util/util_task.h"
 
diff --git a/intern/cycles/render/tables.cpp b/intern/cycles/render/tables.cpp
index d88925939e3..270e05abe29 100644
--- a/intern/cycles/render/tables.cpp
+++ b/intern/cycles/render/tables.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "render/tables.h"
 #include "device/device.h"
 #include "render/scene.h"
-#include "render/tables.h"
 
 #include "util/util_logging.h"
 
diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp
index ca93f8b02d0..87389ebfb16 100644
--- a/intern/cycles/test/render_graph_finalize_test.cpp
+++ b/intern/cycles/test/render_graph_finalize_test.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "testing/testing.h"
 #include "testing/mock_log.h"
+#include "testing/testing.h"
 
 #include "render/graph.h"
-#include "render/scene.h"
 #include "render/nodes.h"
+#include "render/scene.h"
 #include "util/util_array.h"
 #include "util/util_logging.h"
 #include "util/util_string.h"
diff --git a/intern/cycles/test/util_avxf_test.h b/intern/cycles/test/util_avxf_test.h
index 353c8fa9b28..d93563fdb3f 100644
--- a/intern/cycles/test/util_avxf_test.h
+++ b/intern/cycles/test/util_avxf_test.h
@@ -15,8 +15,8 @@
  */
 
 #include "testing/testing.h"
-#include "util/util_types.h"
 #include "util/util_system.h"
+#include "util/util_types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_boundbox.h b/intern/cycles/util/util_boundbox.h
index b5c3f1a8954..7fab7bd5a15 100644
--- a/intern/cycles/util/util_boundbox.h
+++ b/intern/cycles/util/util_boundbox.h
@@ -17,8 +17,8 @@
 #ifndef __UTIL_BOUNDBOX_H__
 #define __UTIL_BOUNDBOX_H__
 
-#include <math.h>
 #include <float.h>
+#include <math.h>
 
 #include "util/util_math.h"
 #include "util/util_string.h"
diff --git a/intern/cycles/util/util_disjoint_set.h b/intern/cycles/util/util_disjoint_set.h
index 80f3c714a29..946632371d2 100644
--- a/intern/cycles/util/util_disjoint_set.h
+++ b/intern/cycles/util/util_disjoint_set.h
@@ -17,8 +17,8 @@
 #ifndef __UTIL_DISJOINT_SET_H__
 #define __UTIL_DISJOINT_SET_H__
 
-#include <utility>
 #include "util_array.h"
+#include <utility>
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_half.h b/intern/cycles/util/util_half.h
index 647e9cf2fd6..8de62893ba8 100644
--- a/intern/cycles/util/util_half.h
+++ b/intern/cycles/util/util_half.h
@@ -17,8 +17,8 @@
 #ifndef __UTIL_HALF_H__
 #define __UTIL_HALF_H__
 
-#include "util/util_types.h"
 #include "util/util_math.h"
+#include "util/util_types.h"
 
 #ifdef __KERNEL_SSE2__
 #  include "util/util_simd.h"
diff --git a/intern/cycles/util/util_md5.cpp b/intern/cycles/util/util_md5.cpp
index c11f495f785..0df521c2b58 100644
--- a/intern/cycles/util/util_md5.cpp
+++ b/intern/cycles/util/util_md5.cpp
@@ -26,8 +26,8 @@
 #include "util_md5.h"
 #include "util_path.h"
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp
index 77293c45f6b..8905c8bc7f0 100644
--- a/intern/cycles/util/util_path.cpp
+++ b/intern/cycles/util/util_path.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "util/util_md5.h"
 #include "util/util_path.h"
+#include "util/util_md5.h"
 #include "util/util_string.h"
 
 #include <OpenImageIO/filesystem.h>
@@ -36,8 +36,8 @@ OIIO_NAMESPACE_USING
 #  define DIR_SEP '/'
 #  include <dirent.h>
 #  include <pwd.h>
-#  include <unistd.h>
 #  include <sys/types.h>
+#  include <unistd.h>
 #endif
 
 #ifdef HAVE_SHLWAPI_H
diff --git a/intern/cycles/util/util_profiling.cpp b/intern/cycles/util/util_profiling.cpp
index dc5bc35c48d..073b09f719f 100644
--- a/intern/cycles/util/util_profiling.cpp
+++ b/intern/cycles/util/util_profiling.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "util/util_profiling.h"
 #include "util/util_algorithm.h"
 #include "util/util_foreach.h"
-#include "util/util_profiling.h"
 #include "util/util_set.h"
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_progress.h b/intern/cycles/util/util_progress.h
index 23e49b4db7a..26534a29dfe 100644
--- a/intern/cycles/util/util_progress.h
+++ b/intern/cycles/util/util_progress.h
@@ -25,8 +25,8 @@
 
 #include "util/util_function.h"
 #include "util/util_string.h"
-#include "util/util_time.h"
 #include "util/util_thread.h"
+#include "util/util_time.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_sky_model.cpp b/intern/cycles/util/util_sky_model.cpp
index 4a6a9f32607..8cdad8a90a4 100644
--- a/intern/cycles/util/util_sky_model.cpp
+++ b/intern/cycles/util/util_sky_model.cpp
@@ -101,9 +101,9 @@ All instructions on how to use this code are in the accompanying header file.
 #include "util/util_sky_model_data.h"
 
 #include <assert.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/util_string.h b/intern/cycles/util/util_string.h
index f71145741c9..ce2d4acdde4 100644
--- a/intern/cycles/util/util_string.h
+++ b/intern/cycles/util/util_string.h
@@ -17,9 +17,9 @@
 #ifndef __UTIL_STRING_H__
 #define __UTIL_STRING_H__
 
+#include <sstream>
 #include <string.h>
 #include <string>
-#include <sstream>
 
 #include "util/util_vector.h"
 
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index f700f9bd277..6d32153209a 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -17,8 +17,8 @@
 #include "util/util_system.h"
 
 #include "util/util_logging.h"
-#include "util/util_types.h"
 #include "util/util_string.h"
+#include "util/util_types.h"
 
 #include <numaapi.h>
 
@@ -35,8 +35,8 @@ OIIO_NAMESPACE_USING
 #  include <sys/sysctl.h>
 #  include <sys/types.h>
 #else
-#  include <unistd.h>
 #  include <sys/ioctl.h>
+#  include <unistd.h>
 #endif
 
 CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/util_task.cpp
index 24286116dfb..61aa28c6815 100644
--- a/intern/cycles/util/util_task.cpp
+++ b/intern/cycles/util/util_task.cpp
@@ -14,10 +14,10 @@
  * 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_task.h"
 #include "util/util_time.h"
 
 //#define THREADING_DEBUG_ENABLED
diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h
index 18ec5b32144..f6dbc9186b8 100644
--- a/intern/cycles/util/util_thread.h
+++ b/intern/cycles/util/util_thread.h
@@ -17,11 +17,11 @@
 #ifndef __UTIL_THREAD_H__
 #define __UTIL_THREAD_H__
 
-#include <thread>
-#include <mutex>
 #include <condition_variable>
 #include <functional>
+#include <mutex>
 #include <queue>
+#include <thread>
 
 #ifdef _WIN32
 #  include "util_windows.h"
diff --git a/intern/cycles/util/util_transform.cpp b/intern/cycles/util/util_transform.cpp
index 302a8a386ac..101122740d7 100644
--- a/intern/cycles/util/util_transform.cpp
+++ b/intern/cycles/util/util_transform.cpp
@@ -46,8 +46,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "util/util_projection.h"
 #include "util/util_transform.h"
+#include "util/util_projection.h"
 
 #include "util/util_boundbox.h"
 #include "util/util_math.h"
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index 8a1890ad319..f6535848480 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -153,8 +153,8 @@ CCL_NAMESPACE_END
 /* SSE types. */
 #ifndef __KERNEL_GPU__
 #  include "util/util_sseb.h"
-#  include "util/util_ssei.h"
 #  include "util/util_ssef.h"
+#  include "util/util_ssei.h"
 #  if defined(__KERNEL_AVX__) || defined(__KERNEL_AVX2__)
 #    include "util/util_avxb.h"
 #    include "util/util_avxf.h"
diff --git a/intern/dualcon/intern/Projections.cpp b/intern/dualcon/intern/Projections.cpp
index b065ba95330..3bf7f8f1de2 100644
--- a/intern/dualcon/intern/Projections.cpp
+++ b/intern/dualcon/intern/Projections.cpp
@@ -18,8 +18,8 @@
 #  include "MEM_guardedalloc.h"
 #endif
 
-#include <math.h>
 #include "Projections.h"
+#include <math.h>
 
 const int vertmap[8][3] = {
     {0, 0, 0},
diff --git a/intern/dualcon/intern/dualcon_c_api.cpp b/intern/dualcon/intern/dualcon_c_api.cpp
index 459bb711e13..d6d9dc4e76f 100644
--- a/intern/dualcon/intern/dualcon_c_api.cpp
+++ b/intern/dualcon/intern/dualcon_c_api.cpp
@@ -14,10 +14,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <cassert>
-#include "dualcon.h"
 #include "ModelReader.h"
+#include "dualcon.h"
 #include "octree.h"
+#include <cassert>
 
 #include <cstdio>
 #include <float.h>
diff --git a/intern/dualcon/intern/octree.h b/intern/dualcon/intern/octree.h
index b2d88f0d2b5..004897950b3 100644
--- a/intern/dualcon/intern/octree.h
+++ b/intern/dualcon/intern/octree.h
@@ -17,18 +17,18 @@
 #ifndef __OCTREE_H__
 #define __OCTREE_H__
 
-#include <cassert>
-#include <cstring>
-#include <stdio.h>
-#include <math.h>
 #include "GeoCommon.h"
-#include "Projections.h"
-#include "ModelReader.h"
 #include "MemoryAllocator.h"
-#include "cubes.h"
+#include "ModelReader.h"
+#include "Projections.h"
 #include "Queue.h"
-#include "manifold_table.h"
+#include "cubes.h"
 #include "dualcon.h"
+#include "manifold_table.h"
+#include <cassert>
+#include <cstring>
+#include <math.h>
+#include <stdio.h>
 
 /**
  * Main class and structures for scan-convertion, sign-generation,
diff --git a/intern/eigen/intern/svd.cc b/intern/eigen/intern/svd.cc
index 945d1bdee14..bfd7064353d 100644
--- a/intern/eigen/intern/svd.cc
+++ b/intern/eigen/intern/svd.cc
@@ -29,8 +29,8 @@
 #endif
 
 #include <Eigen/Core>
-#include <Eigen/SVD>
 #include <Eigen/Dense>
+#include <Eigen/SVD>
 
 #include "svd.h"
 
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
index 123e18430a9..d6eb5f9db1d 100644
--- a/intern/ffmpeg/ffmpeg_compat.h
+++ b/intern/ffmpeg/ffmpeg_compat.h
@@ -37,9 +37,9 @@
 #endif
 
 #include <libavcodec/avcodec.h>
-#include <libavutil/rational.h>
-#include <libavutil/opt.h>
 #include <libavutil/mathematics.h>
+#include <libavutil/opt.h>
+#include <libavutil/rational.h>
 
 #if (LIBAVFORMAT_VERSION_MAJOR > 52) || \
     ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101))
diff --git a/intern/ghost/GHOST_IContext.h b/intern/ghost/GHOST_IContext.h
index 33422b8e351..d404287fe56 100644
--- a/intern/ghost/GHOST_IContext.h
+++ b/intern/ghost/GHOST_IContext.h
@@ -25,8 +25,8 @@
 #ifndef __GHOST_IContext_H__
 #define __GHOST_IContext_H__
 
-#include "STR_String.h"
 #include "GHOST_Types.h"
+#include "STR_String.h"
 
 /**
  * Interface for GHOST context.
diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.h
index fc7e563e1d8..0d9bfb2c4de 100644
--- a/intern/ghost/GHOST_IEvent.h
+++ b/intern/ghost/GHOST_IEvent.h
@@ -25,8 +25,8 @@
 #ifndef __GHOST_IEVENT_H__
 #define __GHOST_IEVENT_H__
 
-#include <stddef.h>
 #include "GHOST_Types.h"
+#include <stddef.h>
 
 class GHOST_IWindow;
 
diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h
index 5d529141ca7..8adf49fe1f9 100644
--- a/intern/ghost/GHOST_ISystem.h
+++ b/intern/ghost/GHOST_ISystem.h
@@ -27,10 +27,10 @@
 #ifndef __GHOST_ISYSTEM_H__
 #define __GHOST_ISYSTEM_H__
 
-#include "GHOST_Types.h"
 #include "GHOST_IContext.h"
 #include "GHOST_ITimerTask.h"
 #include "GHOST_IWindow.h"
+#include "GHOST_Types.h"
 
 class GHOST_IEventConsumer;
 
diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h
index 07133d86ce4..c456f2b1dba 100644
--- a/intern/ghost/GHOST_IWindow.h
+++ b/intern/ghost/GHOST_IWindow.h
@@ -25,9 +25,9 @@
 #ifndef __GHOST_IWINDOW_H__
 #define __GHOST_IWINDOW_H__
 
-#include "STR_String.h"
 #include "GHOST_Rect.h"
 #include "GHOST_Types.h"
+#include "STR_String.h"
 
 /**
  * Interface for GHOST windows.
diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp
index d43a2637ad3..af2a13945d1 100644
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cpp
@@ -25,11 +25,11 @@
 
 #include <stdlib.h>
 
-#include "intern/GHOST_Debug.h"
 #include "GHOST_C-api.h"
-#include "GHOST_ISystem.h"
 #include "GHOST_IEvent.h"
 #include "GHOST_IEventConsumer.h"
+#include "GHOST_ISystem.h"
+#include "intern/GHOST_Debug.h"
 #ifdef WITH_XR_OPENXR
 #  include "GHOST_IXrContext.h"
 #endif
diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp b/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
index 843c8adc6cb..db6ead6d96a 100644
--- a/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
+++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
@@ -25,9 +25,9 @@
  * Copyright (C) 2001 NaN Technologies B.V.
  */
 
-#include "GHOST_Debug.h"
-#include "GHOST_C-api.h"
 #include "GHOST_CallbackEventConsumer.h"
+#include "GHOST_C-api.h"
+#include "GHOST_Debug.h"
 
 GHOST_CallbackEventConsumer::GHOST_CallbackEventConsumer(GHOST_EventCallbackProcPtr eventCallback,
                                                          GHOST_TUserDataPtr userData)
diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.h b/intern/ghost/intern/GHOST_CallbackEventConsumer.h
index 7abe0253f75..9c3fc642209 100644
--- a/intern/ghost/intern/GHOST_CallbackEventConsumer.h
+++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.h
@@ -25,8 +25,8 @@
 #ifndef __GHOST_CALLBACKEVENTCONSUMER_H__
 #define __GHOST_CALLBACKEVENTCONSUMER_H__
 
-#include "GHOST_IEventConsumer.h"
 #include "GHOST_C-api.h"
+#include "GHOST_IEventConsumer.h"
 
 /**
  * Event consumer that will forward events to a call-back routine.
diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm
index e2e74a3113b..c5303aa54da 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -26,11 +26,11 @@
 #include "GHOST_ContextCGL.h"
 
 #include <Cocoa/Cocoa.h>
-#include <QuartzCore/QuartzCore.h>
 #include <Metal/Metal.h>
+#include <QuartzCore/QuartzCore.h>
 
-#include <vector>
 #include <cassert>
+#include <vector>
 
 static void ghost_fatal_error_dialog(const char *msg)
 {
diff --git a/intern/ghost/intern/GHOST_ContextD3D.cpp b/intern/ghost/intern/GHOST_ContextD3D.cpp
index ed65d499073..ad948578d53 100644
--- a/intern/ghost/intern/GHOST_ContextD3D.cpp
+++ b/intern/ghost/intern/GHOST_ContextD3D.cpp
@@ -27,8 +27,8 @@
 #include <GL/glew.h>
 #include <GL/wglew.h>
 
-#include "GHOST_ContextWGL.h" /* For shared drawing */
 #include "GHOST_ContextD3D.h"
+#include "GHOST_ContextWGL.h" /* For shared drawing */
 
 HMODULE GHOST_ContextD3D::s_d3d_lib = NULL;
 PFN_D3D11_CREATE_DEVICE GHOST_ContextD3D::s_D3D11CreateDeviceFn = NULL;
diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp
index 6d5d4f75351..ddb34a8afd9 100644
--- a/intern/ghost/intern/GHOST_ContextWGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextWGL.cpp
@@ -27,8 +27,8 @@
 
 #include <tchar.h>
 
-#include <cstdio>
 #include <cassert>
+#include <cstdio>
 #include <vector>
 
 HGLRC GHOST_ContextWGL::s_sharedHGLRC = NULL;
diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
index f060d45c911..954c3efb22c 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
+++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
@@ -20,8 +20,8 @@
 
 #include <Cocoa/Cocoa.h>
 
-#include "GHOST_DisplayManagerCocoa.h"
 #include "GHOST_Debug.h"
+#include "GHOST_DisplayManagerCocoa.h"
 
 // We do not support multiple monitors at the moment
 
diff --git a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
index 059f04992fb..b836f256b27 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
+++ b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
@@ -22,8 +22,8 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_SystemSDL.h"
 #include "GHOST_DisplayManagerSDL.h"
+#include "GHOST_SystemSDL.h"
 
 #include "GHOST_WindowManager.h"
 
diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.cpp b/intern/ghost/intern/GHOST_DropTargetWin32.cpp
index 931aca81fb8..9f8ce3b5095 100644
--- a/intern/ghost/intern/GHOST_DropTargetWin32.cpp
+++ b/intern/ghost/intern/GHOST_DropTargetWin32.cpp
@@ -21,8 +21,8 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_Debug.h"
 #include "GHOST_DropTargetWin32.h"
+#include "GHOST_Debug.h"
 #include <shellapi.h>
 
 #include "utf_winfunc.h"
diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.h b/intern/ghost/intern/GHOST_DropTargetWin32.h
index ee124f3ba0e..ee75c017981 100644
--- a/intern/ghost/intern/GHOST_DropTargetWin32.h
+++ b/intern/ghost/intern/GHOST_DropTargetWin32.h
@@ -24,10 +24,10 @@
 #ifndef __GHOST_DROPTARGETWIN32_H__
 #define __GHOST_DROPTARGETWIN32_H__
 
-#include <string.h>
-#include <GHOST_Types.h>
-#include "GHOST_WindowWin32.h"
 #include "GHOST_SystemWin32.h"
+#include "GHOST_WindowWin32.h"
+#include <GHOST_Types.h>
+#include <string.h>
 
 class GHOST_DropTargetWin32 : public IDropTarget {
  public:
diff --git a/intern/ghost/intern/GHOST_DropTargetX11.h b/intern/ghost/intern/GHOST_DropTargetX11.h
index d3f98ff11cf..9ca12442085 100644
--- a/intern/ghost/intern/GHOST_DropTargetX11.h
+++ b/intern/ghost/intern/GHOST_DropTargetX11.h
@@ -24,9 +24,9 @@
 #ifndef __GHOST_DROPTARGETX11_H__
 #define __GHOST_DROPTARGETX11_H__
 
-#include <GHOST_Types.h>
-#include "GHOST_WindowX11.h"
 #include "GHOST_SystemX11.h"
+#include "GHOST_WindowX11.h"
+#include <GHOST_Types.h>
 
 #include "xdnd.h"
 
diff --git a/intern/ghost/intern/GHOST_EventManager.cpp b/intern/ghost/intern/GHOST_EventManager.cpp
index 3c27e2c826a..f16d90899b9 100644
--- a/intern/ghost/intern/GHOST_EventManager.cpp
+++ b/intern/ghost/intern/GHOST_EventManager.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "GHOST_EventManager.h"
-#include <algorithm>
 #include "GHOST_Debug.h"
+#include <algorithm>
 #include <stdio.h>  // [mce] temp debug
 
 GHOST_EventManager::GHOST_EventManager()
diff --git a/intern/ghost/intern/GHOST_EventPrinter.cpp b/intern/ghost/intern/GHOST_EventPrinter.cpp
index e459da39d14..fb34b1d3b1a 100644
--- a/intern/ghost/intern/GHOST_EventPrinter.cpp
+++ b/intern/ghost/intern/GHOST_EventPrinter.cpp
@@ -23,10 +23,10 @@
  */
 
 #include "GHOST_EventPrinter.h"
-#include <iostream>
-#include "GHOST_EventKey.h"
-#include "GHOST_EventDragnDrop.h"
 #include "GHOST_Debug.h"
+#include "GHOST_EventDragnDrop.h"
+#include "GHOST_EventKey.h"
+#include <iostream>
 
 #include <stdio.h>
 
diff --git a/intern/ghost/intern/GHOST_ImeWin32.cpp b/intern/ghost/intern/GHOST_ImeWin32.cpp
index 104b0f67c77..112a266ae28 100644
--- a/intern/ghost/intern/GHOST_ImeWin32.cpp
+++ b/intern/ghost/intern/GHOST_ImeWin32.cpp
@@ -25,8 +25,8 @@
 
 #ifdef WITH_INPUT_IME
 
-#  include "GHOST_C-api.h"
 #  include "GHOST_ImeWin32.h"
+#  include "GHOST_C-api.h"
 #  include "GHOST_WindowWin32.h"
 #  include "utfconv.h"
 
diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp
index 3fe61ee0aa9..a9fbadab37a 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManager.cpp
@@ -14,14 +14,14 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "GHOST_Debug.h"
 #include "GHOST_NDOFManager.h"
-#include "GHOST_EventNDOF.h"
+#include "GHOST_Debug.h"
 #include "GHOST_EventKey.h"
+#include "GHOST_EventNDOF.h"
 #include "GHOST_WindowManager.h"
-#include <string.h>  // for memory functions
-#include <stdio.h>   // for error/info reporting
 #include <math.h>
+#include <stdio.h>   // for error/info reporting
+#include <string.h>  // for memory functions
 
 #ifdef DEBUG_NDOF_MOTION
 // printable version of each GHOST_TProgress value
diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
index 4c9c58c36be..5274b2d1ba9 100644
--- a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
+++ b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
@@ -19,8 +19,8 @@
 #include "GHOST_NDOFManagerCocoa.h"
 #include "GHOST_SystemCocoa.h"
 
-#include <stdint.h>
 #include <dlfcn.h>
+#include <stdint.h>
 
 #if DEBUG_NDOF_DRIVER
 #  include <cstdio>
diff --git a/intern/ghost/intern/GHOST_Path-api.cpp b/intern/ghost/intern/GHOST_Path-api.cpp
index 9e4ed1e0eea..df3592fb5e5 100644
--- a/intern/ghost/intern/GHOST_Path-api.cpp
+++ b/intern/ghost/intern/GHOST_Path-api.cpp
@@ -23,10 +23,10 @@
 
 #include <cstdio>
 
-#include "intern/GHOST_Debug.h"
-#include "GHOST_Types.h"
-#include "GHOST_Path-api.h"
 #include "GHOST_ISystemPaths.h"
+#include "GHOST_Path-api.h"
+#include "GHOST_Types.h"
+#include "intern/GHOST_Debug.h"
 
 GHOST_TSuccess GHOST_CreateSystemPaths(void)
 {
diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp
index 12096d65240..97704435f04 100644
--- a/intern/ghost/intern/GHOST_System.cpp
+++ b/intern/ghost/intern/GHOST_System.cpp
@@ -23,13 +23,13 @@
 
 #include "GHOST_System.h"
 
-#include <time.h>
 #include <stdio.h> /* just for printf */
+#include <time.h>
 
 #include "GHOST_DisplayManager.h"
 #include "GHOST_EventManager.h"
-#include "GHOST_TimerTask.h"
 #include "GHOST_TimerManager.h"
+#include "GHOST_TimerTask.h"
 #include "GHOST_WindowManager.h"
 
 #ifdef WITH_INPUT_NDOF
diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h
index dff27b0903d..2eec6ca43b3 100644
--- a/intern/ghost/intern/GHOST_System.h
+++ b/intern/ghost/intern/GHOST_System.h
@@ -27,10 +27,10 @@
 
 #include "GHOST_ISystem.h"
 
-#include "GHOST_Debug.h"
 #include "GHOST_Buttons.h"
-#include "GHOST_ModifierKeys.h"
+#include "GHOST_Debug.h"
 #include "GHOST_EventManager.h"
+#include "GHOST_ModifierKeys.h"
 #ifdef GHOST_DEBUG
 #  include "GHOST_EventPrinter.h"
 #endif  // GHOST_DEBUG
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 9d899a4fc2f..9becff40995 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -20,17 +20,17 @@
 #include "GHOST_SystemCocoa.h"
 
 #include "GHOST_DisplayManagerCocoa.h"
-#include "GHOST_EventKey.h"
 #include "GHOST_EventButton.h"
 #include "GHOST_EventCursor.h"
-#include "GHOST_EventWheel.h"
-#include "GHOST_EventTrackpad.h"
 #include "GHOST_EventDragnDrop.h"
+#include "GHOST_EventKey.h"
 #include "GHOST_EventString.h"
+#include "GHOST_EventTrackpad.h"
+#include "GHOST_EventWheel.h"
 #include "GHOST_TimerManager.h"
 #include "GHOST_TimerTask.h"
-#include "GHOST_WindowManager.h"
 #include "GHOST_WindowCocoa.h"
+#include "GHOST_WindowManager.h"
 
 #if defined(WITH_GL_EGL)
 #  include "GHOST_ContextEGL.h"
@@ -49,9 +49,9 @@
 /* For the currently not ported to Cocoa keyboard layout functions (64bit & 10.6 compatible) */
 #include <Carbon/Carbon.h>
 
+#include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/sysctl.h>
 
 #pragma mark KeyMap, mouse converters
 
diff --git a/intern/ghost/intern/GHOST_SystemNULL.h b/intern/ghost/intern/GHOST_SystemNULL.h
index 10138bfc6eb..68a726f2be8 100644
--- a/intern/ghost/intern/GHOST_SystemNULL.h
+++ b/intern/ghost/intern/GHOST_SystemNULL.h
@@ -22,9 +22,9 @@
 #ifndef __GHOST_SYSTEMNULL_H__
 #define __GHOST_SYSTEMNULL_H__
 
-#include "GHOST_System.h"
 #include "../GHOST_Types.h"
 #include "GHOST_DisplayManagerNULL.h"
+#include "GHOST_System.h"
 #include "GHOST_WindowNULL.h"
 
 class GHOST_WindowNULL;
diff --git a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp
index 9514edb7404..ad3d490eb91 100644
--- a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp
+++ b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp
@@ -30,8 +30,8 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include <stdio.h> /* for fprintf only */
 #include <cstdlib> /* for exit */
+#include <stdio.h> /* for fprintf only */
 
 #include <pwd.h> /* for get home without use getenv() */
 #include <string>
diff --git a/intern/ghost/intern/GHOST_SystemPathsUnix.h b/intern/ghost/intern/GHOST_SystemPathsUnix.h
index dcd3ab34704..f9f89f6e79b 100644
--- a/intern/ghost/intern/GHOST_SystemPathsUnix.h
+++ b/intern/ghost/intern/GHOST_SystemPathsUnix.h
@@ -24,8 +24,8 @@
 #ifndef __GHOST_SYSTEMPATHSUNIX_H__
 #define __GHOST_SYSTEMPATHSUNIX_H__
 
-#include "GHOST_SystemPaths.h"
 #include "../GHOST_Types.h"
+#include "GHOST_SystemPaths.h"
 
 class GHOST_SystemPathsUnix : public GHOST_SystemPaths {
  public:
diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
index 63a6b7224b5..673cbcad97e 100644
--- a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
@@ -26,8 +26,8 @@
 #ifndef _WIN32_IE
 #  define _WIN32_IE 0x0501
 #endif
-#include <shlobj.h>
 #include "utfconv.h"
+#include <shlobj.h>
 
 GHOST_SystemPathsWin32::GHOST_SystemPathsWin32()
 {
diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp
index 656afb9d050..5dae0ce504b 100644
--- a/intern/ghost/intern/GHOST_SystemSDL.cpp
+++ b/intern/ghost/intern/GHOST_SystemSDL.cpp
@@ -26,9 +26,9 @@
 
 #include "GHOST_WindowManager.h"
 
+#include "GHOST_EventButton.h"
 #include "GHOST_EventCursor.h"
 #include "GHOST_EventKey.h"
-#include "GHOST_EventButton.h"
 #include "GHOST_EventWheel.h"
 
 GHOST_SystemSDL::GHOST_SystemSDL() : GHOST_System()
diff --git a/intern/ghost/intern/GHOST_SystemSDL.h b/intern/ghost/intern/GHOST_SystemSDL.h
index c69a7c740bc..1994781530b 100644
--- a/intern/ghost/intern/GHOST_SystemSDL.h
+++ b/intern/ghost/intern/GHOST_SystemSDL.h
@@ -22,12 +22,12 @@
 #ifndef __GHOST_SYSTEMSDL_H__
 #define __GHOST_SYSTEMSDL_H__
 
-#include "GHOST_System.h"
 #include "../GHOST_Types.h"
 #include "GHOST_DisplayManagerSDL.h"
+#include "GHOST_Event.h"
+#include "GHOST_System.h"
 #include "GHOST_TimerManager.h"
 #include "GHOST_WindowSDL.h"
-#include "GHOST_Event.h"
 
 extern "C" {
 #include "SDL.h"
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index d03b9343eab..26d3aea403c 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -21,8 +21,8 @@
  * \ingroup GHOST
  */
 
-#include "GHOST_ContextD3D.h"
 #include "GHOST_SystemWin32.h"
+#include "GHOST_ContextD3D.h"
 #include "GHOST_EventDragnDrop.h"
 
 #ifndef _WIN32_IE
@@ -30,22 +30,22 @@
 #endif
 
 #include <commctrl.h>
-#include <shlobj.h>
-#include <tlhelp32.h>
 #include <psapi.h>
 #include <shellapi.h>
+#include <shlobj.h>
+#include <tlhelp32.h>
 #include <windowsx.h>
 
-#include "utfconv.h"
 #include "utf_winfunc.h"
+#include "utfconv.h"
 
 #include "GHOST_DisplayManagerWin32.h"
 #include "GHOST_EventButton.h"
 #include "GHOST_EventCursor.h"
 #include "GHOST_EventKey.h"
 #include "GHOST_EventWheel.h"
-#include "GHOST_TimerTask.h"
 #include "GHOST_TimerManager.h"
+#include "GHOST_TimerTask.h"
 #include "GHOST_WindowManager.h"
 #include "GHOST_WindowWin32.h"
 
diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h
index bf9d18ca380..e624cc83427 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.h
@@ -30,8 +30,8 @@
 #endif  // WIN32
 
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 #include <ole2.h>  // for drag-n-drop
+#include <windows.h>
 
 #include "GHOST_System.h"
 
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index b0c35ce6546..a9d656a1c36 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -23,21 +23,21 @@
  * \ingroup GHOST
  */
 
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
 #include <X11/XKBlib.h> /* allow detectable autorepeate */
+#include <X11/Xatom.h>
 #include <X11/Xutil.h>
+#include <X11/keysym.h>
 
-#include "GHOST_SystemX11.h"
-#include "GHOST_WindowX11.h"
-#include "GHOST_WindowManager.h"
-#include "GHOST_TimerManager.h"
+#include "GHOST_DisplayManagerX11.h"
+#include "GHOST_EventButton.h"
 #include "GHOST_EventCursor.h"
+#include "GHOST_EventDragnDrop.h"
 #include "GHOST_EventKey.h"
-#include "GHOST_EventButton.h"
 #include "GHOST_EventWheel.h"
-#include "GHOST_DisplayManagerX11.h"
-#include "GHOST_EventDragnDrop.h"
+#include "GHOST_SystemX11.h"
+#include "GHOST_TimerManager.h"
+#include "GHOST_WindowManager.h"
+#include "GHOST_WindowX11.h"
 #ifdef WITH_INPUT_NDOF
 #  include "GHOST_NDOFManagerUnix.h"
 #endif
@@ -74,10 +74,10 @@
 #include <sys/time.h>
 #include <unistd.h>
 
+#include <cstdlib> /* for exit */
 #include <iostream>
-#include <vector>
 #include <stdio.h> /* for fprintf only */
-#include <cstdlib> /* for exit */
+#include <vector>
 
 /* for debugging - so we can breakpoint X11 errors */
 // #define USE_X11_ERROR_HANDLERS
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h
index 8736e20c57f..d0e0506e77b 100644
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.h
@@ -25,11 +25,11 @@
 #ifndef __GHOST_SYSTEMX11_H__
 #define __GHOST_SYSTEMX11_H__
 
-#include <X11/Xlib.h>
 #include <X11/XKBlib.h> /* allow detectable autorepeate */
+#include <X11/Xlib.h>
 
-#include "GHOST_System.h"
 #include "../GHOST_Types.h"
+#include "GHOST_System.h"
 
 // For tablets
 #ifdef WITH_X11_XINPUT
diff --git a/intern/ghost/intern/GHOST_TaskbarWin32.h b/intern/ghost/intern/GHOST_TaskbarWin32.h
index abf1172cea8..58641123c24 100644
--- a/intern/ghost/intern/GHOST_TaskbarWin32.h
+++ b/intern/ghost/intern/GHOST_TaskbarWin32.h
@@ -25,8 +25,8 @@
 #endif  // WIN32
 
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 #include <shlobj.h>
+#include <windows.h>
 
 // ITaskbarList, ITaskbarList2 and ITaskbarList3 might be missing, present here in that case.
 // Note, ITaskbarList3 is supported only since Windows 7, though. Check for that is done in
diff --git a/intern/ghost/intern/GHOST_TaskbarX11.cpp b/intern/ghost/intern/GHOST_TaskbarX11.cpp
index e33c84fe4d8..2fa8137e1be 100644
--- a/intern/ghost/intern/GHOST_TaskbarX11.cpp
+++ b/intern/ghost/intern/GHOST_TaskbarX11.cpp
@@ -20,10 +20,10 @@
 
 #include "GHOST_TaskbarX11.h"
 
-#include <dlfcn.h>
-#include <cstdio>
 #include <cassert>
+#include <cstdio>
 #include <cstdlib>
+#include <dlfcn.h>
 
 typedef void *(*unity_get_entry_t)(const char *);
 typedef void (*unity_set_progress_t)(void *, double);
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index 81eb27a129a..c90b49c27a5 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -18,9 +18,9 @@
  */
 
 #include "GHOST_WindowCocoa.h"
-#include "GHOST_SystemCocoa.h"
 #include "GHOST_ContextNone.h"
 #include "GHOST_Debug.h"
+#include "GHOST_SystemCocoa.h"
 
 #if defined(WITH_GL_EGL)
 #  include "GHOST_ContextEGL.h"
@@ -29,8 +29,8 @@
 #endif
 
 #include <Cocoa/Cocoa.h>
-#include <QuartzCore/QuartzCore.h>
 #include <Metal/Metal.h>
+#include <QuartzCore/QuartzCore.h>
 
 #include <sys/sysctl.h>
 
diff --git a/intern/ghost/intern/GHOST_WindowManager.cpp b/intern/ghost/intern/GHOST_WindowManager.cpp
index d1d66c35de5..eec4bc5f7d0 100644
--- a/intern/ghost/intern/GHOST_WindowManager.cpp
+++ b/intern/ghost/intern/GHOST_WindowManager.cpp
@@ -26,9 +26,9 @@
  */
 
 #include "GHOST_WindowManager.h"
-#include <algorithm>
 #include "GHOST_Debug.h"
 #include "GHOST_Window.h"
+#include <algorithm>
 
 GHOST_WindowManager::GHOST_WindowManager()
     : m_fullScreenWindow(0), m_activeWindow(0), m_activeWindowBeforeFullScreen(0)
diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h
index a682eccf7e2..661439191c5 100644
--- a/intern/ghost/intern/GHOST_WindowManager.h
+++ b/intern/ghost/intern/GHOST_WindowManager.h
@@ -27,8 +27,8 @@
 
 #include <vector>
 
-#include "GHOST_Rect.h"
 #include "GHOST_IWindow.h"
+#include "GHOST_Rect.h"
 
 /**
  * Manages system windows (platform independent implementation).
diff --git a/intern/ghost/intern/GHOST_WindowSDL.h b/intern/ghost/intern/GHOST_WindowSDL.h
index 6332ce584d2..eadd1b7df9d 100644
--- a/intern/ghost/intern/GHOST_WindowSDL.h
+++ b/intern/ghost/intern/GHOST_WindowSDL.h
@@ -22,8 +22,8 @@
 #ifndef __GHOST_WINDOWSDL_H__
 #define __GHOST_WINDOWSDL_H__
 
-#include "GHOST_Window.h"
 #include "GHOST_SystemSDL.h"
+#include "GHOST_Window.h"
 
 #include <map>
 
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 1d2630bc66d..6570f27ac5a 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -23,14 +23,14 @@
 
 #define _USE_MATH_DEFINES
 
-#include "GHOST_ContextD3D.h"
-#include "GHOST_WindowManager.h"
 #include "GHOST_WindowWin32.h"
-#include "GHOST_SystemWin32.h"
-#include "GHOST_DropTargetWin32.h"
+#include "GHOST_ContextD3D.h"
 #include "GHOST_ContextNone.h"
-#include "utfconv.h"
+#include "GHOST_DropTargetWin32.h"
+#include "GHOST_SystemWin32.h"
+#include "GHOST_WindowManager.h"
 #include "utf_winfunc.h"
+#include "utfconv.h"
 
 #if defined(WITH_GL_EGL)
 #  include "GHOST_ContextEGL.h"
@@ -41,10 +41,10 @@
 #  include <Dwmapi.h>
 #endif
 
-#include <windowsx.h>
+#include <assert.h>
 #include <math.h>
 #include <string.h>
-#include <assert.h>
+#include <windowsx.h>
 
 #ifndef GET_POINTERID_WPARAM
 #  define GET_POINTERID_WPARAM(wParam) (LOWORD(wParam))
diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h
index 4795539e0f9..ac1ec0ee852 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.h
@@ -29,8 +29,8 @@
 #  error WIN32 only!
 #endif  // WIN32
 
-#include "GHOST_Window.h"
 #include "GHOST_TaskbarWin32.h"
+#include "GHOST_Window.h"
 #ifdef WITH_INPUT_IME
 #  include "GHOST_ImeWin32.h"
 #endif
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 349b11728bd..3bece605d45 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -22,18 +22,18 @@
  */
 
 /* For standard X11 cursors */
-#include <X11/cursorfont.h>
 #include <X11/Xatom.h>
-#include <X11/Xutil.h>
 #include <X11/Xmd.h>
+#include <X11/Xutil.h>
+#include <X11/cursorfont.h>
 #ifdef WITH_X11_ALPHA
 #  include <X11/extensions/Xrender.h>
 #endif
-#include "GHOST_WindowX11.h"
-#include "GHOST_SystemX11.h"
+#include "GHOST_Debug.h"
 #include "GHOST_IconX11.h"
+#include "GHOST_SystemX11.h"
+#include "GHOST_WindowX11.h"
 #include "STR_String.h"
-#include "GHOST_Debug.h"
 
 #ifdef WITH_XDND
 #  include "GHOST_DropTargetX11.h"
@@ -54,15 +54,15 @@
 // For DPI value
 #include <X11/Xresource.h>
 
-#include <cstring>
 #include <cstdio>
+#include <cstring>
 
 /* gethostname */
 #include <unistd.h>
 
 #include <algorithm>
-#include <string>
 #include <math.h>
+#include <string>
 
 /* For obscure full screen mode stuff
  * lifted verbatim from blut. */
diff --git a/intern/ghost/intern/GHOST_Xr.cpp b/intern/ghost/intern/GHOST_Xr.cpp
index 2f122ca8e13..dc63aac217c 100644
--- a/intern/ghost/intern/GHOST_Xr.cpp
+++ b/intern/ghost/intern/GHOST_Xr.cpp
@@ -25,9 +25,9 @@
 
 #include "GHOST_C-api.h"
 
-#include "GHOST_Xr_intern.h"
 #include "GHOST_XrContext.h"
 #include "GHOST_XrException.h"
+#include "GHOST_Xr_intern.h"
 
 GHOST_XrContextHandle GHOST_XrContextCreate(const GHOST_XrContextCreateInfo *create_info)
 {
diff --git a/intern/ghost/intern/GHOST_XrContext.cpp b/intern/ghost/intern/GHOST_XrContext.cpp
index d7b83114c85..a757aa9a555 100644
--- a/intern/ghost/intern/GHOST_XrContext.cpp
+++ b/intern/ghost/intern/GHOST_XrContext.cpp
@@ -25,9 +25,9 @@
 #include <string>
 
 #include "GHOST_Types.h"
-#include "GHOST_Xr_intern.h"
 #include "GHOST_XrException.h"
 #include "GHOST_XrSession.h"
+#include "GHOST_Xr_intern.h"
 
 #include "GHOST_XrContext.h"
 
diff --git a/intern/ghost/intern/GHOST_XrEvent.cpp b/intern/ghost/intern/GHOST_XrEvent.cpp
index dfee2e95f10..30005055f9b 100644
--- a/intern/ghost/intern/GHOST_XrEvent.cpp
+++ b/intern/ghost/intern/GHOST_XrEvent.cpp
@@ -21,8 +21,8 @@
 #include <iostream>
 
 #include "GHOST_C-api.h"
-#include "GHOST_Xr_intern.h"
 #include "GHOST_XrContext.h"
+#include "GHOST_Xr_intern.h"
 
 static bool GHOST_XrEventPollNext(XrInstance instance, XrEventDataBuffer &r_event_data)
 {
diff --git a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
index f094b0744a2..ea97b3a50cf 100644
--- a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
+++ b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
@@ -25,8 +25,8 @@
 #if defined(WITH_X11)
 #  include "GHOST_ContextGLX.h"
 #elif defined(WIN32)
-#  include "GHOST_ContextWGL.h"
 #  include "GHOST_ContextD3D.h"
+#  include "GHOST_ContextWGL.h"
 #endif
 #include "GHOST_C-api.h"
 #include "GHOST_Xr_intern.h"
diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp
index a85bde3cab6..53d22cbd679 100644
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@ -28,10 +28,10 @@
 #include "GHOST_C-api.h"
 
 #include "GHOST_IXrGraphicsBinding.h"
-#include "GHOST_Xr_intern.h"
 #include "GHOST_XrContext.h"
 #include "GHOST_XrException.h"
 #include "GHOST_XrSwapchain.h"
+#include "GHOST_Xr_intern.h"
 
 #include "GHOST_XrSession.h"
 
diff --git a/intern/ghost/intern/GHOST_XrSwapchain.cpp b/intern/ghost/intern/GHOST_XrSwapchain.cpp
index f0b2fb80bf1..4c91bcc2dc3 100644
--- a/intern/ghost/intern/GHOST_XrSwapchain.cpp
+++ b/intern/ghost/intern/GHOST_XrSwapchain.cpp
@@ -23,9 +23,9 @@
 #include "GHOST_C-api.h"
 
 #include "GHOST_IXrGraphicsBinding.h"
-#include "GHOST_Xr_intern.h"
 #include "GHOST_XrException.h"
 #include "GHOST_XrSession.h"
+#include "GHOST_Xr_intern.h"
 
 #include "GHOST_XrSwapchain.h"
 
diff --git a/intern/ghost/test/gears/GHOST_C-Test.c b/intern/ghost/test/gears/GHOST_C-Test.c
index 80675ac5e3d..3419f70dfcf 100644
--- a/intern/ghost/test/gears/GHOST_C-Test.c
+++ b/intern/ghost/test/gears/GHOST_C-Test.c
@@ -25,10 +25,10 @@
  * in turn, is probably taken from somewhere as well.
  */
 
-#include <stdlib.h>
+#include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
 #define FALSE 0
 
@@ -36,8 +36,8 @@
 
 #if defined(WIN32) || defined(__APPLE__)
 #  ifdef WIN32
-#    include <windows.h>
 #    include <GL/gl.h>
+#    include <windows.h>
 #  else /* WIN32 */
 /* __APPLE__ is defined */
 #    include <AGL/gl.h>
diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp
index 47eddbcfb83..a554bfeebef 100644
--- a/intern/ghost/test/gears/GHOST_Test.cpp
+++ b/intern/ghost/test/gears/GHOST_Test.cpp
@@ -30,8 +30,8 @@
 
 #if defined(WIN32) || defined(__APPLE__)
 #  ifdef WIN32
-#    include <windows.h>
 #    include <atlbase.h>
+#    include <windows.h>
 
 #    include <GL/gl.h>
 #  else  // WIN32 \
@@ -42,12 +42,12 @@
 #  include <GL/gl.h>
 #endif  // defined(WIN32) || defined(__APPLE__)
 
-#include "STR_String.h"
 #include "GHOST_Rect.h"
+#include "STR_String.h"
 
-#include "GHOST_ISystem.h"
 #include "GHOST_IEvent.h"
 #include "GHOST_IEventConsumer.h"
+#include "GHOST_ISystem.h"
 
 #define LEFT_EYE 0
 #define RIGHT_EYE 1
diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c
index 57fb950fa8b..788c0221753 100644
--- a/intern/ghost/test/multitest/EventToBuf.c
+++ b/intern/ghost/test/multitest/EventToBuf.c
@@ -23,8 +23,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "GHOST_C-api.h"
 #include "EventToBuf.h"
+#include "GHOST_C-api.h"
 
 char *eventtype_to_string(GHOST_TEventType type)
 {
diff --git a/intern/ghost/test/multitest/GL.h b/intern/ghost/test/multitest/GL.h
index 2a7d95212e1..34ac1a40d9e 100644
--- a/intern/ghost/test/multitest/GL.h
+++ b/intern/ghost/test/multitest/GL.h
@@ -20,8 +20,8 @@
 #if defined(WIN32) || defined(__APPLE__)
 
 #  ifdef WIN32
-#    include <windows.h>
 #    include <GL/gl.h>
+#    include <windows.h>
 #  else  // WIN32
 // __APPLE__ is defined
 #    include <AGL/gl.h>
diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c
index 374c7170dc6..75aa0119a7f 100644
--- a/intern/ghost/test/multitest/MultiTest.c
+++ b/intern/ghost/test/multitest/MultiTest.c
@@ -33,13 +33,13 @@
 #  pragma warning(disable : 4244 4305)
 #endif
 
+#include <math.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <math.h>
 
-#include <GL/glew.h>
 #include "GL.h"
+#include <GL/glew.h>
 
 #include "MEM_guardedalloc.h"
 
@@ -47,16 +47,16 @@
 
 #include "BLF_api.h"
 
-#include "Util.h"
 #include "Basic.h"
-#include "ScrollBar.h"
 #include "EventToBuf.h"
+#include "ScrollBar.h"
+#include "Util.h"
 
 #include "WindowData.h"
 
 /* GPU API. */
-#include "GPU_immediate.h"
 #include "GPU_context.h"
+#include "GPU_immediate.h"
 #include "GPU_init_exit.h"
 
 extern int datatoc_bfont_ttf_size;
diff --git a/intern/ghost/test/multitest/Util.c b/intern/ghost/test/multitest/Util.c
index c6cdebd39ce..962dd88c47b 100644
--- a/intern/ghost/test/multitest/Util.c
+++ b/intern/ghost/test/multitest/Util.c
@@ -19,9 +19,9 @@
 
 #include <stdlib.h>
 
-#include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index 2a4ae5355a0..d5b109ee59f 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -52,8 +52,8 @@
 #include <stdio.h> /* needed for FILE* */
 
 /* needed for uintptr_t and attributes, exception, dont use BLI anywhere else in MEM_* */
-#include "../../source/blender/blenlib/BLI_sys_types.h"
 #include "../../source/blender/blenlib/BLI_compiler_attrs.h"
+#include "../../source/blender/blenlib/BLI_sys_types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/intern/guardedalloc/cpp/mallocn.cpp b/intern/guardedalloc/cpp/mallocn.cpp
index 0804e096dc6..94d614b942f 100644
--- a/intern/guardedalloc/cpp/mallocn.cpp
+++ b/intern/guardedalloc/cpp/mallocn.cpp
@@ -18,8 +18,8 @@
  * \ingroup MEM
  */
 
-#include <new>
 #include "../MEM_guardedalloc.h"
+#include <new>
 
 void *operator new(size_t size, const char *str) throw(std::bad_alloc);
 void *operator new[](size_t size, const char *str) throw(std::bad_alloc);
diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c
index de2b2eee93a..f601609c6e0 100644
--- a/intern/guardedalloc/intern/mallocn_guarded_impl.c
+++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c
@@ -23,9 +23,9 @@
  * Guarded memory allocation, and boundary-write detection.
  */
 
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h> /* memcpy */
-#include <stdarg.h>
 #include <sys/types.h>
 
 #include "MEM_guardedalloc.h"
@@ -33,8 +33,8 @@
 /* to ensure strict conversions */
 #include "../../source/blender/blenlib/BLI_strict_flags.h"
 
-#include "mallocn_intern.h"
 #include "atomic_ops.h"
+#include "mallocn_intern.h"
 
 /* Only for debugging:
  * store original buffer's name when doing MEM_dupallocN
diff --git a/intern/guardedalloc/intern/mallocn_lockfree_impl.c b/intern/guardedalloc/intern/mallocn_lockfree_impl.c
index 87091bb9862..ab7d9097669 100644
--- a/intern/guardedalloc/intern/mallocn_lockfree_impl.c
+++ b/intern/guardedalloc/intern/mallocn_lockfree_impl.c
@@ -20,9 +20,9 @@
  * Memory allocation which keeps track on allocated memory counters
  */
 
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h> /* memcpy */
-#include <stdarg.h>
 #include <sys/types.h>
 
 #include "MEM_guardedalloc.h"
diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c
index 3508ae4e1aa..245fe05b6af 100644
--- a/intern/guardedalloc/intern/mmap_win.c
+++ b/intern/guardedalloc/intern/mmap_win.c
@@ -23,11 +23,11 @@
 
 #ifdef WIN32
 
-#  include <windows.h>
 #  include <errno.h>
 #  include <io.h>
-#  include <sys/types.h>
 #  include <stdio.h>
+#  include <sys/types.h>
+#  include <windows.h>
 
 #  include "mmap_win.h"
 
diff --git a/intern/guardedalloc/test/simpletest/memtest.c b/intern/guardedalloc/test/simpletest/memtest.c
index 8acced088f6..5c37ceb5b24 100644
--- a/intern/guardedalloc/test/simpletest/memtest.c
+++ b/intern/guardedalloc/test/simpletest/memtest.c
@@ -29,10 +29,10 @@
 /* Number of chunks to test with */
 #define NUM_BLOCKS 10
 
+#include "MEM_guardedalloc.h"
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include "MEM_guardedalloc.h"
+#include <string.h>
 
 static void mem_error_cb(const char *errorStr)
 {
diff --git a/intern/iksolver/intern/IK_QJacobianSolver.h b/intern/iksolver/intern/IK_QJacobianSolver.h
index 1ba3a1bebe1..cef13625dc4 100644
--- a/intern/iksolver/intern/IK_QJacobianSolver.h
+++ b/intern/iksolver/intern/IK_QJacobianSolver.h
@@ -28,8 +28,8 @@
  * @date 28/6/2001
  */
 
-#include <vector>
 #include <list>
+#include <vector>
 
 #include "IK_Math.h"
 #include "IK_QJacobian.h"
diff --git a/intern/locale/boost_locale_wrapper.cpp b/intern/locale/boost_locale_wrapper.cpp
index e03f8500a3d..73433fe7c5e 100644
--- a/intern/locale/boost_locale_wrapper.cpp
+++ b/intern/locale/boost_locale_wrapper.cpp
@@ -17,8 +17,8 @@
  * All rights reserved.
  */
 
-#include <stdio.h>
 #include <boost/locale.hpp>
+#include <stdio.h>
 
 #include "boost_locale_wrapper.h"
 
diff --git a/intern/memutil/MEM_Allocator.h b/intern/memutil/MEM_Allocator.h
index dc7ddcefeeb..50a3e978197 100644
--- a/intern/memutil/MEM_Allocator.h
+++ b/intern/memutil/MEM_Allocator.h
@@ -21,8 +21,8 @@
 #ifndef __MEM_ALLOCATOR_H__
 #define __MEM_ALLOCATOR_H__
 
-#include <stddef.h>
 #include "guardedalloc/MEM_guardedalloc.h"
+#include <stddef.h>
 
 template<typename _Tp> struct MEM_Allocator {
   typedef size_t size_type;
diff --git a/intern/memutil/MEM_CacheLimiter.h b/intern/memutil/MEM_CacheLimiter.h
index a13c3f518db..6ca61fbcde1 100644
--- a/intern/memutil/MEM_CacheLimiter.h
+++ b/intern/memutil/MEM_CacheLimiter.h
@@ -53,10 +53,10 @@
  * \endcode
  */
 
+#include "MEM_Allocator.h"
 #include <list>
 #include <queue>
 #include <vector>
-#include "MEM_Allocator.h"
 
 template<class T> class MEM_CacheLimiter;
 
diff --git a/intern/mikktspace/mikktspace.c b/intern/mikktspace/mikktspace.c
index 47bed53ed28..9fe2c0a815e 100644
--- a/intern/mikktspace/mikktspace.c
+++ b/intern/mikktspace/mikktspace.c
@@ -22,12 +22,12 @@
  */
 
 #include <assert.h>
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
 #include <float.h>
-#include <stdlib.h>
 #include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "mikktspace.h"
 
diff --git a/intern/opencolorio/fallback_impl.cc b/intern/opencolorio/fallback_impl.cc
index f5481b5d7cd..a6b93ac4959 100644
--- a/intern/opencolorio/fallback_impl.cc
+++ b/intern/opencolorio/fallback_impl.cc
@@ -21,9 +21,9 @@
 #include <cstring>
 #include <vector>
 
-#include "MEM_guardedalloc.h"
 #include "BLI_math_color.h"
 #include "BLI_math_vector.h"
+#include "MEM_guardedalloc.h"
 
 #include "ocio_impl.h"
 
diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc
index fd749bb4050..0e25c89f5d7 100644
--- a/intern/opencolorio/ocio_impl.cc
+++ b/intern/opencolorio/ocio_impl.cc
@@ -62,9 +62,9 @@ using namespace OCIO_NAMESPACE;
 #  include <algorithm>
 #  include <map>
 #  include <mutex>
-#  include <vector>
-#  include <string>
 #  include <set>
+#  include <string>
+#  include <vector>
 using std::map;
 using std::set;
 using std::string;
diff --git a/intern/opensubdiv/internal/opensubdiv.cc b/intern/opensubdiv/internal/opensubdiv.cc
index dc19d3d9306..74b81b13351 100644
--- a/intern/opensubdiv/internal/opensubdiv.cc
+++ b/intern/opensubdiv/internal/opensubdiv.cc
@@ -22,8 +22,8 @@
 
 #include <GL/glew.h>
 
-#include "opensubdiv_device_context_opencl.h"
 #include "opensubdiv_device_context_cuda.h"
+#include "opensubdiv_device_context_opencl.h"
 #include "opensubdiv_gl_mesh_capi.h"
 
 void openSubdiv_init(void)
diff --git a/intern/opensubdiv/internal/opensubdiv_converter_internal.cc b/intern/opensubdiv/internal/opensubdiv_converter_internal.cc
index e8d2f237936..0335219d6b9 100644
--- a/intern/opensubdiv/internal/opensubdiv_converter_internal.cc
+++ b/intern/opensubdiv/internal/opensubdiv_converter_internal.cc
@@ -22,8 +22,8 @@
 
 #include "internal/opensubdiv_converter_internal.h"
 
-#include <opensubdiv/sdc/crease.h>
 #include <cassert>
+#include <opensubdiv/sdc/crease.h>
 
 namespace opensubdiv_capi {
 
diff --git a/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc b/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc
index 5ce8af0434e..c0355ab24a8 100644
--- a/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc
+++ b/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc
@@ -39,10 +39,10 @@
 #    include <X11/Xlib.h>
 #  endif
 
+#  include <cstdio>
 #  include <cuda.h>
 #  include <cuda_gl_interop.h>
 #  include <cuda_runtime_api.h>
-#  include <cstdio>
 
 #  include "internal/opensubdiv_util.h"
 
diff --git a/intern/opensubdiv/internal/opensubdiv_evaluator.cc b/intern/opensubdiv/internal/opensubdiv_evaluator.cc
index 4f5a1db82ca..c599a3c9f68 100644
--- a/intern/opensubdiv/internal/opensubdiv_evaluator.cc
+++ b/intern/opensubdiv/internal/opensubdiv_evaluator.cc
@@ -18,8 +18,8 @@
 
 #include "opensubdiv_evaluator_capi.h"
 
-#include <new>
 #include "MEM_guardedalloc.h"
+#include <new>
 
 #include "internal/opensubdiv_evaluator_internal.h"
 
diff --git a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
index 431258aa415..c35909a045b 100644
--- a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
+++ b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
@@ -39,7 +39,6 @@
 
 #include "internal/opensubdiv_topology_refiner_internal.h"
 #include "internal/opensubdiv_util.h"
-#include "internal/opensubdiv_util.h"
 #include "opensubdiv_topology_refiner_capi.h"
 
 using OpenSubdiv::Far::PatchMap;
diff --git a/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc b/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc
index 0e4d9ce0a83..6afd763a63e 100644
--- a/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc
+++ b/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc
@@ -44,9 +44,9 @@ typedef Mesh<CpuGLVertexBuffer, StencilTable, OmpEvaluator, GLPatchTable> OsdOmp
 #endif
 // OpenCL backend.
 #ifdef OPENSUBDIV_HAS_OPENCL
+#  include "opensubdiv_device_context_opencl.h"
 #  include <opensubdiv/osd/clEvaluator.h>
 #  include <opensubdiv/osd/clGLVertexBuffer.h>
-#  include "opensubdiv_device_context_opencl.h"
 using OpenSubdiv::Osd::CLEvaluator;
 using OpenSubdiv::Osd::CLGLVertexBuffer;
 using OpenSubdiv::Osd::CLStencilTable;
@@ -57,9 +57,9 @@ static CLDeviceContext g_cl_device_context;
 #endif
 // CUDA backend.
 #ifdef OPENSUBDIV_HAS_CUDA
+#  include "opensubdiv_device_context_cuda.h"
 #  include <opensubdiv/osd/cudaEvaluator.h>
 #  include <opensubdiv/osd/cudaGLVertexBuffer.h>
-#  include "opensubdiv_device_context_cuda.h"
 using OpenSubdiv::Osd::CudaEvaluator;
 using OpenSubdiv::Osd::CudaGLVertexBuffer;
 using OpenSubdiv::Osd::CudaStencilTable;
@@ -89,12 +89,12 @@ typedef Mesh<GLVertexBuffer, GLStencilTableSSBO, GLComputeEvaluator, GLPatchTabl
 
 #include "MEM_guardedalloc.h"
 
-#include "opensubdiv_topology_refiner_capi.h"
 #include "internal/opensubdiv_gl_mesh_draw.h"
 #include "internal/opensubdiv_gl_mesh_fvar.h"
 #include "internal/opensubdiv_gl_mesh_internal.h"
 #include "internal/opensubdiv_topology_refiner_internal.h"
 #include "internal/opensubdiv_util.h"
+#include "opensubdiv_topology_refiner_capi.h"
 
 using opensubdiv_capi::vector;
 
diff --git a/intern/opensubdiv/internal/opensubdiv_gl_mesh_fvar.h b/intern/opensubdiv/internal/opensubdiv_gl_mesh_fvar.h
index cef78daced7..73a1af05605 100644
--- a/intern/opensubdiv/internal/opensubdiv_gl_mesh_fvar.h
+++ b/intern/opensubdiv/internal/opensubdiv_gl_mesh_fvar.h
@@ -23,8 +23,8 @@
 // work. Still needs a lot of work to make it easy, correct and have proper
 // data ownership.
 
-#include <opensubdiv/far/topologyRefiner.h>
 #include <opensubdiv/far/patchTable.h>
+#include <opensubdiv/far/topologyRefiner.h>
 
 #include "internal/opensubdiv_util.h"
 
diff --git a/intern/opensubdiv/internal/opensubdiv_util.h b/intern/opensubdiv/internal/opensubdiv_util.h
index 7817ebac96e..e515859b42f 100644
--- a/intern/opensubdiv/internal/opensubdiv_util.h
+++ b/intern/opensubdiv/internal/opensubdiv_util.h
@@ -21,11 +21,11 @@
 
 #include <algorithm>
 #include <cassert>
-#include <vector>
 #include <stack>
 #include <string>
 #include <unordered_map>
 #include <utility>
+#include <vector>
 
 namespace opensubdiv_capi {
 
diff --git a/intern/openvdb/intern/openvdb_level_set.cc b/intern/openvdb/intern/openvdb_level_set.cc
index a850aae2be5..ed0020a66ce 100644
--- a/intern/openvdb/intern/openvdb_level_set.cc
+++ b/intern/openvdb/intern/openvdb_level_set.cc
@@ -18,10 +18,10 @@
  */
 
 #include "openvdb_level_set.h"
-#include "openvdb_util.h"
-#include "openvdb_capi.h"
 #include "MEM_guardedalloc.h"
 #include "openvdb/tools/Composite.h"
+#include "openvdb_capi.h"
+#include "openvdb_util.h"
 
 OpenVDBLevelSet::OpenVDBLevelSet()
 {
diff --git a/intern/openvdb/intern/openvdb_level_set.h b/intern/openvdb/intern/openvdb_level_set.h
index c2e1e582fff..882958513fd 100644
--- a/intern/openvdb/intern/openvdb_level_set.h
+++ b/intern/openvdb/intern/openvdb_level_set.h
@@ -20,13 +20,13 @@
 #ifndef __OPENVDB_LEVEL_SET_H__
 #define __OPENVDB_LEVEL_SET_H__
 
-#include <openvdb/openvdb.h>
+#include "openvdb_capi.h"
 #include <openvdb/math/FiniteDifference.h>
+#include <openvdb/openvdb.h>
+#include <openvdb/tools/GridTransformer.h>
+#include <openvdb/tools/LevelSetFilter.h>
 #include <openvdb/tools/MeshToVolume.h>
 #include <openvdb/tools/VolumeToMesh.h>
-#include <openvdb/tools/LevelSetFilter.h>
-#include <openvdb/tools/GridTransformer.h>
-#include "openvdb_capi.h"
 
 struct OpenVDBLevelSet {
  private:
diff --git a/intern/openvdb/openvdb_capi.cc b/intern/openvdb/openvdb_capi.cc
index 22d0d20ea4e..9209bfa30cc 100644
--- a/intern/openvdb/openvdb_capi.cc
+++ b/intern/openvdb/openvdb_capi.cc
@@ -19,9 +19,9 @@
 
 #include "openvdb_capi.h"
 #include "openvdb_dense_convert.h"
-#include "openvdb_util.h"
 #include "openvdb_level_set.h"
 #include "openvdb_transform.h"
+#include "openvdb_util.h"
 
 int OpenVDB_getVersionHex()
 {
diff --git a/intern/rigidbody/rb_bullet_api.cpp b/intern/rigidbody/rb_bullet_api.cpp
index 1b22080756d..a928aaca049 100644
--- a/intern/rigidbody/rb_bullet_api.cpp
+++ b/intern/rigidbody/rb_bullet_api.cpp
@@ -50,22 +50,22 @@
  * -- Joshua Leung, June 2010
  */
 
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
 
 #include "RBI_api.h"
 
 #include "btBulletDynamicsCommon.h"
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btScalar.h"
+#include "LinearMath/btConvexHullComputer.h"
 #include "LinearMath/btMatrix3x3.h"
+#include "LinearMath/btScalar.h"
 #include "LinearMath/btTransform.h"
-#include "LinearMath/btConvexHullComputer.h"
+#include "LinearMath/btVector3.h"
 
-#include "BulletCollision/Gimpact/btGImpactShape.h"
-#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"
 #include "BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h"
+#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"
+#include "BulletCollision/Gimpact/btGImpactShape.h"
 
 struct rbDynamicsWorld {
   btDiscreteDynamicsWorld *dynamicsWorld;
diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h
index 4e6d04c1c64..97b23345f91 100644
--- a/intern/string/STR_String.h
+++ b/intern/string/STR_String.h
@@ -29,11 +29,11 @@
 #  define assertd(exp) ((void)NULL)
 #endif
 
-#include <vector>
 #include <limits.h>
+#include <vector>
 
-#include <cstring>
 #include <cstdlib>
+#include <cstring>
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp
index 3a4e703ca26..306e786969b 100644
--- a/intern/string/intern/STR_String.cpp
+++ b/intern/string/intern/STR_String.cpp
@@ -24,12 +24,12 @@
  * This file was formerly known as: GEN_StdString.cpp.
  */
 
-#include <stdio.h>
+#include "STR_String.h"
+#include <ctype.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 #include <string.h>
-#include "STR_String.h"
 
 /*-------------------------------------------------------------------------------------------------
   Construction / destruction
diff --git a/intern/utfconv/utf_winfunc.c b/intern/utfconv/utf_winfunc.c
index 4dc290a0146..615379d454a 100644
--- a/intern/utfconv/utf_winfunc.c
+++ b/intern/utfconv/utf_winfunc.c
@@ -24,8 +24,8 @@
 #include "utf_winfunc.h"
 #include "utfconv.h"
 #include <io.h>
-#include <windows.h>
 #include <wchar.h>
+#include <windows.h>
 
 FILE *ufopen(const char *filename, const char *mode)
 {
diff --git a/intern/utfconv/utfconv.h b/intern/utfconv/utfconv.h
index c291f1b4e1b..6470802bedf 100644
--- a/intern/utfconv/utfconv.h
+++ b/intern/utfconv/utfconv.h
@@ -21,9 +21,9 @@
 #ifndef __UTFCONV_H__
 #define __UTFCONV_H__
 
-#include <wchar.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <wchar.h>
 
 #ifdef __cplusplus
 extern "C" {