Merge branch 'master' into next

[i3/i3] / include / all.h

diff --git a/include/all.h b/include/all.h
index e550b08bcfa4a61ebae70ec434fc797a4764926a..48ca6621361e523ba93b78a6e6dd3b4cf5daf04f 100644 (file)
--- a/include/all.h
+++ b/include/all.h
@@ -10,8 +10,8 @@
  * compile-time.
  *
  */
-#ifndef _ALL_H
-#define _ALL_H
+#ifndef I3_ALL_H
+#define I3_ALL_H
 
 #include <assert.h>
 #include <stdbool.h>
@@ -35,6 +35,9 @@
 #include <xcb/xcb_keysyms.h>
 #include <xcb/xcb_icccm.h>
 
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
+
 /* Contains compatibility definitions for old libxcb versions */
 #ifdef XCB_COMPAT
 #include "xcb_compat.h"
@@ -51,6 +54,7 @@
 #include "i3.h"
 #include "x.h"
 #include "click.h"
+#include "key_press.h"
 #include "floating.h"
 #include "config.h"
 #include "handlers.h"
@@ -76,5 +80,6 @@
 #include "commands.h"
 #include "commands_parser.h"
 #include "fake_outputs.h"
+#include "display_version.h"
 
 #endif