--- a/common/strhelp.h	Tue Mar 25 17:38:06 2014 +0000
+++ b/common/strhelp.h	Tue Mar 25 18:03:00 2014 +0000
@@ -1,6 +1,10 @@
 #ifndef STRHELP_H
 #define STRHELP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdbool.h>
 
 /**
@@ -89,5 +93,8 @@
  */
 int str_base64_decode(char **dst, size_t *dst_size, char *src,
                       size_t src_size);
+#ifdef __cplusplus
+}
+#endif
 
 #endif

--- a/ui/tests/commontest.cpp	Tue Mar 25 17:38:06 2014 +0000
+++ b/ui/tests/commontest.cpp	Tue Mar 25 18:03:00 2014 +0000
@@ -22,6 +22,7 @@
 
     QVERIFY(ret == 0);
     QVERIFY(data_size == 1000);
+    QVERIFY(data);
 
     for (size_t i = 0; i < data_size; i++) {
         QVERIFY(garbage[i] == data[i]);