tree-wide: sort includes in *.h

This is a continuation of the previous include sort patch, which
only sorted for .c files.

diff --git a/src/basic/fileio-label.h b/src/basic/fileio-label.h
index 34293ab13b29491b45fd44ce842ddeafe8b53ae9..b2d1b5714dfddc71268f63f750a68a5f5a1634b9 100644 (file)
--- a/src/basic/fileio-label.h
+++ b/src/basic/fileio-label.h
@@ -23,6 +23,7 @@
 ***/
 
 #include <stdio.h>
+
 #include "fileio.h"
 
 int write_string_file_atomic_label(const char *fn, const char *line);

diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index b1719b69b44e1ff777a3f545fd452c024e93764d..1f940a4227701f01797ebe5db8fb601c37c04ad4 100644 (file)
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -22,10 +22,10 @@
 ***/
 
 #include <fcntl.h>
+#include <limits.h>
 #include <sys/inotify.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <limits.h>
 
 #include "time-util.h"
 

diff --git a/src/basic/gunicode.h b/src/basic/gunicode.h
index e70818fdd74757d3bbbf2fa6ca1d94cf960df8f7..b03aa431603c64a834d596a4962b9c83bdbca81e 100644 (file)
--- a/src/basic/gunicode.h
+++ b/src/basic/gunicode.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 char *utf8_prev_char (const char *p);

diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 7322556893c0bd05b5eb715e9a9cfb95405ad144..509da0bb5f9b11661786d3ae491eff71b31c267f 100644 (file)
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -119,8 +119,8 @@ struct CGroupContext {
         bool delegate;
 };
 
-#include "unit.h"
 #include "cgroup-util.h"
+#include "unit.h"
 
 void cgroup_context_init(CGroupContext *c);
 void cgroup_context_done(CGroupContext *c);

diff --git a/src/libelogind/sd-bus/bus-control.h b/src/libelogind/sd-bus/bus-control.h
index 5009ca8e619567011cb6ee31255c2b4047411784..e01b0758327efe0f4837ad64ebfbbef800b5e36c 100644 (file)
--- a/src/libelogind/sd-bus/bus-control.h
+++ b/src/libelogind/sd-bus/bus-control.h
@@ -22,6 +22,7 @@
 ***/
 
 #include "sd-bus.h"
+
 #include "bus-match.h"
 
 int bus_add_match_internal(sd_bus *bus, const char *match, struct bus_match_component *components, unsigned n_components, uint64_t cookie);

diff --git a/src/libelogind/sd-bus/bus-error.h b/src/libelogind/sd-bus/bus-error.h
index fb0199c948f677ba4e13bc4207c0d2b9936bee29..d7fd8612d00dc0da8826983746961db0ca99c640 100644 (file)
--- a/src/libelogind/sd-bus/bus-error.h
+++ b/src/libelogind/sd-bus/bus-error.h
@@ -24,6 +24,7 @@
 #include <stdbool.h>
 
 #include "sd-bus.h"
+
 #include "macro.h"
 
 bool bus_error_is_dirty(sd_bus_error *e);

diff --git a/src/libelogind/sd-bus/bus-introspect.h b/src/libelogind/sd-bus/bus-introspect.h
index 1914e6cb8b35c04c509147f0a35eb3e39d1495b0..57c2430ee8d13915c94d6ac4242659146c620019 100644 (file)
--- a/src/libelogind/sd-bus/bus-introspect.h
+++ b/src/libelogind/sd-bus/bus-introspect.h
@@ -24,6 +24,7 @@
 #include <stdio.h>
 
 #include "sd-bus.h"
+
 #include "set.h"
 
 struct introspect {

diff --git a/src/libelogind/sd-bus/bus-slot.h b/src/libelogind/sd-bus/bus-slot.h
index 23a15e4d024ee7d0f45fb34adf6b1f69a9ec36d5..c997e58f9abccfc68e1fde1dcfe0a5c9a4e9ba22 100644 (file)
--- a/src/libelogind/sd-bus/bus-slot.h
+++ b/src/libelogind/sd-bus/bus-slot.h
@@ -22,6 +22,7 @@
 ***/
 
 #include "sd-bus.h"
+
 #include "bus-internal.h"
 
 sd_bus_slot *bus_slot_allocate(sd_bus *bus, bool floating, BusSlotType type, size_t extra, void *userdata);

diff --git a/src/login/logind-action.h b/src/login/logind-action.h
index 2fcad0397d6ca8a81c264f501041ebb167a1e8e7..cb2526d7003f48e79d471758ea0ad66104340870 100644 (file)
--- a/src/login/logind-action.h
+++ b/src/login/logind-action.h
@@ -35,8 +35,8 @@ typedef enum HandleAction {
         _HANDLE_ACTION_INVALID = -1
 } HandleAction;
 
-#include "logind.h"
 #include "logind-inhibit.h"
+#include "logind.h"
 
 int manager_handle_action(
                 Manager *m,

diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index b047d81adef438480b91a91d69d2b6b285efc31c..3fec9d9f8ad34e04dafb63f86460643db75bb3a5 100644 (file)
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -25,8 +25,8 @@ typedef struct Session Session;
 typedef enum KillWho KillWho;
 
 #include "list.h"
-#include "logind-user.h"
 #include "login-util.h"
+#include "logind-user.h"
 
 typedef enum SessionState {
         SESSION_OPENING,  /* Session scope is being created */

diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
index f6a9a4a8e33d9ce7ccaa5f8e6245383e0b475315..cfd09a70a68a428d7ed1cdde665440b10f0a21d5 100644 (file)
--- a/src/shared/acl-util.h
+++ b/src/shared/acl-util.h
@@ -23,9 +23,9 @@
 
 #ifdef HAVE_ACL
 
+#include <acl/libacl.h>
 #include <stdbool.h>
 #include <sys/acl.h>
-#include <acl/libacl.h>
 
 #include "macro.h"