diff --git a/cmd.c b/cmd.c
index 83edaf64..d0348704 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1245,8 +1245,8 @@ cmd_template_replace(const char *template, const char *s, int idx)
 {
 	char		 ch, *buf;
 	const char	*ptr;
-	int	 	 replaced;
-	size_t	 	 len;
+	int		 replaced;
+	size_t		 len;
 
 	if (strchr(template, '%') == NULL)
 		return (xstrdup(template));
diff --git a/server-client.c b/server-client.c
index 13c037d8..f61912bc 100644
--- a/server-client.c
+++ b/server-client.c
@@ -21,10 +21,10 @@
 
 #include <event.h>
 #include <fcntl.h>
-#include <string.h>
-#include <time.h>
 #include <paths.h>
 #include <stdlib.h>
+#include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "tmux.h"