[PATCH 27/32] demo/posix/cyclictest: Rearrange includes

Moving from "local to global" should help us to keep headers
self-contained.

Signed-off-by: Florian Bezdeka <[email protected]>
---
 demo/posix/cyclictest/cyclictest.c | 32 +++++++++++---------------------
 demo/posix/cyclictest/error.c      |  4 ++++
 demo/posix/cyclictest/error.h      |  4 +---
 demo/posix/cyclictest/rt-utils.h   |  2 +-
 demo/posix/cyclictest/rt_numa.h    |  3 ++-
 5 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/demo/posix/cyclictest/cyclictest.c b/demo/posix/cyclictest/cyclictest.c
index 5bc6bd6fcc16be4bdcbb017053c8a6946603d14f..71725ade88e58ac17a73bc6d8c851b915de02508 100644
--- a/demo/posix/cyclictest/cyclictest.c
+++ b/demo/posix/cyclictest/cyclictest.c
@@ -12,35 +12,25 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <unistd.h>
+#include "rt_numa.h"
+#include "rt-utils.h"
+
+#include <boilerplate/ancillaries.h>
+
 #include <fcntl.h>
 #include <getopt.h>
-#include <pthread.h>
+#include <linux/unistd.h>
 #include <signal.h>
-#include <sched.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <time.h>
-#include <errno.h>
-#include <limits.h>
-#include <linux/unistd.h>
-
+#include <sys/mman.h>
 #include <sys/prctl.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
-#include <sys/sysinfo.h>
-#include <sys/types.h>
 #include <sys/time.h>
-#include <sys/resource.h>
 #include <sys/utsname.h>
-#include <sys/mman.h>
-
-#include <boilerplate/ancillaries.h>
-
-#include "rt_numa.h"
-#include "rt-utils.h"
+#include <unistd.h>
 
 #define DEFAULT_INTERVAL 1000
 #define DEFAULT_DISTANCE 500
diff --git a/demo/posix/cyclictest/error.c b/demo/posix/cyclictest/error.c
index b32aa02707808ecd60829361bd061ecff939338c..86efe9f4c25d9e3f93003eb0cad352558ee86ce4 100644
--- a/demo/posix/cyclictest/error.c
+++ b/demo/posix/cyclictest/error.c
@@ -6,6 +6,10 @@
  */
 #include "error.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 /* Print an error message, plus a message for err and exit with error err */
 void err_exit(int err, char *fmt, ...)
 {
diff --git a/demo/posix/cyclictest/error.h b/demo/posix/cyclictest/error.h
index ae05a2e128c8d3aef165fd1a378bd54cae5705c6..4256083b116b0fb29f2e40a4531f44b0993778ce 100644
--- a/demo/posix/cyclictest/error.h
+++ b/demo/posix/cyclictest/error.h
@@ -1,10 +1,8 @@
 #ifndef __ERROR_H
 #define __ERROR_H
 
-#include <stdio.h>
-#include <stdlib.h>
+//#include <stdio.h>
 #include <stdarg.h>
-#include <string.h>
 
 void err_exit(int err, char *fmt, ...);
 void err_msg(char *fmt, ...);
diff --git a/demo/posix/cyclictest/rt-utils.h b/demo/posix/cyclictest/rt-utils.h
index a7c7640b3b9e198c746546b68d69666772f7e3bc..3c6518032046377f9aa411da37853608b4c37c0f 100644
--- a/demo/posix/cyclictest/rt-utils.h
+++ b/demo/posix/cyclictest/rt-utils.h
@@ -2,7 +2,7 @@
 #define __RT_UTILS_H
 
 #include <stdint.h>
-#include <linux/sched.h>
+#include <sys/types.h>
 
 #ifndef SCHED_NORMAL
 #define SCHED_NORMAL SCHED_OTHER
diff --git a/demo/posix/cyclictest/rt_numa.h b/demo/posix/cyclictest/rt_numa.h
index 98e7d0ffda78e9c00f3aca69b1a319f904e11a23..f33a9a8d6b2e09fae2da0786ca3ae5a4f008051c 100644
--- a/demo/posix/cyclictest/rt_numa.h
+++ b/demo/posix/cyclictest/rt_numa.h
@@ -20,9 +20,10 @@
 #ifndef _RT_NUMA_H
 #define _RT_NUMA_H
 
-#include "rt-utils.h"
 #include "error.h"
 
+#include <stdlib.h>
+
 static int numa = 0;
 
 #ifdef NUMA

-- 
2.54.0