diff --git a/cli/cli.c b/cli/cli.c
index 9686738fb..e8efb8a58 100644
--- a/cli/cli.c
+++ b/cli/cli.c
@@ -22,10 +22,9 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include <stdio.h> /* fprintf() */
+#include <stdlib.h> /* atoi() */
+#include <string.h> /* memcmp() */
 #include <signal.h>
 
 #include <libtransmission/transmission.h>
diff --git a/daemon/daemon.c b/daemon/daemon.c
index bdffd7fdc..db734cb43 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -13,7 +13,7 @@
 #include <errno.h>
 #include <stdio.h> /* printf */
 #include <stdlib.h> /* exit, atoi */
-#include <string.h> /* strcmp */
+#include <string.h> /* strerror() */
 
 #include <fcntl.h> /* open */
 #include <signal.h>
diff --git a/daemon/watch.c b/daemon/watch.c
index 488ef21c3..32e959bf6 100644
--- a/daemon/watch.c
+++ b/daemon/watch.c
@@ -20,7 +20,7 @@
 #endif
 
 #include <errno.h>
-#include <string.h> /* strstr */
+#include <string.h> /* strlen() */
 #include <stdio.h> /* perror() */
 
 #include <dirent.h> /* readdir */
diff --git a/gtk/conf.c b/gtk/conf.c
index 2048dcf46..19091eb43 100644
--- a/gtk/conf.c
+++ b/gtk/conf.c
@@ -24,7 +24,7 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <stdlib.h> /* strtol() */
 #include <string.h>
 
 #include <unistd.h>
diff --git a/gtk/details.c b/gtk/details.c
index 7a632fe30..6eaefa1d9 100644
--- a/gtk/details.c
+++ b/gtk/details.c
@@ -10,10 +10,9 @@
  * $Id$
  */
 
-#include <assert.h>
 #include <stddef.h>
-#include <stdio.h> /* sscanf */
-#include <stdlib.h>
+#include <stdio.h> /* sscanf() */
+#include <stdlib.h> /* abort() */
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
diff --git a/gtk/file-list.c b/gtk/file-list.c
index 0f60e88a1..bb24d1ad3 100644
--- a/gtk/file-list.c
+++ b/gtk/file-list.c
@@ -12,7 +12,6 @@
 
 #include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/gtk/main.c b/gtk/main.c
index 1c03a5f35..28a93b0fc 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -26,7 +26,7 @@
 #include <signal.h>
 #include <string.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <stdlib.h> /* exit() */
 #include <sys/param.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c
index 46d14cab7..dfa5315f5 100644
--- a/gtk/makemeta-ui.c
+++ b/gtk/makemeta-ui.c
@@ -10,8 +10,6 @@
  * $Id$
  */
 
-#include <string.h>
-
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
diff --git a/gtk/notify.c b/gtk/notify.c
index 30194b344..755d5349f 100644
--- a/gtk/notify.c
+++ b/gtk/notify.c
@@ -10,7 +10,7 @@
  * $Id$
  */
 
-#include <string.h>
+#include <string.h> /* strcmp() */
 
 #ifdef HAVE_LIBCANBERRA
  #include <canberra-gtk.h>
diff --git a/gtk/torrent-cell-renderer.c b/gtk/torrent-cell-renderer.c
index 895df2985..82147be33 100644
--- a/gtk/torrent-cell-renderer.c
+++ b/gtk/torrent-cell-renderer.c
@@ -10,7 +10,6 @@
  * $Id$
  */
 
-#include <string.h> /* strcmp() */
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libtransmission/transmission.h>
diff --git a/gtk/tr-prefs.c b/gtk/tr-prefs.c
index fd6782022..e5adcff8b 100644
--- a/gtk/tr-prefs.c
+++ b/gtk/tr-prefs.c
@@ -12,7 +12,7 @@
 
 #include <ctype.h> /* isspace */
 #include <limits.h> /* USHRT_MAX */
-#include <stdlib.h> /* free() */
+#include <string.h> /* strcmp() */
 #include <unistd.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/gtk/util.c b/gtk/util.c
index abe7d3ae8..dac2e6dc2 100644
--- a/gtk/util.c
+++ b/gtk/util.c
@@ -13,8 +13,7 @@
 #include <ctype.h> /* isxdigit() */
 #include <errno.h>
 #include <stdarg.h>
-#include <stdlib.h> /* free() */
-#include <string.h> /* strcmp() */
+#include <string.h> /* strchr(), strrchr(), strlen(), strncmp(), strstr() */
 
 #include <sys/types.h> /* for gtr_lockfile()'s open() */
 #include <sys/stat.h> /* for gtr_lockfile()'s open() */
@@ -888,6 +887,6 @@ gtr_label_set_text( GtkLabel * lb, const char * newstr )
 {
     const char * oldstr = gtk_label_get_text( lb );
 
-    if( ( oldstr == NULL ) || strcmp( oldstr, newstr ) )
+    if( tr_strcmp0( oldstr, newstr ) )
         gtk_label_set_text( lb, newstr );
 }
