diff --git a/coreapi/lpc2xml.h b/coreapi/lpc2xml.h
index 9dd8e840d..988c49f5b 100644
--- a/coreapi/lpc2xml.h
+++ b/coreapi/lpc2xml.h
@@ -22,6 +22,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "linphone/core.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 typedef struct _lpc2xml_context lpc2xml_context;
 
 typedef enum _lpc2xml_log_level {
@@ -41,6 +44,8 @@ LINPHONE_PUBLIC int lpc2xml_set_lpc(lpc2xml_context* context, const LpConfig *lp
 LINPHONE_PUBLIC int lpc2xml_convert_file(lpc2xml_context* context, const char *filename);
 LINPHONE_PUBLIC int lpc2xml_convert_fd(lpc2xml_context* context, int fd);
 LINPHONE_PUBLIC int lpc2xml_convert_string(lpc2xml_context* context, char **content);
-
+#ifdef __cplusplus
+}
+#endif
 
 #endif //LPC2XML_H_
diff --git a/coreapi/xml2lpc.h b/coreapi/xml2lpc.h
index 4512d73e2..3204a2e68 100644
--- a/coreapi/xml2lpc.h
+++ b/coreapi/xml2lpc.h
@@ -22,6 +22,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "linphone/core.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+	
 typedef struct _xml2lpc_context xml2lpc_context;
 
 typedef enum _xml2lpc_log_level {
@@ -47,6 +51,8 @@ LINPHONE_PUBLIC int xml2lpc_set_xsd_string(xml2lpc_context* context, const char
 LINPHONE_PUBLIC int xml2lpc_validate(xml2lpc_context *context);
 LINPHONE_PUBLIC int xml2lpc_convert(xml2lpc_context *context, LpConfig *lpc);
 
-
+#ifdef __cplusplus
+}
+#endif
 
 #endif //XML2LPC_H_