tree-wide: fix config.h inclusion

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

src/lxc/af_unix.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
@@ -15,7 +14,6 @@
 #include <sys/un.h>
 
 #include "af_unix.h"
-#include "config.h"
 #include "log.h"
 #include "macro.h"
 #include "memory_utils.h"

src/lxc/af_unix.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_AF_UNIX_H
 #define __LXC_AF_UNIX_H
 
+#include "config.h"
+
 #include <stdio.h>
 #include <sys/socket.h>
 #include <stddef.h>

src/lxc/api_extensions.h

@@ -3,11 +3,11 @@
 #ifndef __LXC_API_EXTENSIONS_H
 #define __LXC_API_EXTENSIONS_H
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "config.h"
-
 /*
  * api_extensions is the list of all API extensions in the order they were
  * added.

src/lxc/attach.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
@@ -31,7 +30,6 @@
 #include "cgroups/cgroup_utils.h"
 #include "commands.h"
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "log.h"
 #include "lsm/lsm.h"

src/lxc/attach.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_ATTACH_H
 #define __LXC_ATTACH_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <sys/types.h>
 

src/lxc/cgroups/cgfsng.c

@@ -14,10 +14,6 @@
 
 #include "config.h"
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>

src/lxc/cgroups/cgroup.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
@@ -12,7 +11,6 @@
 #include "cgroup2_devices.h"
 #include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "initutils.h"
 #include "memory_utils.h"
 #include "log.h"

src/lxc/cgroups/cgroup.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_CGROUP_H
 #define __LXC_CGROUP_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stddef.h>
 #include <linux/types.h>

src/lxc/cgroups/cgroup2_devices.c

@@ -2,9 +2,8 @@
 
 /* Parts of this taken from systemd's implementation. */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
@@ -16,7 +15,6 @@
 #include <unistd.h>
 
 #include "cgroup2_devices.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"

src/lxc/cgroups/cgroup2_devices.h

@@ -5,6 +5,8 @@
 #ifndef __LXC_CGROUP2_DEVICES_H
 #define __LXC_CGROUP2_DEVICES_H
 
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
@@ -18,7 +20,6 @@
 #include "cgroup.h"
 #include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "list.h"
 #include "macro.h"
 #include "memory_utils.h"

src/lxc/cgroups/cgroup_utils.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,7 +10,6 @@
 
 #include "cgroup.h"
 #include "cgroup_utils.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"

src/lxc/cgroups/cgroup_utils.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_CGROUP_UTILS_H
 #define __LXC_CGROUP_UTILS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdio.h>
 

src/lxc/commands.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <caps.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -22,7 +21,6 @@
 #include "commands.h"
 #include "commands_utils.h"
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "log.h"
 #include "lxc.h"

src/lxc/commands_utils.c

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
+#include "config.h"
+
 #include <errno.h>
 #include <inttypes.h>
 #include <stdio.h>
@@ -17,7 +15,6 @@
 #include "af_unix.h"
 #include "commands.h"
 #include "commands_utils.h"
-#include "config.h"
 #include "file_utils.h"
 #include "initutils.h"
 #include "log.h"

src/lxc/commands_utils.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_COMMANDS_UTILS_H
 #define __LXC_COMMANDS_UTILS_H
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "state.h"

src/lxc/compiler.h

@@ -3,15 +3,11 @@
 #ifndef __LXC_COMPILER_H
 #define __LXC_COMPILER_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
 
 #include <stdbool.h>
 #include <linux/types.h>
 
