From 8bad7df9feb9ff373711ad0e8375bdf95388b7c9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Tue, 4 Nov 2025 14:38:41 +0100
Subject: [PATCH] src: reorder includes alphabetically
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Reorder includes alphabetically which makes them easier to follow and find
duplicates.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 src/config.c  |  6 +++---
 src/dhcpv6.c  | 28 +++++++++++++---------------
 src/odhcp6c.c | 25 ++++++++++++-------------
 src/odhcp6c.h |  6 ++++--
 src/ra.c      | 28 +++++++++++++---------------
 src/ra.h      |  5 +++++
 src/script.c  | 12 ++++++------
 src/ubus.c    |  9 +++++----
 8 files changed, 61 insertions(+), 58 deletions(-)

diff --git a/src/config.c b/src/config.c
index d6bbf17..61d5532 100644
--- a/src/config.c
+++ b/src/config.c
@@ -59,11 +59,11 @@
  *
  */
 
-#include <string.h>
-#include <resolv.h>
-#include <limits.h>
 #include <arpa/inet.h>
+#include <limits.h>
+#include <resolv.h>
 #include <stdlib.h>
+#include <string.h>
 #include <syslog.h>
 
 #include "config.h"
diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 0366270..1443e4b 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -13,33 +13,31 @@
  *
  */
 
-#include <time.h>
-#include <fcntl.h>
+#include <arpa/inet.h>
+#include <ctype.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <inttypes.h>
-#include <stdlib.h>
-#include <signal.h>
+#include <libubox/md5.h>
 #include <limits.h>
+#include <netinet/in.h>
+#include <net/if.h>
+#include <net/ethernet.h>
 #include <resolv.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <syslog.h>
-#include <stdbool.h>
-#include <ctype.h>
-#include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-
-#include <net/if.h>
-#include <net/ethernet.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
 
-#include <libubox/md5.h>
 #include "config.h"
 #include "odhcp6c.h"
 
-
 #define ALL_DHCPV6_RELAYS {{{0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02}}}
 #define DHCPV6_CLIENT_PORT 546
diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index cf786e4..91f429c 100644
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -13,27 +13,26 @@
  *
  */
 
-#include <time.h>
-#include <errno.h>
+#include <arpa/inet.h>
 #include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <linux/if_addr.h>
+#include <net/if.h>
+#include <poll.h>
 #include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <syslog.h>
 #include <signal.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <strings.h>
-#include <stdbool.h>
-
-#include <net/if.h>
+#include <syslog.h>
 #include <sys/syscall.h>
-#include <poll.h>
-#include <arpa/inet.h>
-#include <linux/if_addr.h>
+#include <time.h>
+#include <unistd.h>
 
 #include "config.h"
 #include "odhcp6c.h"
diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index a3d9b54..7df4d14 100644
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -12,10 +12,12 @@
  * GNU General Public License for more details.
  *
  */
+
 #pragma once
-#include <stdint.h>
-#include <stdbool.h>
+
 #include <netinet/in.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 #define _unused __attribute__((unused))
 #define _packed __attribute__((packed))
diff --git a/src/ra.c b/src/ra.c
index 01a8b72..99cbc9e 100644
--- a/src/ra.c
+++ b/src/ra.c
@@ -13,27 +13,28 @@
  *
  */
 
+#include <alloca.h>
+#include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
+#include <linux/rtnetlink.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+#include <resolv.h>
 #include <signal.h>
-#include <string.h>
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 #include <syslog.h>
-#include <unistd.h>
-#include <resolv.h>
-#include <alloca.h>
-
-#include <net/if.h>
-#include <arpa/inet.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
+#include <unistd.h>
 
-#include <linux/rtnetlink.h>
+#include "odhcp6c.h"
+#include "ra.h"
 
 #ifndef SOL_NETLINK
 #define SOL_NETLINK 270
@@ -47,9 +48,6 @@
 #define IFF_LOWER_UP 0x10000
 #endif
 
-#include "odhcp6c.h"
-#include "ra.h"
-
 static bool nocarrier = false;
 static bool ptp_link = false;
 
diff --git a/src/ra.h b/src/ra.h
index 9acc8cd..34d8cb4 100644
--- a/src/ra.h
+++ b/src/ra.h
@@ -12,8 +12,13 @@
  * GNU General Public License for more details.
  *
  */
+
 #pragma once
 
+#include <netinet/in.h>
+#include <stdbool.h>
+#include <stdint.h>
+
 #define ALL_IPV6_NODES {{{0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}}}
 
diff --git a/src/script.c b/src/script.c
index eaa2fb3..fba4cde 100644
--- a/src/script.c
+++ b/src/script.c
@@ -13,18 +13,18 @@
  *
  */
 
-#include <stdio.h>
+#include <arpa/inet.h>
+#include <inttypes.h>
 #include <netdb.h>
+#include <netinet/in.h>
 #include <resolv.h>
+#include <signal.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <signal.h>
-#include <unistd.h>
-#include <inttypes.h>
-#include <arpa/inet.h>
 #include <sys/wait.h>
-#include <netinet/in.h>
+#include <unistd.h>
 
 #include "odhcp6c.h"
 
diff --git a/src/ubus.c b/src/ubus.c
index f0758cd..af73489 100644
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -59,16 +59,17 @@
  *
  */
 
-#include <sys/types.h>
 #include <arpa/inet.h>
+#include <inttypes.h>
+#include <libubox/blobmsg.h>
 #include <resolv.h>
 #include <stdio.h>
+#include <sys/types.h>
 #include <syslog.h>
-#include <inttypes.h>
-#include <libubox/blobmsg.h>
 
-#include "ubus.h"
 #include "config.h"
+#include "odhcp6c.h"
+#include "ubus.h"
 
 #define CHECK(stmt) \
 	do { \
-- 
2.30.2