diff --git a/source/blender/blenfont/intern/blf_font.cc b/source/blender/blenfont/intern/blf_font.cc
index dcd8b550df2..aa869573453 100644
--- a/source/blender/blenfont/intern/blf_font.cc
+++ b/source/blender/blenfont/intern/blf_font.cc
@@ -46,7 +46,7 @@
 #include "blf_internal.hh"
 #include "blf_internal_types.hh"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 #ifdef WIN32
 #  define FT_New_Face FT_New_Face__win32_compat
diff --git a/source/blender/blenfont/intern/blf_glyph.cc b/source/blender/blenfont/intern/blf_glyph.cc
index 3fdb2d99db3..1ade29430b3 100644
--- a/source/blender/blenfont/intern/blf_glyph.cc
+++ b/source/blender/blenfont/intern/blf_glyph.cc
@@ -38,9 +38,10 @@
 #include "blf_internal_types.hh"
 
 #include "BLI_math_vector.h"
-#include "BLI_strict_flags.h"
 #include "BLI_string_utf8.h"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 /**
  * Convert glyph coverage amounts to lightness values. Uses a LUT that perceptually improves
  * anti-aliasing and results in text that looks a bit fuller and slightly brighter. This should
diff --git a/source/blender/blenfont/intern/blf_thumbs.cc b/source/blender/blenfont/intern/blf_thumbs.cc
index 3733c0df12f..69662fdf11f 100644
--- a/source/blender/blenfont/intern/blf_thumbs.cc
+++ b/source/blender/blenfont/intern/blf_thumbs.cc
@@ -33,7 +33,7 @@
 
 #include "BLF_api.hh"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* Maximum length of text sample in char32_t, including nullptr terminator. */
 #define BLF_SAMPLE_LEN 5
diff --git a/source/blender/blenkernel/intern/bpath.cc b/source/blender/blenkernel/intern/bpath.cc
index 127fbb91099..ecbf163719a 100644
--- a/source/blender/blenkernel/intern/bpath.cc
+++ b/source/blender/blenkernel/intern/bpath.cc
@@ -72,7 +72,7 @@
 #include "SEQ_iterator.hh"
 
 #ifndef _MSC_VER
-#  include "BLI_strict_flags.h"
+#  include "BLI_strict_flags.h" /* Keep last. */
 #endif
 
 static CLG_LogRef LOG = {"bke.bpath"};
diff --git a/source/blender/blenkernel/intern/curve_bevel.cc b/source/blender/blenkernel/intern/curve_bevel.cc
index d379ff3483d..9240519c032 100644
--- a/source/blender/blenkernel/intern/curve_bevel.cc
+++ b/source/blender/blenkernel/intern/curve_bevel.cc
@@ -12,8 +12,7 @@
 #include <cstring>
 
 #include "BLI_listbase.h"
-/* Needed with MSVC for M_PI & M_PI_2 */
-#include "BLI_math_base.h"
+#include "BLI_math_base.h" /* Needed with MSVC for M_PI & M_PI_2. */
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/curve_decimate.cc b/source/blender/blenkernel/intern/curve_decimate.cc
index 579b01fa07b..7b776b3b027 100644
--- a/source/blender/blenkernel/intern/curve_decimate.cc
+++ b/source/blender/blenkernel/intern/curve_decimate.cc
@@ -18,10 +18,10 @@ extern "C" {
 #include "curve_fit_nd.h"
 }
 
