diff --git a/coreapi/conference.h b/coreapi/conference.h
index 4b1d7f49d..24d889a92 100644
--- a/coreapi/conference.h
+++ b/coreapi/conference.h
@@ -26,6 +26,10 @@
 #ifndef CONFERENCE_H
 #define CONFERENCE_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+	
 #include "linphonecore.h"
 
 //typedef struct _LinphoneConference LinphoneConference;
@@ -65,4 +69,8 @@ void linphone_conference_on_call_terminating(LinphoneConference *obj, LinphoneCa
 
 bool_t linphone_conference_check_class(LinphoneConference *obj, LinphoneConferenceClass _class);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // CONFERENCE_H
diff --git a/coreapi/private.h b/coreapi/private.h
index 5bd63a8ab..afeb75781 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -24,10 +24,7 @@
 
 #ifndef _PRIVATE_H
 #define _PRIVATE_H
-#ifdef __cplusplus
 
-extern "C" {
-#endif
 #include "linphonecore.h"
 #include "linphonefriend.h"
 #include "friendlist.h"
@@ -119,6 +116,15 @@ extern "C" {
 #endif
 #endif
 
+#include <libxml/xmlreader.h>
+#include <libxml/xmlwriter.h>
+#include <libxml/xpath.h>
+#include <libxml/xpathInternals.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct _LinphoneCallParams{
 	belle_sip_object_t base;
 	void *user_data;
@@ -1297,11 +1303,6 @@ void _linphone_player_destroy(LinphonePlayer *player);
  * XML UTILITY FUNCTIONS                                                     *
  ****************************************************************************/
 
-#include <libxml/xmlreader.h>
-#include <libxml/xmlwriter.h>
-#include <libxml/xpath.h>
-#include <libxml/xpathInternals.h>
-
 #define XMLPARSING_BUFFER_LEN 2048
 #define MAX_XPATH_LENGTH 256
 
diff --git a/include/sal/sal.h b/include/sal/sal.h
index a5bb5e999..d8106f6b7 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -38,6 +38,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#define LINPHONE_PUBLIC MS2_PUBLIC
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*Dirty hack, keep in sync with mediastreamer2/include/mediastream.h */
 #ifndef PAYLOAD_TYPE_FLAG_CAN_RECV
 #define PAYLOAD_TYPE_FLAG_CAN_RECV	PAYLOAD_TYPE_USER_FLAG_1
@@ -883,6 +887,9 @@ void sal_set_http_proxy_port(Sal *sal, int port) ;
 const char *sal_get_http_proxy_host(const Sal *sal);
 int sal_get_http_proxy_port(const Sal *sal);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif