Merge branch 'master' into next

[i3/i3] / include / all.h

diff --git a/include/all.h b/include/all.h
index b83b9f4e07df2c876a7c0e216a25dd5988822bae..9ba4c1d9330842764e555c1343cd46cbd449dd8a 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>
@@ -79,7 +79,11 @@
 #include "scratchpad.h"
 #include "commands.h"
 #include "commands_parser.h"
+#include "config_directives.h"
+#include "config_parser.h"
 #include "fake_outputs.h"
 #include "display_version.h"
+#include "restore_layout.h"
+#include "main.h"
 
 #endif