diff --git a/Subsurface-mobile.pro b/Subsurface-mobile.pro
index 8901b033e..36538c618 100644
--- a/Subsurface-mobile.pro
+++ b/Subsurface-mobile.pro
@@ -33,7 +33,7 @@ SOURCES += subsurface-mobile-main.cpp \
 	core/configuredivecomputer.cpp \
 	core/divelogexportlogic.cpp \
 	core/divesitehelpers.cpp \
-	core/errorhelper.c \
+	core/errorhelper.cpp \
 	core/exif.cpp \
 	core/format.cpp \
 	core/gettextfromc.cpp \
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 63ef48f6f..e6f373da7 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -85,7 +85,7 @@ set(SUBSURFACE_CORE_LIB_SRCS
 	eventtype.h
 	equipment.c
 	equipment.h
-	errorhelper.c
+	errorhelper.cpp
 	exif.cpp
 	exif.h
 	extradata.h
diff --git a/core/errorhelper.c b/core/errorhelper.cpp
similarity index 93%
rename from core/errorhelper.c
rename to core/errorhelper.cpp
index ad8caa190..5d9518b62 100644
--- a/core/errorhelper.c
+++ b/core/errorhelper.cpp
@@ -6,7 +6,6 @@
 #include <stdarg.h>
 #include "errorhelper.h"
 #include "membuffer.h"
-#include "qthelper.h"
 
 #if !defined(Q_OS_ANDROID) && !defined(__ANDROID__)
 #define LOG_MSG(fmt, ...)	fprintf(stderr, fmt, ##__VA_ARGS__)
@@ -21,7 +20,7 @@ int verbose;
 
 void report_info(const char *fmt, ...)
 {
-	struct membuffer buf = { 0 };
+	struct membufferpp buf;
 
 	VA_BUF(&buf, fmt);
 	strip_mb(&buf);
@@ -32,7 +31,7 @@ static void (*error_cb)(char *) = NULL;
 
 int report_error(const char *fmt, ...)
 {
-	struct membuffer buf = { 0 };
+	struct membufferpp buf;
 
 	VA_BUF(&buf, fmt);
 	strip_mb(&buf);