diff --git a/libtransmission/JSON_parser.c b/libtransmission/JSON_parser.c
index b86e310bc..e4a5574bc 100644
--- a/libtransmission/JSON_parser.c
+++ b/libtransmission/JSON_parser.c
@@ -68,7 +68,6 @@ SOFTWARE.
 #include <string.h>
 #include <locale.h>
 
-#include <stdarg.h> /* some 1.4.x versions of evutil.h need this */
 #include <event2/util.h> /* evutil_strtoll() */
 
 #include "JSON_parser.h"
diff --git a/libtransmission/announcer.c b/libtransmission/announcer.c
index 1ba65dabe..10b2d69f0 100644
--- a/libtransmission/announcer.c
+++ b/libtransmission/announcer.c
@@ -11,7 +11,7 @@
  */
 
 #include <assert.h>
-#include <limits.h>
+#include <limits.h> /* INT_MAX */
 #include <stdio.h>
 #include <stdlib.h> /* qsort() */
 #include <string.h> /* strcmp(), memcpy() */
diff --git a/libtransmission/blocklist-test.c b/libtransmission/blocklist-test.c
index 767e0811a..fa6e656cb 100644
--- a/libtransmission/blocklist-test.c
+++ b/libtransmission/blocklist-test.c
@@ -1,6 +1,4 @@
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "transmission.h"
 #include "blocklist.h"
 #include "net.h"
diff --git a/libtransmission/blocklist.c b/libtransmission/blocklist.c
index dde097811..37eae2671 100644
--- a/libtransmission/blocklist.c
+++ b/libtransmission/blocklist.c
@@ -10,10 +10,14 @@
  * $Id$
  */
 
+#include <assert.h>
+#include <errno.h>
 #include <stdio.h>
-#include <stdlib.h> /* qsort(), free() */
+#include <stdlib.h> /* bsearch(), qsort() */
 #include <string.h>
 
+#include <unistd.h> /* unlink() */
+
 #ifdef WIN32
  #include <w32api.h>
  #define WINVER  WindowsXP
@@ -28,8 +32,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
-#include <assert.h>
 
 #include "transmission.h"
 #include "platform.h"
diff --git a/libtransmission/clients-test.c b/libtransmission/clients-test.c
index 0f2ed8caa..db33ebeda 100644
--- a/libtransmission/clients-test.c
+++ b/libtransmission/clients-test.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include "transmission.h"
 #include "clients.h"
diff --git a/libtransmission/clients.c b/libtransmission/clients.c
index 484d2c351..75002b6d2 100644
--- a/libtransmission/clients.c
+++ b/libtransmission/clients.c
@@ -13,7 +13,6 @@
 /* thanks amc1! */
 
 #include <ctype.h> /* isprint() */
-#include <stdio.h>
 #include <stdlib.h> /* strtol() */
 #include <string.h>
 
diff --git a/libtransmission/crypto.c b/libtransmission/crypto.c
index d40d49305..36ec86665 100644
--- a/libtransmission/crypto.c
+++ b/libtransmission/crypto.c
@@ -12,10 +12,10 @@
 
 #include <assert.h>
 #include <inttypes.h> /* uint8_t */
-#include <limits.h> /* for INT_MAX */
+#include <limits.h> /* INT_MAX */
 #include <stdarg.h>
-#include <stdlib.h> /* for abs() */
-#include <string.h> /* memcpy */
+#include <stdlib.h> /* abs() */
+#include <string.h> /* memcpy(), memset(), strcmp() */
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
diff --git a/libtransmission/fdlimit.c b/libtransmission/fdlimit.c
index 856c1d8d8..39bb2958d 100644
--- a/libtransmission/fdlimit.c
+++ b/libtransmission/fdlimit.c
@@ -24,8 +24,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #ifdef SYS_DARWIN
  #include <fcntl.h>
@@ -47,7 +45,7 @@
  #include <sys/resource.h> /* getrlimit */
 #endif
 #include <fcntl.h> /* O_LARGEFILE posix_fadvise */
-#include <unistd.h>
+#include <unistd.h> /* lseek(), write(), ftruncate(), pread(), pwrite(), etc */
 
 #include "transmission.h"
 #include "fdlimit.h"
diff --git a/libtransmission/handshake.c b/libtransmission/handshake.c
index ecb0e460e..e670e2ffa 100644
--- a/libtransmission/handshake.c
+++ b/libtransmission/handshake.c
@@ -15,7 +15,6 @@
 #include <inttypes.h>
 #include <limits.h> /* UCHAR_MAX */
 #include <string.h>
-#include <stdio.h>
 
 #include <event2/event.h>
 
diff --git a/libtransmission/inout.c b/libtransmission/inout.c
index bd4213da6..5c4685579 100644
--- a/libtransmission/inout.c
+++ b/libtransmission/inout.c
@@ -12,8 +12,8 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <stdlib.h> /* realloc */
-#include <string.h> /* memcmp */
+#include <stdlib.h> /* bsearch() */
+#include <string.h> /* memcmp() */
 
 #include <openssl/sha.h>
 
