diff --git a/daemon/src/account.h b/daemon/src/account.h
index 52ad18eff46d5cf63a2fa5734ad209adbdb60b4b..0d67a797f3ce603442c247d43f41f8c5269b29f3 100644
--- a/daemon/src/account.h
+++ b/daemon/src/account.h
@@ -40,8 +40,12 @@
 #include "config/serializable.h"
 #include "registration_states.h"
 
+class Account;
 class VoIPLink;
 
+/** Define a type for a AccountMap container */
+typedef std::map<std::string, Account*> AccountMap;
+
 /**
  * @file account.h
  * @brief Interface to protocol account (SIPAccount, IAXAccount)
diff --git a/daemon/src/dbus/configurationmanager.cpp b/daemon/src/dbus/configurationmanager.cpp
index 303d3789d6006952b578a2e57923d688fb9a67f6..05a9debbc3944b4a0dd6078127d141d31d33c827 100644
--- a/daemon/src/dbus/configurationmanager.cpp
+++ b/daemon/src/dbus/configurationmanager.cpp
@@ -34,19 +34,19 @@
 #include "config.h"
 #endif
 
-#include "configurationmanager.h"
-#include "account_schema.h"
 #include <cerrno>
 #include <sstream>
-#include "../manager.h"
+
+#include "configurationmanager.h"
+#include "account_schema.h"
+#include "manager.h"
 #include "sip/sipvoiplink.h"
 #include "sip/siptransport.h"
-#include "account.h"
 #include "logger.h"
 #include "fileutils.h"
 #include "sip/sipaccount.h"
-#include "../history/historynamecache.h"
-#include "../audio/audiolayer.h"
+#include "history/historynamecache.h"
+#include "audio/audiolayer.h"
 
 namespace {
     const char* SERVER_PATH = "/org/sflphone/SFLphone/ConfigurationManager";
diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp
index 5615eb3e160f29761203dd31760cc336b0b5e355..14cc4cb1f2b4c8acaaec25ea61cfa0323d7c69bb 100644
--- a/daemon/src/managerimpl.cpp
+++ b/daemon/src/managerimpl.cpp
@@ -40,7 +40,6 @@
 #include "managerimpl.h"
 #include "account_schema.h"
 
-#include "account.h"
 #include "dbus/callmanager.h"
 #include "global.h"
 #include "fileutils.h"
diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h
index b472dbf1865a4c9f5abe756e7d8c7b00b96e19b8..f26f27e0fcaa8cc7b79c790ed3e82f6971e98f46 100644
--- a/daemon/src/managerimpl.h
+++ b/daemon/src/managerimpl.h
@@ -50,6 +50,8 @@
 
 #include "config/sfl_config.h"
 
+#include "account.h"
+
 #include "call.h"
 #include "conference.h"
 
@@ -82,8 +84,6 @@ class Account;
 class SIPAccount;
 class IAXAccount;
 
-/** Define a type for a AccountMap container */
-typedef std::map<std::string, Account*> AccountMap;
 
 /** Define a type for a std::string to std::string Map inside ManagerImpl */
 typedef std::map<std::string, std::string> CallAccountMap;
diff --git a/daemon/src/sip/sipvoiplink.h b/daemon/src/sip/sipvoiplink.h
index b4706b411e9e733ce52c5bb729f7cb303ca47945..4c00020242e514c6b532519e928233ef595ecf7e 100644
--- a/daemon/src/sip/sipvoiplink.h
+++ b/daemon/src/sip/sipvoiplink.h
@@ -164,6 +164,9 @@ class SIPVoIPLink : public VoIPLink {
          */
         virtual void offhold(const std::string& id);
 
+        /**
+         * Transfer method used for both type of transfer
+         */
         bool transferCommon(SIPCall *call, pj_str_t *dst);
 
         /**
@@ -212,6 +215,9 @@ class SIPVoIPLink : public VoIPLink {
          */
         void SIPCallClosed(SIPCall *call);
 
+        /**
+         * Get the memory pool factory since each calls has its own memory pool
+         */
         pj_caching_pool *getMemoryPoolFactory();
 
         /**
@@ -251,6 +257,9 @@ class SIPVoIPLink : public VoIPLink {
          */
         void createDefaultSipUdpTransport();
 
+        /**
+         * Instance that maintain and manage transport (UDP, TLS)
+         */
         SipTransport sipTransport;
 
 #ifdef SFL_VIDEO
@@ -263,6 +272,7 @@ class SIPVoIPLink : public VoIPLink {
 
         SIPVoIPLink();
         ~SIPVoIPLink();
+
         /**
          * Start a SIP Call
          * @param call  The current call
@@ -275,9 +285,10 @@ class SIPVoIPLink : public VoIPLink {
          */
         EventThread evThread_;
 
-        friend class SIPTest;
         static bool destroyed_;
         static SIPVoIPLink *instance_;
+
+        friend class SIPTest;
 };
 
 #endif // SIPVOIPLINK_H_