diff --git a/asc2log.c b/asc2log.c
index 8bbd6a76..9eb780cd 100644
--- a/asc2log.c
+++ b/asc2log.c
@@ -42,18 +42,18 @@
  *
  */
 
+#include <libgen.h>
+#include <locale.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
 #include <time.h>
-#include <libgen.h>
 #include <unistd.h>
-#include <stdlib.h>
-#include <locale.h>
 
-#include <net/if.h>
 #include <linux/can.h>
 #include <linux/can/error.h>
+#include <net/if.h>
 
 #include "lib.h"
 
diff --git a/bcmserver.c b/bcmserver.c
index 3fe092c4..1f3ab822 100644
--- a/bcmserver.c
+++ b/bcmserver.c
@@ -108,21 +108,21 @@
  *
  */
 
+#include <errno.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <signal.h>
-#include <errno.h>
 #include <time.h>
+#include <unistd.h>
 
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/uio.h>
 #include <net/if.h>
 #include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/wait.h>
 
 #include <linux/can.h>
 #include <linux/can/bcm.h>
diff --git a/can-calc-bit-timing.c b/can-calc-bit-timing.c
index fff00f4d..9f1601f4 100644
--- a/can-calc-bit-timing.c
+++ b/can-calc-bit-timing.c
@@ -18,16 +18,16 @@
 
 #include <errno.h>
 #include <getopt.h>
+#include <libgen.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <libgen.h>
 #include <string.h>
 
-#include <linux/types.h>
 #include <linux/can/netlink.h>
+#include <linux/types.h>
 
 /* imported from kernel */
 
diff --git a/canbusload.c b/canbusload.c
index ff07b608..d6bfd785 100644
--- a/canbusload.c
+++ b/canbusload.c
@@ -42,21 +42,21 @@
  *
  */
 
+#include <ctype.h>
+#include <libgen.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <signal.h>
-#include <ctype.h>
-#include <libgen.h>
 #include <time.h>
+#include <unistd.h>
 
+#include <net/if.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/uio.h>
-#include <net/if.h>
 
 #include <linux/can.h>
 #include <linux/can/raw.h>
diff --git a/candump.c b/candump.c
index b78f4fd3..41f680c5 100644
--- a/candump.c
+++ b/candump.c
@@ -42,23 +42,23 @@
  *
  */
 
+#include <ctype.h>
+#include <errno.h>
+#include <libgen.h>
+#include <signal.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <unistd.h>
 #include <string.h>
-#include <signal.h>
-#include <ctype.h>
-#include <libgen.h>
 #include <time.h>
-#include <errno.h>
+#include <unistd.h>
 
+#include <net/if.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/uio.h>
-#include <net/if.h>
 
 #include <linux/can.h>
 #include <linux/can/raw.h>
diff --git a/canfdtest.c b/canfdtest.c
index 241b3cc8..9ee0d3c4 100644
--- a/canfdtest.c
+++ b/canfdtest.c
@@ -17,24 +17,24 @@
  * Send feedback to <linux-can@vger.kernel.org>
  */
 
+#include <errno.h>
+#include <getopt.h>
+#include <libgen.h>
+#include <limits.h>
+#include <sched.h>
+#include <signal.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <signal.h>
-#include <libgen.h>
-#include <getopt.h>
 #include <time.h>
-#include <sched.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdint.h>
+#include <unistd.h>
 
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <net/if.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/types.h>
 
 #include <linux/can.h>
 #include <linux/can/raw.h>
diff --git a/canframelen.c b/canframelen.c
index 3c5453f3..6ce3c4da 100644
--- a/canframelen.c
+++ b/canframelen.c
@@ -45,12 +45,12 @@
  */
 
 #include "canframelen.h"
-#include <stdint.h>
-#include <stddef.h>
+#include <arpa/inet.h>
+#include <assert.h>
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
-#include <assert.h>
-#include <arpa/inet.h>
 
 /**
  * Functions and types for CRC checks.
diff --git a/cangen.c b/cangen.c
index 0dfcb6e2..3641986c 100644
--- a/cangen.c
+++ b/cangen.c
@@ -42,28 +42,28 @@
  *
  */
 