diff --git a/libtransmission/json.c b/libtransmission/json.c
index 6a09ebd43..e3216a513 100644
--- a/libtransmission/json.c
+++ b/libtransmission/json.c
@@ -13,8 +13,6 @@
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h> /* EILSEQ, EINVAL */
-#include <string.h>
-#include <stdio.h> /* printf */
 
 #include "JSON_parser.h"
 
diff --git a/libtransmission/makemeta.c b/libtransmission/makemeta.c
index a3370d959..8a3c4b2da 100644
--- a/libtransmission/makemeta.c
+++ b/libtransmission/makemeta.c
@@ -18,7 +18,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <unistd.h> /* read() */
 #include <dirent.h>
 
 #include <event2/util.h> /* evutil_ascii_strcasecmp() */
diff --git a/libtransmission/net.c b/libtransmission/net.c
index ead66df6a..014ec8991 100644
--- a/libtransmission/net.c
+++ b/libtransmission/net.c
@@ -24,8 +24,6 @@
  *****************************************************************************/
 
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
@@ -40,9 +38,7 @@
  #include <netinet/tcp.h>
  #include <arpa/inet.h> /* inet_addr */
  #include <netdb.h>
- #include <fcntl.h>
 #endif
-#include <unistd.h>
 
 #include <event2/util.h>
 #include <libutp/utp.h>
diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index 057e76e47..a352fa36e 100644
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -14,8 +14,6 @@
 #include <errno.h>
 #include <limits.h> /* INT_MAX */
 #include <string.h>
-#include <stdio.h>
-#include <unistd.h>
 
 #ifdef WIN32
  #include <winsock2.h>
diff --git a/libtransmission/port-forwarding.c b/libtransmission/port-forwarding.c
index 031c8121a..46aa0d9fb 100644
--- a/libtransmission/port-forwarding.c
+++ b/libtransmission/port-forwarding.c
@@ -11,7 +11,6 @@
  */
 
 #include <assert.h>
-#include <string.h>
 #include <stdio.h>
 
 #include <sys/types.h>
diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c
index 731181c87..774e67777 100644
--- a/libtransmission/rpc-server.c
+++ b/libtransmission/rpc-server.c
@@ -15,9 +15,6 @@
 #include <string.h> /* memcpy */
 #include <limits.h> /* INT_MAX */
 
-#include <sys/types.h> /* open */
-#include <sys/stat.h>  /* open */
-#include <fcntl.h>     /* open */
 #include <unistd.h>    /* close */
 
 #ifdef HAVE_ZLIB
diff --git a/libtransmission/tr-udp.c b/libtransmission/tr-udp.c
index 6797f7100..45b7d575f 100644
--- a/libtransmission/tr-udp.c
+++ b/libtransmission/tr-udp.c
@@ -21,11 +21,12 @@ THE SOFTWARE.
 
 */
 
-#include <unistd.h>
 #include <assert.h>
 #include <string.h> /* memcmp(), memcpy(), memset() */
 #include <stdlib.h> /* malloc(), free() */
 
+#include <unistd.h> /* close() */
+
 #include <event2/event.h>
 
 #include "transmission.h"
diff --git a/libtransmission/tr-utp.c b/libtransmission/tr-utp.c
index 71712b0d4..b22c3dc53 100644
--- a/libtransmission/tr-utp.c
+++ b/libtransmission/tr-utp.c
@@ -22,9 +22,9 @@ THE SOFTWARE.
 */
 
 #include <assert.h>
-#include <unistd.h>
 
 #include <event2/event.h>
+
 #include <libutp/utp.h>
 
 #include "transmission.h"
diff --git a/libtransmission/trevent.c b/libtransmission/trevent.c
index a72496dd5..1aeb4961b 100644
--- a/libtransmission/trevent.c
+++ b/libtransmission/trevent.c
@@ -12,9 +12,7 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 #include <signal.h>
 
@@ -125,7 +123,7 @@ piperead( int s, char *buf, int len )
 #define pipewrite(a,b,c) write(a,b,c)
 #endif
 
-#include <unistd.h>
+#include <unistd.h> /* read(), write(), pipe() */
 
 #include "transmission.h"
 #include "platform.h"
diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index a5237e5eb..9511142ce 100644
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -22,7 +22,7 @@
 #endif
 
 #include <assert.h>
-#include <ctype.h> /* isalpha(), tolower() */
+#include <ctype.h> /* isdigit(), isalpha(), tolower() */
 #include <errno.h>
 #include <float.h> /* DBL_EPSILON */
 #include <locale.h> /* localeconv() */
@@ -40,7 +40,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h> /* stat(), getcwd(), getpagesize() */
+#include <unistd.h> /* stat(), getcwd(), getpagesize(), unlink() */
 
 #include <event2/buffer.h>
 #include <event2/event.h>