From a13d392e9f5cfa6e9b35cdbe61db80d0ed0ffde8 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Wed, 1 Dec 2010 19:51:35 -0500
Subject: Unused-header removals by deheader. All regression tests pass.

---
 Tachometer.c         |  1 -
 ais_json.c           |  4 ----
 cgps.c               |  7 -------
 driver_garmin.c      |  6 ------
 driver_garmin_txt.c  |  5 -----
 driver_geostar.c     |  6 ------
 driver_nmea.c        |  4 ----
 driver_proto.c       |  9 ---------
 driver_rtcm2.c       |  5 -----
 driver_rtcm3.c       |  4 ----
 driver_tsip.c        |  2 --
 drivers.c            |  4 ----
 geoid.c              |  1 -
 gpsctl.c             |  4 ----
 gpsd.c               |  6 ------
 gpsd_json.c          |  2 --
 gpsd_report.c        |  2 --
 gpsdclient.c         |  4 ----
 gpsdecode.c          |  5 -----
 gpsmon.c             | 10 ----------
 gpspipe.c            |  5 -----
 gpsutils.c           |  4 ----
 gpxlogger.c          |  5 -----
 hex.c                |  3 ---
 isgps.c              |  4 ----
 lcdgps.c             |  5 -----
 libgps_core.c        |  3 ---
 libgps_json.c        |  2 --
 monitor_italk.c      |  8 --------
 monitor_nmea.c       |  6 ------
 monitor_superstar2.c |  8 --------
 monitor_tnt.c        |  9 ---------
 monitor_ubx.c        |  7 -------
 net_dgpsip.c         |  5 -----
 net_gnss_dispatch.c  |  1 -
 net_ntrip.c          |  3 ---
 netlib.c             |  1 -
 ntpshm.c             |  2 --
 packet.c             |  2 --
 pseudonmea.c         |  5 -----
 rtcm2_json.c         |  2 --
 serial.c             |  5 -----
 shared_json.c        |  4 ----
 srecord.c            |  2 --
 strl.c               |  2 --
 subframe.c           |  1 -
 test_geoid.c         |  3 ---
 test_gpsmm.cpp       |  2 --
 test_mkgmtime.c      |  3 ---
 test_packet.c        |  5 -----
 50 files changed, 208 deletions(-)

diff --git a/Tachometer.c b/Tachometer.c
index 5e913527..d9a69ab2 100644
--- a/Tachometer.c
+++ b/Tachometer.c
@@ -9,7 +9,6 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <sys/types.h>
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <TachometerP.h>
diff --git a/ais_json.c b/ais_json.c
index 22fa9bd8..8e7eabd3 100644
--- a/ais_json.c
+++ b/ais_json.c
@@ -9,12 +9,8 @@ representations to libgps structures.
 
 ***************************************************************************/
 
-#include <math.h>
-#include <assert.h>
 #include <string.h>
-#include <stddef.h>
 #include <stdlib.h>
-#include <stdio.h>
 
 #include "gpsd.h"
 #include "gps_json.h"
diff --git a/cgps.c b/cgps.c
index f52f6c11..0e878c31 100644
--- a/cgps.c
+++ b/cgps.c
@@ -78,21 +78,14 @@
 /* This is the maximum size we need for the 'satellites' window. */
 #define MAX_SATWIN_SIZE (MAX_POSSIBLE_SATS + SATWIN_OVERHEAD)
 
-#include <sys/types.h>
-#include <sys/select.h>
 #ifndef S_SPLINT_S
 #include <sys/socket.h>
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <math.h>
 #include <errno.h>
-#include <assert.h>
-#include <signal.h>
-#include <stdbool.h>
 
 #include "gpsd_config.h"
 #ifdef HAVE_NCURSES_H
diff --git a/driver_garmin.c b/driver_garmin.c
index 6071b507..9fe0e1e3 100644
--- a/driver_garmin.c
+++ b/driver_garmin.c
@@ -78,11 +78,7 @@
  */
 
 #define __USE_POSIX199309 1
-#include <sys/types.h>
-#include <time.h>		// for nanosleep()
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <math.h>
 
 #include <string.h>
@@ -90,7 +86,6 @@
 #include <unistd.h>
 #endif /* S_SPLINT_S */
 #include <errno.h>
-#include <inttypes.h>
 
 #include "gpsd_config.h"
 #if defined (HAVE_SYS_SELECT_H)
