More header portability auditing by deheader.

23 files changed, 28 insertions, 52 deletions

diff --git a/bits.c b/bits.c
index ba546f9d..a7e68ddb 100644
--- a/bits.c
+++ b/bits.c
@@ -3,8 +3,8 @@
  * This file is Copyright (c)2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  *
- * Bitfield extraction functions.  In each, start is a bit index (not
- * a byte index) and width is a bit width.  The width bounded above by
+ * Bitfield extraction functions.  In each, start is a bit index  - not
+ * a byte index - and width is a bit width.  The width bounded above by
  * the bit width of a long long, which is 64 bits in all standard data
  * models for 32- and 64-bit processors.
  *
diff --git a/driver_aivdm.c b/driver_aivdm.c
index 31acc775..11bd6aa5 100644
--- a/driver_aivdm.c
+++ b/driver_aivdm.c
@@ -10,16 +10,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/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 "gpsd.h"
 #include "bits.h"
diff --git a/driver_evermore.c b/driver_evermore.c
index 97c7629f..0a29572e 100644
--- a/driver_evermore.c
+++ b/driver_evermore.c
@@ -114,6 +114,7 @@
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <math.h>
 #ifndef S_SPLINT_S
diff --git a/driver_garmin.c b/driver_garmin.c
index f37bda10..d1629aee 100644
--- a/driver_garmin.c
+++ b/driver_garmin.c
@@ -79,9 +79,11 @@
 
 #define __USE_POSIX199309 1
 
+#include <stdio.h>
 #include <math.h>
 #include <string.h>
 #include <errno.h>
+#include <time.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
diff --git a/driver_garmin_txt.c b/driver_garmin_txt.c
index 6675d001..e9e5e3ce 100644
--- a/driver_garmin_txt.c
+++ b/driver_garmin_txt.c
@@ -110,12 +110,12 @@ invalid data.
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
+#include <strings.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
 
 #include "gpsd.h"
-#include "timebase.h"
 
 #ifdef GARMINTXT_ENABLE
 
diff --git a/driver_geostar.c b/driver_geostar.c
index ccaa04ca..1817ba5f 100644
--- a/driver_geostar.c
+++ b/driver_geostar.c
@@ -14,9 +14,6 @@
 #include <sys/time.h>		/* for select() */
 #include <math.h>
 #include <string.h>
-#ifndef S_SPLINT_S
-#include <unistd.h>
-#endif /* S_SPLINT_S */
 
 #include "gpsd.h"
 #include "bits.h"
diff --git a/driver_navcom.c b/driver_navcom.c
index 237bcc50..ed502e79 100644
--- a/driver_navcom.c
+++ b/driver_navcom.c
@@ -30,11 +30,9 @@
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <math.h>
-#ifndef S_SPLINT_S
-#include <unistd.h>
-#endif /* S_SPLINT_S */
 #include "gpsd.h"
 
 #if defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE)
diff --git a/driver_rtcm2.c b/driver_rtcm2.c
index 1259c290..883e31d7 100644
--- a/driver_rtcm2.c
+++ b/driver_rtcm2.c
@@ -52,10 +52,11 @@ BSD terms apply: see the file COPYING in the distribution root for details.
 
 *****************************************************************************/
 
+#include <stdio.h>
+#include <string.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <string.h>
 
 #include "gpsd.h"
 #include "driver_rtcm2.h"
diff --git a/driver_rtcm3.c b/driver_rtcm3.c
index 90c734e9..cd0fb938 100644
--- a/driver_rtcm3.c
+++ b/driver_rtcm3.c
@@ -27,16 +27,12 @@ BSD terms apply: see the file COPYING in the distribution root for details.
 
 *****************************************************************************/
 
-#ifndef S_SPLINT_S
-#include <unistd.h>
-#endif /* S_SPLINT_S */
+#include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include "gpsd_config.h"
 #ifndef S_SPLINT_S
-#ifdef HAVE_ARPA_INET
 #include <arpa/inet.h>		/* for ntohl(3) and friends */
-#endif /* HAVE_ARPA_INET */
 #endif /* S_SPLINT_S */
 
 #include "gpsd.h"
diff --git a/driver_zodiac.c b/driver_zodiac.c
index e88d9e23..1caeeb4e 100644
--- a/driver_zodiac.c
+++ b/driver_zodiac.c
@@ -4,13 +4,14 @@
  * 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 <string.h>
+#include <math.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <math.h>
-#include "gpsd.h"
 
+#include "gpsd.h"
 #include "bits.h"
 
 #ifdef ZODIAC_ENABLE
