Merge branch 'master' into next

[i3/i3] / i3bar / include / common.h

diff --git a/i3bar/include/common.h b/i3bar/include/common.h
index 644b777c738c3fd3a0014448970ddded34ed1c0e..bce31a4df22cd5c267d3bf9626b97025d424f2cb 100644 (file)
--- a/i3bar/include/common.h
+++ b/i3bar/include/common.h
@@ -1,16 +1,16 @@
 /*
- * i3bar - an xcb-based status- and ws-bar for i3
- *
- * © 2010-2011 Axel Wagner and contributors
+ * vim:ts=4:sw=4:expandtab
  *
- * See file LICNSE for license information
+ * i3bar - an xcb-based status- and ws-bar for i3
+ * © 2010-2011 Axel Wagner and contributors (see also: LICENSE)
  *
  */
 #ifndef COMMON_H_
 #define COMMON_H_
 
+#include <stdbool.h>
+
 typedef struct rect_t rect;
-typedef int bool;
 
 struct ev_loop* main_loop;
 char            *statusline;
@@ -29,8 +29,9 @@ struct rect_t {
 #include "outputs.h"
 #include "util.h"
 #include "workspaces.h"
+#include "trayclients.h"
 #include "xcb.h"
-#include "ucs2_to_utf8.h"
 #include "config.h"
+#include "libi3.h"
 
 #endif