@@ -106,7 +101,6 @@
 #endif
 
 #include "gpsd.h"
-#include "gps.h"
 
 #ifdef GARMIN_ENABLE
 
diff --git a/driver_garmin_txt.c b/driver_garmin_txt.c
index cec33148..47532c4b 100644
--- a/driver_garmin_txt.c
+++ b/driver_garmin_txt.c
@@ -106,9 +106,7 @@ invalid data.
 
 ***************************************************/
 
-#include <sys/types.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 
@@ -116,8 +114,6 @@ invalid data.
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <errno.h>
-#include <inttypes.h>
 
 #include "gpsd_config.h"
 #if defined (HAVE_SYS_SELECT_H)
@@ -129,7 +125,6 @@ invalid data.
 #endif
 
 #include "gpsd.h"
-#include "gps.h"
 #include "timebase.h"
 
 #ifdef GARMINTXT_ENABLE
diff --git a/driver_geostar.c b/driver_geostar.c
index c9b7f60f..14710b79 100644
--- a/driver_geostar.c
+++ b/driver_geostar.c
@@ -10,13 +10,9 @@
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <math.h>
 #include "gpsd_config.h"
 
 #if defined (HAVE_SYS_SELECT_H)
@@ -26,8 +22,6 @@
 #include <sys/time.h>
 #endif
 
-#include "gpsd.h"
-#include "bits.h"
 
 #ifdef GEOSTAR_ENABLE
 #define GEOSTAR_CHANNELS	24
diff --git a/driver_nmea.c b/driver_nmea.c
index 7155d6b7..a3e4f426 100644
--- a/driver_nmea.c
+++ b/driver_nmea.c
@@ -2,8 +2,6 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <sys/types.h>
-#include <stdio.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
@@ -11,8 +9,6 @@
 #include <math.h>
 #include <string.h>
 #include <stdarg.h>
-#include <ctype.h>
-#include <time.h>
 
 #include "gpsd.h"
 #include "timebase.h"
diff --git a/driver_proto.c b/driver_proto.c
index c13d3621..98cc8a1b 100644
--- a/driver_proto.c
+++ b/driver_proto.c
@@ -34,19 +34,10 @@
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <ctype.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <time.h>
-#include <stdio.h>
 
-#include "gpsd.h"
 #if defined(_PROTO__ENABLE) && defined(BINARY_ENABLE)
 
 #include "bits.h"
diff --git a/driver_rtcm2.c b/driver_rtcm2.c
index a8941df4..1259c290 100644
--- a/driver_rtcm2.c
+++ b/driver_rtcm2.c
@@ -52,15 +52,10 @@ BSD terms apply: see the file COPYING in the distribution root for details.
 
 *****************************************************************************/
 
-#include <sys/types.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <math.h>		/* for round() */
 
 #include "gpsd.h"
 #include "driver_rtcm2.h"
diff --git a/driver_rtcm3.c b/driver_rtcm3.c
index a46a55b9..90c734e9 100644
--- a/driver_rtcm3.c
+++ b/driver_rtcm3.c
@@ -27,14 +27,10 @@ BSD terms apply: see the file COPYING in the distribution root for details.
 
 *****************************************************************************/
 
-#include <sys/types.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
-#include <stdio.h>
 #include <assert.h>
 #include "gpsd_config.h"
 #ifndef S_SPLINT_S
diff --git a/driver_tsip.c b/driver_tsip.c
index fd1ef316..8d894c4e 100644
--- a/driver_tsip.c
+++ b/driver_tsip.c
@@ -5,8 +5,6 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <sys/types.h>
-#include <stdio.h>
 #include <string.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
diff --git a/drivers.c b/drivers.c
index 5186e95f..abfc6962 100644
--- a/drivers.c
+++ b/drivers.c
@@ -7,15 +7,11 @@
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif /* HAVE_SYS_IOCTL_H */
-#include <sys/time.h>
 #include <stdlib.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
 #include <string.h>
-#include <errno.h>
-#include <stdio.h>
-#include <math.h>
 #include <stdarg.h>
 
 #include "gpsd.h"
diff --git a/geoid.c b/geoid.c
index a64c5f08..7801345a 100644
--- a/geoid.c
+++ b/geoid.c
@@ -8,7 +8,6 @@
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 
-#include <sys/types.h>
 #include <math.h>
 #include "gpsd.h"
 
