diff --git a/source/blender/blenkernel/BKE_curves.hh b/source/blender/blenkernel/BKE_curves.hh
index 375328d83e6..8c2ef0bcc3c 100644
--- a/source/blender/blenkernel/BKE_curves.hh
+++ b/source/blender/blenkernel/BKE_curves.hh
@@ -12,14 +12,14 @@
 #include "BLI_bounds_types.hh"
 #include "BLI_generic_virtual_array.hh"
 #include "BLI_implicit_sharing.hh"
-#include "BLI_index_mask.hh"
+#include "BLI_index_mask_fwd.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_offset_indices.hh"
 #include "BLI_shared_cache.hh"
 #include "BLI_span.hh"
 #include "BLI_vector.hh"
-#include "BLI_virtual_array.hh"
+#include "BLI_virtual_array_fwd.hh"
 
 #include "BKE_attribute_math.hh"
 #include "BKE_curves.h"
diff --git a/source/blender/blenkernel/BKE_deform.hh b/source/blender/blenkernel/BKE_deform.hh
index 17223838dd3..1f6e8ffe8fa 100644
--- a/source/blender/blenkernel/BKE_deform.hh
+++ b/source/blender/blenkernel/BKE_deform.hh
@@ -6,7 +6,7 @@
 
 #include "BLI_math_vector_types.hh"
 #include "BLI_offset_indices.hh"
-#include "BLI_virtual_array.hh"
+#include "BLI_virtual_array_fwd.hh"
 
 /** \file
  * \ingroup bke
diff --git a/source/blender/blenkernel/BKE_pbvh_api.hh b/source/blender/blenkernel/BKE_pbvh_api.hh
index bf0a9fb4abc..fad49bb3a79 100644
--- a/source/blender/blenkernel/BKE_pbvh_api.hh
+++ b/source/blender/blenkernel/BKE_pbvh_api.hh
@@ -16,7 +16,7 @@
 #include "BLI_bounds_types.hh"
 #include "BLI_compiler_compat.h"
 #include "BLI_function_ref.hh"
-#include "BLI_index_mask.hh"
+#include "BLI_index_mask_fwd.hh"
 #include "BLI_math_vector_types.hh"
 #include "BLI_offset_indices.hh"
 #include "BLI_span.hh"
diff --git a/source/blender/editors/include/ED_curves.hh b/source/blender/editors/include/ED_curves.hh
index 01df2a0f795..b017ef7484d 100644
--- a/source/blender/editors/include/ED_curves.hh
+++ b/source/blender/editors/include/ED_curves.hh
@@ -11,7 +11,7 @@
 #include "BKE_crazyspace.hh"
 #include "BKE_curves.hh"
 
-#include "BLI_index_mask.hh"
+#include "BLI_index_mask_fwd.hh"
 #include "BLI_vector.hh"
 #include "BLI_vector_set.hh"
 
diff --git a/source/blender/editors/include/ED_grease_pencil.hh b/source/blender/editors/include/ED_grease_pencil.hh
index 521db915ef6..680dd4affee 100644
--- a/source/blender/editors/include/ED_grease_pencil.hh
+++ b/source/blender/editors/include/ED_grease_pencil.hh
@@ -11,7 +11,7 @@
 #include "BKE_grease_pencil.hh"
 
 #include "BLI_generic_span.hh"
-#include "BLI_index_mask.hh"
+#include "BLI_index_mask_fwd.hh"
 #include "BLI_math_matrix_types.hh"
 
 #include "ED_keyframes_edit.hh"
diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_util.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_util.cc
index b926cfd0fd3..e1dbbbc3afe 100644
--- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_util.cc
+++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_util.cc
@@ -7,6 +7,7 @@
  */
 
 #include <cstdio>
+#include <cstring>
 
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.cc b/source/blender/modifiers/intern/MOD_meshdeform.cc
index 5ece3fbe4f6..73e118e3108 100644
--- a/source/blender/modifiers/intern/MOD_meshdeform.cc
+++ b/source/blender/modifiers/intern/MOD_meshdeform.cc
@@ -8,6 +8,7 @@
 
 #include "BLI_utildefines.h"
 
+#include "BLI_array.hh"
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 #include "BLI_simd.h"