-#include "BLI_strict_flags.h"
-
 #include <cstring>
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 struct Knot {
   Knot *next, *prev;
   uint point_index; /* Index in point array. */
diff --git a/source/blender/blenkernel/intern/icons_rasterize.cc b/source/blender/blenkernel/intern/icons_rasterize.cc
index bb76ceff95b..b7b9c79a704 100644
--- a/source/blender/blenkernel/intern/icons_rasterize.cc
+++ b/source/blender/blenkernel/intern/icons_rasterize.cc
@@ -16,7 +16,7 @@
 
 #include "BKE_icons.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 struct UserRasterInfo {
   int pt[3][2];
diff --git a/source/blender/blenkernel/intern/idprop.cc b/source/blender/blenkernel/intern/idprop.cc
index 8f7405fc8c7..c8479708d3e 100644
--- a/source/blender/blenkernel/intern/idprop.cc
+++ b/source/blender/blenkernel/intern/idprop.cc
@@ -32,7 +32,7 @@
 
 #include "BLO_read_write.hh"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* IDPropertyTemplate is a union in DNA_ID.h */
 
diff --git a/source/blender/blenkernel/intern/idprop_utils.cc b/source/blender/blenkernel/intern/idprop_utils.cc
index c25e253d123..80c6f6648cb 100644
--- a/source/blender/blenkernel/intern/idprop_utils.cc
+++ b/source/blender/blenkernel/intern/idprop_utils.cc
@@ -22,7 +22,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* -------------------------------------------------------------------- */
 /** \name IDProp Repr
diff --git a/source/blender/blenkernel/intern/mask_rasterize.cc b/source/blender/blenkernel/intern/mask_rasterize.cc
index 5a71d941d36..1c6c6554a6e 100644
--- a/source/blender/blenkernel/intern/mask_rasterize.cc
+++ b/source/blender/blenkernel/intern/mask_rasterize.cc
@@ -71,7 +71,7 @@
 
 #include "BKE_mask.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* this is rather and annoying hack, use define to isolate it.
  * problem is caused by scanfill removing edges on us. */
diff --git a/source/blender/blenkernel/intern/mball_tessellate.cc b/source/blender/blenkernel/intern/mball_tessellate.cc
index f4cd3af3903..2cf2366c4dc 100644
--- a/source/blender/blenkernel/intern/mball_tessellate.cc
+++ b/source/blender/blenkernel/intern/mball_tessellate.cc
@@ -37,7 +37,7 @@
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* experimental (faster) normal calculation (see #103021) */
 #define USE_ACCUM_NORMAL
diff --git a/source/blender/blenkernel/intern/mesh_mapping.cc b/source/blender/blenkernel/intern/mesh_mapping.cc
index daeb3ce7b24..2f9d500950c 100644
--- a/source/blender/blenkernel/intern/mesh_mapping.cc
+++ b/source/blender/blenkernel/intern/mesh_mapping.cc
@@ -27,7 +27,7 @@
 #include "BKE_mesh_mapping.hh"
 #include "BLI_memarena.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* -------------------------------------------------------------------- */
 /** \name Mesh Connectivity Mapping
diff --git a/source/blender/blenkernel/intern/mesh_merge_customdata.cc b/source/blender/blenkernel/intern/mesh_merge_customdata.cc
index 9a886e89f35..c76389578f3 100644
--- a/source/blender/blenkernel/intern/mesh_merge_customdata.cc
+++ b/source/blender/blenkernel/intern/mesh_merge_customdata.cc
@@ -15,7 +15,7 @@
 #include "BKE_customdata.hh"
 #include "BKE_mesh.hh"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 using namespace blender;
 
diff --git a/source/blender/blenkernel/intern/mesh_remap.cc b/source/blender/blenkernel/intern/mesh_remap.cc
index 8b5911338e7..57df2545736 100644
--- a/source/blender/blenkernel/intern/mesh_remap.cc
+++ b/source/blender/blenkernel/intern/mesh_remap.cc
@@ -34,7 +34,7 @@
 #include "BKE_mesh_remap.hh" /* own include */
 #include "BKE_mesh_runtime.hh"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 static CLG_LogRef LOG = {"bke.mesh"};
 
diff --git a/source/blender/blenkernel/intern/mesh_tangent.cc b/source/blender/blenkernel/intern/mesh_tangent.cc
index 52a0b7438b6..f0d8416d6f2 100644
--- a/source/blender/blenkernel/intern/mesh_tangent.cc
+++ b/source/blender/blenkernel/intern/mesh_tangent.cc
@@ -24,10 +24,10 @@
 #include "BKE_mesh_tangent.hh"
 #include "BKE_report.hh"
 
-#include "BLI_strict_flags.h"
-
 #include "mikktspace.hh"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 using blender::float2;
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/blenkernel/intern/mesh_tessellate.cc b/source/blender/blenkernel/intern/mesh_tessellate.cc
index 9c167f7e3e7..670e2fb92d7 100644
--- a/source/blender/blenkernel/intern/mesh_tessellate.cc
+++ b/source/blender/blenkernel/intern/mesh_tessellate.cc
@@ -22,7 +22,7 @@
 
 #include "BKE_mesh.hh"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 namespace blender::bke::mesh {
 
diff --git a/source/blender/blenkernel/intern/shrinkwrap.cc b/source/blender/blenkernel/intern/shrinkwrap.cc
index 222e090120f..1baec9458bf 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.cc
+++ b/source/blender/blenkernel/intern/shrinkwrap.cc
@@ -40,7 +40,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* for timing... */
 #if 0
diff --git a/source/blender/blenlib/BLI_strict_flags.h b/source/blender/blenlib/BLI_strict_flags.h
index e97bd5f0278..112156c2bc3 100644
--- a/source/blender/blenlib/BLI_strict_flags.h
+++ b/source/blender/blenlib/BLI_strict_flags.h
@@ -6,8 +6,12 @@
 
 /** \file
  * \ingroup bli
- * \brief Strict compiler flags for areas of code we want
+ * Strict compiler flags for areas of code we want
  * to ensure don't do conversions without us knowing about it.
+ *
+ * \note Typically this include should be ordered as the last include in a C/C++ file
+ * otherwise it can cause warnings in any includes after it which aren't expected
+ * to use strict warnings.
  */
 
 #ifdef __GNUC__
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c
index cda177beb35..809df575b45 100644
--- a/source/blender/blenlib/intern/BLI_ghash.c
+++ b/source/blender/blenlib/intern/BLI_ghash.c
@@ -24,8 +24,7 @@
 #define GHASH_INTERNAL_API
 #include "BLI_ghash.h" /* own include */
 
-/* keep last */
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* -------------------------------------------------------------------- */
 /** \name Structs & Constants
diff --git a/source/blender/blenlib/intern/BLI_ghash_utils.cc b/source/blender/blenlib/intern/BLI_ghash_utils.cc
index 3d4ce192b46..5bebf71e41f 100644
--- a/source/blender/blenlib/intern/BLI_ghash_utils.cc
+++ b/source/blender/blenlib/intern/BLI_ghash_utils.cc
@@ -17,8 +17,7 @@
 #include "BLI_hash_mm2a.hh"
 #include "BLI_utildefines.h"
 
-/* keep last */
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* -------------------------------------------------------------------- */
 /** \name Generic Key Hash & Comparison Functions
diff --git a/source/blender/blenlib/intern/BLI_heap.c b/source/blender/blenlib/intern/BLI_heap.c
index 032d439f7b7..8f596988482 100644
--- a/source/blender/blenlib/intern/BLI_heap.c
+++ b/source/blender/blenlib/intern/BLI_heap.c
@@ -14,9 +14,10 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_heap.h"
-#include "BLI_strict_flags.h"
 #include "BLI_utildefines.h"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 /***/
 
 struct HeapNode {
diff --git a/source/blender/blenlib/intern/BLI_heap_simple.c b/source/blender/blenlib/intern/BLI_heap_simple.c
index 9854ffd3ffa..470ec73af23 100644
--- a/source/blender/blenlib/intern/BLI_heap_simple.c
+++ b/source/blender/blenlib/intern/BLI_heap_simple.c
@@ -18,9 +18,10 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_heap_simple.h"
-#include "BLI_strict_flags.h"
 #include "BLI_utildefines.h"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 #define HEAP_PARENT(i) (((i)-1) >> 1)
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index b748ea3bfe7..be3a8aeee6a 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -33,7 +33,7 @@
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* used for iterative_raycast */
 // #define USE_SKIP_LINKS
diff --git a/source/blender/blenlib/intern/BLI_linklist.c b/source/blender/blenlib/intern/BLI_linklist.c
index db400d51234..bb57fc3299f 100644
--- a/source/blender/blenlib/intern/BLI_linklist.c
+++ b/source/blender/blenlib/intern/BLI_linklist.c
@@ -19,7 +19,7 @@
 #include "BLI_mempool.h"
 #include "BLI_utildefines.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 int BLI_linklist_count(const LinkNode *list)
 {
diff --git a/source/blender/blenlib/intern/BLI_linklist_lockfree.c b/source/blender/blenlib/intern/BLI_linklist_lockfree.c
index 992af907266..88fd1fe0878 100644
--- a/source/blender/blenlib/intern/BLI_linklist_lockfree.c
+++ b/source/blender/blenlib/intern/BLI_linklist_lockfree.c
@@ -9,10 +9,11 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_linklist_lockfree.h"
-#include "BLI_strict_flags.h"
 
 #include "atomic_ops.h"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 void BLI_linklist_lockfree_init(LockfreeLinkList *list)
 {
   list->dummy_node.next = NULL;
diff --git a/source/blender/blenlib/intern/BLI_memarena.c b/source/blender/blenlib/intern/BLI_memarena.c
index 5b0a8bd41fb..6f36db18095 100644
--- a/source/blender/blenlib/intern/BLI_memarena.c
+++ b/source/blender/blenlib/intern/BLI_memarena.c
@@ -21,7 +21,6 @@
 
 #include "BLI_asan.h"
 #include "BLI_memarena.h"
-#include "BLI_strict_flags.h"
 #include "BLI_utildefines.h"
 
 #ifdef WITH_MEM_VALGRIND
@@ -33,6 +32,8 @@
 #  define VALGRIND_MOVE_MEMPOOL(pool_a, pool_b) UNUSED_VARS(pool_a, pool_b)
 #endif
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 struct MemBuf {
   struct MemBuf *next;
   uchar data[0];
diff --git a/source/blender/blenlib/intern/BLI_memblock.c b/source/blender/blenlib/intern/BLI_memblock.c
index f2855137426..95b375b8be4 100644
--- a/source/blender/blenlib/intern/BLI_memblock.c
+++ b/source/blender/blenlib/intern/BLI_memblock.c
@@ -17,7 +17,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_strict_flags.h" /* keep last */
+#include "BLI_strict_flags.h" /* Keep last. */
 
 #define CHUNK_LIST_SIZE 16
 
diff --git a/source/blender/blenlib/intern/BLI_memiter.c b/source/blender/blenlib/intern/BLI_memiter.c
index a2278176b4c..11d81373154 100644
--- a/source/blender/blenlib/intern/BLI_memiter.c
+++ b/source/blender/blenlib/intern/BLI_memiter.c
@@ -35,7 +35,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_strict_flags.h" /* keep last */
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* TODO: Valgrind. */
 
diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c
index 12569172e97..610c39176ed 100644
--- a/source/blender/blenlib/intern/BLI_mempool.c
+++ b/source/blender/blenlib/intern/BLI_mempool.c
@@ -31,12 +31,12 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_strict_flags.h" /* keep last */
-
 #ifdef WITH_MEM_VALGRIND
 #  include "valgrind/memcheck.h"
 #endif
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 #ifdef WITH_ASAN
 #  define POISON_REDZONE_SIZE 32
 #else
diff --git a/source/blender/blenlib/intern/array_store.cc b/source/blender/blenlib/intern/array_store.cc
index b1932ff5fa0..3cb91941714 100644
--- a/source/blender/blenlib/intern/array_store.cc
+++ b/source/blender/blenlib/intern/array_store.cc
@@ -96,12 +96,10 @@
 #include "BLI_listbase.h"
 #include "BLI_mempool.h"
 
-#include "BLI_strict_flags.h"
-
 #include "BLI_array_store.h" /* Own include. */
+#include "BLI_ghash.h"       /* Only for #BLI_array_store_is_valid. */
 
-/* Only for #BLI_array_store_is_valid. */
-#include "BLI_ghash.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 struct BChunkList;
 
diff --git a/source/blender/blenlib/intern/array_utils.c b/source/blender/blenlib/intern/array_utils.c
index 9b7544ab94e..cb1ffd47903 100644
--- a/source/blender/blenlib/intern/array_utils.c
+++ b/source/blender/blenlib/intern/array_utils.c
@@ -17,12 +17,13 @@
 
 #include "BLI_alloca.h"
 #include "BLI_math_base.h"
-#include "BLI_strict_flags.h"
 #include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
 
 #include "BLI_array_utils.h"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 void _bli_array_reverse(void *arr_v, uint arr_len, size_t arr_stride)
 {
   const uint arr_stride_uint = (uint)arr_stride;
diff --git a/source/blender/blenlib/intern/bitmap_draw_2d.c b/source/blender/blenlib/intern/bitmap_draw_2d.c
index 372bd58a113..2a1b58ef742 100644
--- a/source/blender/blenlib/intern/bitmap_draw_2d.c
+++ b/source/blender/blenlib/intern/bitmap_draw_2d.c
@@ -18,7 +18,7 @@
 #include "BLI_sort.h"
 #include "BLI_utildefines.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* -------------------------------------------------------------------- */
 /** \name Draw Line
diff --git a/source/blender/blenlib/intern/boxpack_2d.c b/source/blender/blenlib/intern/boxpack_2d.c
index cb65e218039..ee67e5ca8e5 100644
--- a/source/blender/blenlib/intern/boxpack_2d.c
+++ b/source/blender/blenlib/intern/boxpack_2d.c
@@ -18,7 +18,7 @@
 #include "BLI_sort.h" /* qsort_r */
 #define qsort_r BLI_qsort_r
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 #ifdef __GNUC__
 #  pragma GCC diagnostic error "-Wpadded"
diff --git a/source/blender/blenlib/intern/buffer.c b/source/blender/blenlib/intern/buffer.c
index 63492879808..61a4c71637d 100644
--- a/source/blender/blenlib/intern/buffer.c
+++ b/source/blender/blenlib/intern/buffer.c
@@ -36,7 +36,7 @@
 #include "BLI_buffer.h"
 #include "BLI_utildefines.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 static void *buffer_alloc(BLI_Buffer *buffer, const size_t len)
 {
diff --git a/source/blender/blenlib/intern/convexhull_2d.cc b/source/blender/blenlib/intern/convexhull_2d.cc
index 07bf418fc82..ee81229cd1c 100644
--- a/source/blender/blenlib/intern/convexhull_2d.cc
+++ b/source/blender/blenlib/intern/convexhull_2d.cc
@@ -16,9 +16,10 @@
 #include "BLI_bounds.hh"
 #include "BLI_convexhull_2d.h"
 #include "BLI_math_vector.h"
-#include "BLI_strict_flags.h"
 #include "BLI_utildefines.h"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 using namespace blender;
 
 /* Copyright 2001, softSurfer (http://www.softsurfer.com)
diff --git a/source/blender/blenlib/intern/easing.c b/source/blender/blenlib/intern/easing.c
index 6824da2cf8c..aa4c0f8a501 100644
--- a/source/blender/blenlib/intern/easing.c
+++ b/source/blender/blenlib/intern/easing.c
@@ -10,7 +10,7 @@
 
 #include "BLI_easing.h" /* own include */
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* blend if (amplitude < fabsf(change) */
 #define USE_ELASTIC_BLEND
diff --git a/source/blender/blenlib/intern/gsqueue.c b/source/blender/blenlib/intern/gsqueue.c
index 55cfbd65655..c53a07d60e2 100644
--- a/source/blender/blenlib/intern/gsqueue.c
+++ b/source/blender/blenlib/intern/gsqueue.c
@@ -14,9 +14,10 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_gsqueue.h"
-#include "BLI_strict_flags.h"
 #include "BLI_utildefines.h"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 /* target chunk size: 64kb */
 #define CHUNK_SIZE_DEFAULT (1 << 16)
 /* ensure we get at least this many elems per chunk */
diff --git a/source/blender/blenlib/intern/index_mask.cc b/source/blender/blenlib/intern/index_mask.cc
index f47332fa91d..2f7ce7a6671 100644
--- a/source/blender/blenlib/intern/index_mask.cc
+++ b/source/blender/blenlib/intern/index_mask.cc
@@ -13,11 +13,12 @@
 #include "BLI_math_base.hh"
 #include "BLI_set.hh"
 #include "BLI_sort.hh"
-#include "BLI_strict_flags.h"
 #include "BLI_task.hh"
 #include "BLI_threads.h"
 #include "BLI_virtual_array.hh"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 namespace blender::index_mask {
 
 template<typename T> void build_reverse_map(const IndexMask &mask, MutableSpan<T> r_map)
diff --git a/source/blender/blenlib/intern/jitter_2d.c b/source/blender/blenlib/intern/jitter_2d.c
index afd1caa7352..39007c57874 100644
--- a/source/blender/blenlib/intern/jitter_2d.c
+++ b/source/blender/blenlib/intern/jitter_2d.c
@@ -14,7 +14,7 @@
 #include "BLI_jitter_2d.h"
 #include "BLI_rand.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 void BLI_jitterate1(float (*jit1)[2], float (*jit2)[2], int num, float radius1)
 {
diff --git a/source/blender/blenlib/intern/kdtree_impl.h b/source/blender/blenlib/intern/kdtree_impl.h
index 6e24ce0be7f..4324f4009b1 100644
--- a/source/blender/blenlib/intern/kdtree_impl.h
+++ b/source/blender/blenlib/intern/kdtree_impl.h
@@ -10,11 +10,12 @@
 
 #include "BLI_kdtree_impl.h"
 #include "BLI_math_base.h"
-#include "BLI_strict_flags.h"
 #include "BLI_utildefines.h"
 
 #include <string.h>
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 #define _BLI_KDTREE_CONCAT_AUX(MACRO_ARG1, MACRO_ARG2) MACRO_ARG1##MACRO_ARG2
 #define _BLI_KDTREE_CONCAT(MACRO_ARG1, MACRO_ARG2) _BLI_KDTREE_CONCAT_AUX(MACRO_ARG1, MACRO_ARG2)
 #define BLI_kdtree_nd_(id) _BLI_KDTREE_CONCAT(KDTREE_PREFIX_ID, _##id)
diff --git a/source/blender/blenlib/intern/lasso_2d.c b/source/blender/blenlib/intern/lasso_2d.c
index 8a20dbe2c25..a11008f9b96 100644
--- a/source/blender/blenlib/intern/lasso_2d.c
+++ b/source/blender/blenlib/intern/lasso_2d.c
@@ -10,10 +10,11 @@
 
 #include "BLI_math_base.h"
 #include "BLI_math_geom.h"
-#include "BLI_strict_flags.h"
 
 #include "BLI_lasso_2d.h" /* own include */
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 void BLI_lasso_boundbox(rcti *rect, const int mcoords[][2], const uint mcoords_len)
 {
   uint a;
diff --git a/source/blender/blenlib/intern/listbase.cc b/source/blender/blenlib/intern/listbase.cc
index 2919785db6c..dac2206ea7f 100644
--- a/source/blender/blenlib/intern/listbase.cc
+++ b/source/blender/blenlib/intern/listbase.cc
@@ -19,7 +19,7 @@
 
 #include "BLI_listbase.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 void BLI_movelisttolist(ListBase *dst, ListBase *src)
 {
diff --git a/source/blender/blenlib/intern/math_base.c b/source/blender/blenlib/intern/math_base.c
index f9a54c2cb80..73a609d1311 100644
--- a/source/blender/blenlib/intern/math_base.c
+++ b/source/blender/blenlib/intern/math_base.c
@@ -7,7 +7,8 @@
  */
 
 #include "BLI_math_base.h"
-#include "BLI_strict_flags.h"
+
+#include "BLI_strict_flags.h" /* Keep last. */
 
 int pow_i(int base, int exp)
 {
diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c
index 2a1660a9366..9298561ec74 100644
--- a/source/blender/blenlib/intern/math_color.c
+++ b/source/blender/blenlib/intern/math_color.c
@@ -9,7 +9,7 @@
 #include "BLI_math_color.h"
 #include "BLI_utildefines.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 void hsv_to_rgb(float h, float s, float v, float *r_r, float *r_g, float *r_b)
 {
diff --git a/source/blender/blenlib/intern/math_geom.cc b/source/blender/blenlib/intern/math_geom.cc
index 349e300d263..5cc13a0589d 100644
--- a/source/blender/blenlib/intern/math_geom.cc
+++ b/source/blender/blenlib/intern/math_geom.cc
@@ -17,7 +17,7 @@
 #include "BLI_math_vector.h"
 #include "BLI_utildefines.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /********************************** Polygons *********************************/
 
diff --git a/source/blender/blenlib/intern/math_interp.cc b/source/blender/blenlib/intern/math_interp.cc
index f31b78faa04..90f7347551e 100644
--- a/source/blender/blenlib/intern/math_interp.cc
+++ b/source/blender/blenlib/intern/math_interp.cc
@@ -15,7 +15,8 @@
 #include "BLI_math_vector.h"
 #include "BLI_math_vector_types.hh"
 #include "BLI_simd.h"
-#include "BLI_strict_flags.h"
+
+#include "BLI_strict_flags.h" /* Keep last. */
 
 namespace blender::math {
 
diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c
index 6ccecfa52a1..53ec86dff97 100644
--- a/source/blender/blenlib/intern/math_matrix.c
+++ b/source/blender/blenlib/intern/math_matrix.c
@@ -11,7 +11,6 @@
 #include "BLI_math_solvers.h"
 #include "BLI_math_vector.h"
 #include "BLI_simd.h"
-#include "BLI_strict_flags.h"
 
 #ifndef MATH_STANDALONE
 #  include "eigen_capi.h"
@@ -19,6 +18,8 @@
 
 #include <string.h>
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 /********************************* Init **************************************/
 
 void zero_m2(float m[2][2])
diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c
index 796554506cd..04fc61f2dd6 100644
--- a/source/blender/blenlib/intern/math_rotation.c
+++ b/source/blender/blenlib/intern/math_rotation.c
@@ -12,7 +12,8 @@
 #include "BLI_math_geom.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
-#include "BLI_strict_flags.h"
+
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /******************************** Quaternions ********************************/
 
diff --git a/source/blender/blenlib/intern/math_solvers.c b/source/blender/blenlib/intern/math_solvers.c
index 93801d1684e..fbae5f6d980 100644
--- a/source/blender/blenlib/intern/math_solvers.c
+++ b/source/blender/blenlib/intern/math_solvers.c
@@ -14,12 +14,12 @@
 
 #include "BLI_utildefines.h"
 
-#include "BLI_strict_flags.h"
-
 #include "eigen_capi.h"
 
 #include <string.h>
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 /********************************** Eigen Solvers *********************************/
 
 bool BLI_eigen_solve_selfadjoint_m3(const float m3[3][3],
diff --git a/source/blender/blenlib/intern/math_statistics.c b/source/blender/blenlib/intern/math_statistics.c
index e8608617fbf..c121c0d9c8b 100644
--- a/source/blender/blenlib/intern/math_statistics.c
+++ b/source/blender/blenlib/intern/math_statistics.c
@@ -13,7 +13,7 @@
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /********************************** Covariance Matrices *********************************/
 
diff --git a/source/blender/blenlib/intern/math_vector.c b/source/blender/blenlib/intern/math_vector.c
index 6fddd30d813..6a9ce1f172d 100644
--- a/source/blender/blenlib/intern/math_vector.c
+++ b/source/blender/blenlib/intern/math_vector.c
@@ -11,7 +11,8 @@
 #include "BLI_math_base_safe.h"
 #include "BLI_math_geom.h"
 #include "BLI_math_rotation.h"
-#include "BLI_strict_flags.h"
+
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* -------------------------------------------------------------------- */
 /** \name Interpolation
diff --git a/source/blender/blenlib/intern/memory_utils.c b/source/blender/blenlib/intern/memory_utils.c
index e898865ef38..6e7d6b95737 100644
--- a/source/blender/blenlib/intern/memory_utils.c
+++ b/source/blender/blenlib/intern/memory_utils.c
@@ -16,7 +16,7 @@
 
 #include "BLI_memory_utils.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 bool BLI_memory_is_zero(const void *arr, const size_t arr_size)
 {
diff --git a/source/blender/blenlib/intern/polyfill_2d.c b/source/blender/blenlib/intern/polyfill_2d.c
index 7e96defb5e8..5b81a947659 100644
--- a/source/blender/blenlib/intern/polyfill_2d.c
+++ b/source/blender/blenlib/intern/polyfill_2d.c
@@ -40,7 +40,7 @@
 
 #include "BLI_polyfill_2d.h" /* own include */
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* avoid fan-fill topology */
 #define USE_CLIP_EVEN
diff --git a/source/blender/blenlib/intern/polyfill_2d_beautify.c b/source/blender/blenlib/intern/polyfill_2d_beautify.c
index d9d786ae7eb..ae83a487f4c 100644
--- a/source/blender/blenlib/intern/polyfill_2d_beautify.c
+++ b/source/blender/blenlib/intern/polyfill_2d_beautify.c
@@ -31,7 +31,7 @@
 
 #include "BLI_polyfill_2d_beautify.h" /* own include */
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* Used to find matching edges. */
 struct OrderEdge {
diff --git a/source/blender/blenlib/intern/quadric.c b/source/blender/blenlib/intern/quadric.c
index 8a999d2c386..d70e8806ed0 100644
--- a/source/blender/blenlib/intern/quadric.c
+++ b/source/blender/blenlib/intern/quadric.c
@@ -17,14 +17,14 @@
  * often need high precision, see #44780.
  */
 
-#include "BLI_strict_flags.h"
+#include <string.h>
 
 #include "BLI_math_base.h"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 #include "BLI_quadric.h" /* own include */
 
-#include <string.h>
+#include "BLI_strict_flags.h" /* Keep last. */
 
 #define QUADRIC_FLT_TOT (sizeof(Quadric) / sizeof(double))
 
diff --git a/source/blender/blenlib/intern/rand.cc b/source/blender/blenlib/intern/rand.cc
index 29cc51d55cd..a1ec6550c9b 100644
--- a/source/blender/blenlib/intern/rand.cc
+++ b/source/blender/blenlib/intern/rand.cc
@@ -19,10 +19,10 @@
 #include "BLI_math_vector.h"
 #include "BLI_rand.h"
 #include "BLI_rand.hh"
+#include "BLI_sys_types.h"
 #include "BLI_threads.h"
 
-#include "BLI_strict_flags.h"
-#include "BLI_sys_types.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 extern "C" uchar BLI_noise_hash_uchar_512[512]; /* `noise.cc` */
 #define hash BLI_noise_hash_uchar_512
diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c
index af93fb82205..fe6529426ed 100644
--- a/source/blender/blenlib/intern/scanfill.c
+++ b/source/blender/blenlib/intern/scanfill.c
@@ -32,7 +32,7 @@
 
 #include "BLI_scanfill.h" /* own include */
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* local types */
 typedef struct PolyFill {
diff --git a/source/blender/blenlib/intern/scanfill_utils.c b/source/blender/blenlib/intern/scanfill_utils.c
index 279e8856c34..91859bf259b 100644
--- a/source/blender/blenlib/intern/scanfill_utils.c
+++ b/source/blender/blenlib/intern/scanfill_utils.c
@@ -22,7 +22,7 @@
 
 #include "BLI_scanfill.h" /* own include */
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 typedef struct PolyInfo {
   ScanFillEdge *edge_first, *edge_last;
diff --git a/source/blender/blenlib/intern/stack.c b/source/blender/blenlib/intern/stack.c
index addb478d4f9..b771265932a 100644
--- a/source/blender/blenlib/intern/stack.c
+++ b/source/blender/blenlib/intern/stack.c
@@ -14,7 +14,7 @@
 
 #include "BLI_stack.h" /* own include */
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 #define USE_TOTELEM
 
diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index 1a957fb89fe..ea513f63250 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -20,7 +20,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* -------------------------------------------------------------------- */
 /** \name String Duplicate/Copy
diff --git a/source/blender/blenlib/intern/string_cursor_utf8.c b/source/blender/blenlib/intern/string_cursor_utf8.c
index d8c2f40f633..be1977d2a0d 100644
--- a/source/blender/blenlib/intern/string_cursor_utf8.c
+++ b/source/blender/blenlib/intern/string_cursor_utf8.c
@@ -14,7 +14,7 @@
 
 #include "BLI_string_cursor_utf8.h" /* own include */
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /**
  * The category of character as returned by #cursor_delim_type_unicode.
diff --git a/source/blender/blenlib/intern/string_utf8.cc b/source/blender/blenlib/intern/string_utf8.cc
index 07d889272cb..6402376e103 100644
--- a/source/blender/blenlib/intern/string_utf8.cc
+++ b/source/blender/blenlib/intern/string_utf8.cc
@@ -29,7 +29,7 @@
 #  pragma GCC diagnostic error "-Wsign-conversion"
 #endif
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* -------------------------------------------------------------------- */
 /** \name UTF8 Character Decoding (Skip & Mask Lookup)
diff --git a/source/blender/blenlib/intern/string_utils.cc b/source/blender/blenlib/intern/string_utils.cc
index c53a1e62327..92222b5e0e3 100644
--- a/source/blender/blenlib/intern/string_utils.cc
+++ b/source/blender/blenlib/intern/string_utils.cc
@@ -24,7 +24,7 @@
 
 #include "DNA_listBase.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* -------------------------------------------------------------------- */
 /** \name String Replace
diff --git a/source/blender/blenlib/intern/timecode.c b/source/blender/blenlib/intern/timecode.c
index 8b4546d82fa..5989ae47417 100644
--- a/source/blender/blenlib/intern/timecode.c
+++ b/source/blender/blenlib/intern/timecode.c
@@ -18,7 +18,7 @@
 
 #include "DNA_userdef_types.h" /* for eTimecodeStyles only */
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 size_t BLI_timecode_string_from_time(char *str,
                                      const size_t maxncpy,
diff --git a/source/blender/blenlib/intern/voxel.c b/source/blender/blenlib/intern/voxel.c
index 85e8c9e46f2..0ea2b1de57a 100644
--- a/source/blender/blenlib/intern/voxel.c
+++ b/source/blender/blenlib/intern/voxel.c
@@ -9,7 +9,7 @@
 #include "BLI_utildefines.h"
 #include "BLI_voxel.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 BLI_INLINE float D(const float *data, const int res[3], int x, int y, int z)
 {
diff --git a/source/blender/blenlib/tests/BLI_array_test.cc b/source/blender/blenlib/tests/BLI_array_test.cc
index d4eafdc02a6..44e6c9a2ce8 100644
--- a/source/blender/blenlib/tests/BLI_array_test.cc
+++ b/source/blender/blenlib/tests/BLI_array_test.cc
@@ -2,11 +2,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0 */
 
+#include "testing/testing.h"
+
 #include "BLI_array.hh"
 #include "BLI_exception_safety_test_utils.hh"
-#include "BLI_strict_flags.h"
 #include "BLI_vector.hh"
-#include "testing/testing.h"
+
+#include "BLI_strict_flags.h" /* Keep last. */
 
 namespace blender::tests {
 
diff --git a/source/blender/blenlib/tests/BLI_bit_group_vector_test.cc b/source/blender/blenlib/tests/BLI_bit_group_vector_test.cc
index 8885f3d5c00..974a6fd92bd 100644
--- a/source/blender/blenlib/tests/BLI_bit_group_vector_test.cc
+++ b/source/blender/blenlib/tests/BLI_bit_group_vector_test.cc
@@ -2,11 +2,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0 */
 
-#include "BLI_bit_group_vector.hh"
-#include "BLI_strict_flags.h"
-
 #include "testing/testing.h"
 
+#include "BLI_bit_group_vector.hh"
+
+#include "BLI_strict_flags.h" /* Keep last. */
+
 namespace blender::bits::tests {
 
 TEST(bit_group_vector, DefaultConstruct)
diff --git a/source/blender/blenlib/tests/BLI_bit_vector_test.cc b/source/blender/blenlib/tests/BLI_bit_vector_test.cc
index 803ff0f021f..7efeb6bc832 100644
--- a/source/blender/blenlib/tests/BLI_bit_vector_test.cc
+++ b/source/blender/blenlib/tests/BLI_bit_vector_test.cc
@@ -2,11 +2,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0 */
 
+#include "testing/testing.h"
+
 #include "BLI_bit_vector.hh"
 #include "BLI_exception_safety_test_utils.hh"
-#include "BLI_strict_flags.h"
 
-#include "testing/testing.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 namespace blender::bits::tests {
 
diff --git a/source/blender/blenlib/tests/BLI_disjoint_set_test.cc b/source/blender/blenlib/tests/BLI_disjoint_set_test.cc
index 2de71465530..93e0b2e907d 100644
--- a/source/blender/blenlib/tests/BLI_disjoint_set_test.cc
+++ b/source/blender/blenlib/tests/BLI_disjoint_set_test.cc
@@ -2,11 +2,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0 */
 
-#include "BLI_disjoint_set.hh"
-#include "BLI_strict_flags.h"
-
 #include "testing/testing.h"
 
+#include "BLI_disjoint_set.hh"
+
+#include "BLI_strict_flags.h" /* Keep last. */
+
 namespace blender::tests {
 
 TEST(disjoint_set, Test)
diff --git a/source/blender/blenlib/tests/BLI_index_mask_test.cc b/source/blender/blenlib/tests/BLI_index_mask_test.cc
index 9499a24563e..b09e83e18e0 100644
--- a/source/blender/blenlib/tests/BLI_index_mask_test.cc
+++ b/source/blender/blenlib/tests/BLI_index_mask_test.cc
@@ -2,14 +2,15 @@
  *
  * SPDX-License-Identifier: Apache-2.0 */
 
+#include "testing/testing.h"
+
 #include "BLI_array.hh"
 #include "BLI_index_mask.hh"
 #include "BLI_rand.hh"
 #include "BLI_set.hh"
-#include "BLI_strict_flags.h"
 #include "BLI_timeit.hh"
 
-#include "testing/testing.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 namespace blender::index_mask::tests {
 
diff --git a/source/blender/blenlib/tests/BLI_index_range_test.cc b/source/blender/blenlib/tests/BLI_index_range_test.cc
index 57dc9f7bb02..4241b1fe4b7 100644
--- a/source/blender/blenlib/tests/BLI_index_range_test.cc
+++ b/source/blender/blenlib/tests/BLI_index_range_test.cc
@@ -2,11 +2,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0 */
 
-#include "BLI_index_range.hh"
-#include "BLI_strict_flags.h"
-#include "BLI_vector.hh"
 #include "testing/testing.h"
 
+#include "BLI_index_range.hh"
+#include "BLI_vector.hh"
+
+#include "BLI_strict_flags.h" /* Keep last. */
+
 namespace blender::tests {
 
 TEST(index_range, DefaultConstructor)
diff --git a/source/blender/blenlib/tests/BLI_linear_allocator_test.cc b/source/blender/blenlib/tests/BLI_linear_allocator_test.cc
index 8701fb301d5..92292901a41 100644
--- a/source/blender/blenlib/tests/BLI_linear_allocator_test.cc
+++ b/source/blender/blenlib/tests/BLI_linear_allocator_test.cc
@@ -2,10 +2,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0 */
 
+#include "testing/testing.h"
+
 #include "BLI_linear_allocator.hh"
 #include "BLI_rand.hh"
-#include "BLI_strict_flags.h"
-#include "testing/testing.h"
+
+#include "BLI_strict_flags.h" /* Keep last. */
 
 namespace blender::tests {
 
diff --git a/source/blender/blenlib/tests/BLI_map_test.cc b/source/blender/blenlib/tests/BLI_map_test.cc
index d9b31ea7d16..43a2ce1b04b 100644
--- a/source/blender/blenlib/tests/BLI_map_test.cc
+++ b/source/blender/blenlib/tests/BLI_map_test.cc
@@ -5,15 +5,16 @@
 #include <memory>
 #include <unordered_map>
 
+#include "testing/testing.h"
+
 #include "BLI_exception_safety_test_utils.hh"
 #include "BLI_map.hh"
 #include "BLI_rand.h"
 #include "BLI_set.hh"
-#include "BLI_strict_flags.h"
 #include "BLI_timeit.hh"
 #include "BLI_vector.hh"
 
-#include "testing/testing.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 namespace blender::tests {
 
diff --git a/source/blender/blenlib/tests/BLI_memory_utils_test.cc b/source/blender/blenlib/tests/BLI_memory_utils_test.cc
index c6fa3bbd000..b4716b55fcb 100644
--- a/source/blender/blenlib/tests/BLI_memory_utils_test.cc
+++ b/source/blender/blenlib/tests/BLI_memory_utils_test.cc
@@ -2,10 +2,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0 */
 
+#include "testing/testing.h"
+
 #include "BLI_math_vector_types.hh"
 #include "BLI_memory_utils.hh"
-#include "BLI_strict_flags.h"
-#include "testing/testing.h"
+
+#include "BLI_strict_flags.h" /* Keep last. */
 
 namespace blender::tests {
 
diff --git a/source/blender/blenlib/tests/BLI_pool_test.cc b/source/blender/blenlib/tests/BLI_pool_test.cc
index f00a56be569..5ed775d300a 100644
--- a/source/blender/blenlib/tests/BLI_pool_test.cc
+++ b/source/blender/blenlib/tests/BLI_pool_test.cc
@@ -2,10 +2,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0 */
 
+#include "testing/testing.h"
+
 #include "BLI_exception_safety_test_utils.hh"
 #include "BLI_pool.hh"
-#include "BLI_strict_flags.h"
-#include "testing/testing.h"
+
+#include "BLI_strict_flags.h" /* Keep last. */
 
 namespace blender::tests {
 
diff --git a/source/blender/blenlib/tests/BLI_set_test.cc b/source/blender/blenlib/tests/BLI_set_test.cc
index 082c83f7d4f..ee4b9a73ded 100644
--- a/source/blender/blenlib/tests/BLI_set_test.cc
+++ b/source/blender/blenlib/tests/BLI_set_test.cc
@@ -5,14 +5,16 @@
 #include <set>
 #include <unordered_set>
 
+#include "testing/testing.h"
+
 #include "BLI_exception_safety_test_utils.hh"
 #include "BLI_ghash.h"
 #include "BLI_rand.h"
 #include "BLI_set.hh"
-#include "BLI_strict_flags.h"
 #include "BLI_timeit.hh"
 #include "BLI_vector.hh"
-#include "testing/testing.h"
+
+#include "BLI_strict_flags.h" /* Keep last. */
 
 namespace blender {
 namespace tests {
diff --git a/source/blender/blenlib/tests/BLI_span_test.cc b/source/blender/blenlib/tests/BLI_span_test.cc
index 1b98842b819..fbb964af730 100644
--- a/source/blender/blenlib/tests/BLI_span_test.cc
+++ b/source/blender/blenlib/tests/BLI_span_test.cc
@@ -2,11 +2,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0 */
 
-#include "BLI_span.hh"
-#include "BLI_strict_flags.h"
-#include "BLI_vector.hh"
 #include "testing/testing.h"
 
+#include "BLI_span.hh"
+#include "BLI_vector.hh"
+
+#include "BLI_strict_flags.h" /* Keep last. */
+
 namespace blender::tests {
 
 TEST(span, FromSmallVector)
diff --git a/source/blender/blenlib/tests/BLI_stack_cxx_test.cc b/source/blender/blenlib/tests/BLI_stack_cxx_test.cc
index cb8e17ca52f..4461b8bed54 100644
--- a/source/blender/blenlib/tests/BLI_stack_cxx_test.cc
+++ b/source/blender/blenlib/tests/BLI_stack_cxx_test.cc
@@ -2,11 +2,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0 */
 
+#include "testing/testing.h"
+
 #include "BLI_exception_safety_test_utils.hh"
 #include "BLI_stack.hh"
-#include "BLI_strict_flags.h"
 #include "BLI_vector.hh"
-#include "testing/testing.h"
+
+#include "BLI_strict_flags.h" /* Keep last. */
 
 namespace blender::tests {
 
diff --git a/source/blender/blenlib/tests/BLI_string_ref_test.cc b/source/blender/blenlib/tests/BLI_string_ref_test.cc
index 2f89c9e37e6..a59714de08c 100644
--- a/source/blender/blenlib/tests/BLI_string_ref_test.cc
+++ b/source/blender/blenlib/tests/BLI_string_ref_test.cc
@@ -2,11 +2,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0 */
 
-#include "BLI_strict_flags.h"
 #include "BLI_string_ref.hh"
 #include "BLI_vector.hh"
+
 #include "testing/testing.h"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 namespace blender::tests {
 
 TEST(string_ref_null, DefaultConstructor)
diff --git a/source/blender/blenlib/tests/BLI_vector_set_test.cc b/source/blender/blenlib/tests/BLI_vector_set_test.cc
index 7c434830a27..f171ea8d388 100644
--- a/source/blender/blenlib/tests/BLI_vector_set_test.cc
+++ b/source/blender/blenlib/tests/BLI_vector_set_test.cc
@@ -3,10 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0 */
 
 #include "BLI_exception_safety_test_utils.hh"
-#include "BLI_strict_flags.h"
 #include "BLI_vector_set.hh"
+
 #include "testing/testing.h"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 namespace blender::tests {
 
 TEST(vector_set, DefaultConstructor)
diff --git a/source/blender/blenlib/tests/BLI_vector_test.cc b/source/blender/blenlib/tests/BLI_vector_test.cc
index 18eccce0c1a..ab30ebb5b38 100644
--- a/source/blender/blenlib/tests/BLI_vector_test.cc
+++ b/source/blender/blenlib/tests/BLI_vector_test.cc
@@ -3,11 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0 */
 
 #include "BLI_exception_safety_test_utils.hh"
-#include "BLI_strict_flags.h"
 #include "BLI_vector.hh"
 #include "testing/testing.h"
 #include <forward_list>
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 namespace blender::tests {
 
 TEST(vector, DefaultConstructor)
diff --git a/source/blender/blenlib/tests/BLI_virtual_array_test.cc b/source/blender/blenlib/tests/BLI_virtual_array_test.cc
index 2f4f5093584..397037822f3 100644
--- a/source/blender/blenlib/tests/BLI_virtual_array_test.cc
+++ b/source/blender/blenlib/tests/BLI_virtual_array_test.cc
@@ -4,12 +4,13 @@
 
 #include "BLI_array.hh"
 #include "BLI_generic_virtual_array.hh"
-#include "BLI_strict_flags.h"
 #include "BLI_vector.hh"
 #include "BLI_vector_set.hh"
 #include "BLI_virtual_array.hh"
 #include "testing/testing.h"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 namespace blender::tests {
 
 TEST(virtual_array, Span)
diff --git a/source/blender/blenloader/intern/undofile.cc b/source/blender/blenloader/intern/undofile.cc
index e0ddaab78c2..0bf3e884ce9 100644
--- a/source/blender/blenloader/intern/undofile.cc
+++ b/source/blender/blenloader/intern/undofile.cc
@@ -33,8 +33,7 @@
 #include "BKE_main.hh"
 #include "BKE_undo_system.hh"
 
-/* keep last */
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* **************** support for memory-write, for undo buffers *************** */
 
diff --git a/source/blender/bmesh/intern/bmesh_log.cc b/source/blender/bmesh/intern/bmesh_log.cc
index c4f95e7f6a9..1c3bef8a079 100644
--- a/source/blender/bmesh/intern/bmesh_log.cc
+++ b/source/blender/bmesh/intern/bmesh_log.cc
@@ -31,7 +31,7 @@
 #include "bmesh_log.hh"
 #include "range_tree.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 struct BMLogEntry {
   BMLogEntry *next, *prev;
diff --git a/source/blender/bmesh/operators/bmo_fill_grid.cc b/source/blender/bmesh/operators/bmo_fill_grid.cc
index 864df11a05a..d1a6c9d1351 100644
--- a/source/blender/bmesh/operators/bmo_fill_grid.cc
+++ b/source/blender/bmesh/operators/bmo_fill_grid.cc
@@ -20,7 +20,7 @@
 
 #include "intern/bmesh_operators_private.hh" /* own include */
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 #define EDGE_MARK 4
 #define FACE_OUT 16
diff --git a/source/blender/bmesh/tools/bmesh_edgenet.cc b/source/blender/bmesh/tools/bmesh_edgenet.cc
index 4136dadff3f..87493b24425 100644
--- a/source/blender/bmesh/tools/bmesh_edgenet.cc
+++ b/source/blender/bmesh/tools/bmesh_edgenet.cc
@@ -20,7 +20,7 @@
 #include "bmesh.hh"
 #include "bmesh_edgenet.hh" /* own include */
 
-#include "BLI_strict_flags.h" /* keep last */
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* Struct for storing a path of verts walked over */
 struct VertNetInfo {
diff --git a/source/blender/bmesh/tools/bmesh_intersect.cc b/source/blender/bmesh/tools/bmesh_intersect.cc
index f45f29c6718..0090464d1c3 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.cc
+++ b/source/blender/bmesh/tools/bmesh_intersect.cc
@@ -41,7 +41,7 @@
 
 #include "tools/bmesh_edgesplit.hh"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /*
  * Some of these depend on each other:
diff --git a/source/blender/bmesh/tools/bmesh_region_match.cc b/source/blender/bmesh/tools/bmesh_region_match.cc
index ad4c002111e..1f723faffef 100644
--- a/source/blender/bmesh/tools/bmesh_region_match.cc
+++ b/source/blender/bmesh/tools/bmesh_region_match.cc
@@ -52,7 +52,7 @@
 #  include "BLI_time_utildefines.h"
 #endif
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* -------------------------------------------------------------------- */
 /** \name Internal UIDWalk API
diff --git a/source/blender/editors/space_view3d/view3d_navigate_fly.cc b/source/blender/editors/space_view3d/view3d_navigate_fly.cc
index 960de8d2a88..1c46a357c85 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_fly.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_fly.cc
@@ -44,7 +44,7 @@
 #include "view3d_intern.h" /* own include */
 #include "view3d_navigate.hh"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* -------------------------------------------------------------------- */
 /** \name Modal Key-map
diff --git a/source/blender/editors/space_view3d/view3d_navigate_walk.cc b/source/blender/editors/space_view3d/view3d_navigate_walk.cc
index a79bce1d181..b33328c1d3f 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_walk.cc
+++ b/source/blender/editors/space_view3d/view3d_navigate_walk.cc
@@ -43,7 +43,7 @@
 #include "view3d_intern.h" /* own include */
 #include "view3d_navigate.hh"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 #ifdef WITH_INPUT_NDOF
 // #  define NDOF_WALK_DEBUG
diff --git a/source/blender/gpu/intern/gpu_select_pick.cc b/source/blender/gpu/intern/gpu_select_pick.cc
index ebe3ce3930f..8fe7b7649d2 100644
--- a/source/blender/gpu/intern/gpu_select_pick.cc
+++ b/source/blender/gpu/intern/gpu_select_pick.cc
@@ -25,7 +25,7 @@
 
 #include "gpu_select_private.h"
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* #define DEBUG_PRINT */
 
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.cc b/source/blender/modifiers/intern/MOD_correctivesmooth.cc
index ebef665a594..28e0735254f 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.cc
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.cc
@@ -45,10 +45,9 @@
 #include "BLI_time.h"
 #ifdef DEBUG_TIME
 #  include "BLI_time_utildefines.h"
-
 #endif
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 static void init_data(ModifierData *md)
 {
diff --git a/source/blender/modifiers/intern/MOD_screw.cc b/source/blender/modifiers/intern/MOD_screw.cc
index f99c481bfa2..99e4d006311 100644
--- a/source/blender/modifiers/intern/MOD_screw.cc
+++ b/source/blender/modifiers/intern/MOD_screw.cc
@@ -44,10 +44,10 @@
 #include "MOD_modifiertypes.hh"
 #include "MOD_ui_common.hh"
 
-#include "BLI_strict_flags.h"
-
 #include "GEO_mesh_merge_by_distance.hh"
 
+#include "BLI_strict_flags.h" /* Keep last. */
+
 using namespace blender;
 
 static void init_data(ModifierData *md)
diff --git a/source/blender/python/mathutils/mathutils_bvhtree.cc b/source/blender/python/mathutils/mathutils_bvhtree.cc
index aee2c0238c2..570d50a5df0 100644
--- a/source/blender/python/mathutils/mathutils_bvhtree.cc
+++ b/source/blender/python/mathutils/mathutils_bvhtree.cc
@@ -47,7 +47,7 @@
 #  include "../bmesh/bmesh_py_types.h"
 #endif /* MATH_STANDALONE */
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 /* -------------------------------------------------------------------- */
 /** \name Documentation String (snippets)
diff --git a/source/blender/python/mathutils/mathutils_kdtree.cc b/source/blender/python/mathutils/mathutils_kdtree.cc
index d23bd1548c6..580035341cd 100644
--- a/source/blender/python/mathutils/mathutils_kdtree.cc
+++ b/source/blender/python/mathutils/mathutils_kdtree.cc
@@ -22,7 +22,7 @@
 #include "mathutils.h"
 #include "mathutils_kdtree.h" /* own include */
 
-#include "BLI_strict_flags.h"
+#include "BLI_strict_flags.h" /* Keep last. */
 
 struct PyKDTree {
   PyObject_HEAD