tree-wide: fix lxc header inclusion

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

src/lxc/attach.h

@@ -6,8 +6,8 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "lxccontainer.h"
-#include "attach_options.h"
+#include "lxc.h"
+
 #include "compiler.h"
 #include "namespace.h"
 

src/lxc/cmd/lxc_init.c

@@ -16,8 +16,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
-#include <lxc/version.h>
+#include "lxc.h"
+#include "version.h"
 
 #include "compiler.h"
 #include "config.h"

src/lxc/cmd/lxc_monitord.c

@@ -21,7 +21,7 @@
 #include <sys/un.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "af_unix.h"
 #include "config.h"

src/lxc/commands.h

@@ -3,14 +3,17 @@
 #ifndef __LXC_COMMANDS_H
 #define __LXC_COMMANDS_H
 
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "lxc.h"
+
 #include "compiler.h"
 #include "cgroups/cgroup.h"
-#include "lxccontainer.h"
 #include "macro.h"
 #include "state.h"
 

src/lxc/confile.h

@@ -6,8 +6,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "lxccontainer.h"
-#include "attach_options.h"
+#include "lxc.h"
 
 #include "compiler.h"
 

src/lxc/confile_utils.c

@@ -9,6 +9,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "lxc.h"
+
 #include "conf.h"
 #include "config.h"
 #include "confile.h"
@@ -17,7 +19,6 @@
 #include "list.h"
 #include "lxc.h"
 #include "log.h"
-#include "lxccontainer.h"
 #include "macro.h"
 #include "memory_utils.h"
 #include "network.h"

src/lxc/criu.h

@@ -5,7 +5,7 @@
 
 #include <stdbool.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 __hidden extern bool __criu_pre_dump(struct lxc_container *c, struct migrate_opts *opts);
 __hidden extern bool __criu_dump(struct lxc_container *c, struct migrate_opts *opts);

src/lxc/log.c

@@ -18,11 +18,12 @@
 #include <syslog.h>
 #include <unistd.h>
 
+#include "lxc.h"
+
 #include "caps.h"
 #include "config.h"
 #include "file_utils.h"
 #include "log.h"
-#include "lxccontainer.h"
 #include "memory_utils.h"
 #include "utils.h"
 

src/lxc/lxc.h

@@ -12,6 +12,10 @@ extern "C" {
 #include <sys/select.h>
 #include <sys/types.h>
 
+#include "attach_options.h"
+#include "lxccontainer.h"
+#include "version.h"
+
 #include "compiler.h"
 #include "memory_utils.h"
 #include "state.h"

src/lxc/lxccontainer.c

@@ -25,6 +25,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "lxc.h"
+
 #include "netns_ifaddrs.h"
 #include "af_unix.h"
 #include "api_extensions.h"
@@ -42,7 +44,6 @@
 #include "initutils.h"
 #include "log.h"
 #include "lxc.h"
-#include "lxccontainer.h"
 #include "lxclock.h"
 #include "memory_utils.h"
 #include "monitor.h"

src/lxc/lxclock.c

@@ -12,7 +12,7 @@
 #include <sys/file.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "config.h"
 #include "log.h"

src/lxc/seccomp.c

@@ -11,11 +11,12 @@
 #include <sys/mount.h>
 #include <sys/utsname.h>
 
+#include "lxc.h"
+
 #include "af_unix.h"
 #include "commands.h"
 #include "config.h"
 #include "log.h"
-#include "lxccontainer.h"
 #include "lxcseccomp.h"
 #include "mainloop.h"
 #include "memory_utils.h"

src/lxc/start.c

@@ -25,6 +25,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "lxc.h"
+
 #include "af_unix.h"
 #include "attach_options.h"
 #include "caps.h"
@@ -41,7 +43,6 @@
 #include "list.h"
 #include "log.h"
 #include "lsm/lsm.h"
-#include "lxccontainer.h"
 #include "lxclock.h"
 #include "lxcseccomp.h"
 #include "macro.h"

src/lxc/storage/overlay.c

@@ -8,11 +8,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "lxc.h"
+
 #include "conf.h"
 #include "config.h"
 #include "confile.h"
 #include "log.h"
-#include "lxccontainer.h"
 #include "macro.h"
 #include "memory_utils.h"
 #include "overlay.h"

src/lxc/storage/storage.h

@@ -6,7 +6,7 @@
 #include <stdint.h>
 #include <sys/mount.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #if IS_BIONIC
 #include "lxcmntent.h"

src/lxc/terminal.c

@@ -5,7 +5,6 @@
 #endif
 #include <errno.h>
 #include <fcntl.h>
-#include <lxc/lxccontainer.h>
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
@@ -15,6 +14,8 @@
 #include <termios.h>
 #include <unistd.h>
 
+#include "lxc.h"
+
 #include "af_unix.h"
 #include "caps.h"
 #include "commands.h"

src/lxc/tools/arguments.c

@@ -12,8 +12,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "lxccontainer.h"
-#include "version.h"
+#include "lxc.h"
 
 #include "arguments.h"
 #include "initutils.h"

src/lxc/tools/arguments.h

@@ -11,7 +11,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "lxccontainer.h"
+#include "lxc.h"
 #include "compiler.h"
 
 struct lxc_arguments;

src/lxc/tools/lxc_attach.c

@@ -15,7 +15,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "attach.h"

src/lxc/tools/lxc_autostart.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_cgroup.c

@@ -10,7 +10,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_checkpoint.c

@@ -10,7 +10,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_config.c

@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "config.h"
 

src/lxc/tools/lxc_console.c

@@ -17,7 +17,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_copy.c

@@ -18,7 +18,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_create.c

@@ -11,7 +11,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_destroy.c

@@ -10,7 +10,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "log.h"

src/lxc/tools/lxc_device.c

@@ -10,7 +10,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "netns_ifaddrs.h"
 #include "arguments.h"

src/lxc/tools/lxc_execute.c

@@ -14,7 +14,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "caps.h"

src/lxc/tools/lxc_freeze.c

@@ -9,7 +9,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_info.c

@@ -12,7 +12,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_ls.c

@@ -19,7 +19,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_monitor.c

@@ -23,7 +23,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "af_unix.h"
 #include "arguments.h"

src/lxc/tools/lxc_snapshot.c

@@ -12,7 +12,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_start.c

@@ -19,8 +19,7 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 
-#include "lxccontainer.h"
-#include "attach_options.h"
+#include "lxc.h"
 
 #include "arguments.h"
 #include "caps.h"

src/lxc/tools/lxc_stop.c

@@ -9,7 +9,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_top.c

@@ -18,7 +18,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_unfreeze.c

@@ -9,7 +9,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"

src/lxc/tools/lxc_wait.c

@@ -11,7 +11,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
+#include "lxc.h"
 
 #include "arguments.h"
 #include "config.h"