diff --git a/gpsctl.c b/gpsctl.c
index 09b23c04..1c3f5218 100644
--- a/gpsctl.c
+++ b/gpsctl.c
@@ -4,9 +4,7 @@
  * BSD terms apply: see the file COPYING in the distribution root for details.
  *
  */
-#include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include "gpsd_config.h"
 #if HAVE_SYS_IOCTL_H
  #include <sys/ioctl.h>
@@ -14,12 +12,10 @@
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdbool.h>
 #include <string.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <assert.h>
-#include <signal.h>
 
 #include "gpsd.h"
 #include "revision.h"
diff --git a/gpsd.c b/gpsd.c
index fba47e25..9fbacb1b 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -7,18 +7,14 @@
  */
 #include <stdlib.h>
 #include "gpsd_config.h"
-#include <sys/types.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 #endif /* HAVE_SYSLOG_H */
-#include <signal.h>
 #include <errno.h>
-#include <ctype.h>
 #include <fcntl.h>
-#include <string.h>
 #ifndef S_SPLINT_S
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
@@ -40,7 +36,6 @@
 #endif /* S_SPLINT_S */
 #include <stdarg.h>
 #include <setjmp.h>
-#include <stdio.h>
 #include <assert.h>
 #ifdef HAVE_PWD_H
 #include <pwd.h>
@@ -48,7 +43,6 @@
 #ifdef HAVE_GRP_H
 #include <grp.h>
 #endif /* HAVE_GRP_H */
-#include <stdbool.h>
 #include <math.h>
 
 #if defined (HAVE_PATH_H)
diff --git a/gpsd_json.c b/gpsd_json.c
index 45456bf1..5055e3b5 100644
--- a/gpsd_json.c
+++ b/gpsd_json.c
@@ -17,8 +17,6 @@ PERMISSIONS
 #include <math.h>
 #include <assert.h>
 #include <string.h>
-#include <stdio.h>
-#include <ctype.h>
 
 #include "gpsd.h"
 #include "gps_json.h"
diff --git a/gpsd_report.c b/gpsd_report.c
index 956b5f0b..f1c89704 100644
--- a/gpsd_report.c
+++ b/gpsd_report.c
@@ -2,8 +2,6 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <sys/types.h>
-#include <stdio.h>
 #include <stdarg.h>
 #include "gpsd.h"
 
diff --git a/gpsdclient.c b/gpsdclient.c
index 4e991232..2dd75e63 100644
--- a/gpsdclient.c
+++ b/gpsdclient.c
@@ -4,15 +4,11 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <sys/time.h>
-#include <stdio.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <stdarg.h>
 #include <math.h>
 #include <assert.h>
 
diff --git a/gpsdecode.c b/gpsdecode.c
index b0212656..6d985202 100644
--- a/gpsdecode.c
+++ b/gpsdecode.c
@@ -2,17 +2,12 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <sys/types.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
 #include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
-#include <stdio.h>
 #include <stdarg.h>
-#include <stdbool.h>
-#include <ctype.h>
 
 #include "gpsd.h"
 #include "gps_json.h"
diff --git a/gpsmon.c b/gpsmon.c
index 8a7aaa33..35d0f155 100644
--- a/gpsmon.c
+++ b/gpsmon.c
@@ -4,29 +4,20 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <sys/types.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 #include <ctype.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
 #include <assert.h>
-#include <signal.h>
 #include <setjmp.h>
 /* Cygwin has only _timezone and not timezone unless the following is set */
 #if defined(__CYGWIN__)
 #define timezonevar
 #endif /* defined(__CYGWIN__) */
-#include <time.h>
-#include <termios.h>
 #include <fcntl.h>		/* for O_RDWR */
-#include <stdarg.h>
-#include <stdbool.h>
 #include <errno.h>
-#include <sys/ioctl.h>		/* for O_RDWR */
 #include <setjmp.h>
 
 #include "gpsd_config.h"
@@ -42,7 +33,6 @@
 #endif /* HAVE_NCURSES_H */
 #include "gpsd.h"
 
-#include "bits.h"
 
 #if defined(HAVE_SYS_TIME_H)
 #include <sys/time.h>
diff --git a/gpspipe.c b/gpspipe.c
index 4a3bf910..90c70a38 100644
--- a/gpspipe.c
+++ b/gpspipe.c
@@ -24,10 +24,7 @@
  */
 
 #include <stdlib.h>
