diff --git a/source/blender/animrig/intern/fcurve.cc b/source/blender/animrig/intern/fcurve.cc
index 0701d277c78..02792e1a929 100644
--- a/source/blender/animrig/intern/fcurve.cc
+++ b/source/blender/animrig/intern/fcurve.cc
@@ -7,7 +7,7 @@
  */
 
 #include <cmath>
-#include <string.h>
+#include <cstring>
 
 #include "ANIM_animdata.hh"
 #include "ANIM_fcurve.hh"
diff --git a/source/blender/blendthumb/src/blendthumb_win32.cc b/source/blender/blendthumb/src/blendthumb_win32.cc
index a60ff0a3e6f..654f7738812 100644
--- a/source/blender/blendthumb/src/blendthumb_win32.cc
+++ b/source/blender/blendthumb/src/blendthumb_win32.cc
@@ -8,7 +8,7 @@
  * Thumbnail from Blend file extraction for MS-Windows.
  */
 
-#include <math.h>
+#include <cmath>
 #include <new>
 #include <shlwapi.h>
 #include <string>
diff --git a/source/blender/blenkernel/intern/softbody.cc b/source/blender/blenkernel/intern/softbody.cc
index bec46553a11..50609d99fc1 100644
--- a/source/blender/blenkernel/intern/softbody.cc
+++ b/source/blender/blenkernel/intern/softbody.cc
@@ -23,9 +23,9 @@
  * </pre>
  */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "CLG_log.h"
 
diff --git a/source/blender/blenkernel/intern/writeffmpeg.cc b/source/blender/blenkernel/intern/writeffmpeg.cc
index 1e66a19e6db..f7cd6a6339d 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.cc
+++ b/source/blender/blenkernel/intern/writeffmpeg.cc
@@ -8,10 +8,10 @@
  */
 
 #ifdef WITH_FFMPEG
-#  include <stdio.h>
-#  include <string.h>
+#  include <cstdio>
+#  include <cstring>
 
-#  include <stdlib.h>
+#  include <cstdlib>
 
 #  include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenlib/intern/BLI_filelist.cc b/source/blender/blenlib/intern/BLI_filelist.cc
index 7f23be0f6a7..902234cb86f 100644
--- a/source/blender/blenlib/intern/BLI_filelist.cc
+++ b/source/blender/blenlib/intern/BLI_filelist.cc
@@ -6,18 +6,18 @@
  * \ingroup bli
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/types.h>
 
 #ifndef WIN32
 #  include <dirent.h>
 #endif
 
-#include <string.h>
+#include <cstring>
+#include <ctime>
 #include <sys/stat.h>
-#include <time.h>
 
 #ifdef WIN32
 #  include "BLI_winstuff.h"
diff --git a/source/blender/blenlib/intern/array_store.cc b/source/blender/blenlib/intern/array_store.cc
index 6f7c18a53a5..9099882534a 100644
--- a/source/blender/blenlib/intern/array_store.cc
+++ b/source/blender/blenlib/intern/array_store.cc
@@ -87,8 +87,8 @@
  * Otherwise new chunks are created.
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenlib/intern/dynlib.cc b/source/blender/blenlib/intern/dynlib.cc
index a64d1aaad09..122a4ec4584 100644
--- a/source/blender/blenlib/intern/dynlib.cc
+++ b/source/blender/blenlib/intern/dynlib.cc
@@ -6,9 +6,9 @@
  * \ingroup bli
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenlib/intern/fileops_c.cc b/source/blender/blenlib/intern/fileops_c.cc
index 77da8a12724..adb87da2029 100644
--- a/source/blender/blenlib/intern/fileops_c.cc
+++ b/source/blender/blenlib/intern/fileops_c.cc
@@ -6,14 +6,14 @@
  * \ingroup bli
  */
 
-#include <stdlib.h> /* malloc */
-#include <string.h>
+#include <cstdlib> /* malloc */
+#include <cstring>
 
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <errno.h>
+#include <cerrno>
 
 #include <zlib.h>
 #include <zstd.h>
diff --git a/source/blender/blenlib/intern/path_util.cc b/source/blender/blenlib/intern/path_util.cc
index 6611b97c449..8bac740f850 100644
--- a/source/blender/blenlib/intern/path_util.cc
+++ b/source/blender/blenlib/intern/path_util.cc
@@ -8,9 +8,9 @@
  */
 
 #include <algorithm> /* For `min/max`. */
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
 
 #include "DNA_listBase.h"
 
diff --git a/source/blender/blenlib/intern/storage.cc b/source/blender/blenlib/intern/storage.cc
index 4737ba267a7..43bdd177566 100644
--- a/source/blender/blenlib/intern/storage.cc
+++ b/source/blender/blenlib/intern/storage.cc
@@ -8,8 +8,8 @@
  * Some really low-level file operations.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/types.h>
 
 #include <sys/stat.h>
@@ -31,8 +31,8 @@
 #  include <sys/vfs.h>
 #endif
 
+#include <cstring>
 #include <fcntl.h>
-#include <string.h>
 
 #ifdef WIN32
 #  include "BLI_string_utf8.h"
diff --git a/source/blender/blenlib/intern/string_utf8.cc b/source/blender/blenlib/intern/string_utf8.cc
index b06cc85d9b5..6721469b5ec 100644
--- a/source/blender/blenlib/intern/string_utf8.cc
+++ b/source/blender/blenlib/intern/string_utf8.cc
@@ -10,11 +10,11 @@
  * \ingroup bli
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cwchar>
+#include <cwctype>
 #include <wcwidth.h>
 
 #include "BLI_utildefines.h"
diff --git a/source/blender/blenlib/intern/string_utils.cc b/source/blender/blenlib/intern/string_utils.cc
index 2841c39a369..34913bd8436 100644
--- a/source/blender/blenlib/intern/string_utils.cc
+++ b/source/blender/blenlib/intern/string_utils.cc
@@ -6,9 +6,9 @@
  * \ingroup bli
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
 
 #include <array>