diff --git a/Makefile b/Makefile
index d68af40..9be4547 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ BASHCPL = $(PREFIX)/share/bash-completion/completions
 ZSHCPL = $(PREFIX)/share/zsh/site-functions
 
 WM_SRC = bspwm.c helpers.c settings.c monitor.c desktop.c tree.c history.c \
-	 events.c window.c messages.c query.c restore.c rules.c ewmh.c
+	 events.c window.c messages.c query.c restore.c rule.c ewmh.c
 WM_OBJ = $(WM_SRC:.c=.o)
 CL_SRC = bspc.c helpers.c
 CL_OBJ = $(CL_SRC:.c=.o)
diff --git a/Sourcedeps b/Sourcedeps
index 8b3a882..49a59f9 100644
--- a/Sourcedeps
+++ b/Sourcedeps
@@ -1,15 +1,15 @@
 bspc.o: bspc.c common.h helpers.h
-bspwm.o: bspwm.c bspwm.h common.h desktop.h events.h ewmh.h helpers.h messages.h monitor.h rules.h settings.h tree.h types.h window.h
+bspwm.o: bspwm.c bspwm.h common.h desktop.h events.h ewmh.h helpers.h messages.h monitor.h rule.h settings.h tree.h types.h window.h
 desktop.o: desktop.c bspwm.h desktop.h ewmh.h helpers.h history.h tree.h types.h window.h
-events.o: events.c bspwm.h events.h ewmh.h helpers.h monitor.h query.h rules.h settings.h tree.h types.h window.h
+events.o: events.c bspwm.h events.h ewmh.h helpers.h monitor.h query.h settings.h tree.h types.h window.h
 ewmh.o: ewmh.c bspwm.h ewmh.h helpers.h settings.h tree.h types.h
 helpers.o: helpers.c bspwm.h helpers.h types.h
-history.o: history.c helpers.h history.h query.h types.h
-messages.o: messages.c bspwm.h common.h desktop.h events.h ewmh.h helpers.h messages.h monitor.h query.h restore.h rules.h settings.h tree.h types.h window.h
+history.o: history.c helpers.h query.h types.h
+messages.o: messages.c bspwm.h desktop.h events.h ewmh.h helpers.h messages.h monitor.h query.h restore.h rule.h settings.h tree.h types.h window.h
 monitor.o: monitor.c bspwm.h desktop.h ewmh.h helpers.h monitor.h tree.h types.h window.h
-query.o: query.c bspwm.h helpers.h history.h messages.h query.h settings.h tree.h types.h
+query.o: query.c bspwm.h helpers.h history.h messages.h query.h tree.h types.h
 restore.o: restore.c bspwm.h desktop.h ewmh.h helpers.h history.h monitor.h query.h restore.h settings.h tree.h types.h
-rules.o: rules.c bspwm.h ewmh.h helpers.h query.h rules.h types.h window.h
-settings.o: settings.c bspwm.h common.h helpers.h settings.h types.h
+rule.o: rule.c bspwm.h ewmh.h helpers.h query.h rule.h types.h window.h
+settings.o: settings.c bspwm.h helpers.h settings.h types.h
 tree.o: tree.c bspwm.h desktop.h ewmh.h helpers.h history.h query.h settings.h tree.h types.h window.h
-window.o: window.c bspwm.h ewmh.h helpers.h query.h rules.h settings.h tree.h types.h window.h
+window.o: window.c bspwm.h ewmh.h helpers.h query.h rule.h settings.h tree.h types.h window.h
diff --git a/bspwm.c b/bspwm.c
index d21cdd4..36e4618 100644
--- a/bspwm.c
+++ b/bspwm.c
@@ -2,28 +2,22 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <signal.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/select.h>
-#include <xcb/xcb.h>
-#include <xcb/xcb_event.h>
-#include <xcb/xcb_ewmh.h>
-#include <xcb/randr.h>
 #include "types.h"
 #include "desktop.h"
 #include "monitor.h"
 #include "settings.h"
 #include "messages.h"
-#include "rules.h"
 #include "events.h"
 #include "common.h"
-#include "helpers.h"
-#include "window.h"
 #include "bspwm.h"
 #include "tree.h"
+#include "window.h"
+#include "rule.h"
 #include "ewmh.h"
 
 int main(int argc, char *argv[])
diff --git a/desktop.c b/desktop.c
index 49ccfea..d7dbccd 100644
--- a/desktop.c
+++ b/desktop.c
@@ -1,10 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include "bspwm.h"
-#include "types.h"
 #include "desktop.h"
-#include "history.h"
 #include "tree.h"
+#include "history.h"
 #include "window.h"
 #include "ewmh.h"
 
diff --git a/events.c b/events.c
index ec2794f..7410850 100644
--- a/events.c
+++ b/events.c
@@ -1,20 +1,13 @@
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <xcb/xcb.h>
-#include <xcb/randr.h>
-#include <xcb/xcb_event.h>
 #include <xcb/xcb_icccm.h>
 #include "types.h"
-#include "monitor.h"
 #include "bspwm.h"
 #include "settings.h"
-#include "helpers.h"
-#include "window.h"
 #include "events.h"
-#include "tree.h"
+#include "monitor.h"
+#include "window.h"
 #include "query.h"
-#include "rules.h"
+#include "tree.h"
 #include "ewmh.h"
 
 void handle_event(xcb_generic_event_t *evt)