-#include <time.h>
 #include "gpsd_config.h"
-#include <sys/types.h>
-#include <sys/stat.h>
 #ifndef S_SPLINT_S
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
@@ -35,9 +32,7 @@
 #include <unistd.h>
 #endif /* S_SPLINT_S */
 #include <errno.h>
-#include <stdio.h>
 #include <string.h>
-#include <stdbool.h>
 #include <fcntl.h>
 #if HAVE_TERMIOS
 #include <termios.h>
diff --git a/gpsutils.c b/gpsutils.c
index 92cb61d8..cb331ffd 100644
--- a/gpsutils.c
+++ b/gpsutils.c
@@ -3,16 +3,12 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <sys/types.h>
-#include <stdio.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <stdarg.h>
-#include <time.h>
 
 #include "gpsd.h"
 
diff --git a/gpxlogger.c b/gpxlogger.c
index f73af5ab..8207a489 100644
--- a/gpxlogger.c
+++ b/gpxlogger.c
@@ -4,16 +4,11 @@
  */
 #include <stdlib.h>
 #include "gpsd_config.h"
-#include <sys/types.h>
 #include <string.h>
-#include <stdio.h>
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 #endif /* HAVE_SYSLOG_H */
 #include <math.h>
-#include <time.h>
-#include <signal.h>
-#include <getopt.h>
 #include <errno.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
diff --git a/hex.c b/hex.c
index 7a7a2331..bd44acc1 100644
--- a/hex.c
+++ b/hex.c
@@ -5,9 +5,6 @@
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
 #include <string.h>
 
 #include "gpsd.h"
diff --git a/isgps.c b/isgps.c
index db13d430..e1aea7c0 100644
--- a/isgps.c
+++ b/isgps.c
@@ -58,13 +58,9 @@ BSD terms apply: see the file COPYING in the distribution root for details.
 
 *****************************************************************************/
 
-#include <sys/types.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
 
 #include "gpsd.h"
 
diff --git a/lcdgps.c b/lcdgps.c
index c235551d..265ca32c 100644
--- a/lcdgps.c
+++ b/lcdgps.c
@@ -36,9 +36,7 @@
 
 #include <stdlib.h>
 #include "gpsd_config.h"
-#include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
@@ -53,8 +51,6 @@
  #endif /* HAVE_SYS_SOCKET_H */
 #endif /* S_SPLINT_S */
 
-#include <sys/time.h> /* select() */
-#include <sys/stat.h>
 #include <fcntl.h>
 #ifdef HAVE_TERMIOS_H
  #include <termios.h>
@@ -73,7 +69,6 @@
 #endif /* S_SPLINT_S */
 #include <errno.h>
 
-#include <signal.h>
 
 #include "gps.h"
 #include "gpsdclient.h"
diff --git a/libgps_core.c b/libgps_core.c
index f0a52b35..c7a6ec6a 100644
--- a/libgps_core.c
+++ b/libgps_core.c
@@ -3,12 +3,9 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <sys/time.h>
-#include <stdio.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <sys/types.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/libgps_json.c b/libgps_json.c
index eaa056c0..c38b84f7 100644
--- a/libgps_json.c
+++ b/libgps_json.c
@@ -15,10 +15,8 @@ PERMISSIONS
 ***************************************************************************/
 
 #include <math.h>
-#include <assert.h>
 #include <string.h>
 #include <stddef.h>
-#include <stdio.h>
 
 #include "gpsd.h"
 #include "gps_json.h"
diff --git a/monitor_italk.c b/monitor_italk.c
index a945bdd4..d4d912e2 100644
--- a/monitor_italk.c
+++ b/monitor_italk.c
@@ -2,17 +2,9 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <ctype.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdarg.h>
-#include <stdbool.h>
-#include <assert.h>
 
 #include "gpsd_config.h"
 
diff --git a/monitor_nmea.c b/monitor_nmea.c
index 62ac248a..c6c63932 100644
--- a/monitor_nmea.c
+++ b/monitor_nmea.c
@@ -6,16 +6,11 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <ctype.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdarg.h>
-#include <stdbool.h>
 #include <assert.h>
 
 #include "gpsd_config.h"
@@ -27,7 +22,6 @@
 #endif /* HAVE_NCURSES_H */
 #include "gpsd.h"
 
