diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
index 21866d73e..201653e50 100644
--- a/server/core/CMakeLists.txt
+++ b/server/core/CMakeLists.txt
@@ -24,7 +24,8 @@ add_library(maxscale-common SHARED
   queuemanager.cc
   poll.cc
   random_jkiss.cc
-  resultset.c router.cc secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c)
+  resultset.cc
+  router.cc secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c)
 
 if(WITH_JEMALLOC)
   target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES})
diff --git a/server/core/resultset.c b/server/core/resultset.cc
similarity index 100%
rename from server/core/resultset.c
rename to server/core/resultset.cc