tree-wide: fix public lxc header inclusions

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

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index 50d2b34ef5a7327c41650ed39b43fd314e3d874e..a1b16607a079bdfe4779e3c8a42072026e88e202 100644 (file)
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -22,8 +22,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include <lxc/lxccontainer.h>
-#include <lxc/attach_options.h>
+#include "attach.h"
 
 #include "af_unix.h"
 #include "attach.h"

diff --git a/src/lxc/attach.h b/src/lxc/attach.h
index 66b9796a39fd6b5d56654aebf669e28a0989c311..6556bab40384ebd2c22411d38a0bcdac92e25060 100644 (file)
--- a/src/lxc/attach.h
+++ b/src/lxc/attach.h
@@ -4,9 +4,10 @@
 #define __LXC_ATTACH_H
 
 #include <stdbool.h>
-#include <lxc/attach_options.h>
 #include <sys/types.h>
 
+#include "lxccontainer.h"
+#include "attach_options.h"
 #include "compiler.h"
 #include "namespace.h"
 

diff --git a/src/lxc/commands_utils.c b/src/lxc/commands_utils.c
index b2957b00756edc9dc1775c30318c85662207a583..6a62d2fcb8a6aa6ffb89311db8a4d0cefa582c6d 100644 (file)
--- a/src/lxc/commands_utils.c
+++ b/src/lxc/commands_utils.c
@@ -13,6 +13,7 @@
 #include <sys/un.h>
 #include <unistd.h>
 
+#include "attach_options.h"
 #include "af_unix.h"
 #include "commands.h"
 #include "commands_utils.h"

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index c11306dbca14f847fc193ca12c735ecd28c93aa5..60ed9aa9ec200b7273dcc19cd62cb8997f4c887f 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -34,11 +34,11 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "conf.h"
 #include "af_unix.h"
 #include "caps.h"
 #include "cgroups/cgroup.h"
 #include "compiler.h"
-#include "conf.h"
 #include "config.h"
 #include "confile.h"
 #include "confile_utils.h"

diff --git a/src/lxc/confile.h b/src/lxc/confile.h
index 999dc16484b2fb2e502475d0702806383a525bed..73935a858c3d87f097be3589a984a79dd9aeb37a 100644 (file)
--- a/src/lxc/confile.h
+++ b/src/lxc/confile.h
@@ -6,8 +6,8 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include <lxc/attach_options.h>
-#include <lxc/lxccontainer.h>
+#include "lxccontainer.h"
+#include "attach_options.h"
 
 #include "compiler.h"
 

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index ea21640e508ae7bc549b34430cd632af907dc4a8..3d61bea6d4663442fc409b76bb825f5edf547dbc 100644 (file)
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -14,7 +14,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <lxc/attach_options.h>
+#include "attach_options.h"
 
 #include "cgroup.h"
 #include "commands.h"

diff --git a/src/lxc/freezer.c b/src/lxc/freezer.c
index 5d2d48978e38cc9b8e7430281c8626e7cc5ee17e..ef6afa046c2fc06a82862623ba4366a2b924c42b 100644 (file)
--- a/src/lxc/freezer.c
+++ b/src/lxc/freezer.c
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "attach_options.h"
 #include "cgroups/cgroup.h"
 #include "cgroups/cgroup_utils.h"
 #include "commands.h"

diff --git a/src/tests/rootfs_options.c b/src/tests/rootfs_options.c
index c103cbc1127bee41af3e54171893a14a7557f878..05cb3dda6ce56213da12729fe837533d21f559b3 100644 (file)
--- a/src/tests/rootfs_options.c
+++ b/src/tests/rootfs_options.c
@@ -32,8 +32,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <lxc/lxccontainer.h>
-#include <lxc/attach_options.h>
+#include "lxccontainer.h"
+#include "attach_options.h"
 
 #ifdef HAVE_STATVFS
 #include <sys/statvfs.h>

diff --git a/src/tests/sys_mixed.c b/src/tests/sys_mixed.c
index 785f6e8678609aa7fb1c24a383a78ee2ee076b96..9716ac3d0c1b8459911964db19896123848dfc1c 100644 (file)
--- a/src/tests/sys_mixed.c
+++ b/src/tests/sys_mixed.c
@@ -32,8 +32,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <lxc/lxccontainer.h>
-#include <lxc/attach_options.h>
+#include "lxccontainer.h"
+#include "attach_options.h"
 
 #ifdef HAVE_STATVFS
 #include <sys/statvfs.h>