basic: re-sort includes

My previous patch to only include what we use accidentially placed
the added inlcudes in non-sorted order.

diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c
index 1aff9d53298b3bf328c24e9cc82cf89b4d6db02d..acd48f6954a7522d31888c60b91409288e368fd6 100644 (file)
--- a/src/basic/btrfs-util.c
+++ b/src/basic/btrfs-util.c
@@ -49,9 +49,9 @@
 #include "selinux-util.h"
 #include "smack-util.h"
 #include "sparse-endian.h"
-#include "time-util.h"
 #include "stat-util.h"
 #include "string-util.h"
+#include "time-util.h"
 #include "util.h"
 
 /* WARNING: Be careful with file system ioctls! When we get an fd, we

diff --git a/src/basic/calendarspec.c b/src/basic/calendarspec.c
index 2c670a1ac6030bd0b8fdb9f83b86791ef80f1a12..8f83d9c142c0b319579b591af0e090f7130dfe9f 100644 (file)
--- a/src/basic/calendarspec.c
+++ b/src/basic/calendarspec.c
@@ -30,8 +30,8 @@
 #include "alloc-util.h"
 #include "calendarspec.h"
 #include "fileio.h"
-#include "parse-util.h"
 #include "macro.h"
+#include "parse-util.h"
 #include "string-util.h"
 
 #define BITS_WEEKDAYS   127

diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
index aac812dc522f9d07c47577e7aca224e38f9493ba..0e5cc452b955a6507b87c75fdbdb1495b1e31e0b 100644 (file)
--- a/src/basic/cap-list.c
+++ b/src/basic/cap-list.c
@@ -23,9 +23,9 @@
 #include <string.h>
 
 #include "cap-list.h"
+#include "macro.h"
 #include "missing.h"
 #include "parse-util.h"
-#include "macro.h"
 #include "util.h"
 
 static const struct capability_name* lookup_capability(register const char *str, register unsigned int len);

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 7c580caa4339eed02ec3d9b9a65ec9640256b844..8bc2c1e799b07ef67c60118ea02d001b26c0cad4 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -34,14 +34,17 @@
 
 #include "alloc-util.h"
 #include "cgroup-util.h"
+#include "def.h"
 #include "dirent-util.h"
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
 #include "fs-util.h"
+#include "log.h"
 #include "login-util.h"
 #include "macro.h"
+#include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "path-util.h"
@@ -49,9 +52,6 @@
 #include "process-util.h"
 #include "set.h"
 #include "special.h"
-#include "def.h"
-#include "log.h"
-#include "missing.h"
 #include "stat-util.h"
 #include "string-table.h"
 #include "string-util.h"

diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index b50699579431e383f72c10903d2e11cd3d9322ae..661785784a8a669c216f7405c00ea3fb1fabb5c4 100644 (file)
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -28,9 +28,9 @@
 #include <sys/types.h>
 
 #include "def.h"
-#include "set.h"
 #include "hashmap.h"
 #include "macro.h"
+#include "set.h"
 
 /* An enum of well known cgroup controllers */
 typedef enum CGroupController {

diff --git a/src/basic/copy.c b/src/basic/copy.c
index c335959b74a5dc44affb7841fccc52a59fc64c23..024712d2909a2874f22dccf3454b42ce5cd63bbc 100644 (file)
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -42,9 +42,9 @@
 #include "fs-util.h"
 #include "io-util.h"
 #include "macro.h"
-#include "time-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "umask-util.h"
 #include "xattr-util.h"
 

diff --git a/src/basic/cpu-set-util.c b/src/basic/cpu-set-util.c
index 51c069395406740ed5a4c44453dd3f702a9ab210..85b751995315622dd9fee8ffb3f1881039d3a948 100644 (file)
--- a/src/basic/cpu-set-util.c
+++ b/src/basic/cpu-set-util.c
@@ -27,9 +27,9 @@
 #include "alloc-util.h"
 #include "cpu-set-util.h"
 #include "extract-word.h"
-#include "parse-util.h"
 #include "log.h"
 #include "macro.h"
+#include "parse-util.h"
 #include "string-util.h"
 
 cpu_set_t* cpu_set_malloc(unsigned *ncpus) {

diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h
index 58273bb988c62c2a3acddff951a9b2584e7a437a..1ad5e4715aa45ca8cbb498e8931a860f0d2025ac 100644 (file)
--- a/src/basic/dirent-util.h
+++ b/src/basic/dirent-util.h
@@ -25,8 +25,8 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include "path-util.h"
 #include "macro.h"
+#include "path-util.h"
 
 int dirent_ensure_type(DIR *d, struct dirent *de);
 

diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index fe8c825f365d37fdc4a84d52f035e3456ce77741..dd56545f1253a5a6af5b133820110ccdcb4c7d92 100644 (file)
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -28,9 +28,9 @@
 
 #include "alloc-util.h"
 #include "env-util.h"
-#include "parse-util.h"
 #include "extract-word.h"
 #include "macro.h"
+#include "parse-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "utf8.h"

diff --git a/src/basic/exit-status.h b/src/basic/exit-status.h
index 850f58fd985e6f134dd647de6f38348736d43356..664222c1d6a2954362fdcbbd077dce3a90b15cdb 100644 (file)
--- a/src/basic/exit-status.h
+++ b/src/basic/exit-status.h
@@ -23,9 +23,9 @@
 
 #include <stdbool.h>
 
-#include "set.h"
 #include "hashmap.h"
 #include "macro.h"
+#include "set.h"
 
 typedef enum ExitStatus {
         /* EXIT_SUCCESS defined by libc */

diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index 678ac3b1952b4773ddfd618fe6274ed960cbaf86..9759cac23c9e2809d95ecfed5c320fad245a4f56 100644 (file)
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -27,11 +27,11 @@
 #include <unistd.h>
 
 #include "fd-util.h"
-#include "parse-util.h"
-#include "socket-util.h"
 #include "macro.h"
 #include "missing.h"
+#include "parse-util.h"
 #include "path-util.h"
+#include "socket-util.h"
 #include "util.h"
 
 int close_nointr(int fd) {

diff --git a/src/basic/fdset.c b/src/basic/fdset.c
index 654ec5a6390f1000331c6c70126ea033ddd5edd1..de9b723ab841e570ac8eb7ef2906a67a524e85a9 100644 (file)
--- a/src/basic/fdset.c
+++ b/src/basic/fdset.c
@@ -29,11 +29,11 @@
 
 #include "fd-util.h"
 #include "fdset.h"
+#include "log.h"
 #include "macro.h"
 #include "parse-util.h"
-#include "set.h"
-#include "log.h"
 #include "path-util.h"
+#include "set.h"
 
 #define MAKE_SET(s) ((Set*) s)
 #define MAKE_FDSET(s) ((FDSet*) s)

diff --git a/src/basic/fdset.h b/src/basic/fdset.h
index 58a5b45f28b088ef55c279c1e0c08136631bcb9d..615ba05661d9ef588069ffa0f30da2b56b444bff 100644 (file)
--- a/src/basic/fdset.h
+++ b/src/basic/fdset.h
@@ -23,9 +23,9 @@
 
 #include <stdbool.h>
 
-#include "set.h"
 #include "hashmap.h"
 #include "macro.h"
+#include "set.h"
 
 typedef struct FDSet FDSet;
 

diff --git a/src/basic/fileio-label.c b/src/basic/fileio-label.c
index 52a1515cd7e95b20a6f26b7557ae4e8956985dde..1cee87c9cdcc413351dc083838ea6feb338e0781 100644 (file)
--- a/src/basic/fileio-label.c
+++ b/src/basic/fileio-label.c
@@ -23,8 +23,8 @@
 #include <sys/stat.h>
 
 #include "fileio-label.h"
-#include "selinux-util.h"
 #include "fileio.h"
+#include "selinux-util.h"
 
 int write_string_file_atomic_label(const char *fn, const char *line) {
         int r;

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 684ce3d58f01b9bd7c2bdeff145b4fab196296b4..3a237252b5ffe2e02663a4d3fc476f4bd29e9eaa 100644 (file)
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -37,15 +37,15 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "hexdecoct.h"
+#include "log.h"
+#include "macro.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "random-util.h"
-#include "log.h"
-#include "macro.h"
-#include "time-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "umask-util.h"
 #include "utf8.h"
 

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index cd7abee98996fc02f1a9e3d2698b915f1790242a..fb760abe1816bb5f8b81161efe6da221eea429af 100644 (file)
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -34,15 +34,15 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
-#include "mkdir.h"
-#include "parse-util.h"
-#include "path-util.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
-#include "time-util.h"
+#include "mkdir.h"
+#include "parse-util.h"
+#include "path-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "user-util.h"
 #include "util.h"
 

diff --git a/src/basic/label.c b/src/basic/label.c
index 70e6ee20bfc7b16084ed242dfaa376f855cef9b2..f72a985967e4736a05611e63231ad6aede02c484 100644 (file)
--- a/src/basic/label.c
+++ b/src/basic/label.c
@@ -24,9 +24,9 @@
 #include <unistd.h>
 
 #include "label.h"
+#include "macro.h"
 #include "selinux-util.h"
 #include "smack-util.h"
-#include "macro.h"
 
 int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
         int r, q;

diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index 708da0d304d4020a6afd7aff66c08aa008669038..7784d021684ade1b501a31d8af1e67261f847bae 100644 (file)
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -34,10 +34,10 @@
 
 #include "dirent-util.h"
 #include "fd-util.h"
+#include "hashmap.h"
 #include "locale-util.h"
 #include "path-util.h"
 #include "set.h"
-#include "hashmap.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"

diff --git a/src/basic/lockfile-util.c b/src/basic/lockfile-util.c
index 704ae6cc52dbb9eacf3c1087eeba14616b1b4266..6ecfc2ec4669ebc9785cb187144719ff60eed571 100644 (file)
--- a/src/basic/lockfile-util.c
+++ b/src/basic/lockfile-util.c
@@ -30,8 +30,8 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "lockfile-util.h"
-#include "path-util.h"
 #include "macro.h"
+#include "path-util.h"
 
 int make_lock_file(const char *p, int operation, LockFile *ret) {
         _cleanup_close_ int fd = -1;

diff --git a/src/basic/log.c b/src/basic/log.c
index 829f85a5d8a7700aff2e7056010cfc0752fb3821..1a9e6bdb91ebc446ca4c6bd803ef83cef4e92f2a 100644 (file)
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -49,12 +49,12 @@
 #include "process-util.h"
 #include "signal-util.h"
 #include "socket-util.h"
-#include "time-util.h"
 #include "stdio-util.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "syslog-util.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)

diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c
index a9b2151195684aa0fef2e66bee01c07a1b7eca77..789638f013d17d1f386366c7f33836eead05bfee 100644 (file)
--- a/src/basic/memfd-util.c
+++ b/src/basic/memfd-util.c
@@ -32,9 +32,9 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
+#include "macro.h"
 #include "memfd-util.h"
 #include "missing.h"
-#include "macro.h"
 #include "string-util.h"
 #include "utf8.h"
 

diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index 4b809541b101cd2e22967800fe4bd5cec6b7fde5..9f9d52b5df501513219498c38216daed4e9456dd 100644 (file)
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -25,9 +25,9 @@
 #include <sys/stat.h>
 
 #include "fs-util.h"
+#include "macro.h"
 #include "mkdir.h"
 #include "path-util.h"
-#include "macro.h"
 #include "stat-util.h"
 #include "user-util.h"
 

diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index aaac2d47bd1fc76424f12e2e199efb8d395feaf5..10a6536cfc90d711c5d375115dee5a219cd86496 100644 (file)
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -31,11 +31,11 @@
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "hashmap.h"
 #include "mount-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "set.h"
-#include "hashmap.h"
 #include "stdio-util.h"
 #include "string-util.h"
 

diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h
index 3be75e6614f376fe5f00a9558c603fdf5d0460e7..b37250f08e3295aab109cae7c3739e016cfd1a8a 100644 (file)
--- a/src/basic/mount-util.h
+++ b/src/basic/mount-util.h
@@ -28,8 +28,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "missing.h"
 #include "macro.h"
+#include "missing.h"
 
 int fd_is_mount_point(int fd, const char *filename, int flags);
 int path_is_mount_point(const char *path, int flags);

diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index 3d8123ca0dffb8d86244700e23b14941807ddd32..618ef5d56430bc02543f6b016ca48bca371b91d3 100644 (file)
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -29,8 +29,8 @@
 
 #include "alloc-util.h"
 #include "extract-word.h"
-#include "parse-util.h"
 #include "macro.h"
+#include "parse-util.h"
 #include "string-util.h"
 
 int parse_boolean(const char *v) {

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 95b1052aebf6eaa0280e93903d833b08f789686b..61fab0e0878a383d9992dc0a88d22bd181d72478 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -34,16 +34,16 @@
 #undef basename
 
 #include "alloc-util.h"
+#include "extract-word.h"
 #include "fs-util.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
 #include "path-util.h"
-#include "extract-word.h"
-#include "time-util.h"
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 
 bool path_is_absolute(const char *p) {
         return p[0] == '/';

diff --git a/src/basic/prioq.c b/src/basic/prioq.c
index 7d420d8a7bb8bc20f089a77dd0d0264d637e0d9b..86c5c0e9b4e6eafc41be7d49ea2da364d3807183 100644 (file)
--- a/src/basic/prioq.c
+++ b/src/basic/prioq.c
@@ -33,8 +33,8 @@
 #include <stdlib.h>
 
 #include "alloc-util.h"
-#include "prioq.h"
 #include "hashmap.h"
+#include "prioq.h"
 
 struct prioq_item {
         void *data;

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 1d60811cbf9b27c8006f4f1f32cd88f204bf784d..4cc54a51fb43eb3a6695c0cd17c4a82364c97a32 100644 (file)
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -41,10 +41,10 @@
 #include "fs-util.h"
 #include "ioprio.h"
 #include "log.h"
-#include "process-util.h"
-#include "signal-util.h"
 #include "macro.h"
 #include "missing.h"
+#include "process-util.h"
+#include "signal-util.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "user-util.h"

diff --git a/src/basic/ratelimit.c b/src/basic/ratelimit.c
index ee0f8176b943d9ad9e6bf014cc1fb1339b8b5f3c..b62f3da76be0033b8c7d3535583ca254f892781e 100644 (file)
--- a/src/basic/ratelimit.c
+++ b/src/basic/ratelimit.c
@@ -22,8 +22,8 @@
 
 #include <sys/time.h>
 
-#include "ratelimit.h"
 #include "macro.h"
+#include "ratelimit.h"
 
 /* Modelled after Linux' lib/ratelimit.c by Dave Young
  * <hidave.darkstar@gmail.com>, which is licensed GPLv2. */

diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
index 2de965daa62f4b9837ce9d43e6ff7e0dd12392df..44f885db168b287e1de0de8892488f6f1ac51c41 100644 (file)
--- a/src/basic/rlimit-util.c
+++ b/src/basic/rlimit-util.c
@@ -22,9 +22,9 @@
 #include <errno.h>
 #include <sys/resource.h>
 
+#include "macro.h"
 #include "missing.h"
 #include "rlimit-util.h"
-#include "macro.h"
 #include "string-table.h"
 
 int setrlimit_closest(int resource, const struct rlimit *rlim) {

diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index 0408e22777280d32b059c568e63da56aead14ab6..14f8474da006bf8ef1ddd0ee60afae81cc2d6f58 100644 (file)
--- a/src/basic/rm-rf.c
+++ b/src/basic/rm-rf.c
@@ -30,11 +30,11 @@
 
 #include "btrfs-util.h"
 #include "fd-util.h"
+#include "log.h"
+#include "macro.h"
 #include "mount-util.h"
 #include "path-util.h"
 #include "rm-rf.h"
-#include "log.h"
-#include "macro.h"
 #include "stat-util.h"
 #include "string-util.h"
 

diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index 9be8e2c76fb6242315fdb8b8c6be62e893260784..5956c4fe43408f0c6aba70f5764b5c7e8993f0a7 100644 (file)
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -35,10 +35,10 @@
 #endif
 
 #include "alloc-util.h"
-#include "path-util.h"
-#include "selinux-util.h"
 #include "log.h"
 #include "macro.h"
+#include "path-util.h"
+#include "selinux-util.h"
 #include "time-util.h"
 #include "util.h"
 

diff --git a/src/basic/signal-util.c b/src/basic/signal-util.c
index fd9258dfca8f376ab149b18195b8b88ce0e4b268..7637fccb2f137e9033fc6e7f7ce99240e025a6d4 100644 (file)
--- a/src/basic/signal-util.c
+++ b/src/basic/signal-util.c
@@ -23,9 +23,9 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#include "macro.h"
 #include "parse-util.h"
 #include "signal-util.h"
-#include "macro.h"
 #include "string-table.h"
 #include "string-util.h"
 

diff --git a/src/basic/siphash24.c b/src/basic/siphash24.c
index 65667b98599d48421d8de30967fa1204b7be8e65..060e8ba387049e590c5ae37ca04dc7c4c65e1689 100644 (file)
--- a/src/basic/siphash24.c
+++ b/src/basic/siphash24.c
@@ -17,8 +17,8 @@
     coding style)
 */
 
-#include "siphash24.h"
 #include "macro.h"
+#include "siphash24.h"
 #include "unaligned.h"
 
 static inline uint64_t rotate_left(uint64_t x, uint8_t b) {

diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c
index e8030c92f30e666962deb71524879baa983dce08..b9e4ff87d80b3b11c5613a99cfc68b914f4ff9cf 100644 (file)
--- a/src/basic/smack-util.c
+++ b/src/basic/smack-util.c
@@ -29,11 +29,11 @@
 
 #include "alloc-util.h"
 #include "fileio.h"
+#include "log.h"
+#include "macro.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "smack-util.h"
-#include "log.h"
-#include "macro.h"
 #include "string-table.h"
 #include "xattr-util.h"
 

diff --git a/src/basic/socket-label.c b/src/basic/socket-label.c
index 2dc6c76752e86de3f05312ecf61de1e6eac110c5..e169439e04fdf665c0fbb858cb3e0719eb0fb10d 100644 (file)
--- a/src/basic/socket-label.c
+++ b/src/basic/socket-label.c
@@ -31,12 +31,12 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
+#include "log.h"
 #include "macro.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "selinux-util.h"
 #include "socket-util.h"
-#include "log.h"
 
 int socket_address_listen(
                 const SocketAddress *a,

diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 240fb60212b26d11098c145ad450930fdf2c746b..3458741cb50d938d7022f8b6e89efd409a249173 100644 (file)
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -36,12 +36,12 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"
+#include "log.h"
 #include "macro.h"
 #include "missing.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "socket-util.h"
-#include "log.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "user-util.h"

diff --git a/src/basic/string-table.c b/src/basic/string-table.c
index 07a6d785f829be6751063bb9b2bed461fd11f1de..4633a57f44f93cc3bf88e2519c095b0fbffcc3e0 100644 (file)
--- a/src/basic/string-table.c
+++ b/src/basic/string-table.c
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "string-util.h"
 #include "string-table.h"
+#include "string-util.h"
 
 ssize_t string_table_lookup(const char * const *table, size_t len, const char *key) {
         size_t i;

diff --git a/src/basic/strv.h b/src/basic/strv.h
index d0dd08baf3ba3c7ec3dad13973117feeffc41e05..bb61db263816d9049b90f1f0711dcce2a8b07e08 100644 (file)
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -26,8 +26,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "extract-word.h"
 #include "alloc-util.h"
+#include "extract-word.h"
 #include "macro.h"
 #include "util.h"
 

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 68664a152ffcc530289556ae239f002893d450fb..a39764472b89f8e3fe9c42ed02a0dc72f4e64c3e 100644 (file)
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -43,11 +43,11 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "io-util.h"
+#include "log.h"
+#include "macro.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "socket-util.h"
-#include "log.h"
-#include "macro.h"
 #include "stat-util.h"
 #include "string-util.h"
 #include "terminal-util.h"

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index a9296d6ee66a0925b79dae052fd944f9afe09b4a..bfc7cf870c7b0e69e56faddc6da28550c47d9b40 100644 (file)
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -34,10 +34,10 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
-#include "parse-util.h"
-#include "path-util.h"
 #include "log.h"
 #include "macro.h"
+#include "parse-util.h"
+#include "path-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "time-util.h"

diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
index bdec97e54bf65e811e2caa9e7843f1dd918364c8..5fc3b9d6fd21d14f58ab6d5382dc512d6edc8792 100644 (file)
--- a/src/basic/unit-name.c
+++ b/src/basic/unit-name.c
@@ -28,8 +28,8 @@
 #include "alloc-util.h"
 #include "bus-label.h"
 #include "hexdecoct.h"
-#include "path-util.h"
 #include "macro.h"
+#include "path-util.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"

diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 55c64abdd9ef6735e8be6c4b6f7aadbd84cde159..56e1a3be48c4fc212968a71ee8286a9afc3ac55b 100644 (file)
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -34,10 +34,10 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
+#include "formats-util.h"
 #include "macro.h"
 #include "parse-util.h"
 #include "path-util.h"
-#include "formats-util.h"
 #include "string-util.h"
 #include "user-util.h"
 

diff --git a/src/basic/util.c b/src/basic/util.c
index 6d264e0007a6b6fbb7c94fad2a64fc3ce7371e36..9e0b576283b9f035c31b716165672fb14c1234b6 100644 (file)
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -51,12 +51,12 @@
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"
-#include "signal-util.h"
 #include "set.h"
-#include "time-util.h"
+#include "signal-util.h"
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "user-util.h"
 #include "util.h"
 

diff --git a/src/basic/virt.c b/src/basic/virt.c
index eb6794916618b60c0593b59062405791f483e4fd..d5132d1ceeabb1fb81ed33393f468bf4aa070613 100644 (file)
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -27,8 +27,8 @@
 
 #include "alloc-util.h"
 #include "fileio.h"
-#include "process-util.h"
 #include "macro.h"
+#include "process-util.h"
 #include "stat-util.h"
 #include "string-table.h"
 #include "string-util.h"

diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
index 166e2b23fab35b9a1149137b955dfa2306f954eb..960209282f90ac015d1c6bea07948d4c5ad275df 100644 (file)
--- a/src/basic/xattr-util.c
+++ b/src/basic/xattr-util.c
@@ -29,10 +29,10 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "sparse-endian.h"
 #include "macro.h"
-#include "time-util.h"
+#include "sparse-endian.h"
 #include "stdio-util.h"
+#include "time-util.h"
 #include "xattr-util.h"
 
 int getxattr_malloc(const char *path, const char *name, char **value, bool allow_symlink) {