diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index 2ebf88641618c46dcc410dc4e75b91da393769c9..69f52d70a459d1dc212a3279837c308149b913d7 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -45,6 +45,7 @@
 #include "dbus/dbusmanager.h"
 #include "dbus/callmanager.h"
 
+#include "hooks/urlhook.h"
 #include "im/InstantMessaging.h"
 
 #include "audio/audiolayer.h"
diff --git a/sflphone-common/src/sip/sipvoiplink.h b/sflphone-common/src/sip/sipvoiplink.h
index 986487e0341611d1944021433ecf5596e5683dd6..66f1eac77b2be1ce7546316d34769e05acdfc74a 100644
--- a/sflphone-common/src/sip/sipvoiplink.h
+++ b/sflphone-common/src/sip/sipvoiplink.h
@@ -36,7 +36,6 @@
 #define SIPVOIPLINK_H
 
 #include <map>
-#include <sstream>
 #include <exception>
 
 //////////////////////////////
@@ -49,8 +48,10 @@
 ///////////////////////////////
 
 #include "voiplink.h"
-#include "hooks/urlhook.h"
-#include "../im/InstantMessaging.h"
+
+namespace sfl {
+    class InstantMessaging;
+}
 
 class EventThread;
 class SIPCall;
diff --git a/sflphone-common/src/voiplink.h b/sflphone-common/src/voiplink.h
index 3c8533f55aade3d2ee5b72012616e5ec19c35b41..5ccbfcf66ca947543fe7092e5dda58a90b2bd472 100644
--- a/sflphone-common/src/voiplink.h
+++ b/sflphone-common/src/voiplink.h
@@ -36,7 +36,6 @@
 
 #include "call.h"
 
-class AudioCodec;
 class Account;
 
 /** Define AccountID type */