Merge branch 'release-4.16.1'

[i3/i3] / include / all.h

diff --git a/include/all.h b/include/all.h
index a355d3d2b65a8e1ef08bb9a97556942a4b8c12bc..e93b066bc59f64058dce80ae77f7d775a61a8bc7 100644 (file)
--- a/include/all.h
+++ b/include/all.h
@@ -2,7 +2,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * This header file includes all relevant files of i3 and the most often used
  * system header files. This reduces boilerplate (the amount of code duplicated
@@ -10,8 +10,9 @@
  * compile-time.
  *
  */
-#ifndef I3_ALL_H
-#define I3_ALL_H
+#pragma once
+
+#include <config.h>
 
 #include <assert.h>
 #include <stdbool.h>
@@ -27,6 +28,7 @@
 #include <errno.h>
 #include <err.h>
 #include <stdint.h>
+#include <inttypes.h>
 #include <math.h>
 #include <limits.h>
 
@@ -38,11 +40,6 @@
 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_version.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"
@@ -56,7 +53,7 @@
 #include "click.h"
 #include "key_press.h"
 #include "floating.h"
-#include "config.h"
+#include "configuration.h"
 #include "handlers.h"
 #include "randr.h"
 #include "xinerama.h"
@@ -85,6 +82,5 @@
 #include "fake_outputs.h"
 #include "display_version.h"
 #include "restore_layout.h"
+#include "sync.h"
 #include "main.h"
-
-#endif