diff --git a/arguments.c b/arguments.c
index df05d328..3bc888a2 100644
--- a/arguments.c
+++ b/arguments.c
@@ -189,7 +189,7 @@ out:
 /* Parse flags argument. */
 static int
 args_parse_flags(const struct args_parse *parse, struct args_value *values,
-    u_int count, char **cause, struct args *args, int *i)
+    u_int count, char **cause, struct args *args, u_int *i)
 {
 	struct args_value	*value;
 	u_char			 flag;
diff --git a/grid.c b/grid.c
index 3afbfb6a..014e8b8f 100644
--- a/grid.c
+++ b/grid.c
@@ -1044,7 +1044,8 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx,
 	const char		*data;
 	char			*buf, code[8192];
 	size_t			 len, off, size, codelen;
-	u_int			 xx, has_link = 0, end;
+	u_int			 xx, end;
+	int			 has_link = 0;
 	const struct grid_line	*gl;
 
 	if (lastgc != NULL && *lastgc == NULL) {
diff --git a/regsub.c b/regsub.c
index 4039b9be..61a9c324 100644
--- a/regsub.c
+++ b/regsub.c
@@ -24,7 +24,7 @@
 #include "tmux.h"
 
 static void
-regsub_copy(char **buf, size_t *len, const char *text, size_t start, size_t end)
+regsub_copy(char **buf, ssize_t *len, const char *text, size_t start, size_t end)
 {
 	size_t	add = end - start;
 
@@ -34,7 +34,7 @@ regsub_copy(char **buf, size_t *len, const char *text, size_t start, size_t end)
 }
 
 static void
-regsub_expand(char **buf, size_t *len, const char *with, const char *text,
+regsub_expand(char **buf, ssize_t *len, const char *with, const char *text,
     regmatch_t *m, u_int n)
 {
 	const char	*cp;
diff --git a/utf8.c b/utf8.c
index 3c6f88ff..f93891a6 100644
--- a/utf8.c
+++ b/utf8.c
@@ -95,7 +95,7 @@ utf8_item_by_index(u_int index)
 
 /* Add a UTF-8 item. */
 static int
-utf8_put_item(const char *data, size_t size, u_int *index)
+utf8_put_item(const u_char *data, size_t size, u_int *index)
 {
 	struct utf8_item	*ui;
 
diff --git a/window-tree.c b/window-tree.c
index 00c7c0cc..8c956d00 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -671,9 +671,9 @@ window_tree_draw_window(struct window_tree_modedata *data, struct session *s,
 	struct window_pane	*wp;
 	u_int			 cx = ctx->s->cx, cy = ctx->s->cy;
 	u_int			 loop, total, visible, each, width, offset;
-	u_int			 current, start, end, remaining, i;
+	u_int			 current, start, end, remaining, i, pane_idx;
 	struct grid_cell	 gc;
-	int			 colour, active_colour, left, right, pane_idx;
+	int			 colour, active_colour, left, right;
 	char			*label;
 
 	total = window_count_panes(w);