-#include "bits.h"
 #include "gpsmon.h"
 #include "gpsdclient.h"
 
diff --git a/monitor_superstar2.c b/monitor_superstar2.c
index 340f59f8..91576380 100644
--- a/monitor_superstar2.c
+++ b/monitor_superstar2.c
@@ -2,17 +2,9 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <ctype.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdarg.h>
-#include <stdbool.h>
-#include <assert.h>
 
 #include "gpsd_config.h"
 
diff --git a/monitor_tnt.c b/monitor_tnt.c
index b8d81606..6732db9c 100644
--- a/monitor_tnt.c
+++ b/monitor_tnt.c
@@ -4,17 +4,9 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <ctype.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdarg.h>
-#include <stdbool.h>
-#include <assert.h>
 
 #include "gpsd_config.h"
 
@@ -25,7 +17,6 @@
 #endif /* HAVE_NCURSES_H */
 #include "gpsd.h"
 
-#include "bits.h"
 #include "gpsmon.h"
 
 #ifdef TNT_ENABLE
diff --git a/monitor_ubx.c b/monitor_ubx.c
index c707c23c..f5839f74 100644
--- a/monitor_ubx.c
+++ b/monitor_ubx.c
@@ -2,17 +2,10 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <math.h>
-#include <ctype.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdarg.h>
-#include <stdbool.h>
-#include <assert.h>
 
 #include "gpsd_config.h"
 
diff --git a/net_dgpsip.c b/net_dgpsip.c
index 92eb5a28..e949c191 100644
--- a/net_dgpsip.c
+++ b/net_dgpsip.c
@@ -5,7 +5,6 @@
  */
 #include <stdlib.h>
 #include "gpsd_config.h"
-#include <sys/types.h>
 #ifndef S_SPLINT_S
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
@@ -14,16 +13,12 @@
 #endif /* HAVE_SYS_SOCKET_H */
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <sys/time.h>
-#include <stdio.h>
-#include <math.h>
 #ifndef S_SPLINT_S
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif /* HAVE_NETDB_H */
 #endif /* S_SPLINT_S */
 #include <string.h>
-#include <errno.h>
 #include <fcntl.h>
 
 #include "gpsd.h"
diff --git a/net_gnss_dispatch.c b/net_gnss_dispatch.c
index 064247e6..96009aeb 100644
--- a/net_gnss_dispatch.c
+++ b/net_gnss_dispatch.c
@@ -6,7 +6,6 @@
 
 #include <stdlib.h>
 #include "gpsd_config.h"
-#include <sys/types.h>
 #ifndef S_SPLINT_S
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
diff --git a/net_ntrip.c b/net_ntrip.c
index 37ba1ac0..390bcc51 100644
--- a/net_ntrip.c
+++ b/net_ntrip.c
@@ -5,7 +5,6 @@
  */
 #include <stdlib.h>
 #include "gpsd_config.h"
-#include <sys/types.h>
 #ifndef S_SPLINT_S
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
@@ -14,8 +13,6 @@
 #endif /* HAVE_SYS_SOCKET_H */
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <sys/time.h>
-#include <stdio.h>
 #include <math.h>
 #ifndef S_SPLINT_S
 #ifdef HAVE_NETDB_H
diff --git a/netlib.c b/netlib.c
index d10a34a6..156da472 100644
--- a/netlib.c
+++ b/netlib.c
@@ -29,7 +29,6 @@
 #endif /* HAVE_ARPA_INET_H */
 #endif /* S_SPLINT_S */
 #include <errno.h>
-#include <stdlib.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
diff --git a/ntpshm.c b/ntpshm.c
index 1f854262..5e636db7 100644
--- a/ntpshm.c
+++ b/ntpshm.c
@@ -9,11 +9,9 @@
 
 #include <stdlib.h>
 #include "gpsd_config.h"
-#include <sys/types.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdio.h>
 #include <string.h>
 #include <math.h>
 #include <errno.h>
diff --git a/packet.c b/packet.c
index c8c57dc5..bccda37f 100644
--- a/packet.c
+++ b/packet.c
@@ -29,9 +29,7 @@ PERMISSIONS
 ***************************************************************************/
 #include <stdlib.h>
 #include "gpsd_config.h"
-#include <sys/types.h>
 #include <ctype.h>
