fix include order and unify local include placement

In commit https://github.com/linux-can/can-utils/commit/b153fe3f3591
("clang-tidy: sort includes alphabetically") the position of the "lib.h"
include has been moved in a way that struct canfd_frame has not been
defined anymore and lead to a warning when compiling cangen.c

This patch reverts that specific move and unifies the location of local
includes at the end of the include list.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>

isotpdump.c

@@ -55,11 +55,12 @@
 #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
 
 const char fc_info [4][9] = { "CTS", "WT", "OVFLW", "reserved" };