From cdb4f412ff248f53f6719dfd0af6e0fde54c47e5 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 3 Sep 2021 11:09:02 +0200
Subject: [PATCH] tree-wide: fix public lxc header inclusions

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 src/lxc/attach.c           | 3 +--
 src/lxc/attach.h           | 3 ++-
 src/lxc/commands_utils.c   | 1 +
 src/lxc/conf.c             | 2 +-
 src/lxc/confile.h          | 4 ++--
 src/lxc/criu.c             | 2 +-
 src/lxc/freezer.c          | 1 +
 src/tests/rootfs_options.c | 4 ++--
 src/tests/sys_mixed.c      | 4 ++--
 9 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index 50d2b34ef..a1b16607a 100644
--- 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 66b9796a3..6556bab40 100644
--- 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 b2957b007..6a62d2fcb 100644
--- 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 c11306dbc..60ed9aa9e 100644
--- 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 999dc1648..73935a858 100644
--- 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 ea21640e5..3d61bea6d 100644
--- 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 5d2d48978..ef6afa046 100644
--- 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 c103cbc11..05cb3dda6 100644
--- 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 785f6e867..9716ac3d0 100644
--- 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>
-- 
2.47.2