From 48a439f2dac67302f3e7d1ccb21bd93e919efd02 Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Wed, 18 Nov 2015 22:46:33 +0100
Subject: [PATCH] tree-wide: sort includes in *.h

This is a continuation of the previous include sort patch, which
only sorted for .c files.
---
 src/basic/fileio-label.h               | 1 +
 src/basic/fs-util.h                    | 2 +-
 src/basic/gunicode.h                   | 2 +-
 src/core/cgroup.h                      | 2 +-
 src/libelogind/sd-bus/bus-control.h    | 1 +
 src/libelogind/sd-bus/bus-error.h      | 1 +
 src/libelogind/sd-bus/bus-introspect.h | 1 +
 src/libelogind/sd-bus/bus-slot.h       | 1 +
 src/login/logind-action.h              | 2 +-
 src/login/logind-session.h             | 2 +-
 src/shared/acl-util.h                  | 2 +-
 11 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/basic/fileio-label.h b/src/basic/fileio-label.h
index 34293ab13..b2d1b5714 100644
--- 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 b1719b69b..1f940a422 100644
--- 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 e70818fdd..b03aa4316 100644
--- 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 732255689..509da0bb5 100644
--- 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 5009ca8e6..e01b07583 100644
--- 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 fb0199c94..d7fd8612d 100644
--- 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 1914e6cb8..57c2430ee 100644
--- 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 23a15e4d0..c997e58f9 100644
--- 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 2fcad0397..cb2526d70 100644
--- 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 b047d81ad..3fec9d9f8 100644
--- 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 f6a9a4a8e..cfd09a70a 100644
--- 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"
 
-- 
2.30.2