From 5c1d7a5fa367b88c5f26014adeda257ff53cf434 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 15 Nov 2016 14:54:00 +0100
Subject: [PATCH] Fix build with moved header files.

---
 coreapi/vcard.cc        | 2 +-
 coreapi/vcard_private.h | 9 +++++++++
 gtk/propertybox.c       | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/coreapi/vcard.cc b/coreapi/vcard.cc
index 777378a3f..19e4e8bc8 100644
--- a/coreapi/vcard.cc
+++ b/coreapi/vcard.cc
@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include "vcard.h"
+#include "vcard_private.h"
 #include "belcard/belcard.hpp"
 #include "belcard/belcard_parser.hpp"
 #include "sal/sal.h"
diff --git a/coreapi/vcard_private.h b/coreapi/vcard_private.h
index c76575dca..8e89d0bac 100644
--- a/coreapi/vcard_private.h
+++ b/coreapi/vcard_private.h
@@ -23,6 +23,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "linphone/vcard.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /**
  * The LinphoneVcardContext object.
  */
@@ -94,4 +99,8 @@ bool_t linphone_vcard_compare_md5_hash(LinphoneVcard *vCard);
 
 void linphone_vcard_clean_cache(LinphoneVcard *vCard);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LINPHONE_VCARD_PRIVATE_H */
diff --git a/gtk/propertybox.c b/gtk/propertybox.c
index ddd8d33b5..169696372 100644
--- a/gtk/propertybox.c
+++ b/gtk/propertybox.c
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include "linphone.h"
-#include "linphone_tunnel.h"
+#include "linphone/tunnel.h"
 #include "linphone/lpconfig.h"
 #include "config.h"