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.

3 files changed, 7 insertions, 8 deletions

diff --git a/src/libshared/include/shared/install.h b/src/libshared/include/shared/install.h
index d73dfef4ec..e056d374b6 100644
--- a/src/libshared/include/shared/install.h
+++ b/src/libshared/include/shared/install.h
@@ -19,11 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef enum UnitFileScope UnitFileScope;
-typedef enum UnitFileState UnitFileState;
-typedef enum UnitFilePresetMode UnitFilePresetMode;
-typedef enum UnitFileChangeType UnitFileChangeType;
-typedef enum UnitFileType UnitFileType;
 #include <stdbool.h>
 
 #include "basic/hashmap.h"
@@ -31,6 +26,11 @@ typedef enum UnitFileType UnitFileType;
 #include "basic/strv.h"
 #include "basic/unit-name.h"
 
+typedef enum UnitFileChangeType UnitFileChangeType;
+typedef enum UnitFilePresetMode UnitFilePresetMode;
+typedef enum UnitFileScope UnitFileScope;
+typedef enum UnitFileState UnitFileState;
+typedef enum UnitFileType UnitFileType;
 typedef struct UnitFileChange UnitFileChange;
 typedef struct UnitFileInstallInfo UnitFileInstallInfo;
 typedef struct UnitFileList UnitFileList;
diff --git a/src/libshared/src/dns-domain.c b/src/libshared/src/dns-domain.c
index 63793edcfa..4d9088e78e 100644
--- a/src/libshared/src/dns-domain.c
+++ b/src/libshared/src/dns-domain.c
@@ -29,7 +29,6 @@
 #include <sys/socket.h>
 
 #include "basic/alloc-util.h"
-#include "shared/dns-domain.h"
 #include "basic/hashmap.h"
 #include "basic/hexdecoct.h"
 #include "basic/in-addr-util.h"
@@ -38,6 +37,7 @@
 #include "basic/string-util.h"
 #include "basic/strv.h"
 #include "basic/utf8.h"
+#include "shared/dns-domain.h"
 
 int dns_label_unescape(const char **name, char *dest, size_t sz) {
         const char *n;
diff --git a/src/libshared/src/gcrypt-util.c b/src/libshared/src/gcrypt-util.c
index 36ee4b0256..069134a4be 100644
--- a/src/libshared/src/gcrypt-util.c
+++ b/src/libshared/src/gcrypt-util.c
@@ -23,8 +23,7 @@
 #include <gcrypt.h>
 
 #include "basic/hexdecoct.h"
-
-#include "gcrypt-util.h"
+#include "shared/gcrypt-util.h"
 
 void initialize_libgcrypt(bool secmem) {
         const char *p;