Merge branch 'master' into next

[i3/i3] / include / all.h

diff --git a/include/all.h b/include/all.h
index dd2b9365f7a09e80308fcce6715ae462441397fd..9c08ebef8e8067c241dfb5f087b45374a5c64cbf 100644 (file)
--- a/include/all.h
+++ b/include/all.h
@@ -23,13 +23,19 @@
 #include <err.h>
 #include <stdint.h>
 #include <math.h>
+#include <limits.h>
 
 #include <xcb/xcb.h>
 #include <xcb/xcb_aux.h>
-#include <xcb/xcb_event.h>
 #include <xcb/xcb_keysyms.h>
 #include <xcb/xcb_icccm.h>
 
+/* Contains compatibility definitions for old libxcb versions */
+#ifdef XCB_COMPAT
+#include "xcb_compat.h"
+#endif
+
+#include "data.h"
 #include "util.h"
 #include "ipc.h"
 #include "tree.h"
@@ -55,5 +61,9 @@
 #include "resize.h"
 #include "sighandler.h"
 #include "move.h"
+#include "output.h"
+#include "ewmh.h"
+#include "assignments.h"
+#include "regex.h"
 
 #endif