find src \( -name '*.h' -o -name '*.c' \) -type f -exec ./fixup_includes {} \;

9 files changed, 18 insertions, 18 deletions

diff --git a/src/libbasic/include/basic/escape.h b/src/libbasic/include/basic/escape.h
index dffe417cc6..97fa90caf0 100644
--- a/src/libbasic/include/basic/escape.h
+++ b/src/libbasic/include/basic/escape.h
@@ -25,8 +25,8 @@
 #include <sys/types.h>
 #include <uchar.h>
 
-#include "basic/string-util.h"
 #include "basic/missing.h"
+#include "basic/string-util.h"
 
 /* What characters are special in the shell? */
 /* must be escaped outside and inside double-quotes */
diff --git a/src/libbasic/include/basic/socket-util.h b/src/libbasic/include/basic/socket-util.h
index a711d368d5..199e026198 100644
--- a/src/libbasic/include/basic/socket-util.h
+++ b/src/libbasic/include/basic/socket-util.h
@@ -19,6 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <linux/if_packet.h>
+#include <linux/netlink.h>
 #include <netinet/ether.h>
 #include <netinet/in.h>
 #include <stdbool.h>
@@ -26,8 +28,6 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/un.h>
-#include <linux/netlink.h>
-#include <linux/if_packet.h>
 
 #include "basic/macro.h"
 #include "basic/util.h"
diff --git a/src/libbasic/src/chattr-util.c b/src/libbasic/src/chattr-util.c
index a227ce6b05..ab6d8706de 100644
--- a/src/libbasic/src/chattr-util.c
+++ b/src/libbasic/src/chattr-util.c
@@ -19,9 +19,9 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/fs.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <linux/fs.h>
 
 #include "basic/chattr-util.h"
 #include "basic/fd-util.h"
diff --git a/src/libbasic/src/clock-util.c b/src/libbasic/src/clock-util.c
index a6d43803a1..50c3738414 100644
--- a/src/libbasic/src/clock-util.c
+++ b/src/libbasic/src/clock-util.c
@@ -20,12 +20,12 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <stdbool.h>
-#include <time.h>
 #include <linux/rtc.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
+#include <time.h>
 
 #include "basic/clock-util.h"
 #include "basic/fd-util.h"
diff --git a/src/libbasic/src/fileio.c b/src/libbasic/src/fileio.c
index 358477cebe..c784aaac54 100644
--- a/src/libbasic/src/fileio.c
+++ b/src/libbasic/src/fileio.c
@@ -17,6 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
@@ -29,7 +30,6 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "ctype.h"
 #include "basic/escape.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
diff --git a/src/libbasic/src/random-util.c b/src/libbasic/src/random-util.c
index 6c903cbb9a..6f1b1adead 100644
--- a/src/libbasic/src/random-util.c
+++ b/src/libbasic/src/random-util.c
@@ -20,11 +20,11 @@
 #include <elf.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/random.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <sys/time.h>
-#include <linux/random.h>
-#include <stdint.h>
 
 #ifdef HAVE_SYS_AUXV_H
 #include <sys/auxv.h>
diff --git a/src/libbasic/src/stat-util.c b/src/libbasic/src/stat-util.c
index 64f01e5b4d..83edbd3ecc 100644
--- a/src/libbasic/src/stat-util.c
+++ b/src/libbasic/src/stat-util.c
@@ -20,10 +20,10 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <linux/magic.h>
+#include <sys/stat.h>
 #include <sys/statvfs.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include "basic/dirent-util.h"
diff --git a/src/libbasic/src/terminal-util.c b/src/libbasic/src/terminal-util.c
index 6755a3f787..ce750abb08 100644
--- a/src/libbasic/src/terminal-util.c
+++ b/src/libbasic/src/terminal-util.c
@@ -20,20 +20,20 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <linux/kd.h>
+#include <linux/tiocl.h>
+#include <linux/vt.h>
+#include <poll.h>
+#include <signal.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/inotify.h>
+#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysmacros.h>
 #include <sys/time.h>
-#include <linux/kd.h>
-#include <linux/tiocl.h>
-#include <linux/vt.h>
-#include <poll.h>
-#include <signal.h>
-#include <sys/ioctl.h>
 #include <sys/types.h>
 #include <termios.h>
 #include <unistd.h>
diff --git a/src/libbasic/src/user-util.c b/src/libbasic/src/user-util.c
index aeada699ac..c85eb06491 100644
--- a/src/libbasic/src/user-util.c
+++ b/src/libbasic/src/user-util.c
@@ -30,11 +30,11 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "basic/missing.h"
 #include "basic/alloc-util.h"
 #include "basic/fd-util.h"
 #include "basic/formats-util.h"
 #include "basic/macro.h"
+#include "basic/missing.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/string-util.h"