[PATCH 18/32] testsuite/smokey/net_common: Rearrange includes

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

Signed-off-by: Florian Bezdeka <[email protected]>
---
 testsuite/smokey/net_common/client.c            |  9 ---------
 testsuite/smokey/net_common/server.c            | 17 ++---------------
 testsuite/smokey/net_common/setup.c             | 23 +++++++----------------
 testsuite/smokey/net_common/smokey_net_server.c | 21 +++++++++------------
 4 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/testsuite/smokey/net_common/client.c b/testsuite/smokey/net_common/client.c
index 914bda4a49f93f2c8aac7aa2fdd5816d804f8f31..751c819d0503209590fd1d9b28a7d89f8c54df9e 100644
--- a/testsuite/smokey/net_common/client.c
+++ b/testsuite/smokey/net_common/client.c
@@ -1,12 +1,3 @@
-#include <stdio.h>
-#include <stdbool.h>
-
-#include <unistd.h>
-#include <pthread.h>
-#include <sched.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-
 #include "smokey_net.h"
 
 static int duration = 10;
diff --git a/testsuite/smokey/net_common/server.c b/testsuite/smokey/net_common/server.c
index 42edb0f42716a51bce8dca776caa095a9256a915..2110a774b6bfac99c67dd6a0836147004095fe40 100644
--- a/testsuite/smokey/net_common/server.c
+++ b/testsuite/smokey/net_common/server.c
@@ -6,24 +6,11 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
-#include <unistd.h>
-#include <pthread.h>
-#include <sched.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netpacket/packet.h>
-#include <net/ethernet.h>
-
-#include <sys/cobalt.h>
-#include <smokey/smokey.h>
 #include "smokey_net.h"
 #include "smokey_net_server.h"
 
+#include <stdlib.h>
+
 struct smokey_server {
 	sem_t sync;
 	int fds[0];
diff --git a/testsuite/smokey/net_common/setup.c b/testsuite/smokey/net_common/setup.c
index 8a3562ba9630ba73b3b9c96da4b8b7d0e8b6bd18..a06265afb1e384d60a31df92962baaec6dd63919 100644
--- a/testsuite/smokey/net_common/setup.c
+++ b/testsuite/smokey/net_common/setup.c
@@ -4,25 +4,16 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <errno.h>
+#include "smokey_net.h"
+#include "smokey_net_server.h"
+
+#include <rtcfg_chrdev.h>
 
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
 #include <arpa/inet.h>
+#include <fcntl.h>
 #include <netinet/ether.h>
-#include <netpacket/packet.h>
-
-#include <sys/cobalt.h>
-#include <smokey/smokey.h>
-
-#include <rtnet_chrdev.h>
-#include <rtcfg_chrdev.h>
-#include "smokey_net.h"
-#include "smokey_net_server.h"
+#include <sys/ioctl.h>
+#include <unistd.h>
 
 
 struct module {
diff --git a/testsuite/smokey/net_common/smokey_net_server.c b/testsuite/smokey/net_common/smokey_net_server.c
index 5a94126031e5390eed65ad9c33e1292a4530abde..ab3799f552d87cd3cc3fa76f1060bfea70717adb 100644
--- a/testsuite/smokey/net_common/smokey_net_server.c
+++ b/testsuite/smokey/net_common/smokey_net_server.c
@@ -6,21 +6,18 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <unistd.h>
-#include <getopt.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <netinet/ether.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include "smokey_net_server.h"
 
 #include <rtcfg_chrdev.h>
-#include <sys/cobalt.h>
 #include <smokey/smokey.h>
-#include "smokey_net_server.h"
+
+#include <arpa/inet.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <netinet/ether.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
 
 static const char *intf = "rteth0";
 

-- 
2.54.0