diff --git a/.travis.yml b/.travis.yml
index df2014d553..1471983e91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ install:
   - sh autogen.sh
 
 before_script:
-  - ./configure --enable-strerror-override
+  - ./configure
 
 script:
   - make
diff --git a/strerror_override.h b/strerror_override.h
index 48b29b3868..9b8d70aa43 100644
--- a/strerror_override.h
+++ b/strerror_override.h
@@ -4,10 +4,20 @@
 #include "config.h"
 #include <errno.h>
 
-char *_json_c_strerror(int errno_in);
+#include "json_object.h" /* for JSON_EXPORT */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JSON_EXPORT char *_json_c_strerror(int errno_in);
 
 #ifndef STRERROR_OVERRIDE_IMPL
 #define strerror	_json_c_strerror
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _json_strerror_override_h_ */