diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt
index 92188b4e0ac..b2db54c0e6e 100644
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -20,7 +20,7 @@ set(INC_SYS
 
 set(SRC
   ./intern/leak_detector.cc
-  ./intern/mallocn.c
+  ./intern/mallocn.cc
   ./intern/mallocn_guarded_impl.cc
   ./intern/mallocn_lockfree_impl.cc
   ./intern/memory_usage.cc
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.cc
similarity index 99%
rename from intern/guardedalloc/intern/mallocn.c
rename to intern/guardedalloc/intern/mallocn.cc
index 04f06e950ce..256d78e21db 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.cc
@@ -13,7 +13,7 @@
 /* to ensure strict conversions */
 #include "../../source/blender/blenlib/BLI_strict_flags.h"
 
-#include <assert.h>
+#include <cassert>
 
 #include "mallocn_intern.h"