Index: src/inet_ntop.c
===================================================================
--- src/inet_ntop.c	(.../vendor/libeXosip2/libeXosip2-3.1.0)	(revision 3519)
+++ src/inet_ntop.c	(.../trunk/linphone/libeXosip2)	(revision 3519)
@@ -36,6 +36,7 @@
  * SOFTWARE.
  */
 
+
 #if defined(WIN32) || defined(_WIN32_WCE) 
 
 #include <osipparser2/osip_port.h>
@@ -43,28 +44,13 @@
 
 #include <windowsx.h>
 #include <winsock2.h>
-#include <Ws2tcpip.h>
-#include <Iphlpapi.h>
+#include <ws2tcpip.h>
+#include <iphlpapi.h>
 
 #include "inet_ntop.h"
 
-/* added by adm */
-/*
- * the definitions below are valid for 32-bit architectures and will have to
- * be adjusted for 16- or 64-bit architectures
- */
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-typedef __int8 int8_t;
-typedef __int16 int16_t;
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned long in_addr_t;
+#include <stdint.h>
 
-/* !added by amd */
-
 #define	IN6ADDRSZ	16
 #define	INT16SZ		 2
 
Index: src/jrequest.c
===================================================================
--- src/jrequest.c	(.../vendor/libeXosip2/libeXosip2-3.1.0)	(revision 3519)
+++ src/jrequest.c	(.../trunk/linphone/libeXosip2)	(revision 3519)
@@ -33,7 +33,7 @@
 #endif
 #else
 #include <windows.h>
-#include <Iphlpapi.h>
+#include <iphlpapi.h>
 #endif
 
 extern eXosip_t eXosip;
Index: src/jcallback.c
===================================================================
--- src/jcallback.c	(.../vendor/libeXosip2/libeXosip2-3.1.0)	(revision 3519)
+++ src/jcallback.c	(.../trunk/linphone/libeXosip2)	(revision 3519)
@@ -30,7 +30,7 @@
 #elif WIN32
 #include <windowsx.h>
 #include <winsock2.h>
-#include <Ws2tcpip.h>
+#include <ws2tcpip.h>
 #include "inet_ntop.h"
 
 #else
Index: src/eXutils.c
===================================================================
--- src/eXutils.c	(.../vendor/libeXosip2/libeXosip2-3.1.0)	(revision 3519)
+++ src/eXutils.c	(.../trunk/linphone/libeXosip2)	(revision 3519)
@@ -27,7 +27,7 @@
 
 #if defined(_WIN32_WCE)
 #elif defined(WIN32)
-#include <WinDNS.h>
+#include <windns.h>
 #else
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -395,8 +395,8 @@
 #if defined(WIN32) || defined(_WIN32_WCE)
 
 /* You need the Platform SDK to compile this. */
-#include <Windows.h>
-#include <Iphlpapi.h>
+#include <windows.h>
+#include <iphlpapi.h>
 
 int
 eXosip_dns_get_local_fqdn (char **servername, char **serverip,
@@ -814,8 +814,8 @@
     {
       OSIP_TRACE (osip_trace
                   (__FILE__, __LINE__, OSIP_INFO2, NULL,
-                   "getaddrinfo failure. %s:%s (%s)\n", hostname, portbuf,
-                   gai_strerror (error)));
+                   "getaddrinfo failure. %s:%s (%d)\n", hostname, portbuf,
+                   error));
       return -1;
     }
    else{