Cleanup: `make format` after SortedIncludes change

36 files changed, 47 insertions, 47 deletions

diff --git a/tests/gtests/alembic/abc_export_test.cc b/tests/gtests/alembic/abc_export_test.cc
index 3bddd2df6ba..238fab2f872 100644
--- a/tests/gtests/alembic/abc_export_test.cc
+++ b/tests/gtests/alembic/abc_export_test.cc
@@ -1,13 +1,13 @@
 #include "testing/testing.h"
 
 // Keep first since utildefines defines AT which conflicts with STL
-#include "intern/abc_util.h"
 #include "intern/abc_exporter.h"
+#include "intern/abc_util.h"
 
 extern "C" {
-#include "BLI_utildefines.h"
 #include "BKE_main.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 #include "DNA_scene_types.h"
 }
 
diff --git a/tests/gtests/alembic/abc_matrix_test.cc b/tests/gtests/alembic/abc_matrix_test.cc
index daffea15d0a..59ccd57937a 100644
--- a/tests/gtests/alembic/abc_matrix_test.cc
+++ b/tests/gtests/alembic/abc_matrix_test.cc
@@ -4,8 +4,8 @@
 #include "intern/abc_util.h"
 
 extern "C" {
-#include "BLI_utildefines.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 }
 
 TEST(abc_matrix, CreateRotationMatrixY_YfromZ)
diff --git a/tests/gtests/blenlib/BLI_array_ref_test.cc b/tests/gtests/blenlib/BLI_array_ref_test.cc
index 538fadc1cf9..aacd6113161 100644
--- a/tests/gtests/blenlib/BLI_array_ref_test.cc
+++ b/tests/gtests/blenlib/BLI_array_ref_test.cc
@@ -1,6 +1,6 @@
-#include "testing/testing.h"
 #include "BLI_array_ref.h"
 #include "BLI_vector.h"
+#include "testing/testing.h"
 
 using namespace BLI;
 
diff --git a/tests/gtests/blenlib/BLI_array_store_test.cc b/tests/gtests/blenlib/BLI_array_store_test.cc
index 3bca66b613e..5e8548911a2 100644
--- a/tests/gtests/blenlib/BLI_array_store_test.cc
+++ b/tests/gtests/blenlib/BLI_array_store_test.cc
@@ -6,13 +6,13 @@
 
 extern "C" {
 #include "BLI_array_store.h"
-#include "BLI_sys_types.h"
-#include "BLI_utildefines.h"
-#include "BLI_listbase.h"
 #include "BLI_array_utils.h"
-#include "BLI_string.h"
+#include "BLI_listbase.h"
 #include "BLI_rand.h"
 #include "BLI_ressource_strings.h"
+#include "BLI_string.h"
+#include "BLI_sys_types.h"
+#include "BLI_utildefines.h"
 }
 
 /* print memory savings */
diff --git a/tests/gtests/blenlib/BLI_array_test.cc b/tests/gtests/blenlib/BLI_array_test.cc
index 33f84928d3d..dd09c2d20f8 100644
--- a/tests/gtests/blenlib/BLI_array_test.cc
+++ b/tests/gtests/blenlib/BLI_array_test.cc
@@ -1,5 +1,5 @@
-#include "testing/testing.h"
 #include "BLI_array_cxx.h"
+#include "testing/testing.h"
 
 using namespace BLI;
 
diff --git a/tests/gtests/blenlib/BLI_array_utils_test.cc b/tests/gtests/blenlib/BLI_array_utils_test.cc
index fd9caed58f0..d6da9787768 100644
--- a/tests/gtests/blenlib/BLI_array_utils_test.cc
+++ b/tests/gtests/blenlib/BLI_array_utils_test.cc
@@ -3,8 +3,8 @@
 #include "testing/testing.h"
 
 extern "C" {
-#include "BLI_utildefines.h"
 #include "BLI_array_utils.h"
+#include "BLI_utildefines.h"
 #include "BLI_utildefines_stack.h"
 }
 
diff --git a/tests/gtests/blenlib/BLI_delaunay_2d_test.cc b/tests/gtests/blenlib/BLI_delaunay_2d_test.cc
index 79e47211049..6065ccc4e57 100644
--- a/tests/gtests/blenlib/BLI_delaunay_2d_test.cc
+++ b/tests/gtests/blenlib/BLI_delaunay_2d_test.cc
@@ -12,8 +12,8 @@ extern "C" {
 #include "BLI_delaunay_2d.h"
 }
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <sstream>
 
 #define DO_REGULAR_TESTS 1
diff --git a/tests/gtests/blenlib/BLI_edgehash_test.cc b/tests/gtests/blenlib/BLI_edgehash_test.cc
index 0ca251fee50..982f5b35565 100644
--- a/tests/gtests/blenlib/BLI_edgehash_test.cc
+++ b/tests/gtests/blenlib/BLI_edgehash_test.cc
@@ -1,12 +1,12 @@
 /* Apache License, Version 2.0 */
 
 #include "testing/testing.h"
-#include <vector>
 #include <algorithm>
+#include <vector>
 
 extern "C" {
-#include "BLI_utildefines.h"
 #include "BLI_edgehash.h"
+#include "BLI_utildefines.h"
 }
 
 #define VALUE_1 POINTER_FROM_INT(1)
diff --git a/tests/gtests/blenlib/BLI_ghash_performance_test.cc b/tests/gtests/blenlib/BLI_ghash_performance_test.cc
index 631adfc7a6b..ed00fb759cd 100644
--- a/tests/gtests/blenlib/BLI_ghash_performance_test.cc
+++ b/tests/gtests/blenlib/BLI_ghash_performance_test.cc
@@ -1,17 +1,17 @@
 /* Apache License, Version 2.0 */
 
-#include "testing/testing.h"
 #include "BLI_ressource_strings.h"
+#include "testing/testing.h"
 
 #define GHASH_INTERNAL_API
 
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_rand.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 #include "PIL_time_utildefines.h"
 }
 