+#include <ctype.h>
+#include <errno.h>
+#include <libgen.h>
+#include <poll.h>
+#include <signal.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <unistd.h>
 #include <string.h>
-#include <signal.h>
-#include <poll.h>
-#include <ctype.h>
-#include <libgen.h>
 #include <time.h>
-#include <errno.h>
+#include <unistd.h>
 
+#include <net/if.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/uio.h>
-#include <net/if.h>
 
+#include "lib.h"
 #include <linux/can.h>
 #include <linux/can/raw.h>
-#include "lib.h"
 
 #define DEFAULT_GAP 200 /* ms */
 #define DEFAULT_BURST_COUNT 1
diff --git a/cangw.c b/cangw.c
index 715a44fd..52310c9b 100644
--- a/cangw.c
+++ b/cangw.c
@@ -42,17 +42,17 @@
  *
  */
 
+#include <errno.h>
+#include <libgen.h>
+#include <linux/can/gw.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <net/if.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <libgen.h>
 #include <string.h>
-#include <unistd.h>
-#include <errno.h>
 #include <sys/socket.h>
-#include <net/if.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#include <linux/can/gw.h>
+#include <unistd.h>
 
 enum {
 	UNSPEC,
diff --git a/canlogserver.c b/canlogserver.c
index d67fa0f5..5619a9cb 100644
--- a/canlogserver.c
+++ b/canlogserver.c
@@ -42,29 +42,29 @@
  *
  */
 
+#include <ctype.h>
+#include <libgen.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <signal.h>
-#include <ctype.h>
-#include <libgen.h>
 #include <time.h>
+#include <unistd.h>
 
+#include <net/if.h>
+#include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <sys/time.h>
-#include <sys/wait.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/uio.h>
-#include <net/if.h>
-#include <netinet/in.h>
+#include <sys/wait.h>
 
+#include <errno.h>
 #include <linux/can.h>
 #include <linux/can/raw.h>
 #include <linux/sockios.h>
 #include <signal.h>
-#include <errno.h>
 
 #include "lib.h"
 
diff --git a/canplayer.c b/canplayer.c
index b4b02afc..1cf420c1 100644
--- a/canplayer.c
+++ b/canplayer.c
@@ -42,19 +42,19 @@
  *
  */
 
+#include <libgen.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <libgen.h>
-#include <stdlib.h>
 #include <unistd.h>
 
+#include <linux/can.h>
+#include <linux/can/raw.h>
 #include <net/if.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <sys/time.h>
-#include <linux/can.h>
-#include <linux/can/raw.h>
 
 #include "lib.h"
 
diff --git a/cansniffer.c b/cansniffer.c
index caa8796a..4e1725af 100644
--- a/cansniffer.c
+++ b/cansniffer.c
@@ -42,25 +42,25 @@
  *
  */
 
+#include <ctype.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <unistd.h>
 #include <string.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <ctype.h>
-#include <libgen.h>
 #include <time.h>
+#include <unistd.h>
 
+#include <net/if.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/uio.h>
-#include <net/if.h>
 
 #include <linux/can.h>
 #include <linux/can/raw.h>
diff --git a/isotpdump.c b/isotpdump.c
index c18dc5af..416ede71 100644
--- a/isotpdump.c
+++ b/isotpdump.c
@@ -42,23 +42,23 @@
  *
  */
 
+#include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <libgen.h>
-#include <time.h>
 #include <strings.h>
+#include <time.h>
+#include <unistd.h>
 
 #include <net/if.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 
+#include "terminal.h"
 #include <linux/can.h>
 #include <linux/can/raw.h>
 #include <linux/sockios.h>
-#include "terminal.h"
 
 #define NO_CAN_ID 0xFFFFFFFFU
 
diff --git a/isotpperf.c b/isotpperf.c
index 19fb4e68..d2cd3e07 100644
--- a/isotpperf.c
+++ b/isotpperf.c
@@ -42,18 +42,18 @@
  *
  */
 
+#include <libgen.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <unistd.h>
 #include <string.h>
-#include <libgen.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <net/if.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 
 #include <linux/can.h>
 #include <linux/can/raw.h>
diff --git a/isotprecv.c b/isotprecv.c
index c4b8e042..406cf5d7 100644
--- a/isotprecv.c
+++ b/isotprecv.c
@@ -42,16 +42,16 @@
  *
  */
 
+#include <libgen.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libgen.h>
+#include <unistd.h>
 
 #include <net/if.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 
 #include <linux/can.h>
 #include <linux/can/isotp.h>
diff --git a/isotpsend.c b/isotpsend.c
index 3797e953..01572c99 100644
--- a/isotpsend.c
+++ b/isotpsend.c
@@ -42,16 +42,16 @@
  *
  */
 
+#include <libgen.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libgen.h>
+#include <unistd.h>
 
 #include <net/if.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 
 #include <linux/can.h>
 #include <linux/can/isotp.h>
diff --git a/isotpserver.c b/isotpserver.c
index 946169e8..691df48f 100644
--- a/isotpserver.c
+++ b/isotpserver.c
@@ -57,22 +57,22 @@
  *
  */
 
+#include <errno.h>
+#include <libgen.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <libgen.h>
-#include <unistd.h>
 #include <string.h>
-#include <signal.h>
-#include <errno.h>
 #include <time.h>
+#include <unistd.h>
 
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/uio.h>
 #include <net/if.h>
 #include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/wait.h>
 
 #include <linux/can.h>
 #include <linux/can/isotp.h>
diff --git a/isotpsniffer.c b/isotpsniffer.c
index 3a022f1a..a06ecef3 100644
--- a/isotpsniffer.c
+++ b/isotpsniffer.c
@@ -42,23 +42,23 @@
  *
  */
 
-#include <stdio.h>
-#include <unistd.h>
 #include <ctype.h>
+#include <libgen.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libgen.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <net/if.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 
+#include "terminal.h"
 #include <linux/can.h>
 #include <linux/can/isotp.h>
 #include <linux/sockios.h>
-#include "terminal.h"
 
 #define NO_CAN_ID 0xFFFFFFFFU
 
diff --git a/isotptun.c b/isotptun.c
index cb40ecc3..a471025f 100644
--- a/isotptun.c
+++ b/isotptun.c
@@ -48,21 +48,21 @@
  *
  */
 
-#include <stdio.h>
+#include <errno.h>
 #include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
 #include <libgen.h>
-#include <errno.h>
 #include <signal.h>
 #include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <syslog.h>
+#include <unistd.h>
 
 #include <net/if.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 
 #include <linux/can.h>
 #include <linux/can/isotp.h>
diff --git a/j1939acd.c b/j1939acd.c
index de09760f..2869d0a3 100644
--- a/j1939acd.c
+++ b/j1939acd.c
@@ -10,22 +10,22 @@
  * as published by the Free Software Foundation
  */
 
-#include <signal.h>
-#include <time.h>
-#include <inttypes.h>
 #include <errno.h>
-#include <string.h>
-#include <stdlib.h>
+#include <inttypes.h>
+#include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 
-#include <unistd.h>
-#include <getopt.h>
 #include <err.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <net/if.h>
+#include <getopt.h>
 #include <linux/can.h>
 #include <linux/can/j1939.h>
+#include <net/if.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <unistd.h>
 
 #include "libj1939.h"
 
diff --git a/j1939cat.c b/j1939cat.c
index 160e3292..e6f42057 100644
--- a/j1939cat.c
+++ b/j1939cat.c
@@ -8,16 +8,16 @@
 #include <fcntl.h>
 #include <inttypes.h>
 #include <net/if.h>
+#include <poll.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <poll.h>
 
 #include <linux/errqueue.h>
-#include <linux/netlink.h>
 #include <linux/net_tstamp.h>
+#include <linux/netlink.h>
 #include <linux/socket.h>
 
 #include "libj1939.h"
diff --git a/j1939spy.c b/j1939spy.c
index b676d43d..e49ed14f 100644
--- a/j1939spy.c
+++ b/j1939spy.c
@@ -10,19 +10,19 @@
  * as published by the Free Software Foundation
  */
 
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <errno.h>
 #include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 
-#include <unistd.h>
-#include <getopt.h>
 #include <err.h>
-#include <sys/socket.h>
+#include <getopt.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <sys/time.h>
+#include <unistd.h>
 
 #include "libj1939.h"
 
diff --git a/j1939sr.c b/j1939sr.c
index 97a061ae..cdf6da57 100644
--- a/j1939sr.c
+++ b/j1939sr.c
@@ -10,20 +10,20 @@
  * as published by the Free Software Foundation
  */
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <errno.h>
 #include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include <unistd.h>
-#include <getopt.h>
 #include <err.h>
+#include <getopt.h>
 #include <poll.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "libj1939.h"
 
diff --git a/lib.c b/lib.c
index 4a9251f0..38a79ca3 100644
--- a/lib.c
+++ b/lib.c
@@ -42,13 +42,13 @@
  *
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
-#include <sys/socket.h> /* for sa_family_t */
 #include <linux/can.h>
 #include <linux/can/error.h>
+#include <sys/socket.h> /* for sa_family_t */
 
 #include "lib.h"
 
diff --git a/libj1939.c b/libj1939.c
index 072162dd..506b5252 100644
--- a/libj1939.c
+++ b/libj1939.c
@@ -10,16 +10,16 @@
  * as published by the Free Software Foundation
  */
 
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <err.h>
 #include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include <unistd.h>
 #include <fcntl.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
+#include <unistd.h>
 
 #include <net/if.h>
 
diff --git a/log2asc.c b/log2asc.c
index 49e8753b..e2f9c6ad 100644
--- a/log2asc.c
+++ b/log2asc.c
@@ -42,15 +42,15 @@
  *
  */
 
+#include <libgen.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <libgen.h>
 #include <unistd.h>
 
+#include <linux/can.h>
 #include <net/if.h>
 #include <sys/time.h>
-#include <linux/can.h>
 
 #include "lib.h"
 
diff --git a/log2long.c b/log2long.c
index 2033d2ca..25814e28 100644
--- a/log2long.c
+++ b/log2long.c
@@ -44,8 +44,8 @@
 
 #include <stdio.h>
 
-#include <net/if.h>
 #include <linux/can.h>
+#include <net/if.h>
 
 #include "lib.h"
 
diff --git a/slcan_attach.c b/slcan_attach.c
index 6fa9269c..a0222528 100644
--- a/slcan_attach.c
+++ b/slcan_attach.c
@@ -42,18 +42,18 @@
  *
  */
 
+#include <fcntl.h>
+#include <getopt.h>
+#include <linux/sockios.h>
+#include <linux/tty.h>
+#include <net/if.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <net/if.h>
+#include <sys/socket.h>
 #include <termios.h>
-#include <linux/tty.h>
-#include <linux/sockios.h>
+#include <unistd.h>
 
 void print_usage(char *prg)
 {
diff --git a/slcand.c b/slcand.c
index 72e7ed4d..4a15697b 100644
--- a/slcand.c
+++ b/slcand.c
@@ -22,25 +22,25 @@
  *
  */
 
+#include <errno.h>
+#include <fcntl.h>
+#include <linux/serial.h>
+#include <linux/sockios.h>
+#include <linux/tty.h>
+#include <net/if.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <syslog.h>
-#include <errno.h>
-#include <pwd.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
 #include <termios.h>
-#include <linux/tty.h>
-#include <linux/sockios.h>
-#include <linux/serial.h>
-#include <stdarg.h>
+#include <unistd.h>
 
 /* Change this to whatever your daemon is called */
 #define DAEMON_NAME "slcand"
diff --git a/testj1939.c b/testj1939.c
index c7af0134..330e88c2 100644
--- a/testj1939.c
+++ b/testj1939.c
@@ -10,20 +10,20 @@
  * as published by the Free Software Foundation
  */
 
-#include <signal.h>
-#include <time.h>
-#include <inttypes.h>
 #include <errno.h>
-#include <string.h>
-#include <stdlib.h>
+#include <inttypes.h>
+#include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
 
-#include <unistd.h>
-#include <getopt.h>
 #include <err.h>
-#include <sys/time.h>
-#include <sys/socket.h>
+#include <getopt.h>
 #include <net/if.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <unistd.h>
 
 #include "libj1939.h"