From ae9c8edbcaee4ed527635b459005d61756f4fbfd Mon Sep 17 00:00:00 2001
From: Martin Lund <martin.lund@keep-it-simple.com>
Date: Sat, 11 May 2024 10:46:34 +0200
Subject: [PATCH] Clean up includes

---
 src/alert.c      |  7 +------
 src/configfile.c | 22 ++++------------------
 src/error.c      |  9 ---------
 src/log.c        |  9 ---------
 src/main.c       |  2 +-
 src/misc.c       | 14 +-------------
 src/options.c    | 17 +----------------
 src/options.h    |  3 ---
 src/print.c      |  5 -----
 src/print.h      |  1 -
 src/rs485.c      |  6 ++----
 src/timestamp.c  |  2 --
 src/xymodem.c    |  8 +-------
 13 files changed, 11 insertions(+), 94 deletions(-)

diff --git a/src/alert.c b/src/alert.c
index f9ed3ec..23a728e 100644
--- a/src/alert.c
+++ b/src/alert.c
@@ -19,15 +19,10 @@
  * 02110-1301, USA.
  */
 
-#include "alert.h"
-#include "config.h"
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
-#include "error.h"
-#include "print.h"
 #include "options.h"
+#include "alert.h"
 
 void blink_background(void)
 {
diff --git a/src/configfile.c b/src/configfile.c
index cc3013d..3ee878c 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -21,31 +21,17 @@
  */
 
 #define _GNU_SOURCE
-
-#include "config.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <stdbool.h>
-#include <errno.h>
-#include <getopt.h>
-#include <termios.h>
-#include <assert.h>
-#include <limits.h>
+#include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
+#include <assert.h>
 #include <regex.h>
 #include <glib.h>
-#include "options.h"
 #include "configfile.h"
-#include "misc.h"
-#include "options.h"
-#include "error.h"
 #include "print.h"
 #include "rs485.h"
-#include "timestamp.h"
-#include "alert.h"
+#include "misc.h"
 
 #define CONFIG_GROUP_NAME_DEFAULT "default"
 
diff --git a/src/error.c b/src/error.c
index 2973fbb..f318378 100644
--- a/src/error.c
+++ b/src/error.c
@@ -21,17 +21,8 @@
 
 #define __STDC_WANT_LIB_EXT2__ 1   // To access vasprintf
 
-#include "config.h"
 #include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <string.h>
-#include <errno.h>
-#include "options.h"
 #include "print.h"
-#include "error.h"
-#include "timestamp.h"
 
 static char error[2][1000];
 static bool in_session = false;
diff --git a/src/log.c b/src/log.c
index 9fa0414..4eca7c7 100644
--- a/src/log.c
+++ b/src/log.c
@@ -21,18 +21,9 @@
 
 #define __STDC_WANT_LIB_EXT2__ 1   // To access vasprintf
 
-#include "config.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <time.h>
 #include <sys/time.h>
 #include <libgen.h>
-#include "options.h"
 #include "print.h"
-#include "error.h"
 #include "fs.h"
 
 #define IS_ESC_CSI_INTERMEDIATE_CHAR(c) ((c >= 0x20) && (c <= 0x3F))
diff --git a/src/main.c b/src/main.c
index 304258e..9e6c043 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,10 +19,10 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include "config.h"
 #include "options.h"
 #include "configfile.h"
 #include "tty.h"
diff --git a/src/misc.c b/src/misc.c
index 9342769..ef08fb3 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -20,25 +20,13 @@
  */
 
 #define _GNU_SOURCE  // For FNM_EXTMATCH
-#include "config.h"
-#include <ctype.h>
-#include <dirent.h>
-#include <regex.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <errno.h>
 #include <sys/poll.h>
 #include <sys/wait.h>
-#include <termios.h>
 #include <fnmatch.h>
-#include "error.h"
+#include <regex.h>
 #include "print.h"
-#include "options.h"
 
 void delay(long ms)
 {
diff --git a/src/options.c b/src/options.c
index 0eefe7e..234e3e2 100644
--- a/src/options.c
+++ b/src/options.c
@@ -19,29 +19,14 @@
  * 02110-1301, USA.
  */
 
-#include "config.h"
 #include <assert.h>
 #include <regex.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <errno.h>
 #include <getopt.h>
-#include <termios.h>
-#include <limits.h>
-#include "options.h"
-#include "error.h"
+#include "config.h"
 #include "misc.h"
 #include "print.h"
-#include "tty.h"
 #include "rs485.h"
-#include "timestamp.h"
-#include "alert.h"
 #include "log.h"
-#include "script.h"
 #include "configfile.h"
 
 #define HEX_N_VALUE_MAX 4096
diff --git a/src/options.h b/src/options.h
index ee73b8e..21a5f75 100644
--- a/src/options.h
+++ b/src/options.h
@@ -23,9 +23,6 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <limits.h>
-#include <termios.h>
-#include <sys/param.h>
 #include "script.h"
 #include "timestamp.h"
 #include "alert.h"
diff --git a/src/print.c b/src/print.c
index 04d17da..bfcccbf 100644
--- a/src/print.c
+++ b/src/print.c
@@ -19,11 +19,6 @@
  * 02110-1301, USA.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include "options.h"
 #include "print.h"
 
 bool print_tainted = false;
diff --git a/src/print.h b/src/print.h
index 038655c..9baf042 100644
--- a/src/print.h
+++ b/src/print.h
@@ -23,7 +23,6 @@
 
 #include <stdio.h>
 #include <stdbool.h>
-#include "misc.h"
 #include "error.h"
 #include "options.h"
 #include "timestamp.h"
diff --git a/src/rs485.c b/src/rs485.c
index 30b7dc8..31ab2ec 100644
--- a/src/rs485.c
+++ b/src/rs485.c
@@ -19,14 +19,12 @@
  * 02110-1301, USA.
  */
 
-#include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
-#include <errno.h>
 #include <sys/ioctl.h>
-#include <stdbool.h>
 #include "options.h"
 #include "print.h"
-#include "error.h"
+#include "misc.h"
 
 #ifdef HAVE_RS485
 
diff --git a/src/timestamp.c b/src/timestamp.c
index 338ff87..a8d165c 100644
--- a/src/timestamp.c
+++ b/src/timestamp.c
@@ -22,8 +22,6 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 #include <sys/time.h>
 #include <time.h>
 #include "error.h"
diff --git a/src/xymodem.c b/src/xymodem.c
index 83ac6dc..4edfb1f 100644
--- a/src/xymodem.c
+++ b/src/xymodem.c
@@ -7,20 +7,14 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include <sys/poll.h>
 #include <termios.h>
 #include "xymodem.h"
 #include "print.h"
+#include "misc.h"
 
 #define SOH 0x01
 #define STX 0x02