diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index 1de4eba68..1f0bb517f 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -77,4 +77,3 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 
 	return (1);
 }
-
diff --git a/cmd-rotate-window.c b/cmd-rotate-window.c
index b7ac341dd..39605b641 100644
--- a/cmd-rotate-window.c
+++ b/cmd-rotate-window.c
@@ -72,7 +72,7 @@ cmd_rotate_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		TAILQ_INSERT_HEAD(&w->panes, wp, entry);
 
 		xoff = wp->xoff; yoff = wp->yoff;
-		sx = wp->sx; sy = wp->sy;	
+		sx = wp->sx; sy = wp->sy;
 		flags = w->flags;
 		TAILQ_FOREACH(wp, &w->panes, entry) {
 			if ((wp2 = TAILQ_NEXT(wp, entry)) == NULL)
diff --git a/grid.c b/grid.c
index 461d92ea7..71761afe7 100644
--- a/grid.c
+++ b/grid.c
@@ -493,5 +493,3 @@ grid_move_cells(struct grid *gd, u_int dx, u_int px, u_int py, u_int nx)
 		grid_put_cell(gd, xx, py, &grid_default_cell);
 	}
 }
-
-
diff --git a/names.c b/names.c
index 00c79fee7..e4afa70f3 100644
--- a/names.c
+++ b/names.c
@@ -107,4 +107,3 @@ parse_window_name(const char *in)
 	xfree(copy);
 	return (name);
 }
-
diff --git a/screen-write.c b/screen-write.c
index d7d56d97d..f0cdec309 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -89,7 +89,7 @@ screen_write_strlen(int utf8flag, const char *fmt, ...)
 			size++;
 			ptr++;
 		}
-	}	
+	}
 
 	return (size);
 }
@@ -148,7 +148,7 @@ screen_write_vnputs(struct screen_write_ctx *ctx, ssize_t maxlen,
 				*utf8buf = *ptr;
 				ptr++;
 			}
-			
+
 			width = utf8_width(utf8buf);
 			if (maxlen > 0 && size + width > (size_t) maxlen) {
 				while (size < (size_t) maxlen) {
@@ -301,12 +301,12 @@ screen_write_alignmenttest(struct screen_write_ctx *ctx)
 
 	memcpy(&gc, &grid_default_cell, sizeof gc);
 	gc.data = 'E';
-	
+
 	for (yy = 0; yy < screen_size_y(s); yy++) {
 		for (xx = 0; xx < screen_size_x(s); xx++)
 			grid_view_set_cell(s->grid, xx, yy, &gc);
 	}
-	
+
 	s->cx = 0;
 	s->cy = 0;
 
diff --git a/tty-term.c b/tty-term.c
index 200cc0204..e7aced73d 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -390,4 +390,3 @@ tty_term_flag(struct tty_term *term, enum tty_code_code code)
 		log_fatalx("not a flag: %d", code);
 	return (term->codes[code].value.flag);
 }
-
diff --git a/tty-write.c b/tty-write.c
index 46cb8e8ca..83aeea75a 100644
--- a/tty-write.c
+++ b/tty-write.c
@@ -88,4 +88,3 @@ tty_write_mode(struct window_pane *wp, int mode)
 		tty_update_mode(&c->tty, mode);
 	}
 }
-