diff --git a/tests/gtests/blenlib/BLI_ghash_test.cc b/tests/gtests/blenlib/BLI_ghash_test.cc
index d6841ad4d44..a4b727e82aa 100644
--- a/tests/gtests/blenlib/BLI_ghash_test.cc
+++ b/tests/gtests/blenlib/BLI_ghash_test.cc
@@ -5,9 +5,9 @@
 #define GHASH_INTERNAL_API
 
 extern "C" {
-#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 }
 
 #define TESTCASE_SIZE 10000
diff --git a/tests/gtests/blenlib/BLI_heap_simple_test.cc b/tests/gtests/blenlib/BLI_heap_simple_test.cc
index bad5c40eb66..f4d614def9e 100644
--- a/tests/gtests/blenlib/BLI_heap_simple_test.cc
+++ b/tests/gtests/blenlib/BLI_heap_simple_test.cc
@@ -6,11 +6,11 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-#include "BLI_sys_types.h"
 #include "BLI_compiler_attrs.h"
 #include "BLI_heap_simple.h"
-#include "BLI_utildefines.h"
 #include "BLI_rand.h"
+#include "BLI_sys_types.h"
+#include "BLI_utildefines.h"
 };
 
 #define SIZE 1024
diff --git a/tests/gtests/blenlib/BLI_heap_test.cc b/tests/gtests/blenlib/BLI_heap_test.cc
index ddec706eb0e..cda13e62bb8 100644
--- a/tests/gtests/blenlib/BLI_heap_test.cc
+++ b/tests/gtests/blenlib/BLI_heap_test.cc
@@ -8,8 +8,8 @@
 extern "C" {
 #include "BLI_compiler_attrs.h"
 #include "BLI_heap.h"
-#include "BLI_utildefines.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 };
 
 #define SIZE 1024
diff --git a/tests/gtests/blenlib/BLI_index_range_test.cc b/tests/gtests/blenlib/BLI_index_range_test.cc
index c5c1f9a875b..60da18b6baf 100644
--- a/tests/gtests/blenlib/BLI_index_range_test.cc
+++ b/tests/gtests/blenlib/BLI_index_range_test.cc
@@ -1,6 +1,6 @@
-#include "testing/testing.h"
 #include "BLI_index_range.h"
 #include "BLI_vector.h"
+#include "testing/testing.h"
 
 using BLI::ArrayRef;
 using BLI::IndexRange;
diff --git a/tests/gtests/blenlib/BLI_kdopbvh_test.cc b/tests/gtests/blenlib/BLI_kdopbvh_test.cc
index e0762f22840..333f7ffbf44 100644
--- a/tests/gtests/blenlib/BLI_kdopbvh_test.cc
+++ b/tests/gtests/blenlib/BLI_kdopbvh_test.cc
@@ -9,8 +9,8 @@
 extern "C" {
 #include "BLI_compiler_attrs.h"
 #include "BLI_kdopbvh.h"
-#include "BLI_rand.h"
 #include "BLI_math_vector.h"
+#include "BLI_rand.h"
 }
 
 #include "stubs/bf_intern_eigen_stubs.h"
diff --git a/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc b/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc
index 265637ef32c..f1bd02e0d9e 100644
--- a/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc
+++ b/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc
@@ -4,10 +4,10 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_linklist_lockfree.h"
 #include "BLI_task.h"
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
 
 TEST(LockfreeLinkList, Init)
 {
diff --git a/tests/gtests/blenlib/BLI_listbase_test.cc b/tests/gtests/blenlib/BLI_listbase_test.cc
index 5ecf0533763..32dbd49c8fc 100644
--- a/tests/gtests/blenlib/BLI_listbase_test.cc
+++ b/tests/gtests/blenlib/BLI_listbase_test.cc
@@ -7,9 +7,9 @@
 extern "C" {
 #include "BLI_array_utils.h"
 #include "BLI_listbase.h"
-#include "BLI_string.h"
 #include "BLI_path_util.h"
 #include "BLI_ressource_strings.h"
+#include "BLI_string.h"
 }
 
 /* local validation function */
diff --git a/tests/gtests/blenlib/BLI_map_test.cc b/tests/gtests/blenlib/BLI_map_test.cc
index e91f809abba..7be23157e94 100644
--- a/tests/gtests/blenlib/BLI_map_test.cc
+++ b/tests/gtests/blenlib/BLI_map_test.cc
@@ -1,6 +1,6 @@
-#include "testing/testing.h"
 #include "BLI_map.h"
 #include "BLI_set.h"
+#include "testing/testing.h"
 
 using BLI::Map;
 using IntFloatMap = Map<int, float>;
diff --git a/tests/gtests/blenlib/BLI_memiter_test.cc b/tests/gtests/blenlib/BLI_memiter_test.cc
index 07ef0745845..05602dcc1c8 100644
--- a/tests/gtests/blenlib/BLI_memiter_test.cc
+++ b/tests/gtests/blenlib/BLI_memiter_test.cc
@@ -8,8 +8,8 @@ extern "C" {
 #include "BLI_array_utils.h"
 #include "BLI_memiter.h"
 
-#include "BLI_string.h"
 #include "BLI_ressource_strings.h"
+#include "BLI_string.h"
 }
 
 TEST(memiter, Nop)
diff --git a/tests/gtests/blenlib/BLI_optional_test.cc b/tests/gtests/blenlib/BLI_optional_test.cc
index 2e672967680..a25a3cbd588 100644
--- a/tests/gtests/blenlib/BLI_optional_test.cc
+++ b/tests/gtests/blenlib/BLI_optional_test.cc
@@ -1,5 +1,5 @@
-#include "testing/testing.h"
 #include "BLI_optional.h"
+#include "testing/testing.h"
 #include <string>
 
 using namespace BLI;
diff --git a/tests/gtests/blenlib/BLI_path_util_test.cc b/tests/gtests/blenlib/BLI_path_util_test.cc
index 401ba2d5ffb..18d7a9c4fea 100644
--- a/tests/gtests/blenlib/BLI_path_util_test.cc
+++ b/tests/gtests/blenlib/BLI_path_util_test.cc
@@ -3,10 +3,10 @@
 #include "testing/testing.h"
 
 extern "C" {
+#include "../../../source/blender/imbuf/IMB_imbuf.h"
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
-#include "../../../source/blender/imbuf/IMB_imbuf.h"
 
 #ifdef _WIN32
 #  include "../../../source/blender/blenkernel/BKE_global.h"
diff --git a/tests/gtests/blenlib/BLI_polyfill_2d_test.cc b/tests/gtests/blenlib/BLI_polyfill_2d_test.cc
index bb9f739a71e..911137bb83b 100644
--- a/tests/gtests/blenlib/BLI_polyfill_2d_test.cc
+++ b/tests/gtests/blenlib/BLI_polyfill_2d_test.cc
@@ -12,20 +12,20 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-#include "BLI_utildefines.h"
 #include "BLI_array_utils.h"
-#include "BLI_polyfill_2d.h"
 #include "BLI_edgehash.h"
 #include "BLI_math.h"
+#include "BLI_polyfill_2d.h"
+#include "BLI_utildefines.h"
 
 #ifdef USE_OBJ_PREVIEW
 #  include "BLI_string.h"
 #endif
 
 #ifdef USE_BEAUTIFY
-#  include "BLI_polyfill_2d_beautify.h"
-#  include "BLI_memarena.h"
 #  include "BLI_heap.h"
+#  include "BLI_memarena.h"
+#  include "BLI_polyfill_2d_beautify.h"
 #endif
 }
 
diff --git a/tests/gtests/blenlib/BLI_set_test.cc b/tests/gtests/blenlib/BLI_set_test.cc
index 5baf069557e..555140f805c 100644
--- a/tests/gtests/blenlib/BLI_set_test.cc
+++ b/tests/gtests/blenlib/BLI_set_test.cc
@@ -1,6 +1,6 @@
-#include "testing/testing.h"
 #include "BLI_set.h"
 #include "BLI_vector.h"
+#include "testing/testing.h"
 
 using BLI::Set;
 using BLI::Vector;
diff --git a/tests/gtests/blenlib/BLI_stack_cxx_test.cc b/tests/gtests/blenlib/BLI_stack_cxx_test.cc
index 272bba05cb8..6376259927b 100644
--- a/tests/gtests/blenlib/BLI_stack_cxx_test.cc
+++ b/tests/gtests/blenlib/BLI_stack_cxx_test.cc
@@ -1,5 +1,5 @@
-#include "testing/testing.h"
 #include "BLI_stack_cxx.h"
+#include "testing/testing.h"
 
 using BLI::Stack;
 using IntStack = Stack<int>;
diff --git a/tests/gtests/blenlib/BLI_stack_test.cc b/tests/gtests/blenlib/BLI_stack_test.cc
index a3fd5efadf0..359e61c6f47 100644
--- a/tests/gtests/blenlib/BLI_stack_test.cc
+++ b/tests/gtests/blenlib/BLI_stack_test.cc
@@ -4,9 +4,9 @@
 #include <string.h>
 
 extern "C" {
+#include "BLI_array.h"
 #include "BLI_stack.h"
 #include "BLI_utildefines.h"
-#include "BLI_array.h"
 };
 
 #define SIZE 1024
diff --git a/tests/gtests/blenlib/BLI_string_map_test.cc b/tests/gtests/blenlib/BLI_string_map_test.cc
index dfe96d63297..4cb67d5fbac 100644
--- a/tests/gtests/blenlib/BLI_string_map_test.cc
+++ b/tests/gtests/blenlib/BLI_string_map_test.cc
@@ -1,6 +1,6 @@
-#include "testing/testing.h"
 #include "BLI_string_map.h"
 #include "BLI_vector.h"
+#include "testing/testing.h"
 
 using namespace BLI;
 
diff --git a/tests/gtests/blenlib/BLI_string_ref_test.cc b/tests/gtests/blenlib/BLI_string_ref_test.cc
index 38a970455c0..a268bf3215a 100644
--- a/tests/gtests/blenlib/BLI_string_ref_test.cc
+++ b/tests/gtests/blenlib/BLI_string_ref_test.cc
@@ -1,6 +1,6 @@
-#include "testing/testing.h"
 #include "BLI_string_ref.h"
 #include "BLI_vector.h"
+#include "testing/testing.h"
 
 using BLI::StringRef;
 using BLI::StringRefNull;
diff --git a/tests/gtests/blenlib/BLI_string_test.cc b/tests/gtests/blenlib/BLI_string_test.cc
index a35f9fe067e..aae0c12c8b2 100644
--- a/tests/gtests/blenlib/BLI_string_test.cc
+++ b/tests/gtests/blenlib/BLI_string_test.cc
@@ -10,10 +10,10 @@
 #include <vector>
 
 extern "C" {
-#include "BLI_utildefines.h"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
 #include "BLI_string_utils.h"
+#include "BLI_utildefines.h"
 }
 
 using std::initializer_list;
diff --git a/tests/gtests/blenlib/BLI_string_utf8_test.cc b/tests/gtests/blenlib/BLI_string_utf8_test.cc
index 01a9549044a..3e2ade40019 100644
--- a/tests/gtests/blenlib/BLI_string_utf8_test.cc
+++ b/tests/gtests/blenlib/BLI_string_utf8_test.cc
@@ -3,9 +3,9 @@
 #include "testing/testing.h"
 
 extern "C" {
-#include "BLI_utildefines.h"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
+#include "BLI_utildefines.h"
 }
 
 /* Note that 'common' utf-8 variants of string functions (like copy, etc.) are tested in
diff --git a/tests/gtests/blenlib/BLI_task_performance_test.cc b/tests/gtests/blenlib/BLI_task_performance_test.cc
index c5af75f1eb2..db596340464 100644
--- a/tests/gtests/blenlib/BLI_task_performance_test.cc
+++ b/tests/gtests/blenlib/BLI_task_performance_test.cc
@@ -1,7 +1,7 @@
 /* Apache License, Version 2.0 */
 
-#include "testing/testing.h"
 #include "BLI_ressource_strings.h"
+#include "testing/testing.h"
 
 #include "atomic_ops.h"
 
diff --git a/tests/gtests/blenlib/BLI_vector_set_test.cc b/tests/gtests/blenlib/BLI_vector_set_test.cc
index 675e5a154d5..5ec51337aa7 100644
--- a/tests/gtests/blenlib/BLI_vector_set_test.cc
+++ b/tests/gtests/blenlib/BLI_vector_set_test.cc
@@ -1,5 +1,5 @@
-#include "testing/testing.h"
 #include "BLI_vector_set.h"
+#include "testing/testing.h"
 
 using BLI::VectorSet;
 using IntVectorSet = VectorSet<int>;
diff --git a/tests/gtests/blenlib/BLI_vector_test.cc b/tests/gtests/blenlib/BLI_vector_test.cc
index 6cf67fb2488..2402ee9627f 100644
--- a/tests/gtests/blenlib/BLI_vector_test.cc
+++ b/tests/gtests/blenlib/BLI_vector_test.cc
@@ -1,5 +1,5 @@
-#include "testing/testing.h"
 #include "BLI_vector.h"
+#include "testing/testing.h"
 #include <forward_list>
 
 using BLI::Vector;
diff --git a/tests/gtests/blenloader/blendfile_loading_base_test.cc b/tests/gtests/blenloader/blendfile_loading_base_test.cc
index 4f871bc7ddf..62befae90cd 100644
--- a/tests/gtests/blenloader/blendfile_loading_base_test.cc
+++ b/tests/gtests/blenloader/blendfile_loading_base_test.cc
@@ -31,13 +31,13 @@ extern "C" {
 #include "BKE_node.h"
 #include "BKE_scene.h"
 
-#include "BLI_threads.h"
 #include "BLI_path_util.h"
+#include "BLI_threads.h"
 
 #include "BLO_readfile.h"
 
-#include "DEG_depsgraph_build.h"
 #include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
 
 #include "DNA_genfile.h" /* for DNA_sdna_current_init() */
 #include "DNA_windowmanager_types.h"
diff --git a/tests/gtests/blenloader/blendfile_loading_base_test.h b/tests/gtests/blenloader/blendfile_loading_base_test.h
index 466bbcd2392..6ed32168737 100644
--- a/tests/gtests/blenloader/blendfile_loading_base_test.h
+++ b/tests/gtests/blenloader/blendfile_loading_base_test.h
@@ -18,8 +18,8 @@
 #ifndef __BLENDFILE_LOADING_BASE_TEST_H__
 #define __BLENDFILE_LOADING_BASE_TEST_H__
 
-#include "testing/testing.h"
 #include "DEG_depsgraph.h"
+#include "testing/testing.h"
 
 struct BlendFileData;
 struct Depsgraph;
diff --git a/tests/gtests/bmesh/bmesh_core_test.cc b/tests/gtests/bmesh/bmesh_core_test.cc
index 7531568af87..25c48e9fd36 100644
--- a/tests/gtests/bmesh/bmesh_core_test.cc
+++ b/tests/gtests/bmesh/bmesh_core_test.cc
@@ -1,8 +1,8 @@
 #include "testing/testing.h"
 
+#include "BLI_math.h"
 #include "BLI_utildefines.h"
 #include "bmesh.h"
-#include "BLI_math.h"
 
 TEST(bmesh_core, BMVertCreate)
 {
diff --git a/tests/gtests/testing/mock_log.h b/tests/gtests/testing/mock_log.h
index e3414fa1533..7d0a94a4971 100644
--- a/tests/gtests/testing/mock_log.h
+++ b/tests/gtests/testing/mock_log.h
@@ -40,8 +40,8 @@
 
 #include <string>
 
-#include "gmock/gmock.h"
 #include "glog/logging.h"
+#include "gmock/gmock.h"
 
 // Needed to make the scoped mock log tests work without modification.
 namespace ceres {
diff --git a/tests/gtests/testing/testing.h b/tests/gtests/testing/testing.h
index 67138e4f874..32cb6e7f18a 100644
--- a/tests/gtests/testing/testing.h
+++ b/tests/gtests/testing/testing.h
@@ -3,8 +3,8 @@
 
 #include <vector>
 
-#include "glog/logging.h"
 #include "gflags/gflags.h"
+#include "glog/logging.h"
 #include "gtest/gtest.h"
 
 #define EXPECT_V3_NEAR(a, b, eps) \