Clean up includes

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)
 {

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 <stdlib.h>
-#include <getopt.h>
-#include <termios.h>
-#include <assert.h>
-#include <limits.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 "misc.h"
-#include "alert.h"
 
 #define CONFIG_GROUP_NAME_DEFAULT "default"
 

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;

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))

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"

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)
 {

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 "config.h"
-#include <limits.h>
-#include "options.h"
-#include "error.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

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"

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;

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"

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
 

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"

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