diff --git a/src/common/outbound.c b/src/common/outbound.c
index 9fab4a75..7211f000 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -4397,7 +4397,7 @@ void
 check_special_chars (char *cmd, int do_ascii) /* check for %X */
 {
 	int occur = 0;
-	int len = strlen (cmd);
+	size_t len = strlen (cmd);
 	char *buf, *utf;
 	char tbuf[4];
 	int i = 0, j = 0;
diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
index 7a163f73..12fcb579 100644
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -1017,7 +1017,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 	char *account;
 	char ip[128], nick[NICKLEN];
 	char *text, *ex;
-	int len = strlen (type);
+	size_t len = strlen (type);
 
 	/* fill in the "ip" and "nick" buffers */
 	ex = strchr (word[1], '!');
diff --git a/src/common/url.c b/src/common/url.c
index e49138dd..4966db30 100644
--- a/src/common/url.c
+++ b/src/common/url.c
@@ -321,7 +321,7 @@ url_check_line (char *buf)
 	for (i = 0; i < ARRAY_SIZE (commands); i++)
 	{
 		char *cmd = commands[i];
-		int len = strlen (cmd);
+		size_t len = strlen (cmd);
 
 		if (strncmp (cmd, po, len) == 0)
 		{
diff --git a/src/common/util.c b/src/common/util.c
index f8a5f5bf..77f286a6 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -98,7 +98,7 @@ path_part (char *file, char *path, int pathlen)
 char *				/* like strstr(), but nocase */
 nocasestrstr (const char *s, const char *wanted)
 {
-	register const int len = strlen (wanted);
+	register const size_t len = strlen (wanted);
 
 	if (len == 0)
 		return (char *)s;
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index 47c23e76..cff68ad8 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -1364,7 +1364,7 @@ setup_entry_cb (GtkEntry *entry, setting *set)
         int size;
         int pos;
         unsigned char *p = (unsigned char*)gtk_entry_get_text (entry);
-        int len = strlen (p);
+        size_t len = strlen ((const char *) p);
 
         /* need to truncate? */
         if (len >= set->extra)
diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c
index 9e68a333..7a03446b 100644
--- a/src/fe-text/fe-text.c
+++ b/src/fe-text/fe-text.c
@@ -313,7 +313,8 @@ fe_print_text (struct session *sess, char *text, time_t stamp,
 			   gboolean no_activity)
 {
 	int dotime = FALSE;
-	int comma, k, i = 0, j = 0, len = strlen (text);
+	int comma, k, i = 0, j = 0;
+	size_t len = strlen (text);
 
 	unsigned char *newtext = g_malloc (len + 1024);