-#include "config.h"
-
 #ifndef thread_local
 #if __STDC_VERSION__ >= 201112L &&    \
     !(defined(__STDC_NO_THREADS__) || \

src/lxc/confile.c

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <dirent.h>
@@ -26,7 +24,6 @@
 
 #include "af_unix.h"
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "confile_utils.h"
 #include "netns_ifaddrs.h"
@@ -36,7 +33,6 @@
 #include "memory_utils.h"
 #include "network.h"
 #include "parse.h"
-#include "storage/storage.h"
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY

src/lxc/confile.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_CONFILE_H
 #define __LXC_CONFILE_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdio.h>
 

src/lxc/confile_utils.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -12,7 +11,6 @@
 #include "lxc.h"
 
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "confile_utils.h"
 #include "error.h"

src/lxc/confile_utils.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_CONFILE_UTILS_H
 #define __LXC_CONFILE_UTILS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "compiler.h"

src/lxc/criu.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <inttypes.h>
 #include <linux/limits.h>
 #include <sched.h>
@@ -19,7 +18,6 @@
 #include "cgroup.h"
 #include "commands.h"
 #include "conf.h"
-#include "config.h"
 #include "criu.h"
 #include "log.h"
 #include "lxc.h"

src/lxc/criu.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_CRIU_H
 #define __LXC_CRIU_H
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "lxc.h"

src/lxc/error.c

@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/wait.h>

src/lxc/error_utils.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_ERROR_UTILS_H
 #define __LXC_ERROR_UTILS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "macro.h"

src/lxc/execute.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,7 +10,6 @@
 #include <unistd.h>
 
 #include "conf.h"
-#include "config.h"
 #include "log.h"
 #include "start.h"
 #include "process_utils.h"

src/lxc/file_utils.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/magic.h>
@@ -13,7 +12,6 @@
 #include <sys/types.h>
 #include <time.h>
 
-#include "config.h"
 #include "file_utils.h"
 #include "macro.h"
 #include "memory_utils.h"

src/lxc/file_utils.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_FILE_UTILS_H
 #define __LXC_FILE_UTILS_H
 
+#include "config.h"
+
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdio.h>

src/lxc/freezer.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -17,7 +16,6 @@
 #include "cgroups/cgroup_utils.h"
 #include "commands.h"
 #include "commands_utils.h"
-#include "config.h"
 #include "error.h"
 #include "log.h"
 #include "lxc.h"

src/lxc/initutils.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <pthread.h>
 #include <signal.h>
 #include <sys/prctl.h>
@@ -11,7 +10,6 @@
 #include <unistd.h>
 
 #include "compiler.h"
-#include "config.h"
 #include "error.h"
 #include "file_utils.h"
 #include "initutils.h"

src/lxc/list.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_LIST_H
 #define __LXC_LIST_H
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "memory_utils.h"

src/lxc/log.c

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
@@ -21,7 +19,6 @@
 #include "lxc.h"
 
 #include "caps.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "memory_utils.h"

src/lxc/lsm/apparmor.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -15,7 +14,6 @@
 #include "caps.h"
 #include "cgroups/cgroup_utils.h"
 #include "conf.h"
-#include "config.h"
 #include "initutils.h"
 #include "file_utils.h"
 #include "log.h"

src/lxc/lsm/lsm.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/mount.h>
@@ -11,7 +10,6 @@
 
 #include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "log.h"
 #include "lsm.h"
 

src/lxc/lsm/lsm.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_LSM_H
 #define __LXC_LSM_H
 
+#include "config.h"
+
 struct lxc_conf;
 
 #include <sys/types.h>

src/lxc/lsm/nop.c

@@ -1,11 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdlib.h>
 
-#include "config.h"
 #include "lsm/lsm.h"
 
 static char *nop_process_label_get(struct lsm_ops *ops, pid_t pid)

src/lxc/lsm/selinux.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <selinux/selinux.h>
 #include <stdbool.h>
@@ -12,7 +11,6 @@
 #include <unistd.h>
 
 #include "conf.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "lsm.h"

src/lxc/lxc.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_LXC_H
 #define __LXC_LXC_H
 
+#include "config.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

src/lxc/lxccontainer.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <dirent.h>
 #include <errno.h>
@@ -36,7 +35,6 @@
 #include "commands.h"
 #include "commands_utils.h"
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "confile_utils.h"
 #include "criu.h"

src/lxc/lxccontainer.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_CONTAINER_H
 #define __LXC_CONTAINER_H
 
+#include "config.h"
+
 #include <malloc.h>
 #include <semaphore.h>
 #include <stdbool.h>

src/lxc/lxclock.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <malloc.h>
@@ -14,7 +13,6 @@
 
 #include "lxc.h"
 
-#include "config.h"
 #include "log.h"
 #include "lxclock.h"
 #include "memory_utils.h"

src/lxc/lxclock.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_LXCLOCK_H
 #define __LXC_LXCLOCK_H
 
+#include "config.h"
+
 #include <fcntl.h>
 #include <semaphore.h>
 #include <string.h>

src/lxc/lxcseccomp.h

@@ -3,9 +3,8 @@
 #ifndef __LXC_LXCSECCOMP_H
 #define __LXC_LXCSECCOMP_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #ifdef HAVE_SECCOMP
 #include <linux/seccomp.h>
@@ -18,7 +17,6 @@
 
 #include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "memory_utils.h"
 
 struct lxc_conf;

src/lxc/macro.h

@@ -3,10 +3,8 @@
 #ifndef __LXC_MACRO_H
 #define __LXC_MACRO_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <asm/types.h>
 #include <limits.h>
 #include <linux/if_link.h>
@@ -22,7 +20,6 @@
 #include <unistd.h>
 
 #include "compiler.h"
-#include "config.h"
 
 #ifndef PATH_MAX
 #define PATH_MAX 4096

src/lxc/mainloop.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -12,7 +11,6 @@
 #include <sys/epoll.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "macro.h"
 #include "mainloop.h"

src/lxc/mainloop.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_MAINLOOP_H
 #define __LXC_MAINLOOP_H
 
+#include "config.h"
+
 #include <stdint.h>
 
 #include "compiler.h"

src/lxc/memory_utils.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_MEMORY_UTILS_H
 #define __LXC_MEMORY_UTILS_H
 
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <stdio.h>

src/lxc/monitor.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
@@ -22,7 +21,6 @@
 #include <unistd.h>
 
 #include "af_unix.h"
-#include "config.h"
 #include "error.h"
 #include "log.h"
 #include "lxclock.h"

src/lxc/monitor.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_MONITOR_H
 #define __LXC_MONITOR_H
 
+#include "config.h"
+
 #include <limits.h>
 #include <poll.h>
 #include <sys/param.h>

src/lxc/mount_utils.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdio.h>

src/lxc/mount_utils.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_MOUNT_UTILS_H
 #define __LXC_MOUNT_UTILS_H
 
+#include "config.h"
+
 #include <linux/types.h>
 #include <stdio.h>
 #include <stdlib.h>

src/lxc/namespace.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <sched.h>
@@ -13,7 +12,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "memory_utils.h"
 #include "namespace.h"

src/lxc/namespace.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_NAMESPACE_H
 #define __LXC_NAMESPACE_H
 
+#include "config.h"
+
 #include <sched.h>
 #include <unistd.h>
 #include <sys/syscall.h>

src/lxc/network.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <errno.h>
@@ -29,7 +28,6 @@
 #include "netns_ifaddrs.h"
 #include "af_unix.h"
 #include "conf.h"
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"

src/lxc/network.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_NETWORK_H
 #define __LXC_NETWORK_H
 
+#include "config.h"
+
 #include <arpa/inet.h>
 #include <linux/types.h>
 #include <stdbool.h>

src/lxc/nl.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
@@ -13,7 +12,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "nl.h"
 

src/lxc/nl.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_NL_H
 #define __LXC_NL_H
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "compiler.h"

src/lxc/pam/pam_cgfs.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
@@ -23,7 +22,6 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "file_utils.h"
 #include "macro.h"
 #include "memory_utils.h"

src/lxc/parse.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <limits.h>
@@ -12,7 +11,6 @@
 #include <sys/mman.h>
 #include <sys/sendfile.h>
 
-#include "config.h"
 #include "file_utils.h"
 #include "log.h"
 #include "macro.h"

src/lxc/parse.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_PARSE_H
 #define __LXC_PARSE_H
 
+#include "config.h"
+
 #include <stdio.h>
 #include <sys/types.h>
 

src/lxc/process_utils.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <sched.h>
 #include <signal.h>
@@ -12,7 +11,6 @@
 #include <unistd.h>
 
 #include "compiler.h"
-#include "config.h"
 #include "log.h"
 #include "macro.h"
 #include "process_utils.h"

src/lxc/process_utils.h

@@ -3,9 +3,8 @@
 #ifndef __LXC_PROCESS_UTILS_H
 #define __LXC_PROCESS_UTILS_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <linux/sched.h>
 #include <sched.h>
 #include <signal.h>
@@ -16,7 +15,6 @@
 #include <unistd.h>
 
 #include "compiler.h"
-#include "config.h"
 #include "syscall_numbers.h"
 
 #ifndef CSIGNAL

src/lxc/rexec.c

@@ -1,15 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "file_utils.h"
 #include "macro.h"
 #include "memory_utils.h"

src/lxc/rexec.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_REXEC_H
 #define __LXC_REXEC_H
 
+#include "config.h"
+
 #include "compiler.h"
 
 __hidden extern int lxc_rexec(const char *memfd_name);

src/lxc/ringbuf.c

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <errno.h>
 #include <inttypes.h>
 #include <stdbool.h>
@@ -13,7 +11,6 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "ringbuf.h"
 #include "syscall_wrappers.h"
 #include "utils.h"

src/lxc/ringbuf.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_RINGBUF_H
 #define __LXC_RINGBUF_H
 
+#include "config.h"
+
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>

src/lxc/rtnl.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
@@ -12,7 +11,6 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "nl.h"
 #include "rtnl.h"
 

src/lxc/rtnl.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_RTNL_H
 #define __LXC_RTNL_H
 
+#include "config.h"
+
 #include <compiler.h>
 
 /*

src/lxc/seccomp.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <seccomp.h>
 #include <stdio.h>
@@ -15,7 +14,6 @@
 
 #include "af_unix.h"
 #include "commands.h"
-#include "config.h"
 #include "log.h"
 #include "lxcseccomp.h"
 #include "mainloop.h"

src/lxc/start.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -36,7 +35,6 @@
 #include "commands_utils.h"
 #include "compiler.h"
 #include "conf.h"
-#include "config.h"
 #include "confile_utils.h"
 #include "error.h"
 #include "file_utils.h"

src/lxc/start.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_START_H
 #define __LXC_START_H
 
+#include "config.h"
+
 #include <linux/sched.h>
 #include <sched.h>
 #include <signal.h>

src/lxc/state.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -19,7 +18,6 @@
 #include "cgroup.h"
 #include "commands.h"
 #include "commands_utils.h"
-#include "config.h"
 #include "log.h"
 #include "lxc.h"
 #include "monitor.h"

src/lxc/state.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_STATE_H
 #define __LXC_STATE_H
 
+#include "config.h"
+
 #include "compiler.h"
 
 #define MAX_STATE_LENGTH (8 + 1)

src/lxc/storage/btrfs.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
@@ -18,7 +17,6 @@
 #include <unistd.h>
 
 #include "btrfs.h"
-#include "config.h"
 #include "log.h"
 #include "memory_utils.h"
 #include "rsync.h"

src/lxc/storage/btrfs.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_BTRFS_H
 #define __LXC_BTRFS_H
 
+#include "config.h"
+
 #include <byteswap.h>
 #include <linux/types.h> /* __le64, __l32 ... */
 #include <stdbool.h>

src/lxc/storage/dir.c

@@ -1,13 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "config.h"
 #include "log.h"
 #include "macro.h"
 #include "memory_utils.h"

src/lxc/storage/dir.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_DIR_H
 #define __LXC_DIR_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 

src/lxc/storage/loop.c

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <inttypes.h>
@@ -15,7 +13,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "loop.h"
 #include "memory_utils.h"

src/lxc/storage/loop.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_LOOP_H
 #define __LXC_LOOP_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 

src/lxc/storage/lvm.c

@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS
+#include "config.h"
+
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -13,7 +11,6 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "lvm.h"
 #include "memory_utils.h"

src/lxc/storage/lvm.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_LVM_H
 #define __LXC_LVM_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 

src/lxc/storage/nbd.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -12,7 +11,6 @@
 #include <sys/prctl.h>
 #include <sys/wait.h>
 
-#include "config.h"
 #include "log.h"
 #include "memory_utils.h"
 #include "nbd.h"

src/lxc/storage/nbd.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_NBD_H
 #define __LXC_NBD_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 

src/lxc/storage/overlay.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,7 +10,6 @@
 #include "lxc.h"
 
 #include "conf.h"
-#include "config.h"
 #include "confile.h"
 #include "log.h"
 #include "macro.h"

src/lxc/storage/overlay.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_OVERLAY_H
 #define __LXC_OVERLAY_H
 
+#include "config.h"
+
 #include <grp.h>
 #include <stdio.h>
 #include <stdbool.h>

src/lxc/storage/rbd.c

@@ -1,16 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-#define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
+#include "config.h"
+
 #include <inttypes.h>	/* Required for PRIu64 to work. */
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "log.h"
 #include "memory_utils.h"
 #include "storage.h"

src/lxc/storage/rbd.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_RDB_H
 #define __LXC_RDB_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 

src/lxc/storage/rsync.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <grp.h>
 #include <sched.h>
 #include <stdint.h>
@@ -13,7 +12,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "rsync.h"
 #include "storage.h"

src/lxc/storage/rsync.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_RSYNC_H
 #define __LXC_RSYNC_H
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "compiler.h"

src/lxc/storage/storage.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -22,7 +21,6 @@
 
 #include "btrfs.h"
 #include "conf.h"
-#include "config.h"
 #include "dir.h"
 #include "error.h"
 #include "log.h"

src/lxc/storage/storage.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_STORAGE_H
 #define __LXC_STORAGE_H
 
+#include "config.h"
+
 #include <stdint.h>
 #include <sys/mount.h>
 

src/lxc/storage/storage_utils.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
@@ -21,7 +20,6 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "nbd.h"
 #include "parse.h"

src/lxc/storage/storage_utils.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_STORAGE_UTILS_H
 #define __LXC_STORAGE_UTILS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>

src/lxc/storage/zfs.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -11,7 +10,6 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "parse.h"
 #include "rsync.h"

src/lxc/storage/zfs.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_ZFS_H
 #define __LXC_ZFS_H
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>

src/lxc/string_utils.h

@@ -3,10 +3,10 @@
 #ifndef __LXC_STRING_UTILS_H
 #define __LXC_STRING_UTILS_H
 
-#include <stdarg.h>
-
 #include "config.h"
 
+#include <stdarg.h>
+
 #include "initutils.h"
 #include "macro.h"
 

src/lxc/sync.c

@@ -1,15 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "log.h"
 #include "start.h"
 #include "sync.h"

src/lxc/sync.h

@@ -3,6 +3,8 @@
 #ifndef __LXC_SYNC_H
 #define __LXC_SYNC_H
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "compiler.h"

src/lxc/syscall_numbers.h

@@ -2,9 +2,8 @@
 #ifndef __LXC_SYSCALL_NUMBERS_H
 #define __LXC_SYSCALL_NUMBERS_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <asm/unistd.h>
 #include <errno.h>
 #include <linux/keyctl.h>

src/lxc/syscall_wrappers.h

@@ -3,9 +3,8 @@
 #ifndef __LXC_SYSCALL_WRAPPER_H
 #define __LXC_SYSCALL_WRAPPER_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <asm/unistd.h>
 #include <errno.h>
 #include <linux/keyctl.h>
@@ -15,7 +14,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "macro.h"
 #include "syscall_numbers.h"
 

src/lxc/terminal.c

@@ -1,8 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
@@ -20,7 +19,6 @@
 #include "caps.h"
 #include "commands.h"
 #include "conf.h"
-#include "config.h"
 #include "log.h"
 #include "lxclock.h"
 #include "mainloop.h"