Cleanup: `make format` after SortedIncludes change

34 files changed, 71 insertions, 71 deletions

diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h
index bc5f0ac1971..5f55b512695 100644
--- a/source/blender/gpu/GPU_batch.h
+++ b/source/blender/gpu/GPU_batch.h
@@ -27,10 +27,10 @@
 #ifndef __GPU_BATCH_H__
 #define __GPU_BATCH_H__
 
-#include "GPU_vertex_buffer.h"
 #include "GPU_element.h"
-#include "GPU_shader_interface.h"
 #include "GPU_shader.h"
+#include "GPU_shader_interface.h"
+#include "GPU_vertex_buffer.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/gpu/GPU_common.h b/source/blender/gpu/GPU_common.h
index a4bafe13500..dd580ebbdac 100644
--- a/source/blender/gpu/GPU_common.h
+++ b/source/blender/gpu/GPU_common.h
@@ -37,9 +37,9 @@
 #  include <GL/glew.h>
 #endif
 
+#include "BLI_sys_types.h"
 #include <stdbool.h>
 #include <stdint.h>
-#include "BLI_sys_types.h"
 
 #if TRUST_NO_ONE
 #  include <assert.h>
diff --git a/source/blender/gpu/GPU_context.h b/source/blender/gpu/GPU_context.h
index ebeb104b7e8..dd7611fe2fc 100644
--- a/source/blender/gpu/GPU_context.h
+++ b/source/blender/gpu/GPU_context.h
@@ -30,8 +30,8 @@
 extern "C" {
 #endif
 
-#include "GPU_common.h"
 #include "GPU_batch.h"
+#include "GPU_common.h"
 #include "GPU_shader_interface.h"
 
 typedef struct GPUContext GPUContext;
diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h
index 39fa625f5cc..d1db1d5f3e7 100644
--- a/source/blender/gpu/GPU_immediate.h
+++ b/source/blender/gpu/GPU_immediate.h
@@ -26,12 +26,12 @@
 #ifndef __GPU_IMMEDIATE_H__
 #define __GPU_IMMEDIATE_H__
 
-#include "GPU_vertex_format.h"
-#include "GPU_primitive.h"
-#include "GPU_shader_interface.h"
 #include "GPU_batch.h"
 #include "GPU_immediate_util.h"
+#include "GPU_primitive.h"
 #include "GPU_shader.h"
+#include "GPU_shader_interface.h"
+#include "GPU_vertex_format.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/gpu/GPU_vertex_format.h b/source/blender/gpu/GPU_vertex_format.h
index f5717645bc1..7e384d0a692 100644
--- a/source/blender/gpu/GPU_vertex_format.h
+++ b/source/blender/gpu/GPU_vertex_format.h
@@ -26,9 +26,9 @@
 #ifndef __GPU_VERTEX_FORMAT_H__
 #define __GPU_VERTEX_FORMAT_H__
 
-#include "GPU_common.h"
-#include "BLI_compiler_compat.h"
 #include "BLI_assert.h"
+#include "BLI_compiler_compat.h"
+#include "GPU_common.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/gpu/GPU_viewport.h b/source/blender/gpu/GPU_viewport.h
index b7b8af9f90a..50d265feaad 100644
--- a/source/blender/gpu/GPU_viewport.h
+++ b/source/blender/gpu/GPU_viewport.h
@@ -26,8 +26,8 @@
 
 #include <stdbool.h>
 
-#include "DNA_vec_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_vec_types.h"
 
 #include "GPU_framebuffer.h"
 #include "GPU_texture.h"
diff --git a/source/blender/gpu/intern/gpu_attr_binding_private.h b/source/blender/gpu/intern/gpu_attr_binding_private.h
index bcd4ba1dbfc..301ec3333dd 100644
--- a/source/blender/gpu/intern/gpu_attr_binding_private.h
+++ b/source/blender/gpu/intern/gpu_attr_binding_private.h
@@ -26,8 +26,8 @@
 #ifndef __GPU_ATTR_BINDING_PRIVATE_H__
 #define __GPU_ATTR_BINDING_PRIVATE_H__
 
-#include "GPU_vertex_format.h"
 #include "GPU_shader_interface.h"
+#include "GPU_vertex_format.h"
 
 void AttrBinding_clear(GPUAttrBinding *binding);
 
diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c
index 731407a64f9..6bc3cd27130 100644
--- a/source/blender/gpu/intern/gpu_batch.c
+++ b/source/blender/gpu/intern/gpu_batch.c
@@ -29,8 +29,8 @@
 #include "GPU_batch.h"
 #include "GPU_batch_presets.h"
 #include "GPU_extensions.h"
-#include "GPU_platform.h"
 #include "GPU_matrix.h"
+#include "GPU_platform.h"
 #include "GPU_shader.h"
 
 #include "gpu_batch_private.h"
@@ -38,9 +38,9 @@
 #include "gpu_primitive_private.h"
 #include "gpu_shader_private.h"
 
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 
 static void batch_update_program_bindings(GPUBatch *batch, uint i_first);
 
diff --git a/source/blender/gpu/intern/gpu_batch_presets.c b/source/blender/gpu/intern/gpu_batch_presets.c
index 9018582f6dd..e00b6f78c2e 100644
--- a/source/blender/gpu/intern/gpu_batch_presets.c
+++ b/source/blender/gpu/intern/gpu_batch_presets.c
@@ -21,17 +21,17 @@
  * \ingroup gpu
  */
 
-#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_threads.h"
-#include "BLI_listbase.h"
+#include "BLI_utildefines.h"
 #include "MEM_guardedalloc.h"
 
 #include "UI_interface.h"
 
 #include "GPU_batch.h"
-#include "GPU_batch_utils.h"
 #include "GPU_batch_presets.h" /* own include */
+#include "GPU_batch_utils.h"
 #include "gpu_shader_private.h"
 
 /* Struct to store 3D Batches and their format */
diff --git a/source/blender/gpu/intern/gpu_batch_utils.c b/source/blender/gpu/intern/gpu_batch_utils.c
index 825f72e175b..0660d4a1724 100644
--- a/source/blender/gpu/intern/gpu_batch_utils.c
+++ b/source/blender/gpu/intern/gpu_batch_utils.c
@@ -20,11 +20,11 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_rect.h"
 #include "BLI_math.h"
 #include "BLI_polyfill_2d.h"
+#include "BLI_rect.h"
 #include "BLI_sort_utils.h"
+#include "BLI_utildefines.h"
 
 #include "GPU_batch.h"
 #include "GPU_batch_utils.h" /* own include */
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index f21cd990a41..c377d196eb5 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -30,22 +30,22 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_bitmap.h"
-#include "BLI_math_color.h"
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_hash.h"
+#include "BLI_math.h"
+#include "BLI_math_color.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_meshdata_types.h"
 
-#include "BKE_ccg.h"
 #include "BKE_DerivedMesh.h"
-#include "BKE_paint.h"
+#include "BKE_ccg.h"
 #include "BKE_mesh.h"
+#include "BKE_paint.h"
 #include "BKE_pbvh.h"
 
-#include "GPU_buffers.h"
 #include "GPU_batch.h"
+#include "GPU_buffers.h"
 
 #include "gpu_private.h"
 
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
index 066b8d633d2..211ae0b3897 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -29,12 +29,12 @@
 #include "DNA_image_types.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_hash_mm2a.h"
-#include "BLI_link_utils.h"
-#include "BLI_utildefines.h"
 #include "BLI_dynstr.h"
 #include "BLI_ghash.h"
+#include "BLI_hash_mm2a.h"
+#include "BLI_link_utils.h"
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
 
 #include "PIL_time.h"
 
@@ -53,8 +53,8 @@
 #include "gpu_material_library.h"
 #include "gpu_node_graph.h"
 
-#include <string.h>
 #include <stdarg.h>
+#include <string.h>
 
 extern char datatoc_gpu_shader_common_obinfos_lib_glsl[];
 extern char datatoc_common_view_lib_glsl[];
diff --git a/source/blender/gpu/intern/gpu_context.cpp b/source/blender/gpu/intern/gpu_context.cpp
index 17b86e3eec8..0b9104e5349 100644
--- a/source/blender/gpu/intern/gpu_context.cpp
+++ b/source/blender/gpu/intern/gpu_context.cpp
@@ -38,11 +38,11 @@
 #include "gpu_context_private.h"
 #include "gpu_matrix_private.h"
 
-#include <vector>
-#include <string.h>
-#include <pthread.h>
 #include <mutex>
+#include <pthread.h>
+#include <string.h>
 #include <unordered_set>
+#include <vector>
 
 #if TRUST_NO_ONE
 #  if 0
diff --git a/source/blender/gpu/intern/gpu_debug.c b/source/blender/gpu/intern/gpu_debug.c
index 8293aae5dfa..f7d6236071d 100644
--- a/source/blender/gpu/intern/gpu_debug.c
+++ b/source/blender/gpu/intern/gpu_debug.c
@@ -22,14 +22,14 @@
  */
 
 #include "BLI_compiler_attrs.h"
-#include "BLI_utildefines.h"
 #include "BLI_sys_types.h"
 #include "BLI_system.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_global.h"
 
-#include "GPU_glew.h"
 #include "GPU_debug.h"
+#include "GPU_glew.h"
 #include "intern/gpu_private.h"
 
 #include <stdio.h>
diff --git a/source/blender/gpu/intern/gpu_draw_smoke.c b/source/blender/gpu/intern/gpu_draw_smoke.c
index 546faadbda4..80c59ed47c9 100644
--- a/source/blender/gpu/intern/gpu_draw_smoke.c
+++ b/source/blender/gpu/intern/gpu_draw_smoke.c
@@ -28,8 +28,8 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-#include "DNA_modifier_types.h"
 #include "DNA_fluid_types.h"
+#include "DNA_modifier_types.h"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index f497ed22bec..e3632b82778 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -24,9 +24,9 @@
  * with checks for drivers and GPU support.
  */
 
-#include "BLI_utildefines.h"
 #include "BLI_math_base.h"
 #include "BLI_math_vector.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_global.h"
 #include "MEM_guardedalloc.h"
@@ -34,13 +34,13 @@
 #include "GPU_extensions.h"
 #include "GPU_framebuffer.h"
 #include "GPU_glew.h"
-#include "GPU_texture.h"
 #include "GPU_platform.h"
+#include "GPU_texture.h"
 
 #include "intern/gpu_private.h"
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #ifdef WIN32
diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c
index f254cce25e4..59d0be2cefb 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.c
+++ b/source/blender/gpu/intern/gpu_framebuffer.c
@@ -24,8 +24,8 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
 #include "BLI_math_base.h"
+#include "BLI_utildefines.h"
 
 #include "GPU_batch.h"
 #include "GPU_draw.h"
@@ -34,8 +34,8 @@
 #include "GPU_shader.h"
 #include "GPU_texture.h"
 
-#include "gpu_private.h"
 #include "gpu_context_private.h"
+#include "gpu_private.h"
 
 typedef enum {
   GPU_FB_DEPTH_ATTACHMENT = 0,
diff --git a/source/blender/gpu/intern/gpu_immediate.c b/source/blender/gpu/intern/gpu_immediate.c
index 671335ca702..4523df8be7c 100644
--- a/source/blender/gpu/intern/gpu_immediate.c
+++ b/source/blender/gpu/intern/gpu_immediate.c
@@ -36,8 +36,8 @@
 #include "gpu_shader_private.h"
 #include "gpu_vertex_format_private.h"
 
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 /* necessary functions from matrix API */
 extern void GPU_matrix_bind(const GPUShaderInterface *);
diff --git a/source/blender/gpu/intern/gpu_immediate_util.c b/source/blender/gpu/intern/gpu_immediate_util.c
index 45d9c40b3e6..28544d50ba1 100644
--- a/source/blender/gpu/intern/gpu_immediate_util.c
+++ b/source/blender/gpu/intern/gpu_immediate_util.c
@@ -23,8 +23,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "BLI_utildefines.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "GPU_immediate.h"
 #include "GPU_immediate_util.h"
diff --git a/source/blender/gpu/intern/gpu_init_exit.c b/source/blender/gpu/intern/gpu_init_exit.c
index 96dc437e10b..54ddb9351b9 100644
--- a/source/blender/gpu/intern/gpu_init_exit.c
+++ b/source/blender/gpu/intern/gpu_init_exit.c
@@ -21,12 +21,12 @@
  * \ingroup gpu
  */
 
+#include "GPU_init_exit.h" /* interface */
+#include "BKE_global.h"
 #include "BLI_sys_types.h"
+#include "GPU_batch.h"
 #include "GPU_buffers.h"
-#include "GPU_init_exit.h" /* interface */
 #include "GPU_immediate.h"
-#include "GPU_batch.h"
-#include "BKE_global.h"
 
 #include "intern/gpu_codegen.h"
 #include "intern/gpu_material_library.h"
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index 8a4a88d0663..3e73d156440 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -32,12 +32,12 @@
 #include "DNA_scene_types.h"
 #include "DNA_world_types.h"
 
-#include "BLI_math.h"
+#include "BLI_ghash.h"
 #include "BLI_listbase.h"
-#include "BLI_utildefines.h"
+#include "BLI_math.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
-#include "BLI_ghash.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_main.h"
 #include "BKE_material.h"
diff --git a/source/blender/gpu/intern/gpu_material_library.c b/source/blender/gpu/intern/gpu_material_library.c
index 959e5ef7440..42cd9673ac2 100644
--- a/source/blender/gpu/intern/gpu_material_library.c
+++ b/source/blender/gpu/intern/gpu_material_library.c
@@ -27,10 +27,10 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_dynstr.h"
 #include "BLI_ghash.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "gpu_material_library.h"
 
diff --git a/source/blender/gpu/intern/gpu_node_graph.c b/source/blender/gpu/intern/gpu_node_graph.c
index 0eb62bf5b2f..953b2eb40d8 100644
--- a/source/blender/gpu/intern/gpu_node_graph.c
+++ b/source/blender/gpu/intern/gpu_node_graph.c
@@ -29,10 +29,10 @@
 
 #include "DNA_node_types.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "gpu_material_library.h"
 #include "gpu_node_graph.h"
diff --git a/source/blender/gpu/intern/gpu_node_graph.h b/source/blender/gpu/intern/gpu_node_graph.h
index 8506c6a87e2..3067be1c485 100644
--- a/source/blender/gpu/intern/gpu_node_graph.h
+++ b/source/blender/gpu/intern/gpu_node_graph.h
@@ -29,8 +29,8 @@
 #include "DNA_customdata_types.h"
 #include "DNA_listBase.h"
 
-#include "GPU_material.h"
 #include "GPU_glew.h"
+#include "GPU_material.h"
 #include "GPU_shader.h"
 
 struct GPUNode;
diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c
index f12da9ce2f7..1776f0f391d 100644
--- a/source/blender/gpu/intern/gpu_select.c
+++ b/source/blender/gpu/intern/gpu_select.c
@@ -23,11 +23,11 @@
  * Interface for accessing gpu-related methods for selection. The semantics are
  * similar to glRenderMode(GL_SELECT) from older OpenGL versions.
  */
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
-#include "GPU_select.h"
 #include "GPU_glew.h"
+#include "GPU_select.h"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/gpu/intern/gpu_select_pick.c b/source/blender/gpu/intern/gpu_select_pick.c
index 498de13e10f..56fe1e40d87 100644
--- a/source/blender/gpu/intern/gpu_select_pick.c
+++ b/source/blender/gpu/intern/gpu_select_pick.c
@@ -23,20 +23,20 @@
  * Custom select code for picking small regions (not efficient for large regions).
  * `gpu_select_pick_*` API.
  */
-#include <string.h>
-#include <stdlib.h>
 #include <float.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include "GPU_immediate.h"
 #include "GPU_draw.h"
+#include "GPU_glew.h"
+#include "GPU_immediate.h"
 #include "GPU_select.h"
 #include "GPU_state.h"
-#include "GPU_glew.h"
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_rect.h"
 #include "BLI_listbase.h"
+#include "BLI_rect.h"
 #include "BLI_utildefines.h"
 
 #include "gpu_select_private.h"
diff --git a/source/blender/gpu/intern/gpu_select_sample_query.c b/source/blender/gpu/intern/gpu_select_sample_query.c
index 578546f3af9..c82d1e17c66 100644
--- a/source/blender/gpu/intern/gpu_select_sample_query.c
+++ b/source/blender/gpu/intern/gpu_select_sample_query.c
@@ -26,9 +26,9 @@
 
 #include <stdlib.h>
 
+#include "GPU_glew.h"
 #include "GPU_select.h"
 #include "GPU_state.h"
-#include "GPU_glew.h"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 620f18629b5..21de07a62f1 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -23,12 +23,12 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_math_base.h"
 #include "BLI_math_vector.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_appdir.h"
 #include "BKE_global.h"
@@ -36,8 +36,8 @@
 #include "DNA_space_types.h"
 
 #include "GPU_extensions.h"
-#include "GPU_platform.h"
 #include "GPU_matrix.h"
+#include "GPU_platform.h"
 #include "GPU_shader.h"
 #include "GPU_texture.h"
 #include "GPU_uniformbuffer.h"
diff --git a/source/blender/gpu/intern/gpu_shader_interface.c b/source/blender/gpu/intern/gpu_shader_interface.c
index f895993a27d..f23a0a438d6 100644
--- a/source/blender/gpu/intern/gpu_shader_interface.c
+++ b/source/blender/gpu/intern/gpu_shader_interface.c
@@ -23,16 +23,16 @@
  * GPU shader interface (C --> GLSL)
  */
 
-#include "MEM_guardedalloc.h"
 #include "BKE_global.h"
+#include "MEM_guardedalloc.h"
 
 #include "GPU_shader_interface.h"
 
 #include "gpu_batch_private.h"
 #include "gpu_context_private.h"
 
-#include <stdlib.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <string.h>
 
 #define DEBUG_SHADER_INTERFACE 0
diff --git a/source/blender/gpu/intern/gpu_state.c b/source/blender/gpu/intern/gpu_state.c
index 6fd9b167599..d6f044a79e3 100644
--- a/source/blender/gpu/intern/gpu_state.c
+++ b/source/blender/gpu/intern/gpu_state.c
@@ -29,9 +29,9 @@
 
 #include "BKE_global.h"
 
+#include "GPU_extensions.h"
 #include "GPU_glew.h"
 #include "GPU_state.h"
-#include "GPU_extensions.h"
 
 static GLenum gpu_get_gl_blendfunction(eGPUBlendFunction blend)
 {
diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c
index 7b51b03096f..088cf912d6a 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -28,8 +28,8 @@
 #include "DNA_image_types.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
 #include "BLI_math_base.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_global.h"
 
@@ -38,8 +38,8 @@
 #include "GPU_debug.h"
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
-#include "GPU_glew.h"
 #include "GPU_framebuffer.h"
+#include "GPU_glew.h"
 #include "GPU_platform.h"
 #include "GPU_texture.h"
 
diff --git a/source/blender/gpu/intern/gpu_uniformbuffer.c b/source/blender/gpu/intern/gpu_uniformbuffer.c
index 734b4fa7b92..943793956d1 100644
--- a/source/blender/gpu/intern/gpu_uniformbuffer.c
+++ b/source/blender/gpu/intern/gpu_uniformbuffer.c
@@ -21,8 +21,8 @@
  * \ingroup gpu
  */
 
-#include <string.h>
 #include "MEM_guardedalloc.h"
+#include <string.h>
 
 #include "BLI_blenlib.h"
 
diff --git a/source/blender/gpu/intern/gpu_vertex_format.c b/source/blender/gpu/intern/gpu_vertex_format.c
index 16d8f8f875b..8370bcf4beb 100644
--- a/source/blender/gpu/intern/gpu_vertex_format.c
+++ b/source/blender/gpu/intern/gpu_vertex_format.c
@@ -30,9 +30,9 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "BLI_utildefines.h"
-#include "BLI_string.h"
 #include "BLI_ghash.h"
+#include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #define PACK_DEBUG 0
 
diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c
index 750db39d908..57efaf99b8b 100644
--- a/source/blender/gpu/intern/gpu_viewport.c
+++ b/source/blender/gpu/intern/gpu_viewport.c
@@ -26,24 +26,24 @@
 #include <string.h>
 
 #include "BLI_listbase.h"
-#include "BLI_rect.h"
 #include "BLI_math_vector.h"
 #include "BLI_memblock.h"
+#include "BLI_rect.h"
 
 #include "BKE_colortools.h"
 
 #include "IMB_colormanagement.h"
 
-#include "DNA_vec_types.h"
 #include "DNA_userdef_types.h"
+#include "DNA_vec_types.h"
 
 #include "GPU_framebuffer.h"
 #include "GPU_glew.h"
 #include "GPU_immediate.h"
 #include "GPU_matrix.h"
 #include "GPU_texture.h"
-#include "GPU_viewport.h"
 #include "GPU_uniformbuffer.h"
+#include "GPU_viewport.h"
 
 #include "DRW_engine.h"