diff --git a/sflphone-common/libs/utilspp/NonCopyable.hpp b/sflphone-common/libs/utilspp/NonCopyable.hpp
index 43f68e9d328bd81dea38798165c43622095da114..2a684d136c22a130928204131f70802688c10253 100644
--- a/sflphone-common/libs/utilspp/NonCopyable.hpp
+++ b/sflphone-common/libs/utilspp/NonCopyable.hpp
@@ -28,13 +28,15 @@ namespace utilspp
 {
    class NonCopyable
    {
-      public:
+      protected:
          NonCopyable()
          {}
+         ~NonCopyable()
+         {}
 
       private:
-         NonCopyable(const NonCopyable&)
-         {}
+         NonCopyable(const NonCopyable&);
+         const NonCopyable& operator=(const NonCopyable&);
    };
 }
 
diff --git a/sflphone-common/src/sip/sipcall.cpp b/sflphone-common/src/sip/sipcall.cpp
index 7d86567fb8dc9d586b3eb8f74c7504a232772ffe..e8fa530748354d8fec5be99db4f79c6e10c6b4c3 100644
--- a/sflphone-common/src/sip/sipcall.cpp
+++ b/sflphone-common/src/sip/sipcall.cpp
@@ -33,6 +33,7 @@
 
 #include "sipcall.h"
 #include "global.h" // for _debug
+#include "audio/audiortp/AudioRtpFactory.h"
 #include "sdp.h"
 
 const int SIPCall::CALL_MEMPOOL_INIT_SIZE = 16384;
diff --git a/sflphone-common/src/sip/sipcall.h b/sflphone-common/src/sip/sipcall.h
index 59494e74678488528ed99f6672cdac5f3e2fd965..40988af1a9d89c61fe3190641044f65fe4878d69 100644
--- a/sflphone-common/src/sip/sipcall.h
+++ b/sflphone-common/src/sip/sipcall.h
@@ -37,11 +37,7 @@
 #include <pjsip-simple/evsub.h>
 #include <pjsip_ua.h>
 
-#include "audio/audiortp/AudioRtpFactory.h"
-
-class AudioCodec;
 class Sdp;
-class AudioRtp;
 
 namespace sfl
 {
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index 69ca116a379611ea90cf572fd1f862a217a3b0c1..f67313a4d453141107b16db3470db032d76b1399 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -49,6 +49,7 @@
 #include "im/InstantMessaging.h"
 
 #include "audio/audiolayer.h"
+#include "audio/audiortp/AudioRtpFactory.h"
 
 #include "pjsip/sip_endpoint.h"
 #include "pjsip/sip_transport_tls.h"