diff --git a/src/call.cpp b/src/call.cpp
index 997bcde064c9b5b1306fce28a023fb68d2456960..a0e56d779a59e735442d665c934db0278bab9623 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -20,8 +20,6 @@
 #include <iostream>
 
 #include "call.h"
-#include "manager.h"
-#include "sipvoiplink.h"
 #include "voIPLink.h"
 
 
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 179f6d7757f8d510ad844bc91ecde873389c04f2..bb81b8beaa68b6ee1dec904cc0a3021ab5242fa6 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -28,12 +28,14 @@
 //#include <arpa/inet.h>
 
 #include <cc++/thread.h>
+
 #include <cstdlib> 
 #include <iostream>
 #include <fstream> 
 #include <string>
 #include <vector>
 
+#include "sipvoiplink.h"
 #include "manager.h"
 #include "audio/audiocodec.h"
 #include "audio/audiolayer.h"
@@ -44,7 +46,6 @@
 #include "configuration.h"  
 #include "configurationtree.h" 
 #include "error.h"
-#include "sipvoiplink.h"
 #include "skin.h" 
 #include "user_cfg.h"
 #include "voIPLink.h" 
diff --git a/src/sipvoiplink.cpp b/src/sipvoiplink.cpp
index 443e5420afbc2f7e1fdce943f411994a978fcf49..6db2eb3dc0efb3b73f3073ea0a642a81b4256d60 100644
--- a/src/sipvoiplink.cpp
+++ b/src/sipvoiplink.cpp
@@ -18,31 +18,22 @@
  *  along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <sys/time.h>
+//#include <sys/time.h>
 
 #include <eXosip2/eXosip.h>  
 #include <osip2/osip.h>
-#include <osipparser2/osip_const.h>
-#include <osipparser2/osip_headers.h>
-#include <osipparser2/osip_body.h>
 
-#include <cc++/thread.h>
-#include <stdexcept>
-#include <iostream>
 #include <string>
-#include <vector>
 
-#include "global.h"
 #include "sipvoiplink.h"
-#include "audio/audiortp.h"
+#include "global.h"
 #include "audio/codecDescriptor.h"
-#include "call.h"
 #include "error.h"
-#include "eventthread.h"
 #include "manager.h"
 #include "sipcall.h"
 #include "user_cfg.h"
-#include "voIPLink.h"
+#include "eventthread.h"
+
  
 using namespace ost;
 using namespace std;
@@ -66,6 +57,10 @@ SipVoIPLink::SipVoIPLink (short id)
   _evThread = new EventThread(this);
 }
 
+SipVoIPLink::~SipVoIPLink(void) {
+  delete _evThread;
+}
+
 bool 
 SipVoIPLink::checkNetwork (void) 
 {
diff --git a/src/sipvoiplink.h b/src/sipvoiplink.h
index 3cb5ecd213ed1f61aedb1f6602cc51030500ca80..f6efdfb6813b10354ddd6766a9dbfcc6ed4d09ae 100644
--- a/src/sipvoiplink.h
+++ b/src/sipvoiplink.h
@@ -22,14 +22,11 @@
 #ifndef __SIP_VOIP_LINK_H__
 #define __SIP_VOIP_LINK_H__
 
-#include <eXosip2/eXosip.h>
-#include <osipparser2/sdp_message.h>
-
-#include <string>
 #include <vector>
+#include <eXosip2/eXosip.h>  
+//#include <osipparser2/sdp_message.h>
 
 #include "voIPLink.h"
-#include "eventthread.h"
 #include "audio/audiortp.h"
 
 using namespace std;
@@ -65,6 +62,7 @@ using namespace std;
 class AudioCodec;
 class CodecDescriptor;
 class SipCall;
+class EventThread;
 
 typedef vector< CodecDescriptor* > CodecDescriptorVector;