diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
index 89f1a2c1b..7f72e3fa6 100644
--- a/server/core/CMakeLists.txt
+++ b/server/core/CMakeLists.txt
@@ -38,7 +38,8 @@ add_library(maxscale-common SHARED
   thread.cc
   users.cc
   utils.cc
-  mysql_utils.c mysql_binlog.c modulecmd.c)
+  mysql_utils.cc
+  mysql_binlog.cc modulecmd.c)
 
 if(WITH_JEMALLOC)
   target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES})
diff --git a/server/core/mysql_binlog.c b/server/core/mysql_binlog.cc
similarity index 100%
rename from server/core/mysql_binlog.c
rename to server/core/mysql_binlog.cc
diff --git a/server/core/mysql_utils.c b/server/core/mysql_utils.cc
similarity index 99%
rename from server/core/mysql_utils.c
rename to server/core/mysql_utils.cc
index 901dd566f..83cdd8f78 100644
--- a/server/core/mysql_utils.c
+++ b/server/core/mysql_utils.cc
@@ -117,7 +117,7 @@ uint64_t mxs_leint_consume(uint8_t ** c)
 char* mxs_lestr_consume_dup(uint8_t** c)
 {
     uint64_t slen = mxs_leint_consume(c);
-    char *str = MXS_MALLOC((slen + 1) * sizeof(char));
+    char *str = (char*)MXS_MALLOC((slen + 1) * sizeof(char));
 
     if (str)
     {