More deheaderizing. All regression tests pass.

13 files changed, 2 insertions, 63 deletions

diff --git a/Makefile.am b/Makefile.am
index 53daa28f..4e9e8d82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -652,7 +652,7 @@ xmllint: $(XML)
 
 # Use deheader to remove headers not required
 deheader:
-	deheader -r -i gpsd_config.h -m "MORECFLAGS='-Werror -Wfatal-errors' make -e"
+	deheader -r -i gpsd_config.h -i gpsd.h -m "MORECFLAGS='-Werror -Wfatal-errors' make -e"
 
 # Re-indent the codebase in a uniform style for readability.
 INDENT_FILES = $(gpsd_c_sources) $(libgpsd_c_sources) $(libgps_c_sources) \
diff --git a/driver_evermore.c b/driver_evermore.c
index 39706faa..e035b77b 100644
--- a/driver_evermore.c
+++ b/driver_evermore.c
@@ -114,17 +114,11 @@
  * 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(EVERMORE_ENABLE) && defined(BINARY_ENABLE)
diff --git a/driver_italk.c b/driver_italk.c
index 847adb04..2a5f15cc 100644
--- a/driver_italk.c
+++ b/driver_italk.c
@@ -4,17 +4,11 @@
  *
  * Driver for the iTalk binary protocol used by FasTrax
  */
-#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(ITRAX_ENABLE) && defined(BINARY_ENABLE)
diff --git a/driver_navcom.c b/driver_navcom.c
index 60d65d8f..8a43a5dd 100644
--- a/driver_navcom.c
+++ b/driver_navcom.c
@@ -30,18 +30,11 @@
  * 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 <time.h>
-#include <sys/types.h>
-#include <inttypes.h>
-#include <stdio.h>
 #include "gpsd.h"
 
 #if defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE)
diff --git a/driver_oncore.c b/driver_oncore.c
index 5be86724..a72820d1 100644
--- a/driver_oncore.c
+++ b/driver_oncore.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 <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(ONCORE_ENABLE) && defined(BINARY_ENABLE)
diff --git a/driver_sirf.c b/driver_sirf.c
index d6f61eef..cba1abf2 100644
--- a/driver_sirf.c
+++ b/driver_sirf.c
@@ -27,8 +27,6 @@
  * 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>
@@ -36,8 +34,6 @@
 #ifndef S_SPLINT_S
 #include <unistd.h>
 #endif /* S_SPLINT_S */
-#include <time.h>
-#include <stdio.h>
 
 #include "gpsd.h"
 #include "bits.h"
diff --git a/driver_superstar2.c b/driver_superstar2.c
index 03bab599..d91ba940 100644
--- a/driver_superstar2.c
+++ b/driver_superstar2.c
@@ -6,16 +6,11 @@
 
 #include "gpsd_config.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"
 
diff --git a/driver_ubx.c b/driver_ubx.c
index f9324177..96829cc5 100644
--- a/driver_ubx.c
+++ b/driver_ubx.c
@@ -6,17 +6,11 @@
  *
  */
 
-#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 <assert.h>
 
 #include "gpsd.h"
diff --git a/driver_zodiac.c b/driver_zodiac.c
index 96900a34..7525586c 100644
--- a/driver_zodiac.c
+++ b/driver_zodiac.c
@@ -4,9 +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.
  */
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #ifndef S_SPLINT_S
 #include <unistd.h>
diff --git a/libgpsd_core.c b/libgpsd_core.c
index b2a2bb56..49cf9335 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -5,7 +5,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 */
@@ -17,8 +16,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
@@ -26,8 +23,6 @@
 #endif /* HAVE_NETDB_H */
 #endif /* S_SPLINT_S */
 #include <string.h>
-#include <errno.h>
-#include <fcntl.h>
 
 #include "gpsd.h"
 
diff --git a/monitor_oncore.c b/monitor_oncore.c
index 6c29c5ab..1c58a97c 100644
--- a/monitor_oncore.c
+++ b/monitor_oncore.c
@@ -4,16 +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 <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_sirf.c b/monitor_sirf.c
index 09b38bff..77468b10 100644
--- a/monitor_sirf.c
+++ b/monitor_sirf.c
@@ -5,16 +5,12 @@
  * 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/test_json.c b/test_json.c
index b656c4b0..62bd9c90 100644
--- a/test_json.c
+++ b/test_json.c
@@ -5,15 +5,13 @@
  */
 
 #include <assert.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
 #include <string.h>
+#include <stddef.h>
 
 #include "gpsd.h"
 #include "gps_json.h"
 
-#include "strl.c"
 
 static void assert_case(int num, int status)
 {