./fixup.sh

10 files changed, 23 insertions, 17 deletions

diff --git a/src/libshared/include/shared/bus-unit-util.h b/src/libshared/include/shared/bus-unit-util.h
index 5e5b33ded1..b4b68cc5d2 100644
--- a/src/libshared/include/shared/bus-unit-util.h
+++ b/src/libshared/include/shared/bus-unit-util.h
@@ -21,8 +21,8 @@
 
 #include <systemd/sd-bus.h>
 
-#include "shared/install.h"
-#include "shared/output-mode.h"
+#include "install.h"
+#include "output-mode.h"
 
 typedef struct UnitInfo {
         const char *machine;
diff --git a/src/libshared/include/shared/cgroup-show.h b/src/libshared/include/shared/cgroup-show.h
index 7deb42fff7..5c1d6e6d98 100644
--- a/src/libshared/include/shared/cgroup-show.h
+++ b/src/libshared/include/shared/cgroup-show.h
@@ -22,8 +22,8 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "shared/logs-show.h"
-#include "shared/output-mode.h"
+#include "logs-show.h"
+#include "output-mode.h"
 
 int show_cgroup_by_path(const char *path, const char *prefix, unsigned columns, OutputFlags flags);
 int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned columns, OutputFlags flags);
diff --git a/src/libshared/include/shared/install-printf.h b/src/libshared/include/shared/install-printf.h
index 56099f464d..8a570fc265 100644
--- a/src/libshared/include/shared/install-printf.h
+++ b/src/libshared/include/shared/install-printf.h
@@ -19,6 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/install.h"
+#include "install.h"
 
 int install_full_printf(UnitFileInstallInfo *i, const char *format, char **ret);
diff --git a/src/libshared/include/shared/install.h b/src/libshared/include/shared/install.h
index bf1f6f25c8..d73dfef4ec 100644
--- a/src/libshared/include/shared/install.h
+++ b/src/libshared/include/shared/install.h
@@ -24,17 +24,18 @@ typedef enum UnitFileState UnitFileState;
 typedef enum UnitFilePresetMode UnitFilePresetMode;
 typedef enum UnitFileChangeType UnitFileChangeType;
 typedef enum UnitFileType UnitFileType;
-typedef struct UnitFileChange UnitFileChange;
-typedef struct UnitFileList UnitFileList;
-typedef struct UnitFileInstallInfo UnitFileInstallInfo;
-
 #include <stdbool.h>
 
 #include "basic/hashmap.h"
 #include "basic/macro.h"
 #include "basic/strv.h"
 #include "basic/unit-name.h"
-#include "shared/path-lookup.h"
+
+typedef struct UnitFileChange UnitFileChange;
+typedef struct UnitFileInstallInfo UnitFileInstallInfo;
+typedef struct UnitFileList UnitFileList;
+
+#include "path-lookup.h"
 
 enum UnitFileScope {
         UNIT_FILE_SYSTEM,
diff --git a/src/libshared/include/shared/logs-show.h b/src/libshared/include/shared/logs-show.h
index 14f955dfb4..f16cb64838 100644
--- a/src/libshared/include/shared/logs-show.h
+++ b/src/libshared/include/shared/logs-show.h
@@ -29,7 +29,8 @@
 #include "basic/macro.h"
 #include "basic/time-util.h"
 #include "basic/util.h"
-#include "shared/output-mode.h"
+
+#include "output-mode.h"
 
 int output_journal(
                 FILE *f,
diff --git a/src/libshared/include/shared/path-lookup.h b/src/libshared/include/shared/path-lookup.h
index c3e0a10552..ab14bdc267 100644
--- a/src/libshared/include/shared/path-lookup.h
+++ b/src/libshared/include/shared/path-lookup.h
@@ -21,10 +21,11 @@
 
 #include <stdbool.h>
 
+#include "basic/macro.h"
+
 typedef struct LookupPaths LookupPaths;
 
-#include "shared/install.h"
-#include "basic/macro.h"
+#include "install.h"
 
 typedef enum LookupPathsFlags {
         LOOKUP_PATHS_EXCLUDE_GENERATED = 1,
diff --git a/src/libshared/src/gcrypt-util.c b/src/libshared/src/gcrypt-util.c
index 35e380d3d0..069134a4be 100644
--- a/src/libshared/src/gcrypt-util.c
+++ b/src/libshared/src/gcrypt-util.c
@@ -23,7 +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;
diff --git a/src/libshared/src/machine-image.c b/src/libshared/src/machine-image.c
index c7b0a33ce5..28b096f538 100644
--- a/src/libshared/src/machine-image.c
+++ b/src/libshared/src/machine-image.c
@@ -20,7 +20,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <linux/fs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,6 +27,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <linux/fs.h>
+
 #include "basic/alloc-util.h"
 #include "basic/btrfs-util.h"
 #include "basic/chattr-util.h"
diff --git a/src/libshared/src/machine-pool.c b/src/libshared/src/machine-pool.c
index ee8c0a9ba1..176bc24890 100644
--- a/src/libshared/src/machine-pool.c
+++ b/src/libshared/src/machine-pool.c
@@ -19,7 +19,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <linux/loop.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -33,6 +32,8 @@
 #include <sys/statvfs.h>
 #include <unistd.h>
 
+#include <linux/loop.h>
+
 #include <systemd/sd-bus-protocol.h>
 #include <systemd/sd-bus.h>
 
diff --git a/src/libshared/src/watchdog.c b/src/libshared/src/watchdog.c
index 49577669f4..c4e58c9577 100644
--- a/src/libshared/src/watchdog.c
+++ b/src/libshared/src/watchdog.c
@@ -19,11 +19,12 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <linux/watchdog.h>
 #include <sys/ioctl.h>
 #include <syslog.h>
 #include <unistd.h>
 
+#include <linux/watchdog.h>
+
 #include "basic/fd-util.h"
 #include "basic/log.h"
 #include "basic/time-util.h"