diff --git a/ewmh.c b/ewmh.c
index 192cff1..903d492 100644
--- a/ewmh.c
+++ b/ewmh.c
@@ -1,8 +1,5 @@
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <xcb/xcb_ewmh.h>
-#include "types.h"
 #include "bspwm.h"
 #include "settings.h"
 #include "tree.h"
diff --git a/helpers.c b/helpers.c
index 6b8a844..2011b2e 100644
--- a/helpers.c
+++ b/helpers.c
@@ -1,10 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <xcb/xcb.h>
-#include <xcb/xcb_event.h>
 #include "bspwm.h"
-#include "helpers.h"
 
 void warn(char *fmt, ...)
 {
diff --git a/history.c b/history.c
index 6334a67..3035535 100644
--- a/history.c
+++ b/history.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include "types.h"
 #include "query.h"
-#include "history.h"
 
 focus_history_t *make_focus_history(void)
 {
diff --git a/messages.c b/messages.c
index 2370dbd..734cf11 100644
--- a/messages.c
+++ b/messages.c
@@ -3,20 +3,17 @@
 #include <stdlib.h>
 #include <errno.h>
 #include "settings.h"
-#include "messages.h"
 #include "query.h"
-#include "restore.h"
-#include "common.h"
-#include "types.h"
+#include "bspwm.h"
+#include "tree.h"
 #include "desktop.h"
 #include "monitor.h"
-#include "bspwm.h"
-#include "ewmh.h"
-#include "helpers.h"
 #include "window.h"
+#include "rule.h"
+#include "restore.h"
 #include "events.h"
-#include "tree.h"
-#include "rules.h"
+#include "ewmh.h"
+#include "messages.h"
 
 bool cmd_window(char **args, int num)
 {
diff --git a/monitor.c b/monitor.c
index 35d1e24..d93b9a3 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,10 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include "bspwm.h"
-#include "types.h"
-#include "desktop.h"
 #include "tree.h"
 #include "monitor.h"
+#include "desktop.h"
 #include "window.h"
 #include "ewmh.h"
 
diff --git a/query.c b/query.c
index 15eb548..a1e5f17 100644
--- a/query.c
+++ b/query.c
@@ -1,11 +1,9 @@
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include "bspwm.h"
 #include "tree.h"
-#include "history.h"
-#include "settings.h"
 #include "messages.h"
+#include "history.h"
 #include "query.h"
 
 void query_monitors(coordinates_t loc, domain_t dom, char *rsp)
diff --git a/restore.c b/restore.c
index b007e16..2b6fb80 100644
--- a/restore.c
+++ b/restore.c
@@ -1,14 +1,14 @@
 #include <ctype.h>
 #include <string.h>
+#include "bspwm.h"
 #include "types.h"
-#include "desktop.h"
 #include "monitor.h"
-#include "history.h"
+#include "desktop.h"
 #include "tree.h"
 #include "settings.h"
-#include "ewmh.h"
-#include "bspwm.h"
 #include "query.h"
+#include "history.h"
+#include "ewmh.h"
 #include "restore.h"
 
 void restore_tree(char *file_path)
diff --git a/rules.c b/rule.c
similarity index 98%
rename from rules.c
rename to rule.c
index 5fb776b..0303916 100644
--- a/rules.c
+++ b/rule.c
@@ -1,13 +1,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <xcb/xcb_icccm.h>
-#include <xcb/xcb_ewmh.h>
-#include "window.h"
-#include "types.h"
 #include "bspwm.h"
 #include "ewmh.h"
-#include "rules.h"
+#include "window.h"
 #include "query.h"
+#include "rule.h"
 
 rule_t *make_rule(void)
 {
diff --git a/rules.h b/rule.h
similarity index 92%
rename from rules.h
rename to rule.h
index 286c125..dd49c8e 100644
--- a/rules.h
+++ b/rule.h
@@ -1,5 +1,5 @@
-#ifndef _RULES_H
-#define _RULES_H
+#ifndef _RULE_H
+#define _RULE_H
 
 #define MATCH_ALL  "*"
 
diff --git a/settings.c b/settings.c
index 3f16a4e..35f0ffc 100644
--- a/settings.c
+++ b/settings.c
@@ -1,13 +1,8 @@
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/wait.h>
-#include <xcb/xcb.h>
-#include <xcb/xcb_event.h>
 #include "bspwm.h"
-#include "helpers.h"
-#include "common.h"
 #include "settings.h"
 
 void run_config(void)
diff --git a/tree.c b/tree.c
index 22d5cfb..a24c989 100644
--- a/tree.c
+++ b/tree.c
@@ -3,15 +3,13 @@
 #include <limits.h>
 #include <float.h>
 #include "settings.h"
-#include "helpers.h"
 #include "window.h"
-#include "types.h"
-#include "desktop.h"
-#include "history.h"
-#include "query.h"
 #include "bspwm.h"
 #include "ewmh.h"
 #include "tree.h"
+#include "desktop.h"
+#include "history.h"
+#include "query.h"
 
 node_t *make_node(void)
 {
diff --git a/window.c b/window.c
index 61055d4..71a85f1 100644
--- a/window.c
+++ b/window.c
@@ -1,17 +1,12 @@
-#include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
-#include <xcb/xcb.h>
-#include <xcb/xcb_event.h>
-#include <xcb/xcb_icccm.h>
 #include "types.h"
 #include "tree.h"
 #include "bspwm.h"
 #include "settings.h"
 #include "ewmh.h"
-#include "rules.h"
 #include "query.h"
+#include "rule.h"
 #include "window.h"
 
 pointer_state_t *make_pointer_state(void)