diff --git a/drivers.c b/drivers.c
index 6d89bd01..76b75ecf 100644
--- a/drivers.c
+++ b/drivers.c
@@ -2,7 +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 <sys/types.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/gpsmon.c b/gpsmon.c
index 566c1fc7..03e3c173 100644
--- a/gpsmon.c
+++ b/gpsmon.c
@@ -11,6 +11,9 @@
 #include <setjmp.h>
 #include <fcntl.h>		/* for O_RDWR */
 #include <errno.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <time.h>
 #include <sys/time.h>		/* expected to declare select(2) a la SuS */
 #ifndef S_SPLINT_S
 #include <unistd.h>
diff --git a/gpspipe.c b/gpspipe.c
index 8df4a85d..3ffaef36 100644
--- a/gpspipe.c
+++ b/gpspipe.c
@@ -25,12 +25,16 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
+#include <strings.h>
 #include <fcntl.h>
 #include <termios.h>
 #include <assert.h>
+#include <signal.h>
+#include <time.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
diff --git a/gpsutils.c b/gpsutils.c
index 8a63ee4e..6a7dc295 100644
--- a/gpsutils.c
+++ b/gpsutils.c
@@ -3,12 +3,8 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#ifndef S_SPLINT_S
-#include <unistd.h>
-#endif /* S_SPLINT_S */
 #include <stdlib.h>
 #include <math.h>
-#include <string.h>
 
 #include "gpsd.h"
 
diff --git a/isgps.c b/isgps.c
index e1aea7c0..5d8af4af 100644
--- a/isgps.c
+++ b/isgps.c
@@ -58,10 +58,6 @@ BSD terms apply: see the file COPYING in the distribution root for details.
 
 *****************************************************************************/
 
-#ifndef S_SPLINT_S
-#include <unistd.h>
-#endif /* S_SPLINT_S */
-
 #include "gpsd.h"
 
 #define MAG_SHIFT 6u
diff --git a/libgpsd_core.c b/libgpsd_core.c
index 5f4d8bdf..87c55e28 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
 #ifndef S_SPLINT_S
diff --git a/monitor_sirf.c b/monitor_sirf.c
index b25ffa91..5ffcf5fc 100644
--- a/monitor_sirf.c
+++ b/monitor_sirf.c
@@ -9,9 +9,8 @@
 #include <string.h>
 #include <math.h>
 #include <assert.h>
-#ifndef S_SPLINT_S
-#include <unistd.h>
-#endif /* S_SPLINT_S */
+#include <time.h>
+#include <sys/time.h>
 
 #include "gpsd.h"
 #include "bits.h"
diff --git a/monitor_superstar2.c b/monitor_superstar2.c
index ade795c2..58c1b1af 100644
--- a/monitor_superstar2.c
+++ b/monitor_superstar2.c
@@ -2,10 +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.
  */
-#ifndef S_SPLINT_S
-#include <unistd.h>
-#endif /* S_SPLINT_S */
-
 #include "gpsd.h"
 #include "bits.h"
 #include "gpsmon.h"
diff --git a/monitor_tnt.c b/monitor_tnt.c
index 890644d8..490f3fd9 100644
--- a/monitor_tnt.c
+++ b/monitor_tnt.c
@@ -4,10 +4,6 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#ifndef S_SPLINT_S
-#include <unistd.h>
-#endif /* S_SPLINT_S */
-
 #include "gpsd.h"
 #include "gpsmon.h"
 
diff --git a/monitor_ubx.c b/monitor_ubx.c
index 7fd74439..4015223f 100644
--- a/monitor_ubx.c
+++ b/monitor_ubx.c
@@ -3,9 +3,6 @@
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 #include <math.h>
-#ifndef S_SPLINT_S
-#include <unistd.h>
-#endif /* S_SPLINT_S */
 
 #include "gpsd.h"
 #include "bits.h"
diff --git a/net_gnss_dispatch.c b/net_gnss_dispatch.c
index 67711a51..f957454c 100644
--- a/net_gnss_dispatch.c
+++ b/net_gnss_dispatch.c
@@ -7,6 +7,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #ifndef S_SPLINT_S
 #include <sys/socket.h>
 #include <unistd.h>
diff --git a/pseudonmea.c b/pseudonmea.c
index cb322004..99979b10 100644
--- a/pseudonmea.c
+++ b/pseudonmea.c
@@ -2,12 +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 <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <math.h>
-#ifndef S_SPLINT_S
-#include <unistd.h>
-#endif /* S_SPLINT_S */
+#include <time.h>
 
 #include "gpsd.h"
 
diff --git a/test_json.c b/test_json.c
index 62bd9c90..e5f3f185 100644
--- a/test_json.c
+++ b/test_json.c
@@ -4,6 +4,7 @@
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 
+#include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>