[PATCH 31/32] utils: Rearrange includes

Moving from "local to global" should help us to keep headers
self-contained. This commit holds the cleanups of all utils/
subdirectories where only a single file has been modified.

Signed-off-by: Florian Bezdeka <[email protected]>
---
 utils/autotune/autotune.c    | 17 ++++++-----------
 utils/chkkconf/checkconfig.c | 12 ++++++------
 utils/corectl/corectl.c      | 11 +++++------
 utils/hdb/hdb.c              | 16 ++++++++--------
 utils/ps/rtps.c              |  7 ++++---
 utils/slackspot/slackspot.c  | 19 +++++++++----------
 6 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/utils/autotune/autotune.c b/utils/autotune/autotune.c
index f52733b7ae1d5a920fc7ad79c7288001dfeb8f21..b608eba8c7044971a8800a273e2e3ad32b28f650 100644
--- a/utils/autotune/autotune.c
+++ b/utils/autotune/autotune.c
@@ -16,20 +16,15 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
-#include <fcntl.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <pthread.h>
-#include <limits.h>
-#include <time.h>
-#include <signal.h>
-#include <error.h>
-#include <sys/cobalt.h>
+
 #include <rtdm/autotune.h>
+#include <sys/cobalt.h>
 #include <xenomai/init.h>
 
+#include <error.h>
+#include <getopt.h>
+#include <stdlib.h>
+
 static int tune_irqlat, tune_kernlat, tune_userlat;
 
 static int reset, noload, background;
diff --git a/utils/chkkconf/checkconfig.c b/utils/chkkconf/checkconfig.c
index 134d8e519085320043c510b565ae488d105a882e..31d6c7838b109b55c85e9f99179851e442ea2272 100644
--- a/utils/chkkconf/checkconfig.c
+++ b/utils/chkkconf/checkconfig.c
@@ -4,17 +4,17 @@
  * Copyright (C) 2020 Philippe Gerum  <[email protected]>
  */
 
-#include <unistd.h>
+#include <ctype.h>
+#include <errno.h>
+#include <error.h>
 #include <getopt.h>
+#include <search.h>
 #include <stdbool.h>
-#include <ctype.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <search.h>
-#include <error.h>
-#include <errno.h>
 #include <sys/utsname.h>
+#include <unistd.h>
 
 #define DEFAULT_KCONFIG    "/proc/config.gz"
 #define DEFAULT_CHECKLIST  DATADIR"/kconf-checklist"
diff --git a/utils/corectl/corectl.c b/utils/corectl/corectl.c
index 41b8773ad5db15d60a85b2d00b9b7bba7189d971..c8977af168fc30b1ff4a8ee9ff8c4839258fde52 100644
--- a/utils/corectl/corectl.c
+++ b/utils/corectl/corectl.c
@@ -16,15 +16,14 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
-#include <xeno_config.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <error.h>
+
 #include <sys/cobalt.h>
 #include <xenomai/init.h>
 
+#include <error.h>
+#include <getopt.h>
+#include <stdlib.h>
+
 int __cobalt_control_bind = 1;
 
 static int action;
diff --git a/utils/hdb/hdb.c b/utils/hdb/hdb.c
index 1ecce6ebf533a13b96f7a4a36f281edff10c4d00..dd596b32f9e638fe6dd92bed322914fe58326791 100644
--- a/utils/hdb/hdb.c
+++ b/utils/hdb/hdb.c
@@ -16,17 +16,17 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
-#include <xeno_config.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <error.h>
-#include <fcntl.h>
+
 #include <copperplate/cluster.h>
 #include <xenomai/init.h>
 
+#include <error.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
 static const struct option options[] = {
 	{
 #define dump_cluster_opt	0
diff --git a/utils/ps/rtps.c b/utils/ps/rtps.c
index 6a07f110dbd7694225a6a6837cdd8fffb1562786..1ff53956862ae243193fb9826334f3c1e33702cc 100644
--- a/utils/ps/rtps.c
+++ b/utils/ps/rtps.c
@@ -16,11 +16,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
-#include <string.h>
-#include <stdio.h>
-#include <error.h>
+
 #include <errno.h>
+#include <error.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #define PROC_ACCT  "/proc/xenomai/sched/acct"
 #define PROC_PID  "/proc/%d/cmdline"
diff --git a/utils/slackspot/slackspot.c b/utils/slackspot/slackspot.c
index 031b97f13f975ca77ac579afc41fbb8e3ddbc479..9fb507b2812b295f846740cd485b4dde02ea5e07 100644
--- a/utils/slackspot/slackspot.c
+++ b/utils/slackspot/slackspot.c
@@ -19,20 +19,19 @@
  * vfile, to get backtraces of spurious relaxes.
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
+#include <errno.h>
 #include <error.h>
-#include <stdint.h>
-#include <stdlib.h>
 #include <fnmatch.h>
+#include <getopt.h>
+#include <limits.h>
 #include <search.h>
-#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <malloc.h>
-#include <getopt.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+/* UAPI and dependencies */
 #include <signal.h>
 #include <cobalt/uapi/signal.h>
 

-- 
2.54.0