-#include <stdio.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
diff --git a/pseudonmea.c b/pseudonmea.c
index 22f61f3e..bedb8bcc 100644
--- a/pseudonmea.c
+++ b/pseudonmea.c
@@ -4,7 +4,6 @@
  */
 #include <stdlib.h>
 #include "gpsd_config.h"
-#include <sys/time.h>
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif /* HAVE_SYS_IOCTL_H */
@@ -14,8 +13,6 @@
 #endif /* HAVE_SYS_SOCKET_H */
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <sys/time.h>
-#include <stdio.h>
 #include <math.h>
 #ifndef S_SPLINT_S
 #ifdef HAVE_NETDB_H
@@ -23,8 +20,6 @@
 #endif /* HAVE_NETDB_H */
 #endif /* S_SPLINT_S */
 #include <string.h>
-#include <errno.h>
-#include <fcntl.h>
 
 #include "gpsd.h"
 
diff --git a/rtcm2_json.c b/rtcm2_json.c
index 87a450fc..cbea57c8 100644
--- a/rtcm2_json.c
+++ b/rtcm2_json.c
@@ -14,10 +14,8 @@ PERMISSIONS
 ***************************************************************************/
 
 #include <math.h>
-#include <assert.h>
 #include <string.h>
 #include <stddef.h>
-#include <stdio.h>
 
 #include "gpsd.h"
 #include "gps_json.h"
diff --git a/serial.c b/serial.c
index 28c6befc..99b4ffa8 100644
--- a/serial.c
+++ b/serial.c
@@ -2,21 +2,16 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <sys/types.h>
-#include <sys/stat.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <ctype.h>
 
 #include "gpsd_config.h"
 
 #ifdef HAVE_BLUEZ
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/socket.h>
 
 #include <bluetooth/bluetooth.h>
diff --git a/shared_json.c b/shared_json.c
index f7a2f9f3..bdcdeef0 100644
--- a/shared_json.c
+++ b/shared_json.c
@@ -16,10 +16,6 @@ PERMISSIONS
 ***************************************************************************/
 
 #include <math.h>
-#include <assert.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
 
 #include "gpsd.h"
 #include "gps_json.h"
diff --git a/srecord.c b/srecord.c
index 259e0f31..18273f12 100644
--- a/srecord.c
+++ b/srecord.c
@@ -13,8 +13,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#include <sys/types.h>
-#include <stdio.h>
 #include <string.h>
 
 #include "gpsd.h"
diff --git a/strl.c b/strl.c
index 0111bf14..200f472a 100644
--- a/strl.c
+++ b/strl.c
@@ -2,11 +2,9 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <stdio.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <stdlib.h>
 #include <string.h>
 #include "gpsd_config.h"
 
diff --git a/subframe.c b/subframe.c
index 6eb2a9d7..e00b6496 100644
--- a/subframe.c
+++ b/subframe.c
@@ -3,7 +3,6 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <sys/types.h>
 
 #include "gpsd.h"
 #include "timebase.h"
diff --git a/test_geoid.c b/test_geoid.c
index a95bbc52..4b4e7fe6 100644
--- a/test_geoid.c
+++ b/test_geoid.c
@@ -4,9 +4,6 @@
  * BSD terms apply: see the file COPYING in the distribution root for details. 
  */
 
-#include <sys/types.h>
-#include <math.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "gpsd.h"
diff --git a/test_gpsmm.cpp b/test_gpsmm.cpp
index f30fdfa6..daf28081 100644
--- a/test_gpsmm.cpp
+++ b/test_gpsmm.cpp
@@ -8,8 +8,6 @@
 
 /* This simple program shows the basic functionality of the C++ wrapper class */
 #include <iostream>
-#include <string>
-#include <unistd.h>
 
 #include "libgpsmm.h"
 
diff --git a/test_mkgmtime.c b/test_mkgmtime.c
index 4ff71479..d8407003 100644
--- a/test_mkgmtime.c
+++ b/test_mkgmtime.c
@@ -2,10 +2,7 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#include <time.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
 
 #include "gps.h"
 
diff --git a/test_packet.c b/test_packet.c
index d9109d64..802f7d56 100644
--- a/test_packet.c
+++ b/test_packet.c
@@ -3,16 +3,11 @@
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 #include <stdlib.h>
-#include <ctype.h>
-#include <stdio.h>
 #include <string.h>
-#include <errno.h>
 #include <stdarg.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 
 #include "gpsd.h"
-- 
cgit v1.2.1