Merge pull request #3629 from brauner/2021-01-22/static_binaries

configure.ac

@@ -278,9 +278,14 @@ if test "$enable_openssl" = "auto" ; then
 fi
 AM_CONDITIONAL([ENABLE_OPENSSL], [test "x$enable_openssl" = "xyes"])
 
+AC_ARG_ENABLE([static-binaries],
+	[AS_HELP_STRING([--enable-static-binaries], [build all binaries statically [default=no]])],
+	[enable_static_binaries=$enableval], [enable_static_binaries=no])
+AM_CONDITIONAL([ENABLE_STATIC_BINARIES], [test "x$enable_static_binaries" = "xyes"])
+
 AM_COND_IF([ENABLE_OPENSSL],
 	[AC_CHECK_HEADER([openssl/engine.h],[],[AC_MSG_ERROR([You must install the OpenSSL development package in order to compile lxc])])
-	AC_SUBST([OPENSSL_LIBS], '-lssl -lcrypto')])
+	AM_COND_IF([ENABLE_STATIC_BINARIES], [AC_SUBST([OPENSSL_LIBS], '-lssl -lcrypto -ldl')], [AC_SUBST([OPENSSL_LIBS], '-lssl -lcrypto')])])
 
 # SELinux
 AC_ARG_ENABLE([selinux],
@@ -433,6 +438,11 @@ AC_ARG_ENABLE([commands],
 	[enable_commands=$enableval], [enable_commands=yes])
 AM_CONDITIONAL([ENABLE_COMMANDS], [test "x$enable_commands" = "xyes"])
 
+AC_ARG_ENABLE([static-binaries],
+	[AS_HELP_STRING([--enable-static-binaries], [build all binaries statically [default=no]])],
+	[enable_static_binaries=$enableval], [enable_static_binaries=no])
+AM_CONDITIONAL([ENABLE_STATIC_BINARIES], [test "x$enable_static_binaries" = "xyes"])
+
 # Build with ASAN commands
 AC_ARG_ENABLE([asan],
 	[AS_HELP_STRING([--enable-asan], [build with address sanitizer enabled [default=no]])],
@@ -1041,6 +1051,8 @@ Binaries
    - lxc-user-nic:      $enable_commands
    - lxc-usernsexec:    $enable_commands
 
+ - static binaries: $enable_static_binaries
+
 Environment:
  - compiler: $CC
  - distribution: $with_distro

src/lxc/Makefile.am

@@ -331,8 +331,13 @@ LDADD = liblxc.la \
 
 if ENABLE_TOOLS
 lxc_attach_SOURCES = tools/lxc_attach.c \
-		     tools/arguments.c tools/arguments.h \
-		     af_unix.c af_unix.h \
+		     tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_attach_SOURCES += $(liblxc_la_SOURCES)
+lxc_attach_LDFLAGS = -all-static -pthread
+else
+lxc_attach_SOURCES += af_unix.c af_unix.h \
 		      caps.c caps.h \
 		      cgroups/cgfsng.c \
 		      cgroups/cgroup.c cgroups/cgroup.h \
@@ -380,10 +385,16 @@ lxc_attach_SOURCES = tools/lxc_attach.c \
 if ENABLE_SECCOMP
 lxc_attach_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_autostart_SOURCES = tools/lxc_autostart.c \
-			tools/arguments.c tools/arguments.h \
-			af_unix.c af_unix.h \
+			tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_autostart_SOURCES += $(liblxc_la_SOURCES)
+lxc_autostart_LDFLAGS = -all-static -pthread
+else
+lxc_autostart_SOURCES += af_unix.c af_unix.h \
 			 caps.c caps.h \
 			 cgroups/cgfsng.c \
 			 cgroups/cgroup.c cgroups/cgroup.h \
@@ -430,10 +441,16 @@ lxc_autostart_SOURCES = tools/lxc_autostart.c \
 if ENABLE_SECCOMP
 lxc_autostart_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
-		     tools/arguments.c tools/arguments.h \
-		     af_unix.c af_unix.h \
+		     tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_cgroup_SOURCES += $(liblxc_la_SOURCES)
+lxc_cgroup_LDFLAGS = -all-static -pthread
+else
+lxc_cgroup_SOURCES += af_unix.c af_unix.h \
 		      caps.c caps.h \
 		      cgroups/cgfsng.c \
 		      cgroups/cgroup.c cgroups/cgroup.h \
@@ -480,10 +497,16 @@ lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
 if ENABLE_SECCOMP
 lxc_cgroup_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_config_SOURCES = tools/lxc_config.c \
-		     tools/arguments.c tools/arguments.h \
-		     af_unix.c af_unix.h \
+		     tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_config_SOURCES += $(liblxc_la_SOURCES)
+lxc_config_LDFLAGS = -all-static -pthread
+else
+lxc_config_SOURCES += af_unix.c af_unix.h \
 		      caps.c caps.h \
 		      cgroups/cgfsng.c \
 		      cgroups/cgroup.c cgroups/cgroup.h \
@@ -530,10 +553,16 @@ lxc_config_SOURCES = tools/lxc_config.c \
 if ENABLE_SECCOMP
 lxc_config_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_console_SOURCES = tools/lxc_console.c \
-		      tools/arguments.c tools/arguments.h \
-		      af_unix.c af_unix.h \
+		      tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_console_SOURCES += $(liblxc_la_SOURCES)
+lxc_console_LDFLAGS = -all-static -pthread
+else
+lxc_console_SOURCES += af_unix.c af_unix.h \
 		       caps.c caps.h \
 		       cgroups/cgfsng.c \
 		       cgroups/cgroup.c cgroups/cgroup.h \
@@ -580,10 +609,16 @@ lxc_console_SOURCES = tools/lxc_console.c \
 if ENABLE_SECCOMP
 lxc_console_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_destroy_SOURCES = tools/lxc_destroy.c \
-		      tools/arguments.c tools/arguments.h \
-		      af_unix.c af_unix.h \
+		      tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_destroy_SOURCES += $(liblxc_la_SOURCES)
+lxc_destroy_LDFLAGS = -all-static -pthread
+else
+lxc_destroy_SOURCES += af_unix.c af_unix.h \
 		       caps.c caps.h \
 		       cgroups/cgfsng.c \
 		       cgroups/cgroup.c cgroups/cgroup.h \
@@ -630,10 +665,16 @@ lxc_destroy_SOURCES = tools/lxc_destroy.c \
 if ENABLE_SECCOMP
 lxc_destroy_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_device_SOURCES = tools/lxc_device.c \
-		     tools/arguments.c tools/arguments.h \
-		     af_unix.c af_unix.h \
+		     tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_device_SOURCES += $(liblxc_la_SOURCES)
+lxc_device_LDFLAGS = -all-static -pthread
+else
+lxc_device_SOURCES += af_unix.c af_unix.h \
 		      caps.c caps.h \
 		      cgroups/cgfsng.c \
 		      cgroups/cgroup.c cgroups/cgroup.h \
@@ -680,10 +721,16 @@ lxc_device_SOURCES = tools/lxc_device.c \
 if ENABLE_SECCOMP
 lxc_device_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_execute_SOURCES = tools/lxc_execute.c \
-		      tools/arguments.c tools/arguments.h \
-		      af_unix.c af_unix.h \
+		      tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_execute_SOURCES += $(liblxc_la_SOURCES)
+lxc_execute_LDFLAGS = -all-static -pthread
+else
+lxc_execute_SOURCES += af_unix.c af_unix.h \
 		       caps.c caps.h \
 		       cgroups/cgfsng.c \
 		       cgroups/cgroup.c cgroups/cgroup.h \
@@ -730,10 +777,16 @@ lxc_execute_SOURCES = tools/lxc_execute.c \
 if ENABLE_SECCOMP
 lxc_execute_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_freeze_SOURCES = tools/lxc_freeze.c \
-		     tools/arguments.c tools/arguments.h \
-		     af_unix.c af_unix.h \
+		     tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_freeze_SOURCES += $(liblxc_la_SOURCES)
+lxc_freeze_LDFLAGS = -all-static -pthread
+else
+lxc_freeze_SOURCES += af_unix.c af_unix.h \
 		      caps.c caps.h \
 		      cgroups/cgfsng.c \
 		      cgroups/cgroup.c cgroups/cgroup.h \
@@ -780,10 +833,16 @@ lxc_freeze_SOURCES = tools/lxc_freeze.c \
 if ENABLE_SECCOMP
 lxc_freeze_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_info_SOURCES = tools/lxc_info.c \
-		   tools/arguments.c tools/arguments.h \
-		   af_unix.c af_unix.h \
+		   tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_info_SOURCES += $(liblxc_la_SOURCES)
+lxc_info_LDFLAGS = -all-static -pthread
+else
+lxc_info_SOURCES += af_unix.c af_unix.h \
 		    caps.c caps.h \
 		    cgroups/cgfsng.c \
 		    cgroups/cgroup.c cgroups/cgroup.h \
@@ -830,10 +889,16 @@ lxc_info_SOURCES = tools/lxc_info.c \
 if ENABLE_SECCOMP
 lxc_info_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_monitor_SOURCES = tools/lxc_monitor.c \
-		      tools/arguments.c tools/arguments.h \
-		      af_unix.c af_unix.h \
+		      tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_monitor_SOURCES += $(liblxc_la_SOURCES)
+lxc_monitor_LDFLAGS = -all-static -pthread
+else
+lxc_monitor_SOURCES += af_unix.c af_unix.h \
 		       caps.c caps.h \
 		       cgroups/cgfsng.c \
 		       cgroups/cgroup.c cgroups/cgroup.h \
@@ -881,10 +946,16 @@ lxc_monitor_SOURCES = tools/lxc_monitor.c \
 if ENABLE_SECCOMP
 lxc_monitor_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_ls_SOURCES = tools/lxc_ls.c \
-		 tools/arguments.c tools/arguments.h \
-		 af_unix.c af_unix.h \
+		 tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_ls_SOURCES += $(liblxc_la_SOURCES)
+lxc_ls_LDFLAGS = -all-static -pthread
+else
+lxc_ls_SOURCES += af_unix.c af_unix.h \
 		  caps.c caps.h \
 		  cgroups/cgfsng.c \
 		  cgroups/cgroup.c cgroups/cgroup.h \
@@ -932,10 +1003,16 @@ lxc_ls_SOURCES = tools/lxc_ls.c \
 if ENABLE_SECCOMP
 lxc_ls_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_copy_SOURCES = tools/lxc_copy.c \
-		   tools/arguments.c tools/arguments.h \
-		   af_unix.c af_unix.h \
+		   tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_copy_SOURCES += $(liblxc_la_SOURCES)
+lxc_copy_LDFLAGS = -all-static -pthread
+else
+lxc_copy_SOURCES += af_unix.c af_unix.h \
 		    caps.c caps.h \
 		    cgroups/cgfsng.c \
 		    cgroups/cgroup.c cgroups/cgroup.h \
@@ -982,10 +1059,16 @@ lxc_copy_SOURCES = tools/lxc_copy.c \
 if ENABLE_SECCOMP
 lxc_copy_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_start_SOURCES = tools/lxc_start.c \
-		    tools/arguments.c tools/arguments.h \
-		    af_unix.c af_unix.h \
+		    tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_start_SOURCES += $(liblxc_la_SOURCES)
+lxc_start_LDFLAGS = -all-static -pthread
+else
+lxc_start_SOURCES += af_unix.c af_unix.h \
 		     caps.c caps.h \
 		     cgroups/cgfsng.c \
 		     cgroups/cgroup.c cgroups/cgroup.h \
@@ -1032,10 +1115,16 @@ lxc_start_SOURCES = tools/lxc_start.c \
 if ENABLE_SECCOMP
 lxc_start_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_stop_SOURCES = tools/lxc_stop.c \
-		   tools/arguments.c tools/arguments.h \
-		   af_unix.c af_unix.h \
+		   tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_stop_SOURCES += $(liblxc_la_SOURCES)
+lxc_stop_LDFLAGS = -all-static -pthread
+else
+lxc_stop_SOURCES += af_unix.c af_unix.h \
 		    caps.c caps.h \
 		    cgroups/cgfsng.c \
 		    cgroups/cgroup.c cgroups/cgroup.h \
@@ -1082,10 +1171,16 @@ lxc_stop_SOURCES = tools/lxc_stop.c \
 if ENABLE_SECCOMP
 lxc_stop_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_top_SOURCES = tools/lxc_top.c \
-		  tools/arguments.c tools/arguments.h \
-		  af_unix.c af_unix.h \
+		  tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_top_SOURCES += $(liblxc_la_SOURCES)
+lxc_top_LDFLAGS = -all-static -pthread
+else
+lxc_top_SOURCES += af_unix.c af_unix.h \
 		   caps.c caps.h \
 		   cgroups/cgfsng.c \
 		   cgroups/cgroup.c cgroups/cgroup.h \
@@ -1132,10 +1227,16 @@ lxc_top_SOURCES = tools/lxc_top.c \
 if ENABLE_SECCOMP
 lxc_top_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
-		       tools/arguments.c tools/arguments.h \
-		       af_unix.c af_unix.h \
+		       tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_unfreeze_SOURCES += $(liblxc_la_SOURCES)
+lxc_unfreeze_LDFLAGS = -all-static -pthread
+else
+lxc_unfreeze_SOURCES += af_unix.c af_unix.h \
 			caps.c caps.h \
 			cgroups/cgfsng.c \
 			cgroups/cgroup.c cgroups/cgroup.h \
@@ -1182,10 +1283,16 @@ lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
 if ENABLE_SECCOMP
 lxc_unfreeze_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_unshare_SOURCES = tools/lxc_unshare.c \
-		      tools/arguments.c tools/arguments.h \
-		      af_unix.c af_unix.h \
+		      tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_unshare_SOURCES += $(liblxc_la_SOURCES)
+lxc_unshare_LDFLAGS = -all-static -pthread
+else
+lxc_unshare_SOURCES += af_unix.c af_unix.h \
 		       caps.c caps.h \
 		       cgroups/cgfsng.c \
 		       cgroups/cgroup.c cgroups/cgroup.h \
@@ -1234,10 +1341,16 @@ lxc_unshare_SOURCES = tools/lxc_unshare.c \
 if ENABLE_SECCOMP
 lxc_unshare_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_wait_SOURCES = tools/lxc_wait.c \
-		   tools/arguments.c tools/arguments.h \
-		   af_unix.c af_unix.h \
+		   tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_wait_SOURCES += $(liblxc_la_SOURCES)
+lxc_wait_LDFLAGS = -all-static -pthread
+else
+lxc_wait_SOURCES += af_unix.c af_unix.h \
 		    caps.c caps.h \
 		    cgroups/cgfsng.c \
 		    cgroups/cgroup.c cgroups/cgroup.h \
@@ -1284,10 +1397,16 @@ lxc_wait_SOURCES = tools/lxc_wait.c \
 if ENABLE_SECCOMP
 lxc_wait_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_create_SOURCES = tools/lxc_create.c \
-		     tools/arguments.c tools/arguments.h \
-		     af_unix.c af_unix.h \
+		     tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_create_SOURCES += $(liblxc_la_SOURCES)
+lxc_create_LDFLAGS = -all-static -pthread
+else
+lxc_create_SOURCES += af_unix.c af_unix.h \
 		      caps.c caps.h \
 		      cgroups/cgfsng.c \
 		      cgroups/cgroup.c cgroups/cgroup.h \
@@ -1334,10 +1453,16 @@ lxc_create_SOURCES = tools/lxc_create.c \
 if ENABLE_SECCOMP
 lxc_create_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
-		       tools/arguments.c tools/arguments.h \
-		       af_unix.c af_unix.h \
+		       tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_snapshot_SOURCES += $(liblxc_la_SOURCES)
+lxc_snapshot_LDFLAGS = -all-static -pthread
+else
+lxc_snapshot_SOURCES += af_unix.c af_unix.h \
 			caps.c caps.h \
 			cgroups/cgfsng.c \
 			cgroups/cgroup.c cgroups/cgroup.h \
@@ -1384,10 +1509,16 @@ lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
 if ENABLE_SECCOMP
 lxc_snapshot_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
 lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
-			 tools/arguments.c tools/arguments.h \
-			 af_unix.c af_unix.h \
+			 tools/arguments.c tools/arguments.h
+
+if ENABLE_STATIC_BINARIES
+lxc_checkpoint_SOURCES += $(liblxc_la_SOURCES)
+lxc_checkpoint_LDFLAGS = -all-static -pthread
+else
+lxc_checkpoint_SOURCES += af_unix.c af_unix.h \
 			  caps.c caps.h \
 			  cgroups/cgfsng.c \
 			  cgroups/cgroup.c cgroups/cgroup.h \
@@ -1434,7 +1565,7 @@ lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
 if ENABLE_SECCOMP
 lxc_checkpoint_SOURCES += seccomp.c lxcseccomp.h
 endif
-
+endif
 endif
 
 if ENABLE_COMMANDS
@@ -1452,8 +1583,13 @@ init_lxc_SOURCES = cmd/lxc_init.c \
 		   string_utils.c string_utils.h
 init_lxc_LDFLAGS = -pthread
 
-lxc_monitord_SOURCES = cmd/lxc_monitord.c \
-		       af_unix.c af_unix.h \
+lxc_monitord_SOURCES = cmd/lxc_monitord.c
+
+if ENABLE_STATIC_BINARIES
+lxc_monitord_SOURCES += $(liblxc_la_SOURCES)
+lxc_monitord_LDFLAGS = -all-static -pthread
+else
+lxc_monitord_SOURCES += af_unix.c af_unix.h \
 			caps.c caps.h \
 			cgroups/cgfsng.c \
 			cgroups/cgroup.c cgroups/cgroup.h \
@@ -1501,9 +1637,15 @@ lxc_monitord_SOURCES = cmd/lxc_monitord.c \
 if ENABLE_SECCOMP
 lxc_monitord_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
-lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \
-		       af_unix.c af_unix.h \
+lxc_user_nic_SOURCES = cmd/lxc_user_nic.c
+
+if ENABLE_STATIC_BINARIES
+lxc_user_nic_SOURCES += $(liblxc_la_SOURCES)
+lxc_user_nic_LDFLAGS = -all-static -pthread
+else
+lxc_user_nic_SOURCES += af_unix.c af_unix.h \
 			caps.c caps.h \
 			cgroups/cgfsng.c \
 			cgroups/cgroup.c cgroups/cgroup.h \
@@ -1553,9 +1695,15 @@ lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \
 if ENABLE_SECCOMP
 lxc_user_nic_SOURCES += seccomp.c lxcseccomp.h
 endif
+endif
 
-lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \
-			 af_unix.c af_unix.h \
+lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c
+
+if ENABLE_STATIC_BINARIES
+lxc_usernsexec_SOURCES += $(liblxc_la_SOURCES)
+lxc_usernsexec_LDFLAGS = -all-static -pthread
+else
+lxc_usernsexec_SOURCES += af_unix.c af_unix.h \
 			  caps.c caps.h \
 			  cgroups/cgfsng.c \
 			  cgroups/cgroup.c cgroups/cgroup.h \
@@ -1607,6 +1755,7 @@ if ENABLE_SECCOMP
 lxc_usernsexec_SOURCES += seccomp.c lxcseccomp.h
 endif
 endif
+endif
 
 
 if ENABLE_TOOLS

src/lxc/commands.c

@@ -17,7 +17,7 @@
 #include <unistd.h>
 
 #include "af_unix.h"
-#include "cgroup.h"
+#include "cgroups/cgroup.h"
 #include "cgroups/cgroup2_devices.h"
 #include "commands.h"
 #include "commands_utils.h"

src/lxc/conf.c

@@ -35,7 +35,7 @@
 
 #include "af_unix.h"
 #include "caps.h"
-#include "cgroup.h"
+#include "cgroups/cgroup.h"
 #include "conf.h"
 #include "config.h"
 #include "confile.h"
@@ -54,7 +54,7 @@
 #include "process_utils.h"
 #include "ringbuf.h"
 #include "start.h"
-#include "storage.h"
+#include "storage/storage.h"
 #include "storage/overlay.h"
 #include "syscall_wrappers.h"
 #include "terminal.h"

src/lxc/confile.c

@@ -36,7 +36,7 @@
 #include "memory_utils.h"
 #include "network.h"
 #include "parse.h"
-#include "storage.h"
+#include "storage/storage.h"
 #include "utils.h"
 
 #if HAVE_SYS_PERSONALITY_H

src/lxc/initutils.h

@@ -15,6 +15,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "config.h"
+#include "cgroups/cgroup.h"
 #include "compiler.h"
 #include "string_utils.h"