Run the new fixup script.

The biggest change is that it keeps looking for new #include
blocks.  This means that it (more) correctly handles #ifdef'd
#includes.

I'm not 100% in love with it, but it's pretty good for automated.
What I really don't like is it did some silly things with newlines
in typedef blocks.  I've avoided committing those.  I think it may
be possible to get it to do the right thing.  But really, the
typedef blocks are a hack for poorly structured headers.

Now that it keeps looking for new #include blocks, I could strip
out the typedef support, and it would mostly work; but it wouldn't
be able to move some headers back to the top.

IDK what to do.

7 files changed, 29 insertions, 22 deletions

diff --git a/src/libsystemd/src/sd-bus/bus-control.c b/src/libsystemd/src/sd-bus/bus-control.c
index 5582a17aae..689b70bc60 100644
--- a/src/libsystemd/src/sd-bus/bus-control.c
+++ b/src/libsystemd/src/sd-bus/bus-control.c
@@ -27,16 +27,17 @@
 #include <systemd/sd-bus.h>
 
 #include "basic/alloc-util.h"
-#include "bus-bloom.h"
-#include "bus-control.h"
-#include "bus-internal.h"
-#include "bus-message.h"
-#include "shared/bus-util.h"
 #include "basic/capability-util.h"
 #include "basic/stdio-util.h"
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/user-util.h"
+#include "shared/bus-util.h"
+
+#include "bus-bloom.h"
+#include "bus-control.h"
+#include "bus-internal.h"
+#include "bus-message.h"
 
 _public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
         int r;
diff --git a/src/libsystemd/src/sd-bus/bus-kernel.c b/src/libsystemd/src/sd-bus/bus-kernel.c
index ef9fb87ee5..9d767340b6 100644
--- a/src/libsystemd/src/sd-bus/bus-kernel.c
+++ b/src/libsystemd/src/sd-bus/bus-kernel.c
@@ -33,12 +33,7 @@
 #undef basename
 
 #include "basic/alloc-util.h"
-#include "bus-bloom.h"
-#include "bus-internal.h"
-#include "bus-kernel.h"
 #include "basic/bus-label.h"
-#include "bus-message.h"
-#include "shared/bus-util.h"
 #include "basic/capability-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
@@ -50,6 +45,12 @@
 #include "basic/strv.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
+#include "shared/bus-util.h"
+
+#include "bus-bloom.h"
+#include "bus-internal.h"
+#include "bus-kernel.h"
+#include "bus-message.h"
 
 #define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t))
 
diff --git a/src/libsystemd/src/sd-bus/test-bus-gvariant.c b/src/libsystemd/src/sd-bus/test-bus-gvariant.c
index bffc7247c2..5fdf8e661c 100644
--- a/src/libsystemd/src/sd-bus/test-bus-gvariant.c
+++ b/src/libsystemd/src/sd-bus/test-bus-gvariant.c
@@ -24,13 +24,14 @@
 #include <systemd/sd-bus.h>
 
 #include "basic/alloc-util.h"
+#include "basic/macro.h"
+#include "basic/util.h"
+#include "shared/bus-util.h"
+
 #include "bus-dump.h"
 #include "bus-gvariant.h"
 #include "bus-internal.h"
 #include "bus-message.h"
-#include "shared/bus-util.h"
-#include "basic/macro.h"
-#include "basic/util.h"
 
 static void test_bus_gvariant_is_fixed_size(void) {
         assert_se(bus_gvariant_is_fixed_size("") > 0);
diff --git a/src/libsystemd/src/sd-bus/test-bus-marshal.c b/src/libsystemd/src/sd-bus/test-bus-marshal.c
index 59a11718d9..4d8f22b042 100644
--- a/src/libsystemd/src/sd-bus/test-bus-marshal.c
+++ b/src/libsystemd/src/sd-bus/test-bus-marshal.c
@@ -31,14 +31,15 @@
 #include <systemd/sd-bus.h>
 
 #include "basic/alloc-util.h"
-#include "bus-dump.h"
 #include "basic/bus-label.h"
-#include "bus-message.h"
-#include "shared/bus-util.h"
 #include "basic/fd-util.h"
 #include "basic/hexdecoct.h"
 #include "basic/log.h"
 #include "basic/util.h"
+#include "shared/bus-util.h"
+
+#include "bus-dump.h"
+#include "bus-message.h"
 
 static void test_bus_path_encode_unique(void) {
         _cleanup_free_ char *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL;
diff --git a/src/libsystemd/src/sd-journal/audit-type.c b/src/libsystemd/src/sd-journal/audit-type.c
index 1a10a378b2..f4dd1e9417 100644
--- a/src/libsystemd/src/sd-journal/audit-type.c
+++ b/src/libsystemd/src/sd-journal/audit-type.c
@@ -24,7 +24,8 @@
 #  include <libaudit.h>
 #endif
 
+#include "basic/macro.h"
 #include "basic/missing.h"
+
 #include "audit-type.h"
 #include "audit_type-to-name.h"
-#include "basic/macro.h"
diff --git a/src/libsystemd/src/sd-journal/compress.c b/src/libsystemd/src/sd-journal/compress.c
index f763ceeac8..a96d93c455 100644
--- a/src/libsystemd/src/sd-journal/compress.c
+++ b/src/libsystemd/src/sd-journal/compress.c
@@ -33,16 +33,17 @@
 #endif
 
 #include "basic/alloc-util.h"
-#include "compress.h"
 #include "basic/fd-util.h"
 #include "basic/io-util.h"
-#include "journal-def.h"
 #include "basic/macro.h"
 #include "basic/sparse-endian.h"
 #include "basic/string-table.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
 
+#include "compress.h"
+#include "journal-def.h"
+
 #ifdef HAVE_LZ4
 DEFINE_TRIVIAL_CLEANUP_FUNC(LZ4F_compressionContext_t, LZ4F_freeCompressionContext);
 DEFINE_TRIVIAL_CLEANUP_FUNC(LZ4F_decompressionContext_t, LZ4F_freeDecompressionContext);
diff --git a/src/libsystemd/src/sd-journal/journal-file.h b/src/libsystemd/src/sd-journal/journal-file.h
index 366d168166..daafc8ae0d 100644
--- a/src/libsystemd/src/sd-journal/journal-file.h
+++ b/src/libsystemd/src/sd-journal/journal-file.h
@@ -25,15 +25,16 @@
 #include <gcrypt.h>
 #endif
 
+#include <systemd/sd-event.h>
 #include <systemd/sd-id128.h>
 
 #include "basic/hashmap.h"
-#include "journal-def.h"
 #include "basic/macro.h"
-#include "mmap-cache.h"
-#include <systemd/sd-event.h>
 #include "basic/sparse-endian.h"
 
+#include "journal-def.h"
+#include "mmap-cache.h"
+
 typedef struct JournalMetrics {
         /* For all these: -1 means "pick automatically", and 0 means "no limit enforced" */
         uint64_t max_size;     /* how large journal files grow at max */