diff --git a/include/polarssl/error.h b/include/polarssl/error.h
index 8a3f30446..af2f33183 100644
--- a/include/polarssl/error.h
+++ b/include/polarssl/error.h
@@ -71,6 +71,10 @@
  * Module dependent error code (5 bits 0x.08.-0x.F8.)
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief Translate a PolarSSL error code into a string representation,
  *        Result is truncated if necessary and always includes a terminating
@@ -82,4 +86,8 @@
  */
 void error_strerror( int errnum, char *buffer, size_t buflen );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* error.h */