diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index 50a275d834e9d0048ab3f04e36c234f1e523c366..4fa943bf5593629723ee4db910eba3c25e9ae5a3 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -357,7 +357,7 @@ SIPVoIPLink::terminate()
     /* Clean shutdown of pjsip library */
     if (initDone()) {
         _debug ("UserAgent: Shutting down PJSIP");
-        pjsip_shutdown();
+        pjsipShutdown();
     }
 
     initDone (false);
@@ -3028,7 +3028,7 @@ void SIPVoIPLink::busySleep (unsigned msec)
 #endif
 }
 
-bool SIPVoIPLink::pjsip_shutdown (void)
+bool SIPVoIPLink::pjsipShutdown (void)
 {
     if (_endpt) {
         _debug ("UserAgent: Shutting down...");
@@ -4763,7 +4763,7 @@ std::string SIPVoIPLink::getInterfaceAddrFromName (std::string ifaceName)
     saddr_in = (struct sockaddr_in *) &ifr.ifr_addr;
     addr_in = & (saddr_in->sin_addr);
 
-    std::string addr (pj_inet_ntoa (* ( (pj_in_addr*) addr_in)));
+    std::string addr (inet_ntoa (*addr_in));
 
     close (fd);
 
diff --git a/sflphone-common/src/sip/sipvoiplink.h b/sflphone-common/src/sip/sipvoiplink.h
index a2c2b0789a39df3eeecd45bc8dd3a59c9fafdce1..731d560d0703b04669b0b7f7a7365b27f4ec1cfd 100644
--- a/sflphone-common/src/sip/sipvoiplink.h
+++ b/sflphone-common/src/sip/sipvoiplink.h
@@ -449,7 +449,7 @@ class SIPVoIPLink : public VoIPLink
         /**
          * Delete link-related stuff like calls
          */
-        bool pjsip_shutdown (void);
+        bool pjsipShutdown (void);
 
         /**
          * Resolve public address for this account