diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 25967bcb8..e99f02e17 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -17,14 +17,15 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-
 #include "c-wrapper/internal/c-sal.h"
 #include "sal/call-op.h"
 #include "sal/message-op.h"
 #include "sal/refer-op.h"
 
+#include "linphone/api/c-content.h"
 #include "linphone/core.h"
 #include "linphone/utils/utils.h"
+
 #include "private.h"
 #include "mediastreamer2/mediastream.h"
 #include "linphone/lpconfig.h"
diff --git a/coreapi/friendlist.c b/coreapi/friendlist.c
index 159409449..9475b877c 100644
--- a/coreapi/friendlist.c
+++ b/coreapi/friendlist.c
@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <bctoolbox/crypto.h>
 
+#include "linphone/api/c-content.h"
 #include "linphone/core.h"
 
 #include "c-wrapper/c-wrapper.h"
diff --git a/coreapi/info.c b/coreapi/info.c
index 5b12089bb..f68bb4522 100644
--- a/coreapi/info.c
+++ b/coreapi/info.c
@@ -23,6 +23,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "linphone/api/c-content.h"
 #include "linphone/core.h"
 #include "linphone/lpconfig.h"
 
diff --git a/coreapi/lime.c b/coreapi/lime.c
index 4270f9d2a..965ccd10c 100644
--- a/coreapi/lime.c
+++ b/coreapi/lime.c
@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
+#include "linphone/api/c-content.h"
+
 #include "lime.h"
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -787,8 +789,8 @@ int lime_im_encryption_engine_process_incoming_message_cb(LinphoneImEncryptionEn
 	LinphoneCore *lc = linphone_im_encryption_engine_get_core(engine);
 	int errcode = -1;
 	/* check if we have a xml/cipher message to be decrypted */
-	if (linphone_chat_message_get_content_type(msg) && 
-		(strcmp("xml/cipher", linphone_chat_message_get_content_type(msg)) == 0 || 
+	if (linphone_chat_message_get_content_type(msg) &&
+		(strcmp("xml/cipher", linphone_chat_message_get_content_type(msg)) == 0 ||
 		strcmp("application/cipher.vnd.gsma.rcs-ft-http+xml", linphone_chat_message_get_content_type(msg)) == 0)) {
 		errcode = 0;
 		int retval;
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 114749d3a..9e01822e1 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -18,9 +18,11 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
+#include "linphone/api/c-content.h"
 #include "linphone/core.h"
-#include "linphone/sipsetup.h"
 #include "linphone/lpconfig.h"
+#include "linphone/sipsetup.h"
+
 #include "private.h"
 #include "quality_reporting.h"
 #include "lime.h"
@@ -2320,7 +2322,7 @@ void linphone_core_start (LinphoneCore *lc) {
 		lp_config_set_string(lc->config,"misc","uuid",tmp);
 	}else if (strcmp(uuid,"0")!=0) /*to allow to disable sip.instance*/
 		lc->sal->set_uuid(uuid);
-	
+
 	if (lc->sal->get_root_ca()) {
 		belle_tls_crypto_config_set_root_ca(lc->http_crypto_config, lc->sal->get_root_ca());
 		belle_http_provider_set_tls_crypto_config(lc->http_provider, lc->http_crypto_config);
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index d5f3ea5ad..1f7d88519 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -20,10 +20,12 @@ Copyright (C) 2000  Simon MORLAT (simon.morlat@linphone.org)
 
 #include <ctype.h>
 
+#include "linphone/api/c-content.h"
 #include "linphone/core_utils.h"
 #include "linphone/core.h"
 #include "linphone/lpconfig.h"
 #include "linphone/sipsetup.h"
+
 #include "mediastreamer2/mediastream.h"
 
 #include "enum.h"
diff --git a/coreapi/quality_reporting.c b/coreapi/quality_reporting.c
index 571a8faa0..a20b03b8e 100644
--- a/coreapi/quality_reporting.c
+++ b/coreapi/quality_reporting.c
@@ -21,7 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "config.h"
 #endif
 
+#include "linphone/api/c-content.h"
 #include "linphone/core.h"
+
 #include "private.h"
 #include "c-wrapper/internal/c-sal.h"
 #include "sal/sal.h"
diff --git a/include/linphone/core.h b/include/linphone/core.h
index d2efdce47..d1ebbeb53 100644
--- a/include/linphone/core.h
+++ b/include/linphone/core.h
@@ -42,7 +42,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "linphone/call_stats.h"
 #include "linphone/chat.h"
 #include "linphone/conference.h"
-#include "linphone/content.h"
 #include "linphone/dictionary.h"
 #include "linphone/error_info.h"
 #include "linphone/event.h"
diff --git a/src/c-wrapper/api/c-chat-message.cpp b/src/c-wrapper/api/c-chat-message.cpp
index 1bf1faee5..7f8e1b8c6 100644
--- a/src/c-wrapper/api/c-chat-message.cpp
+++ b/src/c-wrapper/api/c-chat-message.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "linphone/api/c-chat-message.h"
+#include "linphone/api/c-content.h"
 #include "linphone/utils/utils.h"
 #include "linphone/wrapper_utils.h"
 
diff --git a/src/c-wrapper/api/c-content.cpp b/src/c-wrapper/api/c-content.cpp
index 6691ec9da..b4f77a316 100644
--- a/src/c-wrapper/api/c-content.cpp
+++ b/src/c-wrapper/api/c-content.cpp
@@ -243,4 +243,4 @@ LinphoneContent * linphone_content_from_sal_body_handler(SalBodyHandler *body_ha
 SalBodyHandler * sal_body_handler_from_content(const LinphoneContent *content) {
 	if (content == NULL) return NULL;
 	return content->body_handler;
-}
\ No newline at end of file
+}
diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp
index 2c5130802..fd3157614 100644
--- a/src/chat/chat-message/chat-message.cpp
+++ b/src/chat/chat-message/chat-message.cpp
@@ -19,6 +19,7 @@
 
 #include "object/object-p.h"
 
+#include "linphone/api/c-content.h"
 #include "linphone/core.h"
 #include "linphone/lpconfig.h"
 #include "linphone/utils/utils.h"
@@ -668,7 +669,7 @@ void ChatMessagePrivate::send () {
 	} else {
 		msgOp->send_message(ContentType::PlainText.asString().c_str(), internalContent.getBodyAsUtf8String().c_str());
 	}
-	
+
 	// Restore FileContents and remove FileTransferContents
 	list<Content*>::iterator it = contents.begin();
 	while (it != contents.end()) {
diff --git a/src/chat/modifier/file-transfer-chat-message-modifier.cpp b/src/chat/modifier/file-transfer-chat-message-modifier.cpp
index 674ddb308..ec04c61f0 100644
--- a/src/chat/modifier/file-transfer-chat-message-modifier.cpp
+++ b/src/chat/modifier/file-transfer-chat-message-modifier.cpp
@@ -17,15 +17,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "c-wrapper/c-wrapper.h"
+#include "linphone/api/c-content.h"
+
 #include "address/address.h"
+#include "bctoolbox/crypto.h"
+#include "c-wrapper/c-wrapper.h"
 #include "chat/chat-message/chat-message-p.h"
+#include "chat/chat-room/chat-room-p.h"
 #include "content/content-type.h"
 #include "content/content.h"
-#include "chat/chat-room/chat-room-p.h"
 #include "core/core.h"
 #include "logger/logger.h"
-#include "bctoolbox/crypto.h"
 
 #include "file-transfer-chat-message-modifier.h"
 
diff --git a/src/conference/handlers/local-conference-event-handler.cpp b/src/conference/handlers/local-conference-event-handler.cpp
index 7b3989b72..96da99d07 100644
--- a/src/conference/handlers/local-conference-event-handler.cpp
+++ b/src/conference/handlers/local-conference-event-handler.cpp
@@ -19,6 +19,7 @@
 
 #include <ctime>
 
+#include "linphone/api/c-content.h"
 #include "linphone/utils/utils.h"
 
 #include "conference/local-conference.h"
diff --git a/src/conference/session/call-session.cpp b/src/conference/session/call-session.cpp
index 97aa06f6f..bb3ac773e 100644
--- a/src/conference/session/call-session.cpp
+++ b/src/conference/session/call-session.cpp
@@ -19,19 +19,18 @@
 
 #include <bctoolbox/defs.h>
 
-#include "c-wrapper/c-wrapper.h"
+#include "linphone/api/c-content.h"
+#include "linphone/core.h"
 
 #include "address/address-p.h"
+#include "c-wrapper/c-wrapper.h"
 #include "call/call-p.h"
 #include "conference/params/call-session-params-p.h"
 #include "conference/session/call-session-p.h"
 #include "conference/session/call-session.h"
 #include "core/core-p.h"
-
 #include "logger/logger.h"
 
-#include "linphone/core.h"
-
 #include "private.h"
 
 using namespace std;