diff --git a/libtransmission/natpmp.c b/libtransmission/natpmp.c
index b7f5893b8..30bcbc4c2 100644
--- a/libtransmission/natpmp.c
+++ b/libtransmission/natpmp.c
@@ -14,12 +14,14 @@
 #include <time.h>
 #include <inttypes.h>
 
+#include <event2/util.h> /* evutil_inet_ntop() */
+
 #define ENABLE_STRNATPMPERR
 #include <libnatpmp/natpmp.h>
 
 #include "transmission.h"
 #include "natpmp.h"
-#include "net.h" /* inet_ntoa() */
+#include "net.h" /* tr_netCloseSocket */
 #include "port-forwarding.h"
 #include "utils.h"
 
@@ -134,8 +136,9 @@ tr_natpmpPulse( struct tr_natpmp * nat, tr_port private_port, bool is_enabled, t
         logVal( "readnatpmpresponseorretry", val );
         if( val >= 0 )
         {
-            tr_ninf( getKey( ), _( "Found public address \"%s\"" ),
-                     inet_ntoa( response.pnu.publicaddress.addr ) );
+            char str[128];
+            evutil_inet_ntop( AF_INET, &response.pnu.publicaddress.addr, str, sizeof( str ) );
+            tr_ninf( getKey( ), _( "Found public address \"%s\"" ), str );
             nat->state = TR_NATPMP_IDLE;
         }
         else if( val != NATPMP_TRYAGAIN )
diff --git a/libtransmission/net.c b/libtransmission/net.c
index 014ec8991..4b30a8c43 100644
--- a/libtransmission/net.c
+++ b/libtransmission/net.c
@@ -32,26 +32,19 @@
 #ifdef WIN32
  #define _WIN32_WINNT   0x0501
  #include <ws2tcpip.h>
-#else
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
- #include <arpa/inet.h> /* inet_addr */
- #include <netdb.h>
 #endif
 
 #include <event2/util.h>
+
 #include <libutp/utp.h>
 
 #include "transmission.h"
-#include "fdlimit.h"
-#include "natpmp.h"
+#include "fdlimit.h" /* tr_fdSocketClose() */
 #include "net.h"
-#include "peer-io.h"
-#include "platform.h"
-#include "session.h"
-#include "tr-utp.h"
-#include "utils.h"
+#include "peer-io.h" /* tr_peerIoAddrStr() FIXME this should be moved to net.h */
+#include "session.h" /* tr_sessionGetPublicAddress() */
+#include "tr-utp.h" /* tr_utpSendTo() */
+#include "utils.h" /* tr_time(), tr_dbg() */
 
 #ifndef IN_MULTICAST
 #define IN_MULTICAST( a ) ( ( ( a ) & 0xf0000000 ) == 0xe0000000 )
diff --git a/libtransmission/net.h b/libtransmission/net.h
index cbc3ec928..639dff1f8 100644
--- a/libtransmission/net.h
+++ b/libtransmission/net.h
@@ -33,10 +33,8 @@
  #include <inttypes.h>
  #include <ws2tcpip.h>
 #else
- #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
- #include <arpa/inet.h>
 #endif
 
 #ifdef WIN32
diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index 874b9f274..dd32ea81d 100644
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -15,12 +15,6 @@
 #include <limits.h> /* INT_MAX */
 #include <string.h>
 
-#ifdef WIN32
- #include <winsock2.h>
-#else
- #include <arpa/inet.h> /* inet_ntoa */
-#endif
-
 #include <event2/event.h>
 #include <event2/buffer.h>
 #include <event2/bufferevent.h>
diff --git a/libtransmission/tr-lpd.c b/libtransmission/tr-lpd.c
index 84ba3d3a0..9590554b1 100644
--- a/libtransmission/tr-lpd.c
+++ b/libtransmission/tr-lpd.c
@@ -533,7 +533,7 @@ static int tr_lpdConsiderAnnounce( tr_pex* peer, const char* const msg )
             /* we found a suitable peer, add it to the torrent */
             tr_peerMgrAddPex( tor, TR_PEER_FROM_LPD, peer, -1 );
             tr_tordbg( tor, "Learned %d local peer from LPD (%s:%u)",
-                1, inet_ntoa( peer->addr.addr.addr4 ), peerPort );
+                1, tr_ntop_non_ts( &peer->addr ), peerPort );
 
             /* periodic reconnectPulse() deals with the rest... */
 
diff --git a/utils/create.c b/utils/create.c
index e79dc2878..409d7fa3e 100644
--- a/utils/create.c
+++ b/utils/create.c
@@ -11,7 +11,7 @@
  */
 
 #include <errno.h>
-#include <stdio.h>
+#include <stdio.h> /* fprintf() */
 #include <stdlib.h> /* EXIT_FAILURE */
 #include <unistd.h> /* getcwd() */
 
diff --git a/utils/edit.c b/utils/edit.c
index a86b1c335..c05318c1a 100644
--- a/utils/edit.c
+++ b/utils/edit.c
@@ -10,7 +10,7 @@
  * $Id$
  */
 
-#include <stdio.h>
+#include <stdio.h> /* fprintf() */
 #include <string.h> /* strlen(), strstr(), strcmp() */
 #include <stdlib.h> /* EXIT_FAILURE */
 
diff --git a/utils/show.c b/utils/show.c
index 52762314b..312e8c0a8 100644
--- a/utils/show.c
+++ b/utils/show.c
@@ -10,7 +10,7 @@
  * $Id$
  */
 
-#include <stdio.h>
+#include <stdio.h> /* fprintf() */
 #include <string.h> /* strcmp(), strchr(), memcmp() */
 #include <stdlib.h> /* getenv(), qsort() */
 #include <time.h>