tree-wide: fix lxc header inclusion

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

diff --git a/src/lxc/attach.h b/src/lxc/attach.h
index 6556bab40384ebd2c22411d38a0bcdac92e25060..d9b356bbf8eb6621485b095cda725be07877b92d 100644 (file)
--- a/src/lxc/attach.h
+++ b/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"
 

diff --git a/src/lxc/cmd/lxc_init.c b/src/lxc/cmd/lxc_init.c
index f8a0bc23dee63172330a601cee7dc5d512307586..6491e2406074e134afa26115f811b248f4fec3e3 100644 (file)
--- a/src/lxc/cmd/lxc_init.c
+++ b/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"

diff --git a/src/lxc/cmd/lxc_monitord.c b/src/lxc/cmd/lxc_monitord.c
index a18712b64b4e22293d1b62702b6899e887460fca..8f3ef023f1be94cc4feca6ca545bd93354f60ffb 100644 (file)
--- a/src/lxc/cmd/lxc_monitord.c
+++ b/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"

diff --git a/src/lxc/commands.h b/src/lxc/commands.h
index 8d93bbd3a85f4a5d743727187ea7cc317c0f7636..b4aac93a0db089aa663c4d81dba0bc8440043600 100644 (file)
--- a/src/lxc/commands.h
+++ b/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"
 

diff --git a/src/lxc/confile.h b/src/lxc/confile.h
index 73935a858c3d87f097be3589a984a79dd9aeb37a..f085d1e22856affeaf4f9891c1592a35f8ec5dc2 100644 (file)
--- a/src/lxc/confile.h
+++ b/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"
 

diff --git a/src/lxc/confile_utils.c b/src/lxc/confile_utils.c
index 07aabd2de08fd1d3de5b1527b7e002ba35e1d7c9..ae05ddac3fe3dda8a39f65cab81a0f1ab2ba10bb 100644 (file)
--- a/src/lxc/confile_utils.c
+++ b/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"

diff --git a/src/lxc/criu.h b/src/lxc/criu.h
index 2e0ca7febb4acafd6a7968704715a94e09cfa2f2..234f79b79c310622f99440ebf0c98f46e3926cea 100644 (file)
--- a/src/lxc/criu.h
+++ b/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);

diff --git a/src/lxc/log.c b/src/lxc/log.c
index 9c5053ec94f3efb8b570e9a8ed04df3649b7b177..781cc2fa5b07ee5ae1af53d4ee0501fb2737a722 100644 (file)
--- a/src/lxc/log.c
+++ b/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"
 

diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
index f688b25c264a6b399486c03966ac1705d4328760..9cf8da67abd0f1b16e33e21b2d29a0bb2d5f17da 100644 (file)
--- a/src/lxc/lxc.h
+++ b/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"

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 401288986aad87ddcc6ef549e62d033d20969961..e51a1c4636ddf2f4df97fe53f6f77e463687089d 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/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"

diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
index a6a43cef28b1bdcbfff86565b6a3a39ad429217b..12be6ef00f71db1597e244e0a290325da192b60d 100644 (file)
--- a/src/lxc/lxclock.c
+++ b/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"

diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
index c2c0928bdf719ff585c8cdb99c01562618e48707..2b9ecaf69d65e1796a35ce98a67492987e0ec7dc 100644 (file)
--- a/src/lxc/seccomp.c
+++ b/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"

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 58c4136ea6fe4d6d24926d0fa406b80f421bec6e..252fc8a8a5cc3d178a84a6b7ea27b678bc7af611 100644 (file)
--- a/src/lxc/start.c
+++ b/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"

diff --git a/src/lxc/storage/overlay.c b/src/lxc/storage/overlay.c
index c00ebc344e37e8cece81d7f670ab4ab4d7e37155..86c21a96db6e817b1d3f946f7f1ad51f181c0a51 100644 (file)
--- a/src/lxc/storage/overlay.c
+++ b/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"

diff --git a/src/lxc/storage/storage.h b/src/lxc/storage/storage.h
index 0f14fd260b7ed7397ebb1a8112b517f6e975517e..62ac75e2695495cee8680f63ec09c69491bc0699 100644 (file)
--- a/src/lxc/storage/storage.h
+++ b/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"

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index a1f974be0c3144fc70a0a6a4b7db11fcab685f42..b86d8c59a4410633e6059199046add2f9e356ec2 100644 (file)
--- a/src/lxc/terminal.c
+++ b/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"

diff --git a/src/lxc/tools/arguments.c b/src/lxc/tools/arguments.c
index 9b16a9409782b8d25ce69bb0141aeb8365461a12..4176db0e744c1b4f34bed2a4462059b3e1a4dec0 100644 (file)
--- a/src/lxc/tools/arguments.c
+++ b/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"

diff --git a/src/lxc/tools/arguments.h b/src/lxc/tools/arguments.h
index e4991374097219ae328c0e162832d401fb643590..0f087507989741a9444d8f3d4399ef6db7d1feec 100644 (file)
--- a/src/lxc/tools/arguments.h
+++ b/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;

diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c
index e6b388b20c4b0150bc2646f05c35866bccdd10f1..6a9ac817b746c49b32f9676c47f676162d61dd60 100644 (file)
--- a/src/lxc/tools/lxc_attach.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_autostart.c b/src/lxc/tools/lxc_autostart.c
index ecede5c3436ae1649e533108c8ebcc7debf1298c..4a50318109151e7749e664b11229cd9c2866f8c5 100644 (file)
--- a/src/lxc/tools/lxc_autostart.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_cgroup.c b/src/lxc/tools/lxc_cgroup.c
index 17975152d5f68de5c84f5dddca4df30e9ef89419..edfc03c28dc15c9e2f6b66b09c98f19914b61f24 100644 (file)
--- a/src/lxc/tools/lxc_cgroup.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_checkpoint.c b/src/lxc/tools/lxc_checkpoint.c
index 4fd25f75bc8a65cec457274a81ddfb652381baf5..22abf1866f2ef02a0385c4ee2c94bff4d122234f 100644 (file)
--- a/src/lxc/tools/lxc_checkpoint.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_config.c b/src/lxc/tools/lxc_config.c
index dda2db6dc821f3967007474a8f1b35bf7ae6dfbd..333dde54fe53e7114d97630b82cf4852be10e177 100644 (file)
--- a/src/lxc/tools/lxc_config.c
+++ b/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"
 

diff --git a/src/lxc/tools/lxc_console.c b/src/lxc/tools/lxc_console.c
index 3e35fe4aa6eb1700fded42c80895218acfe2bca1..d11827121a3d8aa6de97cccd1fe581bbc0e21de1 100644 (file)
--- a/src/lxc/tools/lxc_console.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_copy.c b/src/lxc/tools/lxc_copy.c
index 94b339f63d4e5b147e6bc2ed35641e7719683910..384a7e3c88aa9a4bc0d4d084b8933e3dcac850ad 100644 (file)
--- a/src/lxc/tools/lxc_copy.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_create.c b/src/lxc/tools/lxc_create.c
index 368d0d0a5e58adcc91ed370d57756032ab88a017..6af5540318da20b829d1f1f4e05a83a44e0fdd52 100644 (file)
--- a/src/lxc/tools/lxc_create.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_destroy.c b/src/lxc/tools/lxc_destroy.c
index e2e5f9843639b2a83362321439ffb1ea76a5e10e..581460ae4b066543995e29ddb8c51cef282a4fbf 100644 (file)
--- a/src/lxc/tools/lxc_destroy.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_device.c b/src/lxc/tools/lxc_device.c
index 62d5ac86ea4462be1b4a9c0eb0c0fa37c79bd1f3..ed69cdfd74c2088a16b6e4f11348cffe68cd6b68 100644 (file)
--- a/src/lxc/tools/lxc_device.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_execute.c b/src/lxc/tools/lxc_execute.c
index 6352114ecf5b028d5559a0cc44f0568280500fd4..a706d94db5a0fd9d9e040791b5d43041a801489a 100644 (file)
--- a/src/lxc/tools/lxc_execute.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_freeze.c b/src/lxc/tools/lxc_freeze.c
index 483d3aca33a20f1a611317ae140547348b57fb35..cf5ff616239934bb9061ab1965c75bfd1aac5965 100644 (file)
--- a/src/lxc/tools/lxc_freeze.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_info.c b/src/lxc/tools/lxc_info.c
index fda811fd8138280899be12c33bf1d71b886ac79b..12b2562d37cf80afd7744ad1365de1b59ef87300 100644 (file)
--- a/src/lxc/tools/lxc_info.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_ls.c b/src/lxc/tools/lxc_ls.c
index 562622c4d619aea12b98180fff9d32f6d9f664bc..cc64f873222ff8d5a826df12ef0b85c6c055a639 100644 (file)
--- a/src/lxc/tools/lxc_ls.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_monitor.c b/src/lxc/tools/lxc_monitor.c
index 326b8e7e020d52f83c27951edc43be942c24ecba..2ecc55c4390d46d413ae1501a1ca41bc4635b2e6 100644 (file)
--- a/src/lxc/tools/lxc_monitor.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_snapshot.c b/src/lxc/tools/lxc_snapshot.c
index a3c058abdea4b13ac1b5bbe0ddc15c46266537a1..a920a595c330d64377929bc13b2e484363f9ca43 100644 (file)
--- a/src/lxc/tools/lxc_snapshot.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_start.c b/src/lxc/tools/lxc_start.c
index f3c990783ae974ff1e077a1bfab9be9c702d7f57..6d2c0ae252960f5aa18747ce02b94faec931608b 100644 (file)
--- a/src/lxc/tools/lxc_start.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_stop.c b/src/lxc/tools/lxc_stop.c
index 73ae61766ffeb9809c33011d40d9cc94f6c62fab..e3cecb6b26d8f3a7dd4ae15239d3f3b8d181bcef 100644 (file)
--- a/src/lxc/tools/lxc_stop.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_top.c b/src/lxc/tools/lxc_top.c
index 9cf2cbbbdc50e1a1f52d1e1b1df76b8a06803bc2..35fe76b5ae7c7b42688331ee1a3b11072c39dd54 100644 (file)
--- a/src/lxc/tools/lxc_top.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_unfreeze.c b/src/lxc/tools/lxc_unfreeze.c
index e8e2f31807ef4c551e101e86cb816b6214f727a8..e5b287289cccf1241d30b56b63ba724b67282e33 100644 (file)
--- a/src/lxc/tools/lxc_unfreeze.c
+++ b/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"

diff --git a/src/lxc/tools/lxc_wait.c b/src/lxc/tools/lxc_wait.c
index b5ce3e13fa9e814a12398ff599c1ba1d1015953e..27f8020d77287c84e30fd897eec4d40b5fd0c12f 100644 (file)
--- a/src/lxc/tools/lxc_wait.c
+++ b/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"