diff --git a/options.c b/options.c
index c355f9ce..5f958d23 100644
--- a/options.c
+++ b/options.c
@@ -47,7 +47,7 @@ options_cmp(struct options_entry *o1, struct options_entry *o2)
 struct options *
 options_create(struct options *parent)
 {
-	struct options *oo;
+	struct options	*oo;
 
 	oo = xcalloc(1, sizeof *oo);
 	RB_INIT(&oo->tree);
diff --git a/tmux.h b/tmux.h
index fa589f57..7757f12f 100644
--- a/tmux.h
+++ b/tmux.h
@@ -693,10 +693,12 @@ struct grid {
 
 /* Hook data structures. */
 struct hook {
-	const char      *name;
-	struct cmd_q    *cmdq;
-	struct cmd_list *cmdlist;
-	RB_ENTRY(hook)   entry;
+	const char	*name;
+
+	struct cmd_q	*cmdq;
+	struct cmd_list	*cmdlist;
+
+	RB_ENTRY(hook)	 entry;
 };
 
 /* Option data structures. */