adjust include statements (v2)

Use "#include <somefile.h>" style for external or exported headers only.

changes since v1:
 - adjusted formatting as Stéphane suggested

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lua-lxc/core.c b/src/lua-lxc/core.c
index 8904ffc86f6fba4bee713bddd77a5d4a3a3333de..aa5831c4f012c3db9d5eaad74af64280c34536eb 100644 (file)
--- a/src/lua-lxc/core.c
+++ b/src/lua-lxc/core.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <libgen.h>
 #include <lxc/lxccontainer.h>
-#include <lxc/commands.h>
+#include "lxc/commands.h"
 
 #if LUA_VERSION_NUM < 502
 #define luaL_newlib(L,l) (lua_newtable(L), luaL_register(L,NULL,l))

diff --git a/src/lxc/attach.h b/src/lxc/attach.h
index b5f3ea1c3f9cc4e37683f1dd10afa830e1d92d52..22e6932b4b243451831eaaef6436b893aa5964c4 100644 (file)
--- a/src/lxc/attach.h
+++ b/src/lxc/attach.h
@@ -25,7 +25,7 @@
 #define _attach_h
 
 #include <sys/types.h>
-#include "attach_options.h"
+#include <lxc/attach_options.h>
 
 struct lxc_proc_context_info {
        char *lsm_label;

diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c
index b737effce239be6939160c99820345426d9bd1fb..29e2ad57f77b4d9c594df2380ed3efdc7fd89e99 100644 (file)
--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -37,6 +37,7 @@
 #include <libgen.h>
 #include <linux/loop.h>
 #include <dirent.h>
+
 #include "lxc.h"
 #include "config.h"
 #include "conf.h"

diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c
index ce6b7396177c15f93afc7a9595a379fa68d2fc84..946ab0eeb65d581e30f8582a28fe3f09ac3010b1 100644 (file)
--- a/src/lxc/cgroup.c
+++ b/src/lxc/cgroup.c
@@ -45,10 +45,9 @@
 #include "conf.h"
 #include "utils.h"
 #include "bdev.h"
-
-#include <lxc/log.h>
-#include <lxc/cgroup.h>
-#include <lxc/start.h>
+#include "log.h"
+#include "cgroup.h"
+#include "start.h"
 
 #if IS_BIONIC
 #include <../include/lxcmntent.h>

diff --git a/src/lxc/checkpoint.c b/src/lxc/checkpoint.c
index 75834c98f88f3e65ab6cdaee353a376c4edc2b6a..b50273a84646837ac7ac905d29fe7143e13caf6f 100644 (file)
--- a/src/lxc/checkpoint.c
+++ b/src/lxc/checkpoint.c
@@ -20,8 +20,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include <lxc/lxc.h>
-#include <lxc/log.h>
+#include "lxc.h"
+#include "log.h"
 
 lxc_log_define(lxc_checkpoint, lxc);
 

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 19a416f61e1edfa26522f9f01d27dd4722ef3b6a..73933cab532628ec45f3d8cdf8205f89fe8b3ca9 100644 (file)
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -33,13 +33,12 @@
 #include <malloc.h>
 #include <stdlib.h>
 
-#include <lxc/log.h>
-#include <lxc/lxc.h>
-#include <lxc/conf.h>
-#include <lxc/start.h> /* for struct lxc_handler */
-#include <lxc/utils.h>
-#include <lxc/cgroup.h>
-
+#include "log.h"
+#include "lxc.h"
+#include "conf.h"
+#include "start.h"     /* for struct lxc_handler */
+#include "utils.h"
+#include "cgroup.h"
 #include "commands.h"
 #include "console.h"
 #include "confile.h"

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index ec76295850e24ddcd9a706a91bc65e2cb93a1a14..9becc6399b1fdd105c5730958640eae02b6e8554 100644 (file)
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -31,9 +31,8 @@
 #include <sys/types.h>
 #include <stdbool.h>
 
-#include <lxc/list.h>
-
-#include <lxc/start.h> /* for lxc_handler */
+#include "list.h"
+#include "start.h" /* for lxc_handler */
 
 #if HAVE_SCMP_FILTER_CTX
 typedef void * scmp_filter_ctx;

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index c5ec4f3af983f6861d654244624764ed7729ace6..ad694e8673d3db30c59682d906546434e0bc7b10 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -41,9 +41,8 @@
 #include "config.h"
 #include "confile.h"
 #include "utils.h"
-
-#include <lxc/log.h>
-#include <lxc/conf.h>
+#include "log.h"
+#include "conf.h"
 #include "network.h"
 
 #if HAVE_SYS_PERSONALITY_H

diff --git a/src/lxc/confile.h b/src/lxc/confile.h
index eb7a8c27425e370c7c26cad4234ed87bee5b50eb..a16c9fd5bb0cfc7e4c1aea27a19f4ea35eb9481e 100644 (file)
--- a/src/lxc/confile.h
+++ b/src/lxc/confile.h
@@ -22,7 +22,7 @@
  */
 
 #include <stdio.h>
-#include "attach_options.h"
+#include <lxc/attach_options.h>
 
 #ifndef _confile_h
 #define _confile_h

diff --git a/src/lxc/console.c b/src/lxc/console.c
index 86e5e0593fd67b23c4bb7190112f7555fa96761f..55e895cdf2d89509d52e7777c2ff767613b5faf2 100644 (file)
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -32,6 +32,7 @@
 #include <termios.h>
 
 #include <lxc/lxccontainer.h>
+
 #include "log.h"
 #include "conf.h"
 #include "config.h"

diff --git a/src/lxc/error.c b/src/lxc/error.c
index 46c34bbc413a605c15e761305f75e282ffad1b8c..f433bf92188d944305b1fc13a3e1c2ebdd8ad6a2 100644 (file)
--- a/src/lxc/error.c
+++ b/src/lxc/error.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/wait.h>
+
 #include "error.h"
 #include "log.h"
 

diff --git a/src/lxc/freezer.c b/src/lxc/freezer.c
index be97d757e71949cf0a366b7f98aac5fe507c40b8..7b9f45f21e7cd3494726315bd7a004f60dd14ff6 100644 (file)
--- a/src/lxc/freezer.c
+++ b/src/lxc/freezer.c
@@ -34,9 +34,8 @@
 #include "error.h"
 #include "state.h"
 #include "monitor.h"
-
-#include <lxc/log.h>
-#include <lxc/cgroup.h>
+#include "log.h"
+#include "cgroup.h"
 
 lxc_log_define(lxc_freezer, lxc);
 

diff --git a/src/lxc/lsm/apparmor.c b/src/lxc/lsm/apparmor.c
index fdae5e699341ef85ae3de80c2c042c35ea63c0c1..be89987709f14e9bbb625c2a4c8acd071a5675c0 100644 (file)
--- a/src/lxc/lsm/apparmor.c
+++ b/src/lxc/lsm/apparmor.c
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/apparmor.h>
+
 #include "log.h"
 #include "lsm/lsm.h"
 

diff --git a/src/lxc/lsm/selinux.c b/src/lxc/lsm/selinux.c
index b1b02530a8d47819bf323279bc79c44a5bad62d8..11620c99d712292a4b34f8f508a1563c406632d0 100644 (file)
--- a/src/lxc/lsm/selinux.c
+++ b/src/lxc/lsm/selinux.c
@@ -25,6 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <selinux/selinux.h>
+
 #include "log.h"
 #include "lsm/lsm.h"
 

diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
index 84bcc0469f6da34ae8e612f1c8af68c798b307a6..d048cf21102ef66354d41a01a022122b3b0e57b3 100644 (file)
--- a/src/lxc/lxc.h
+++ b/src/lxc/lxc.h
@@ -30,7 +30,7 @@ extern "C" {
 #include <stddef.h>
 #include <sys/select.h>
 #include <sys/types.h>
-#include <lxc/state.h>
+#include "state.h"
 
 struct lxc_msg;
 struct lxc_conf;

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 7c26fc62008c90fc118f544f234af130fbd4fff8..7998f1cca0c9247b033d02ca767efd44bf038089 100644 (file)
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -26,10 +26,10 @@
 #include <libgen.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-
 #include <lxc/lxccontainer.h>
+
+#include "lxc.h"
+#include "log.h"
 #include "arguments.h"
 
 lxc_log_define(lxc_cgroup_ui, lxc_cgroup);

diff --git a/src/lxc/lxc_checkpoint.c b/src/lxc/lxc_checkpoint.c
index f6a03139099710da9150c63e91926dccac5bcbef..7f7d53ed08703fadfa770e5b2fa6f7f36146253c 100644 (file)
--- a/src/lxc/lxc_checkpoint.c
+++ b/src/lxc/lxc_checkpoint.c
@@ -30,10 +30,9 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-#include <lxc/utils.h>
-
+#include "lxc.h"
+#include "log.h"
+#include "utils.h"
 #include "arguments.h"
 #include "config.h"
 #include "caps.h"

diff --git a/src/lxc/lxc_clone.c b/src/lxc/lxc_clone.c
index 7464dcdecc4596a6d2b697c94086995e16353184..3354809ea04a932b1c532808fa53ec1e00039984 100644 (file)
--- a/src/lxc/lxc_clone.c
+++ b/src/lxc/lxc_clone.c
@@ -27,12 +27,13 @@
 #include <errno.h>
 #include <ctype.h>
 
+#include <lxc/lxccontainer.h>
+
 #include "log.h"
 #include "config.h"
 #include "lxc.h"
 #include "conf.h"
 #include "state.h"
-#include <lxc/lxccontainer.h>
 
 lxc_log_define(lxc_clone, lxc);
 

diff --git a/src/lxc/lxc_config.c b/src/lxc/lxc_config.c
index 8a4114d19465fca4f2741431e83a3ccaaa6ccab3..f137498901f6710f564571b346a5c65007a1cc87 100644 (file)
--- a/src/lxc/lxc_config.c
+++ b/src/lxc/lxc_config.c
@@ -20,9 +20,11 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
+
 #include <lxc/lxccontainer.h>
 
+#include "config.h"
+
 struct lxc_config_items {
        char *name;
        const char *(*fn)(void);

diff --git a/src/lxc/lxc_console.c b/src/lxc/lxc_console.c
index 5dc3d49a08e67cdb9fe6bad5e1f07c6e5c3611d1..e6a5a7ea2c6ed5a7c617a269ac21b6438d8f6637 100644 (file)
--- a/src/lxc/lxc_console.c
+++ b/src/lxc/lxc_console.c
@@ -39,6 +39,7 @@
 #include <sys/ioctl.h>
 
 #include <lxc/lxccontainer.h>
+
 #include "error.h"
 #include "lxc.h"
 #include "log.h"

diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c
index 7399683d7d695cd178624a30949dc509101f57fc..5ec7fc33bbfdb6f5a74f1715b265c4627c17db72 100644 (file)
--- a/src/lxc/lxc_create.c
+++ b/src/lxc/lxc_create.c
@@ -26,10 +26,9 @@
 #include <fcntl.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-#include <lxc/bdev.h>
-
+#include "lxc.h"
+#include "log.h"
+#include "bdev.h"
 #include "arguments.h"
 #include "utils.h"
 

diff --git a/src/lxc/lxc_destroy.c b/src/lxc/lxc_destroy.c
index 06d2d0d16376e5418ef56523bea6553d893cf212..729d35276cd5b517bb12fd96cc7c8fdee60dcc26 100644 (file)
--- a/src/lxc/lxc_destroy.c
+++ b/src/lxc/lxc_destroy.c
@@ -24,9 +24,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-
+#include "lxc.h"
+#include "log.h"
 #include "arguments.h"
 #include "utils.h"
 

diff --git a/src/lxc/lxc_freeze.c b/src/lxc/lxc_freeze.c
index 9e783bdacd658690acfa8ece8fea0928d632076d..086c81c3b8ff6e86141504becbbd07b2f3f28e85 100644 (file)
--- a/src/lxc/lxc_freeze.c
+++ b/src/lxc/lxc_freeze.c
@@ -26,10 +26,11 @@
 #include <libgen.h>
 #include <string.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
 #include <lxc/lxccontainer.h>
 
+#include "lxc.h"
+#include "log.h"
+
 #include "arguments.h"
 
 lxc_log_define(lxc_freeze_ui, lxc_cgroup);

diff --git a/src/lxc/lxc_info.c b/src/lxc/lxc_info.c
index b344dca50992d45544da75732a69f045cd45ee23..98698818d9091bb9a85a40391cf619b1dd3ec9cc 100644 (file)
--- a/src/lxc/lxc_info.c
+++ b/src/lxc/lxc_info.c
@@ -29,11 +29,11 @@
 #include <libgen.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-#include <lxc/utils.h>
 #include <lxc/lxccontainer.h>
 
+#include "lxc.h"
+#include "log.h"
+#include "utils.h"
 #include "commands.h"
 #include "arguments.h"
 

diff --git a/src/lxc/lxc_kill.c b/src/lxc/lxc_kill.c
index 8322b424f1a41f56b7cf0675cda952b4c900c569..62c76bd4656c233520bf49c2b86e7819cb90dc0e 100644 (file)
--- a/src/lxc/lxc_kill.c
+++ b/src/lxc/lxc_kill.c
@@ -26,6 +26,7 @@
 #include <sys/param.h>
 #include <stdlib.h>
 #include <signal.h>
+
 #include "commands.h"
 #include "arguments.h"
 #include "namespace.h"

diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index be381b06760a21129296e63b09a0571d9ae57e72..52f4c98c328958d892d06a1cac8c0dcc114f9fa4 100644 (file)
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -29,9 +29,9 @@
 #include <sys/types.h>
 #include <errno.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-#include <lxc/monitor.h>
+#include "lxc.h"
+#include "log.h"
+#include "monitor.h"
 #include "arguments.h"
 
 lxc_log_define(lxc_monitor_ui, lxc_monitor);

diff --git a/src/lxc/lxc_monitord.c b/src/lxc/lxc_monitord.c
index fc83f01bf522b49d1b879d100f6a7b100fadf2f4..84e023990ea87382514a46f23249eb17b24af08e 100644 (file)
--- a/src/lxc/lxc_monitord.c
+++ b/src/lxc/lxc_monitord.c
@@ -38,11 +38,11 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <lxc/af_unix.h>
-#include <lxc/log.h>
-#include <lxc/mainloop.h>
-#include <lxc/monitor.h>
-#include <lxc/utils.h>
+#include "af_unix.h"
+#include "log.h"
+#include "mainloop.h"
+#include "monitor.h"
+#include "utils.h"
 
 #define CLIENTFDS_CHUNK 64
 

diff --git a/src/lxc/lxc_snapshot.c b/src/lxc/lxc_snapshot.c
index 1de56719707cbf1060be4b03d3e7c425b53a66fd..e83f1b2b9358514bba9717f2ec838317c8540c52 100644 (file)
--- a/src/lxc/lxc_snapshot.c
+++ b/src/lxc/lxc_snapshot.c
@@ -17,8 +17,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <lxc/lxccontainer.h>
-
 #include <stdio.h>
 #include <libgen.h>
 #include <unistd.h>
@@ -26,10 +24,11 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-#include <lxc/bdev.h>
+#include <lxc/lxccontainer.h>
 
+#include "lxc.h"
+#include "log.h"
+#include "bdev.h"
 #include "arguments.h"
 #include "utils.h"
 

diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index acf3145eceae23dcebc110b69cdb6f4d226acda6..e6ca3555806453f13bf8e8a18d5bcd973cec6c41 100644 (file)
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -40,10 +40,11 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
+#include <lxc/lxccontainer.h>
+
 #include "log.h"
 #include "caps.h"
 #include "lxc.h"
-#include <lxc/lxccontainer.h>
 #include "conf.h"
 #include "cgroup.h"
 #include "utils.h"

diff --git a/src/lxc/lxc_stop.c b/src/lxc/lxc_stop.c
index 7940053f25db9b5fa336f2e05c0db382aaaff21f..a7f2907dd714987ae1c5989e71dd980c6fb2230e 100644 (file)
--- a/src/lxc/lxc_stop.c
+++ b/src/lxc/lxc_stop.c
@@ -25,10 +25,10 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-
 #include <lxc/lxccontainer.h>
+
+#include "lxc.h"
+#include "log.h"
 #include "arguments.h"
 #include "commands.h"
 #include "utils.h"

diff --git a/src/lxc/lxc_unfreeze.c b/src/lxc/lxc_unfreeze.c
index e5def1a278b5b2ffe87e4081a13810ffe05c19ae..ccabada5565b6e3afd0dbadf2f47d8c4d59cdbf6 100644 (file)
--- a/src/lxc/lxc_unfreeze.c
+++ b/src/lxc/lxc_unfreeze.c
@@ -25,10 +25,10 @@
 #include <libgen.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
 #include <lxc/lxccontainer.h>
 
+#include "lxc.h"
+#include "log.h"
 #include "arguments.h"
 
 lxc_log_define(lxc_unfreeze_ui, lxc_cgroup);

diff --git a/src/lxc/lxc_user_nic.c b/src/lxc/lxc_user_nic.c
index 16f1495c326af4e815706cce97d6e02dbc4bb2c5..67b1fa854e27bbefc9b1b7ef635e5f92217e52b4 100644 (file)
--- a/src/lxc/lxc_user_nic.c
+++ b/src/lxc/lxc_user_nic.c
@@ -45,6 +45,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/sockios.h>
 #include <sys/param.h>
+
 #include "config.h"
 #include "utils.h"
 #include "network.h"

diff --git a/src/lxc/lxc_usernsexec.c b/src/lxc/lxc_usernsexec.c
index e36ff3487011d74f7469d2857f57af1eddedca69..f152f91bff32c6102b0f5b8c332c6a50a060a8f3 100644 (file)
--- a/src/lxc/lxc_usernsexec.c
+++ b/src/lxc/lxc_usernsexec.c
@@ -38,6 +38,7 @@
 #include <sched.h>
 #include <pwd.h>
 #include <grp.h>
+
 #include "config.h"
 #include "namespace.h"
 #include "utils.h"

diff --git a/src/lxc/lxc_wait.c b/src/lxc/lxc_wait.c
index b00377ccf6d43dadc3737f7fdb45c493b54a9cf9..269acfdee3e294cfa2f064b49a1a0ed46d1d866e 100644 (file)
--- a/src/lxc/lxc_wait.c
+++ b/src/lxc/lxc_wait.c
@@ -28,9 +28,10 @@
 #include <signal.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
 #include <lxc/lxccontainer.h>
+
+#include "lxc.h"
+#include "log.h"
 #include "arguments.h"
 
 lxc_log_define(lxc_wait_ui, lxc_monitor);

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index e1d004f3f470d0159b3abe3da1730569972057cb..b62f7ba6eb861a180758a4453a994f63a5fb7e77 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -30,26 +30,28 @@
 #include <fcntl.h>
 #include <sched.h>
 #include <dirent.h>
+#include <sched.h>
+#include <arpa/inet.h>
+#include <libgen.h>
+
+#include <lxc/lxccontainer.h>
+#include <lxc/version.h>
+
 #include "config.h"
 #include "lxc.h"
 #include "state.h"
-#include <lxc/lxccontainer.h>
 #include "conf.h"
 #include "confile.h"
 #include "console.h"
 #include "cgroup.h"
 #include "commands.h"
-#include "version.h"
 #include "log.h"
 #include "bdev.h"
 #include "utils.h"
 #include "attach.h"
-#include <lxc/utils.h>
-#include <lxc/monitor.h>
-#include <lxc/namespace.h>
-#include <sched.h>
-#include <arpa/inet.h>
-#include <libgen.h>
+#include "utils.h"
+#include "monitor.h"
+#include "namespace.h"
 #include "lxclock.h"
 
 #if HAVE_IFADDRS_H

diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
index 7d1839eaa74de82ebb94456fa684119b2488abea..f62ff8fd164497d8395a1299246bd8aab28ce52c 100644 (file)
--- a/src/lxc/lxccontainer.h
+++ b/src/lxc/lxccontainer.h
@@ -22,12 +22,13 @@
 
 #ifndef __LXC_CONTAINER_H
 #define __LXC_CONTAINER_H
-#include "attach_options.h"
 #include <malloc.h>
 #include <semaphore.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include <lxc/attach_options.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif

diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
index 28691b083c090070806f4ba07d083a180ce4b1a9..b30f4c3421079b0305fba0de76973abde233fc4a 100644 (file)
--- a/src/lxc/lxclock.c
+++ b/src/lxc/lxclock.c
@@ -27,10 +27,12 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include <lxc/utils.h>
-#include <lxc/log.h>
+
 #include <lxc/lxccontainer.h>
 
+#include "utils.h"
+#include "log.h"
+
 #ifdef MUTEX_DEBUGGING
 #include <execinfo.h>
 #endif

diff --git a/src/lxc/monitor.c b/src/lxc/monitor.c
index 7e0a713f7a888ee950870c362d9126bac3ab07e0..2cc4831afd7c472b46a17460de570278475fcbcd 100644 (file)
--- a/src/lxc/monitor.c
+++ b/src/lxc/monitor.c
@@ -41,12 +41,11 @@
 
 #include "error.h"
 #include "af_unix.h"
-
-#include <lxc/log.h>
-#include <lxc/lxclock.h>
-#include <lxc/state.h>
-#include <lxc/monitor.h>
-#include <lxc/utils.h>
+#include "log.h"
+#include "lxclock.h"
+#include "state.h"
+#include "monitor.h"
+#include "utils.h"
 
 lxc_log_define(lxc_monitor, lxc);
 

diff --git a/src/lxc/monitor.h b/src/lxc/monitor.h
index 809391993aba7a5443e26fb396f3415965474e08..7e2a468faa68dd0ca2a8d251852125ff96ced2b9 100644 (file)
--- a/src/lxc/monitor.h
+++ b/src/lxc/monitor.h
@@ -26,7 +26,7 @@
 #include <sys/param.h>
 #include <sys/un.h>
 
-#include <lxc/conf.h>
+#include "conf.h"
 
 typedef enum {
        lxc_msg_state,

diff --git a/src/lxc/parse.c b/src/lxc/parse.c
index ed51d88719b90323d2fdeb5b427d0f497b8ca0c1..ea13d0645b4854ff07516a85e2333a6a78aaad1d 100644 (file)
--- a/src/lxc/parse.c
+++ b/src/lxc/parse.c
@@ -31,7 +31,7 @@
 #include "parse.h"
 #include "config.h"
 #include "utils.h"
-#include <lxc/log.h>
+#include "log.h"
 
 lxc_log_define(lxc_parse, lxc);
 

diff --git a/src/lxc/restart.c b/src/lxc/restart.c
index 72320740ffb9f0ca11670e61af562c228f922610..8d5b7923e5121dcaa1bf5753dad22e65299ae994 100644 (file)
--- a/src/lxc/restart.c
+++ b/src/lxc/restart.c
@@ -30,10 +30,10 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include <lxc/log.h>
-#include <lxc/start.h> /* for struct lxc_handler */
-#include <lxc/utils.h>
-#include <lxc/error.h>
+#include "log.h"
+#include "start.h"     /* for struct lxc_handler */
+#include "utils.h"
+#include "error.h"
 
 lxc_log_define(lxc_restart, lxc);
 

diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
index 1abd697118ca31cb68352aea9661eded51e55128..ab6c85666a8c914f032d46877d43f40e926975d6 100644 (file)
--- a/src/lxc/seccomp.c
+++ b/src/lxc/seccomp.c
@@ -27,9 +27,9 @@
 #include <seccomp.h>
 #include <errno.h>
 #include <seccomp.h>
+
 #include "config.h"
 #include "lxcseccomp.h"
-
 #include "log.h"
 
 lxc_log_define(lxc_seccomp, lxc);

diff --git a/src/lxc/start.h b/src/lxc/start.h
index c1f790901580491846bac02d4578645a9d5db699..ec7f3f6bb28fbbd5406a6ca1b03da3686a56bf6c 100644 (file)
--- a/src/lxc/start.h
+++ b/src/lxc/start.h
@@ -23,10 +23,10 @@
 #ifndef __lxc_state_h
 #define __lxc_state_h
 
-#include "config.h"
-
-#include <lxc/state.h>
 #include <sys/param.h>
+
+#include "config.h"
+#include "state.h"
 #include "namespace.h"
 
 struct lxc_conf;

diff --git a/src/lxc/state.c b/src/lxc/state.c
index 398833aa99e2c1f615d4f9f764ab93d041badc89..411be853c97953a80a2622417e95daa42d8f8613 100644 (file)
--- a/src/lxc/state.c
+++ b/src/lxc/state.c
@@ -32,11 +32,11 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-#include <lxc/start.h>
-#include <lxc/cgroup.h>
-#include <lxc/monitor.h>
+#include "lxc.h"
+#include "log.h"
+#include "start.h"
+#include "cgroup.h"
+#include "monitor.h"
 #include "commands.h"
 #include "config.h"
 

diff --git a/src/lxc/utils.h b/src/lxc/utils.h
index 844565dfbce565a2a0ff5b289cf1edf6f54a4338..253756257b05fd866a905a8026c91ac13cca66b4 100644 (file)
--- a/src/lxc/utils.h
+++ b/src/lxc/utils.h
@@ -30,6 +30,7 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include "config.h"
 
 /* returns 1 on success, 0 if there were any failures */

diff --git a/src/python-lxc/lxc.c b/src/python-lxc/lxc.c
index 0099b98ed34f5bed58ce819133cf9c6a47cdaf8d..5ee8dd083a07228f89b55833837406b915bc231f 100644 (file)
--- a/src/python-lxc/lxc.c
+++ b/src/python-lxc/lxc.c
@@ -25,9 +25,9 @@
 #include <Python.h>
 #include "structmember.h"
 #include <lxc/lxccontainer.h>
-#include <lxc/utils.h>
-#include <lxc/namespace.h>
-#include <lxc/confile.h>
+#include "lxc/utils.h"
+#include "lxc/namespace.h"
+#include "lxc/confile.h"
 #include <stdio.h>
 #include <sys/wait.h>
 

diff --git a/src/tests/attach.c b/src/tests/attach.c
index 54f899f58df988090d024b8abeddd4f2affd5377..b63c6339c967977d2181d4326f7adf74adfc1d09 100644 (file)
--- a/src/tests/attach.c
+++ b/src/tests/attach.c
@@ -20,8 +20,8 @@
  */
 
 #include <lxc/lxccontainer.h>
-#include <lxc/utils.h>
-#include <lxc/lsm/lsm.h>
+#include "lxc/utils.h"
+#include "lxc/lsm/lsm.h"
 
 #include <string.h>
 #include <sys/stat.h>

diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c
index ef192c6275d09fba12514d2db7577553f2219411..f0e2de84cef4b44e1298a9774e72c46b53d7d4a3 100644 (file)
--- a/src/tests/cgpath.c
+++ b/src/tests/cgpath.c
@@ -28,9 +28,9 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
-#include "../lxc/cgroup.h"
-#include "../lxc/lxc.h"
-#include "../lxc/commands.h"
+#include "lxc/cgroup.h"
+#include "lxc/lxc.h"
+#include "lxc/commands.h"
 
 #define MYNAME "lxctest1"
 

diff --git a/src/tests/containertests.c b/src/tests/containertests.c
index e6f05af9032b29850bfc9888955165d5b27c24b7..d3742e78cd670a03895bae3c5755e7852e041da4 100644 (file)
--- a/src/tests/containertests.c
+++ b/src/tests/containertests.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <lxc/state.h>
+#include "lxc/state.h"
 
 #define MYNAME "lxctest1"
 

diff --git a/src/tests/get_item.c b/src/tests/get_item.c
index 10ab3d108edc3b5791b2574917e59834fad3e6a5..1e4121717c5def87eaeafe5856fe5a328219f58e 100644 (file)
--- a/src/tests/get_item.c
+++ b/src/tests/get_item.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <lxc/state.h>
+#include "lxc/state.h"
 
 #define MYNAME "lxctest1"
 

diff --git a/src/tests/getkeys.c b/src/tests/getkeys.c
index 5c336db930d03b86b448c3f46d69260bc6345f4f..ed68440b75e071b4a3f1e8416d5b4903b1a8898b 100644 (file)
--- a/src/tests/getkeys.c
+++ b/src/tests/getkeys.c
@@ -25,7 +25,7 @@
 #include <sys/wait.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <lxc/state.h>
+#include "lxc/state.h"
 
 #define MYNAME "lxctest1"
 

diff --git a/src/tests/locktests.c b/src/tests/locktests.c
index 360851fdf69c3c50c27063526da5ed4ef5437321..191414c069e3702860ed430747b52f2f068c7e26 100644 (file)
--- a/src/tests/locktests.c
+++ b/src/tests/locktests.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "../lxc/lxclock.h"
+#include "lxc/lxclock.h"
 #include <unistd.h>
 #include <signal.h>
 #include <stdio.h>

diff --git a/src/tests/reboot.c b/src/tests/reboot.c
index b27d523126269002e689d3e5491adc4c5886afd5..3601e0dba4548864450926e259e457d1329e46f4 100644 (file)
--- a/src/tests/reboot.c
+++ b/src/tests/reboot.c
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <lxc/namespace.h>
+#include "lxc/namespace.h"
 
 #include <sched.h>
 #include <linux/sched.h>

diff --git a/src/tests/snapshot.c b/src/tests/snapshot.c
index d9fed363221ec86afac52d0b1ba7eecd13bed333..6e13932ed96eb747021bb892fd5ae347e5e29179 100644 (file)
--- a/src/tests/snapshot.c
+++ b/src/tests/snapshot.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-#include "../lxc/lxc.h"
+#include "lxc/lxc.h"
 
 #define MYNAME "snapxxx1"
 #define RESTNAME "snapxxx2"