diff --git a/src/chat/chat-room.cpp b/src/chat/chat-room.cpp
index 3aeac16d8..9ca62c0b3 100644
--- a/src/chat/chat-room.cpp
+++ b/src/chat/chat-room.cpp
@@ -21,8 +21,6 @@
 #include "linphone/utils/utils.h"
 
 #include "chat-room-p.h"
-
-#include "chat-room.h"
 #include "imdn.h"
 #include "logger/logger.h"
 #include "utils/content-type.h"
@@ -35,8 +33,6 @@ using namespace std;
 
 LINPHONE_BEGIN_NAMESPACE
 
-// =============================================================================
-
 ChatRoomPrivate::ChatRoomPrivate (LinphoneCore *core)
 	: core(core), isComposingHandler(core, this) {}
 
diff --git a/src/chat/imdn.cpp b/src/chat/imdn.cpp
index 79b953cbe..e0c0696ca 100644
--- a/src/chat/imdn.cpp
+++ b/src/chat/imdn.cpp
@@ -16,16 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "logger/logger.h"
+
 #include "imdn.h"
 
-#include "logger/logger.h"
+// =============================================================================
 
 using namespace std;
 
 LINPHONE_BEGIN_NAMESPACE
 
-// =============================================================================
-
 const string Imdn::imdnPrefix = "/imdn:imdn";
 
 void Imdn::parse (ChatRoom &cr, const string &text) {
diff --git a/src/chat/is-composing.cpp b/src/chat/is-composing.cpp
index 4a6e9a98a..efc1c685d 100644
--- a/src/chat/is-composing.cpp
+++ b/src/chat/is-composing.cpp
@@ -16,19 +16,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "is-composing.h"
+#include "linphone/utils/utils.h"
 
 #include "chat-room-p.h"
-
 #include "logger/logger.h"
-#include "linphone/utils/utils.h"
+
+#include "is-composing.h"
+
+// =============================================================================
 
 using namespace std;
 
 LINPHONE_BEGIN_NAMESPACE
 
-// =============================================================================
-
 const string IsComposing::isComposingPrefix = "/xsi:isComposing";
 
 // -----------------------------------------------------------------------------