Merge branch 'master' into next

diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index 6bd8039b26289b7c6ced3e075bdb9d0eb588991f..3a8d8b9c3add9197b9088c640802bead9cc91ba8 100644 (file)
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -9,7 +9,6 @@
  */
 #include <xcb/xcb.h>
 #include <xcb/xproto.h>
-#include <xcb/xcb_atom.h>
 #include <xcb/xcb_aux.h>
 
 #ifdef XCB_COMPAT

diff --git a/include/data.h b/include/data.h
index 63b18b280e8837b471b437d2e245857071e0ad50..70b650115ea7586022069199f3aa529b3eb1776a 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -14,7 +14,6 @@
 #include <libsn/sn-launcher.h>
 
 #include <xcb/randr.h>
-#include <xcb/xcb_atom.h>
 #include <stdbool.h>
 #include <pcre.h>
 #include <sys/time.h>

diff --git a/src/click.c b/src/click.c
index 5eedd00041f250b978798649bc8cf503dbbcb0f8..c48132eee8fe721f3e600df31cae9a96077dd367 100644 (file)
--- a/src/click.c
+++ b/src/click.c
@@ -14,7 +14,6 @@
 #include <time.h>
 #include <math.h>
 
-#include <xcb/xcb_atom.h>
 #include <xcb/xcb_icccm.h>
 
 #include <X11/XKBlib.h>