Many files:

  * include/ntp_if.h:
  * include/ntp_machine.h:
  * include/ntp_unixtime.h:
  * libntp/humandate.c:
  * libntp/iosignal.c:
  * libntp/mktime.c:
  * libntp/prettydate.c:
  * libntp/systime.c:
  * libntp/tvtoa.c:
  * libntp/uglydate.c:
  * libntp/utvtoa.c:
  * libparse/clk_computime.c:
  * libparse/clk_dcf7000.c:
  * libparse/clk_hopf6021.c:
  * libparse/clk_meinberg.c:
  * libparse/clk_rawdcf.c:
  * libparse/clk_rcc8000.c:
  * libparse/clk_schmid.c:
  * libparse/clk_trimtaip.c:
  * libparse/clk_trimtsip.c:
  * libparse/clk_varitext.c:
  * libparse/parse.c:
  * libparse/parse_conf.c:
  * ntpd/check_y2k.c:
  * ntpd/ntp_config.c:
  * ntpd/ntp_control.c:
  * ntpd/ntp_intres.c:
  * ntpd/ntp_io.c:
  * ntpd/ntp_loopfilter.c:
  * ntpd/ntp_monitor.c:
  * ntpd/ntp_proto.c:
  * ntpd/ntp_refclock.c:
  * ntpd/ntp_request.c:
  * ntpd/ntp_resolver.c:
  * ntpd/ntp_timer.c:
  * ntpd/ntp_util.c:
  * ntpd/ntpd.c:
  * ntpd/refclock_acts.c:
  * ntpd/refclock_arbiter.c:
  * ntpd/refclock_arc.c:
  * ntpd/refclock_as2201.c:
  * ntpd/refclock_atom.c:
  * ntpd/refclock_bancomm.c:
  * ntpd/refclock_chronolog.c:
  * ntpd/refclock_chu.c:
  * ntpd/refclock_datum.c:
  * ntpd/refclock_dumbclock.c:
  * ntpd/refclock_fg.c:
  * ntpd/refclock_gpsvme.c:
  * ntpd/refclock_heath.c:
  * ntpd/refclock_hpgps.c:
  * ntpd/refclock_irig.c:
  * ntpd/refclock_jupiter.c:
  * ntpd/refclock_leitch.c:
  * ntpd/refclock_local.c:
  * ntpd/refclock_msfees.c:
  * ntpd/refclock_mx4200.c:
  * ntpd/refclock_nmea.c:
  * ntpd/refclock_oncore.c:
  * ntpd/refclock_pcf.c:
  * ntpd/refclock_pst.c:
  * ntpd/refclock_shm.c:
  * ntpd/refclock_tpro.c:
  * ntpd/refclock_trak.c:
  * ntpd/refclock_true.c:
  * ntpd/refclock_ulink.c:
  * ntpd/refclock_usno.c:
  * ntpd/refclock_wwv.c:
  * ntpd/refclock_wwvb.c:
  * ntpdate/ntpdate.c:
  * ntpdate/ntptime_config.c:
  * ntpdate/ntptimeset.c:
  * ntpdc/ntpdc.c:
  * ntpdc/ntpdc_ops.c:
  * ntpq/ntpq.c:
  * ntpq/ntpq_ops.c:
  * ntptrace/ntptrace.c:
  * parseutil/testdcf.c:
  * util/hist.c:
  * util/ntp-genkeys.c:
  * util/ntptime.c:
  * util/precision.c:
  * util/tickadj.c:
  time.h and sys/time.h cleanup.

bk: 3abecd6bXaIBhxVvVFEFcf5F5xwWmw

diff --git a/ChangeLog b/ChangeLog
index f986e0921d386a564188bc8c4ad03b4990d95943..76ffc3c2ee3c9f717691f61b48c230b7552cbee6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,90 @@
+2001-03-25  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * include/ntp_if.h: 
+       * include/ntp_machine.h:
+       * include/ntp_unixtime.h: 
+       * libntp/humandate.c: 
+       * libntp/iosignal.c: 
+       * libntp/mktime.c: 
+       * libntp/prettydate.c: 
+       * libntp/systime.c: 
+       * libntp/tvtoa.c: 
+       * libntp/uglydate.c: 
+       * libntp/utvtoa.c: 
+       * libparse/clk_computime.c: 
+       * libparse/clk_dcf7000.c: 
+       * libparse/clk_hopf6021.c: 
+       * libparse/clk_meinberg.c: 
+       * libparse/clk_rawdcf.c: 
+       * libparse/clk_rcc8000.c: 
+       * libparse/clk_schmid.c: 
+       * libparse/clk_trimtaip.c: 
+       * libparse/clk_trimtsip.c: 
+       * libparse/clk_varitext.c: 
+       * libparse/parse.c: 
+       * libparse/parse_conf.c: 
+       * ntpd/check_y2k.c: 
+       * ntpd/ntp_config.c: 
+       * ntpd/ntp_control.c: 
+       * ntpd/ntp_intres.c: 
+       * ntpd/ntp_io.c: 
+       * ntpd/ntp_loopfilter.c: 
+       * ntpd/ntp_monitor.c: 
+       * ntpd/ntp_proto.c: 
+       * ntpd/ntp_refclock.c: 
+       * ntpd/ntp_request.c: 
+       * ntpd/ntp_resolver.c: 
+       * ntpd/ntp_timer.c: 
+       * ntpd/ntp_util.c: 
+       * ntpd/ntpd.c: 
+       * ntpd/refclock_acts.c: 
+       * ntpd/refclock_arbiter.c: 
+       * ntpd/refclock_arc.c: 
+       * ntpd/refclock_as2201.c: 
+       * ntpd/refclock_atom.c: 
+       * ntpd/refclock_bancomm.c: 
+       * ntpd/refclock_chronolog.c: 
+       * ntpd/refclock_chu.c: 
+       * ntpd/refclock_datum.c: 
+       * ntpd/refclock_dumbclock.c: 
+       * ntpd/refclock_fg.c: 
+       * ntpd/refclock_gpsvme.c: 
+       * ntpd/refclock_heath.c: 
+       * ntpd/refclock_hpgps.c: 
+       * ntpd/refclock_irig.c: 
+       * ntpd/refclock_jupiter.c: 
+       * ntpd/refclock_leitch.c: 
+       * ntpd/refclock_local.c: 
+       * ntpd/refclock_msfees.c: 
+       * ntpd/refclock_mx4200.c: 
+       * ntpd/refclock_nmea.c: 
+       * ntpd/refclock_oncore.c: 
+       * ntpd/refclock_pcf.c: 
+       * ntpd/refclock_pst.c: 
+       * ntpd/refclock_shm.c: 
+       * ntpd/refclock_tpro.c: 
+       * ntpd/refclock_trak.c: 
+       * ntpd/refclock_true.c: 
+       * ntpd/refclock_ulink.c: 
+       * ntpd/refclock_usno.c: 
+       * ntpd/refclock_wwv.c: 
+       * ntpd/refclock_wwvb.c: 
+       * ntpdate/ntpdate.c: 
+       * ntpdate/ntptime_config.c: 
+       * ntpdate/ntptimeset.c: 
+       * ntpdc/ntpdc.c: 
+       * ntpdc/ntpdc_ops.c: 
+       * ntpq/ntpq.c: 
+       * ntpq/ntpq_ops.c: 
+       * ntptrace/ntptrace.c: 
+       * parseutil/testdcf.c: 
+       * util/hist.c: 
+       * util/ntp-genkeys.c: 
+       * util/ntptime.c: 
+       * util/precision.c: 
+       * util/tickadj.c: 
+       time.h and sys/time.h cleanup.
+
 2001-03-24  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * configure.in: '99k19

diff --git a/include/ntp_if.h b/include/ntp_if.h
index 0be01560123493a95564d64e6522150723959d28..91362d83106ac545ce1b5db9680f796fd916c3f6 100644 (file)
--- a/include/ntp_if.h
+++ b/include/ntp_if.h
@@ -8,12 +8,6 @@
 # include "/sys/sync/sema.h"
 #endif
 
-/* was: defined(SYS_AIX) */
-#if defined(TIME_WITH_SYS_TIME)
-# include <sys/time.h>
-# include <time.h>
-#endif
-
 /* was: (defined(SYS_SOLARIS) && !defined(bsd)) || defined(SYS_SUNOS4) */
 /* was: defined(SYS_UNIXWARE1) */
 #ifdef HAVE_SYS_SOCKIO_H

diff --git a/include/ntp_machine.h b/include/ntp_machine.h
index 4f7f345d8eba03c5ee35e76cd4d1e43952b19e1d..7cac8e1593bfc9231a51492722ae32a960f5307d 100644 (file)
--- a/include/ntp_machine.h
+++ b/include/ntp_machine.h
@@ -6,11 +6,18 @@
 #define __ntp_machine
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
 #endif
 
 #include "ntp_proto.h"

diff --git a/include/ntp_unixtime.h b/include/ntp_unixtime.h
index 9dd23f0e8eda8965f4983f5bd38e46d4474a3695..bdc080e6edd21cde5a486ee6eea221e78bad7491 100644 (file)
--- a/include/ntp_unixtime.h
+++ b/include/ntp_unixtime.h
@@ -5,8 +5,6 @@
 
 #include "ntp_types.h"
 
-#include <sys/time.h>
-
 /* gettimeofday() takes two args in BSD and only one in SYSV */
 # if defined(HAVE_SYS_TIMERS_H) && defined(HAVE_GETCLOCK)
 #  include <sys/timers.h>

diff --git a/libntp/humandate.c b/libntp/humandate.c
index f663c9ea256fe2247edfd4d7390b4f9ea955cb70..7995633be4d325468f8d088c21ad3760fb820e9c 100644 (file)
--- a/libntp/humandate.c
+++ b/libntp/humandate.c
@@ -2,16 +2,11 @@
  * humandate - convert an NTP (or the current) time to something readable
  */
 #include <stdio.h>
-#include "time.h"
 #include "ntp_fp.h"
-#include "ntp_unixtime.h"      /* includes <sys/time.h> */
+#include "ntp_unixtime.h"      /* includes <sys/time.h> and <time.h> */
 #include "lib_strbuf.h"
 #include "ntp_stdlib.h"
 
-#ifdef TIME_WITH_SYS_TIME
-#include <time.h>
-#endif
-
 static const char *months[] = {
        "Jan", "Feb", "Mar", "Apr", "May", "Jun",
        "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"

diff --git a/libntp/iosignal.c b/libntp/iosignal.c
index cb863d4320c5356cd0077453776bbe87b3f4ff95..3c78d48a0ccba04924d7d81a906d4a65b4ce573b 100644 (file)
--- a/libntp/iosignal.c
+++ b/libntp/iosignal.c
@@ -3,44 +3,27 @@
  *                was shamelessly stolen from ntpd.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "ntp_machine.h"
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_if.h"
+#include "ntp_stdlib.h"
+#include "iosignal.h"
 
 #include <stdio.h>
 #include <signal.h>
-#include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif /* HAVE_SYS_PARAM_H */
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#if 0 /* Included by ntp_fp.h */
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#endif
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
-#if 0 /* Included by ntp_if.h below */
-#ifdef HAVE_SYS_SOCKIO_H       /* UXPV: SIOC* #defines (Frank Vance <fvance@waii.com>) */
-# include <sys/sockio.h>
-#endif
-#endif
+
 #include <arpa/inet.h>
 
 #if _BSDI_VERSION >= 199510
 # include <ifaddrs.h>
 #endif
-/*     98/06/01  */
-#include "ntp_machine.h"       /*  98/06/01  */
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_if.h"
-#include "ntp_stdlib.h"
-#include "iosignal.h"
 
 #if defined(HAVE_SIGNALED_IO)
 static int sigio_block_count = 0;

diff --git a/libntp/machines.c b/libntp/machines.c
index 32bff0743c5857eb640c5c87893e5ee1c4faff71..a3dcf2f6abd14d809e8bbb8dc7dd0f80dccbbec5 100644 (file)
--- a/libntp/machines.c
+++ b/libntp/machines.c
@@ -13,10 +13,6 @@
 #include "ntp_stdlib.h"
 #include "ntp_unixtime.h"
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/libntp/mktime.c b/libntp/mktime.c
index c7526905b0efc56a650accbef11c424e6fd9a55d..b9cd42e7203e6d3c304a08e16479ba1fcfbb72b0 100644 (file)
--- a/libntp/mktime.c
+++ b/libntp/mktime.c
@@ -60,9 +60,7 @@
  * by hand.  Sorry about that.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "ntp_machine.h"
 
 #ifndef DSTMINUTES
 #define DSTMINUTES 60
@@ -84,12 +82,6 @@
 #define TM_YEAR_BASE    1900
 #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#include <time.h>
-
 extern time_t  time();
 
 static int     mon_lengths[2][MONSPERYEAR] = {

diff --git a/libntp/prettydate.c b/libntp/prettydate.c
index 291c17c2c11d05735ce339297b56cbb3387e3985..9710c84be173456c411cf3659662101dfebd6f45 100644 (file)
--- a/libntp/prettydate.c
+++ b/libntp/prettydate.c
@@ -8,10 +8,6 @@
 #include "lib_strbuf.h"
 #include "ntp_stdlib.h"
 
-#ifndef TM_IN_SYS_TIME
-#include <time.h>
-#endif
-
 static const char *months[] = {
   "Jan", "Feb", "Mar", "Apr", "May", "Jun",
   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"

diff --git a/libntp/systime.c b/libntp/systime.c
index edaac1e33954d34218f43fbbcff0e831720d715d..e14a4d8d1562d7c087739e6387c67f054bea11c5 100644 (file)
--- a/libntp/systime.c
+++ b/libntp/systime.c
@@ -2,13 +2,13 @@
  * systime -- routines to fiddle a UNIX clock.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "ntp_proto.h"         /* for MAX_FREQ */
+#include "ntp_machine.h"
+#include "ntp_fp.h"
+#include "ntp_syslog.h"
+#include "ntp_unixtime.h"
+#include "ntp_stdlib.h"
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
@@ -19,13 +19,6 @@
 # include <utmpx.h>
 #endif /* HAVE_UTMPX_H */
 
-#include "ntp_proto.h"         /* for MAX_FREQ */
-#include "ntp_machine.h"
-#include "ntp_fp.h"
-#include "ntp_syslog.h"
-#include "ntp_unixtime.h"
-#include "ntp_stdlib.h"
-
 int    systime_10ms_ticks = 0; /* adj sysclock in 10ms increments */
 
 /*

diff --git a/libntp/tvtoa.c b/libntp/tvtoa.c
index 6bc72ac8d48f92c928735023dbd2268e5fa8dbac..19d4a94ed1d5ec4f5a87b881efb71a57ab5db90e 100644 (file)
--- a/libntp/tvtoa.c
+++ b/libntp/tvtoa.c
@@ -1,16 +1,17 @@
 /*
  * tvtoa - return an asciized representation of a struct timeval
  */
-#include <stdio.h>
-#include <sys/time.h>
 
 #include "lib_strbuf.h"
+
 #if defined(VMS)
-#include "ntp_fp.h"
+# include "ntp_fp.h"
 #endif /* VMS */
 #include "ntp_stdlib.h"
 #include "ntp_unixtime.h"
 
+#include <stdio.h>
+
 char *
 tvtoa(
        const struct timeval *tv

diff --git a/libntp/uglydate.c b/libntp/uglydate.c
index fcd3d9f5cf961a8eab3b54febda28797ca99dbd2..676a5fdde786005e36e474b5ab7b7697a58b1347 100644 (file)
--- a/libntp/uglydate.c
+++ b/libntp/uglydate.c
@@ -8,9 +8,7 @@
 #include "ntp_unixtime.h"
 #include "lib_strbuf.h"
 #include "ntp_stdlib.h"
-#ifndef TM_IN_SYS_TIME
-#include <time.h>
-#endif
+
 
 char *
 uglydate(

diff --git a/libntp/utvtoa.c b/libntp/utvtoa.c
index 79d14ef048e622a600c1d99987a3e9f586b5d609..a441c4910ffbebb360486efc9fb01638303e04d3 100644 (file)
--- a/libntp/utvtoa.c
+++ b/libntp/utvtoa.c
@@ -2,11 +2,11 @@
  * utvtoa - return an asciized representation of an unsigned struct timeval
  */
 #include <stdio.h>
-#include <sys/time.h>
 
 #include "lib_strbuf.h"
+
 #if defined(VMS)
-#include "ntp_fp.h"
+# include "ntp_fp.h"
 #endif
 #include "ntp_stdlib.h"
 #include "ntp_unixtime.h"

diff --git a/libparse/clk_computime.c b/libparse/clk_computime.c
index 2b19392519fa5cd4fa311d4f3982d5b74f22f977..5a155cf35f76c807077b2ddc01af0713e2681abf 100644 (file)
--- a/libparse/clk_computime.c
+++ b/libparse/clk_computime.c
@@ -23,10 +23,6 @@
  * 
  */
 
-
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include "ntp_fp.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"

diff --git a/libparse/clk_dcf7000.c b/libparse/clk_dcf7000.c
index c113ec7a7d90e692eb0ca5e3277007c1dd215bd4..e815e9d324842751148e56e67baa93565dbe8aab 100644 (file)
--- a/libparse/clk_dcf7000.c
+++ b/libparse/clk_dcf7000.c
@@ -20,9 +20,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_PARSE) && defined(CLOCK_DCF7000)
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include "ntp_fp.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"

diff --git a/libparse/clk_hopf6021.c b/libparse/clk_hopf6021.c
index d55c111ab5d3cb4d02e67e480dd44aaaa7b201e1..cd1e821851e123383fbf34d710e3194baa348b1f 100644 (file)
--- a/libparse/clk_hopf6021.c
+++ b/libparse/clk_hopf6021.c
@@ -22,9 +22,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_PARSE) && defined(CLOCK_HOPF6021)
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include "ntp_fp.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"

diff --git a/libparse/clk_meinberg.c b/libparse/clk_meinberg.c
index 2e58cf68f73d7e0950d65cee1d5bfcf04d26ab04..504ddf14efe14632740eeac7e674ec052ea00ea5 100644 (file)
--- a/libparse/clk_meinberg.c
+++ b/libparse/clk_meinberg.c
@@ -20,9 +20,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_PARSE) && defined(CLOCK_MEINBERG)
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include "ntp_fp.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"

diff --git a/libparse/clk_rawdcf.c b/libparse/clk_rawdcf.c
index c4df5b5bceda1d4b614071fe99069da865dde858..65592ce45a4548e429028ed78b57b723da100348 100644 (file)
--- a/libparse/clk_rawdcf.c
+++ b/libparse/clk_rawdcf.c
@@ -20,9 +20,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_PARSE) && defined(CLOCK_RAWDCF)
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include "ntp_fp.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"

diff --git a/libparse/clk_rcc8000.c b/libparse/clk_rcc8000.c
index ecafbde37d98986a5bb262c58307d98514ecdf46..863e5d4655f7cbd25581a8d32ba11cad59ec4ccc 100644 (file)
--- a/libparse/clk_rcc8000.c
+++ b/libparse/clk_rcc8000.c
@@ -19,9 +19,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_PARSE) && defined(CLOCK_RCC8000)
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include "ntp_fp.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"

diff --git a/libparse/clk_schmid.c b/libparse/clk_schmid.c
index 5fb426833a0e10e8c0c4b1d39e385629e5448e50..8a0beaf6739d5e771c3515916cd483c20874b27e 100644 (file)
--- a/libparse/clk_schmid.c
+++ b/libparse/clk_schmid.c
@@ -20,9 +20,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_PARSE) && defined(CLOCK_SCHMID)
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include "ntp_fp.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"

diff --git a/libparse/clk_trimtaip.c b/libparse/clk_trimtaip.c
index f18aaa06704a5cb143e3c4b703aef0d2782f1532..21b8420869c800d10a75e9cc44cd0343a42044d5 100644 (file)
--- a/libparse/clk_trimtaip.c
+++ b/libparse/clk_trimtaip.c
@@ -11,8 +11,6 @@
 #endif
 
 #if defined(REFCLOCK) && defined(CLOCK_PARSE) && defined(CLOCK_TRIMTAIP)
-#include <sys/types.h>
-#include <sys/time.h>
 
 #include "ntp_fp.h"
 #include "ntp_unixtime.h"

diff --git a/libparse/clk_trimtsip.c b/libparse/clk_trimtsip.c
index cbe65f34ad14dec818d6f64ff96a0fac8014341f..4e1d98332d82835bb1495cf3b9089e83d745ef35 100644 (file)
--- a/libparse/clk_trimtsip.c
+++ b/libparse/clk_trimtsip.c
@@ -12,9 +12,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_PARSE) && defined(CLOCK_TRIMTSIP)
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include "ntp_syslog.h"
 #include "ntp_types.h"
 #include "ntp_fp.h"

diff --git a/libparse/clk_varitext.c b/libparse/clk_varitext.c
index 9236bb4b8c9ac884350673693621a56167ca1ea4..c5c9059b60eefac173da4950c580ccc062339250 100644 (file)
--- a/libparse/clk_varitext.c
+++ b/libparse/clk_varitext.c
@@ -19,9 +19,6 @@
  * 
  */
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include "ntp_fp.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"
@@ -29,10 +26,10 @@
 #include "parse.h"
 
 #ifndef PARSESTREAM
-#include "ntp_stdlib.h"
-#include <stdio.h>
+# include "ntp_stdlib.h"
+# include <stdio.h>
 #else
-#include "sys/parsestreams.h"
+# include "sys/parsestreams.h"
 extern void printf P((const char *, ...));
 #endif
 

diff --git a/libparse/parse.c b/libparse/parse.c
index 78ff981e5456e663489bea239b304d00b976cc02..d3712b6b5ba8e2cd04bcccd43458535b3f461368 100644 (file)
--- a/libparse/parse.c
+++ b/libparse/parse.c
@@ -30,9 +30,6 @@
 static char rcsid[] = "parse.c,v 4.14 1999/11/28 09:13:52 kardel RELEASE_19991128_A";
 #endif
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include "ntp_fp.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"

diff --git a/libparse/parse_conf.c b/libparse/parse_conf.c
index 353775d01407e56ced9b504a442a33bef7a8e978..5dc267bc8b37d88fbe62a6384f4305ae6e0fc10b 100644 (file)
--- a/libparse/parse_conf.c
+++ b/libparse/parse_conf.c
@@ -26,9 +26,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_PARSE)
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include "ntp_fp.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"

diff --git a/ntpd/check_y2k.c b/ntpd/check_y2k.c
index b0a84e12011987dcf001544bdc638aefa977056c..f0f4480e7560a7d16a7345193f87a5ca0c6be756 100644 (file)
--- a/ntpd/check_y2k.c
+++ b/ntpd/check_y2k.c
@@ -31,7 +31,8 @@
 # include <config.h>
 #endif
 
-#include <sys/types.h>
+#include "ntpd.h"
+
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -48,7 +49,6 @@
 # ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
 # endif /* HAVE_SYS_IOCTL_H */
-# include <sys/time.h>
 # if !defined(VMS)     /*wjm*/
 #  include <sys/resource.h>
 # endif /* VMS */
@@ -94,8 +94,6 @@
 # include <apollo/base.h>
 #endif /* SYS_DOMAINOS */
 
-#include "ntpd.h"
-
 /* } end definitions lifted from ntpd.c */
 
 #include "ntp_calendar.h"

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index f75695a1286a7801c2917396741d22605574e1fa..4076d073551675b108e6a25aa24441d5ea82d3bb 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -5,25 +5,6 @@
 # include <config.h>
 #endif
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <signal.h>
-#ifndef SIGCHLD
-#define SIGCHLD SIGCLD
-#endif
-#if !defined(VMS)
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-#endif /* VMS */
-#include <sys/time.h>
-
-#ifdef HAVE_NETINFO
-#include <netinfo/ni.h>
-#endif
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_unixtime.h"
@@ -34,11 +15,28 @@
 #include "ntp_cmdargs.h"
 
 #ifdef PUBKEY
-#include "ntp_crypto.h"
+# include "ntp_crypto.h"
 #endif /* PUBKEY */
 
+#include <stdio.h>
+#include <ctype.h>
+#include <sys/param.h>
+#include <signal.h>
+#ifndef SIGCHLD
+# define SIGCHLD SIGCLD
+#endif
+#if !defined(VMS)
+# ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+# endif
+#endif /* VMS */
+
+#ifdef HAVE_NETINFO
+# include <netinfo/ni.h>
+#endif
+
 #ifdef SYS_WINNT
-#include <io.h>
+# include <io.h>
 extern HANDLE ResolverThreadHandle;
 #endif /* SYS_WINNT */
 

diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index c6c89a0d090bcbfcbd80b5961d9cf679ee244e45..c48b5425dbedce49369c32f67b5037097841c30e 100644 (file)
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -5,18 +5,16 @@
 #include <config.h>
 #endif
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <sys/time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_control.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+#include <signal.h>
+
 #ifdef PUBKEY
 #include "ntp_crypto.h"
 #endif /* PUBKEY */

diff --git a/ntpd/ntp_intres.c b/ntpd/ntp_intres.c
index bb575f2097bb57bb5af3c87296d06c5bc52b56c7..9653fdd191b9c482f8c1eae4dc55c55345fcf13f 100644 (file)
--- a/ntpd/ntp_intres.c
+++ b/ntpd/ntp_intres.c
@@ -20,10 +20,14 @@
 # include <config.h>
 #endif
 
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_request.h"
+#include "ntp_stdlib.h"
+#include "ntp_syslog.h"
+
 #include <stdio.h>
 #include <ctype.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #include <netdb.h>
 #include <signal.h>
 
@@ -35,12 +39,6 @@
 # include <sys/param.h>                /* MAXHOSTNAMELEN (often) */
 #endif
 
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_request.h"
-#include "ntp_stdlib.h"
-#include "ntp_syslog.h"
-
 #define        STREQ(a, b)     (*(a) == *(b) && strcmp((a), (b)) == 0)
 
 /*

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 82f61f6a48162de4b2dde46b9a1f5513997992f8..48514fb02cb04c8bd8f77a5f5a3811cf03064849 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -7,15 +7,19 @@
 # include <config.h>
 #endif
 
+#include "ntp_machine.h"
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "iosignal.h"
+#include "ntp_refclock.h"
+#include "ntp_if.h"
+#include "ntp_stdlib.h"
+
 #include <stdio.h>
 #include <signal.h>
-#include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif /* HAVE_SYS_PARAM_H */
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
@@ -37,14 +41,6 @@
 # include <ifaddrs.h>
 #endif
 
-#include "ntp_machine.h"
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "iosignal.h"
-#include "ntp_refclock.h"
-#include "ntp_if.h"
-#include "ntp_stdlib.h"
-
 #if defined(VMS)               /* most likely UCX-specific */
 
 #include <UCX$INETDEF.H>

diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index 554ff0d3337c4e3fea5a5e9c128d17da82b0831e..8db57dbfee6234af27d3c3b46269c8f7eb744d12 100644 (file)
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -6,19 +6,17 @@
 # include <config.h>
 #endif
 
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_unixtime.h"
+#include "ntp_stdlib.h"
+
 #include <stdio.h>
 #include <ctype.h>
-#include <sys/time.h>
-
 
 #include <signal.h>
 #include <setjmp.h>
 
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_unixtime.h"
-#include "ntp_stdlib.h"
-
 #if defined(VMS) && defined(VMS_LOCALUNIT)     /*wjm*/
 #include "ntp_refclock.h"
 #endif /* VMS */

diff --git a/ntpd/ntp_monitor.c b/ntpd/ntp_monitor.c
index 64dfb3ee15429adc6addab0c0ba75b04b9de6963..8526aacecf381012daf1076e5e3d798efe3ac6e7 100644 (file)
--- a/ntpd/ntp_monitor.c
+++ b/ntpd/ntp_monitor.c
@@ -1,23 +1,22 @@
 /*
  * ntp_monitor.c - monitor who is using the ntpd server
  */
+
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <signal.h>
-# ifdef HAVE_SYS_IOCTL_H
-#  include <sys/ioctl.h>
-# endif
-# include <sys/time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_if.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <signal.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
+
 /*
  * I'm still not sure I like what I've done here.  It certainly consumes
  * memory like it is going out of style, and also may not be as low

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 3e5e9acc5e25004c7cc3ed71a4fbabaa5092a7b9..65dfc940c94b2669293afbadfbe7cb23a9de1c41 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -5,10 +5,6 @@
 #include <config.h>
 #endif
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include "ntpd.h"
 #include "ntp_stdlib.h"
 #include "ntp_unixtime.h"
@@ -16,6 +12,8 @@
 #include "ntp_string.h"
 #include "ntp_crypto.h"
 
+#include <stdio.h>
+
 #if defined(VMS) && defined(VMS_LOCALUNIT)     /*wjm*/
 #include "ntp_refclock.h"
 #endif

diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index 8faec9790ef80a068a51c1ac8cead4d325301279..317f005b7ea9daa51464c438b720f943b1f1ea7c 100644 (file)
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -5,12 +5,6 @@
 # include <config.h>
 #endif
 
-#include <stdio.h>
-#include <sys/types.h>
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-#endif /* HAVE_SYS_IOCTL_H */
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_unixtime.h"
@@ -18,6 +12,12 @@
 #include "ntp_refclock.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif /* HAVE_SYS_IOCTL_H */
+
 #ifdef REFCLOCK
 
 #ifdef TTYCLK

diff --git a/ntpd/ntp_request.c b/ntpd/ntp_request.c
index 9dbff283f6fb7a7479fad01fe22c70231b46e8fd..6f5e1530328047f174908f1bc844eded5e87530a 100644 (file)
--- a/ntpd/ntp_request.c
+++ b/ntpd/ntp_request.c
@@ -5,13 +5,6 @@
 # include <config.h>
 #endif
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_request.h"
@@ -19,6 +12,12 @@
 #include "ntp_refclock.h"
 #include "ntp_if.h"
 #include "ntp_stdlib.h"
+
+#include <stdio.h>
+#include <signal.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 #include "recvbuff.h"
 
 #ifdef KERNEL_PLL

diff --git a/ntpd/ntp_resolver.c b/ntpd/ntp_resolver.c
index 9fadfd7eb30644504b12783eef74999dc4981a2a..84b25838e48186c2d450b21f92065435644da1f6 100644 (file)
--- a/ntpd/ntp_resolver.c
+++ b/ntpd/ntp_resolver.c
@@ -39,22 +39,20 @@
 # include <config.h>
 #endif
 
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_request.h"
+#include "ntp_stdlib.h"
+#include "ntp_syslog.h"
+
 #include <stdio.h>
 #include <ctype.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #include <netdb.h>
 #include <signal.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_request.h"
-#include "ntp_stdlib.h"
-#include "ntp_syslog.h"
-
 #define        STREQ(a, b)     (*(a) == *(b) && strcmp((a), (b)) == 0)
 
 /*

diff --git a/ntpd/ntp_timer.c b/ntpd/ntp_timer.c
index db75b5b861539db6a76ea823cec548cc5d42d9a7..08eaba57a03e798a7ceb66d43fa4a427dc3e6a08 100644 (file)
--- a/ntpd/ntp_timer.c
+++ b/ntpd/ntp_timer.c
@@ -5,17 +5,17 @@
 # include <config.h>
 #endif
 
+#include "ntp_machine.h"
+#include "ntpd.h"
+#include "ntp_stdlib.h"
+
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #include <signal.h>
 #include <sys/signal.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#include "ntp_machine.h"
-#include "ntpd.h"
-#include "ntp_stdlib.h"
+
 #if defined(HAVE_IO_COMPLETION_PORT)
 # include "ntp_iocompletionport.h"
 # include "ntp_timer.h"

diff --git a/ntpd/ntp_util.c b/ntpd/ntp_util.c
index d9c7527d961cdc86ca8c7e6dfdadc965a4e70a76..34d38a7cd335d58b79f55935a135a3823d9ba5b0 100644 (file)
--- a/ntpd/ntp_util.c
+++ b/ntpd/ntp_util.c
@@ -1,17 +1,24 @@
 /*
  * ntp_util.c - stuff I didn't have any other place for
  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_unixtime.h"
+#include "ntp_filegen.h"
+#include "ntp_if.h"
+#include "ntp_stdlib.h"
+
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
-#include <sys/time.h>
 
 #ifdef HAVE_IEEEFP_H
 # include <ieeefp.h>
@@ -20,13 +27,6 @@
 # include <math.h>
 #endif
 
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_unixtime.h"
-#include "ntp_filegen.h"
-#include "ntp_if.h"
-#include "ntp_stdlib.h"
-
 #ifdef  DOSYNCTODR
 #if !defined(VMS)
 #include <sys/resource.h>

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index fa2e401809133fc04b96e4824262e6446b761fad..fab5b6ccc462de4231e1efe178a2df43104e4dcb 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -1,11 +1,15 @@
 /*
  * ntpd.c - main program for the fixed point NTP daemon
  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#include <sys/types.h>
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_stdlib.h"
+
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -21,7 +25,6 @@
 # ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
 # endif /* HAVE_SYS_IOCTL_H */
-# include <sys/time.h>
 # ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>
 # endif /* HAVE_SYS_RESOURCE_H */
@@ -68,10 +71,6 @@
 # include <apollo/base.h>
 #endif /* SYS_DOMAINOS */
 
-#include "ntpd.h"
-#include "ntp_io.h"
-
-#include "ntp_stdlib.h"
 #include "recvbuff.h"  
 #include "ntp_cmdargs.h"  
 

diff --git a/ntpd/refclock_acts.c b/ntpd/refclock_acts.c
index e46e37919c98eba592a26b6dd5e0c202dcad1252..efdf536fe8dd32aa17ef20ee65dcf04f30dfc211 100644 (file)
--- a/ntpd/refclock_acts.c
+++ b/ntpd/refclock_acts.c
@@ -9,13 +9,6 @@
 
 #if defined(REFCLOCK) && (defined(CLOCK_ACTS) || defined(CLOCK_PTBACTS))
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-#endif /* HAVE_SYS_IOCTL_H */
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_unixtime.h"
@@ -23,6 +16,12 @@
 #include "ntp_stdlib.h"
 #include "ntp_control.h"
 
+#include <stdio.h>
+#include <ctype.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif /* HAVE_SYS_IOCTL_H */
+
 /* MUST BE AFTER LAST #include <config.h> !!! */
 
 #if defined(CLOCK_ACTS) && defined(CLOCK_PTBACTS)

diff --git a/ntpd/refclock_arbiter.c b/ntpd/refclock_arbiter.c
index 045a93a1b773068eb98ceb5420a315ba36ffad5b..cdbe2ee38627b53b7739e0d737d302bb30cd61b6 100644 (file)
--- a/ntpd/refclock_arbiter.c
+++ b/ntpd/refclock_arbiter.c
@@ -9,15 +9,14 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_ARBITER)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 /*
  * This driver supports the Arbiter 1088A/B Satellite Controlled Clock.
  * The claimed accuracy of this clock is 100 ns relative to the PPS

diff --git a/ntpd/refclock_arc.c b/ntpd/refclock_arc.c
index 1db8a9a512410a600bd44c52b77f61be013d0944..c771f478f67774621c6eba24eac622a62bad99a7 100644 (file)
--- a/ntpd/refclock_arc.c
+++ b/ntpd/refclock_arc.c
@@ -303,10 +303,13 @@ Also note h<cr> command which starts a resync to MSF signal.
 */
 
 
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_refclock.h"
+#include "ntp_stdlib.h"
 
 #include <stdio.h>
 #include <ctype.h>
-#include <sys/time.h>
 
 #if defined(HAVE_BSD_TTYS)
 #include <sgtty.h>
@@ -320,11 +323,6 @@ Also note h<cr> command which starts a resync to MSF signal.
 #include <termios.h>
 #endif
 
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_refclock.h"
-#include "ntp_stdlib.h"
-
 /*
  * This driver supports the ARCRON MSF Radio Controlled Clock
  */

diff --git a/ntpd/refclock_as2201.c b/ntpd/refclock_as2201.c
index 2c104402f098cf10dd6f34222472476c1a66aee8..516f7adc54d4d313608608aa4924d6cc18dc29d7 100644 (file)
--- a/ntpd/refclock_as2201.c
+++ b/ntpd/refclock_as2201.c
@@ -8,16 +8,15 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_AS2201)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_unixtime.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 /*
  * This driver supports the Austron 2200A/2201A GPS Receiver with
  * Buffered RS-232-C Interface Module. Note that the original 2200/2201

diff --git a/ntpd/refclock_atom.c b/ntpd/refclock_atom.c
index fc454efca9722f695eac9259bb59a2a9c15df054..9dd6765167039f408081e4ea4ec0a76d4795507a 100644 (file)
--- a/ntpd/refclock_atom.c
+++ b/ntpd/refclock_atom.c
@@ -16,9 +16,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_ATOM)
 
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
 #ifdef HAVE_PPSAPI
 # ifdef HAVE_TIMEPPS_H
 #  include <timepps.h>

diff --git a/ntpd/refclock_bancomm.c b/ntpd/refclock_bancomm.c
index ba9aaf2d688c6aca05c25e187dbfac2ee76e8873..a3debcb6795bfa1b3e5195b3a345f928942d45c5 100644 (file)
--- a/ntpd/refclock_bancomm.c
+++ b/ntpd/refclock_bancomm.c
@@ -32,12 +32,6 @@
 #endif
 
 #if defined(REFCLOCK) && defined(CLOCK_BANC) 
-#include <stdio.h>
-#include <syslog.h>
-#include <ctype.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/time.h>
 
 #include "ntpd.h"
 #include "ntp_io.h"
@@ -45,6 +39,10 @@
 #include "ntp_unixtime.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <syslog.h>
+#include <ctype.h>
+
 /*  STUFF BY RES */
 struct btfp_time                /* Structure for reading 5 time words   */
                                 /* in one ioctl(2) operation.           */

diff --git a/ntpd/refclock_chronolog.c b/ntpd/refclock_chronolog.c
index 2982ecc9843a7d75a0d7fdc7062d18f9094eac95..9273a84fdfa8dd2c3982bd8c8b1b60f5aaaf2ede 100644 (file)
--- a/ntpd/refclock_chronolog.c
+++ b/ntpd/refclock_chronolog.c
@@ -13,17 +13,15 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_CHRONOLOG)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_calendar.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 /*
  * This driver supports the Chronolog K-series WWVB receiver.
  *

diff --git a/ntpd/refclock_chu.c b/ntpd/refclock_chu.c
index 5fd816a9436ad5c887f4e1f333c39108b9637f35..10fcea5aad7115205de948149a249bc0c360cf13 100644 (file)
--- a/ntpd/refclock_chu.c
+++ b/ntpd/refclock_chu.c
@@ -7,17 +7,16 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_CHU)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <time.h>
-#include <math.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_calendar.h"
 #include "ntp_stdlib.h"
+
+#include <stdio.h>
+#include <ctype.h>
+#include <math.h>
+
 #ifdef HAVE_AUDIO
 #include "audio.h"
 #endif /* HAVE_AUDIO */

diff --git a/ntpd/refclock_datum.c b/ntpd/refclock_datum.c
index 56083dbcfd5db7c73bfca3617ca27f351f9eee8d..db03c95f2c646b0242cd09f072a705c7de8a1436 100644 (file)
--- a/ntpd/refclock_datum.c
+++ b/ntpd/refclock_datum.c
@@ -17,16 +17,15 @@
 ** Include Files
 */
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_unixtime.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 #if defined(HAVE_BSD_TTYS)
 #include <sgtty.h>
 #endif /* HAVE_BSD_TTYS */

diff --git a/ntpd/refclock_dumbclock.c b/ntpd/refclock_dumbclock.c
index 8138d9e66bf72991d4ed36a92a19274b72e8c883..c439646f9130604b31095fb0919e01ceef2bf8bf 100644 (file)
--- a/ntpd/refclock_dumbclock.c
+++ b/ntpd/refclock_dumbclock.c
@@ -14,17 +14,15 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_DUMBCLOCK)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_calendar.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 /*
  * This driver supports a generic dumb clock that only outputs hh:mm:ss,
  * in local time, no less.

diff --git a/ntpd/refclock_fg.c b/ntpd/refclock_fg.c
index f1320b010d9e3e981fef1bee09aac6fe02cd2769..655b6bcda1313cb78337a897e03253b5d89b9f99 100644 (file)
--- a/ntpd/refclock_fg.c
+++ b/ntpd/refclock_fg.c
@@ -8,8 +8,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_FG)
 
-#include <time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"

diff --git a/ntpd/refclock_gpsvme.c b/ntpd/refclock_gpsvme.c
index b37466b5ee7d954f2b5d92885ccda77318abe4df..42eb2f981b2be2ca72a0e95cf0a8cb8a4f9589d0 100644 (file)
--- a/ntpd/refclock_gpsvme.c
+++ b/ntpd/refclock_gpsvme.c
@@ -16,19 +16,18 @@
 #endif
 
 #if defined(REFCLOCK) && defined(CLOCK_GPSVME) 
-#include <stdio.h>
-#include <syslog.h>
-#include <ctype.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/time.h>
 
-#include "gps.h"
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_unixtime.h"
 #include "ntp_stdlib.h"
+
+#include <stdio.h>
+#include <syslog.h>
+#include <ctype.h>
+
+#include "gps.h"
 #include "/etc/conf/h/io.h"
 
 /* GLOBAL STUFF BY RES */

diff --git a/ntpd/refclock_heath.c b/ntpd/refclock_heath.c
index 9d297d1f877bed9f66044418783251713cfd6570..c1b55aab3f3a1a30d1c57df8e4f3d6e06e63aa45 100644 (file)
--- a/ntpd/refclock_heath.c
+++ b/ntpd/refclock_heath.c
@@ -7,27 +7,18 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_HEATH)
 
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_refclock.h"
+#include "ntp_stdlib.h"
+
 #include <stdio.h>
 #include <ctype.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
+
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif /* not HAVE_SYS_IOCTL_H */
 
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_refclock.h"
-#include "ntp_stdlib.h"
-
 /*
  * This driver supports the Heath GC-1000 Most Accurate Clock, with
  * RS232C Output Accessory. This is a WWV/WWVH receiver somewhat less

diff --git a/ntpd/refclock_hpgps.c b/ntpd/refclock_hpgps.c
index 30aa49406842d52fa38d1f099d813dc1622c702d..7a506cfc7f9587edc9ee4877a22b6c961ea1c3f9 100644 (file)
--- a/ntpd/refclock_hpgps.c
+++ b/ntpd/refclock_hpgps.c
@@ -1,21 +1,21 @@
 /*
  * refclock_hpgps - clock driver for HP 58503A GPS receiver
  */
+
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #if defined(REFCLOCK) && defined(CLOCK_HPGPS)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 /* Version 0.1 April  1, 1995  
  *         0.2 April 25, 1995
  *             tolerant of missing timecode response prompt and sends

diff --git a/ntpd/refclock_irig.c b/ntpd/refclock_irig.c
index 13f8e17d36301c2b0a440a302f788ad08bc1dca6..7efd57edeb179ee27e14bef1c56b0705a2a5bbe9 100644 (file)
--- a/ntpd/refclock_irig.c
+++ b/ntpd/refclock_irig.c
@@ -7,19 +7,19 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_IRIG)
 
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_refclock.h"
+#include "ntp_calendar.h"
+#include "ntp_stdlib.h"
+
 #include <stdio.h>
 #include <ctype.h>
-#include <sys/time.h>
 #include <math.h>
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif /* HAVE_SYS_IOCTL_H */
 
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_refclock.h"
-#include "ntp_calendar.h"
-#include "ntp_stdlib.h"
 #include "audio.h"
 
 /*

diff --git a/ntpd/refclock_jupiter.c b/ntpd/refclock_jupiter.c
index b337e0cff872f14ea00723bf27b515df09e1daad..483984cceb3413451b876e729d1e23886bacc005 100644 (file)
--- a/ntpd/refclock_jupiter.c
+++ b/ntpd/refclock_jupiter.c
@@ -37,10 +37,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_JUPITER) && defined(PPS)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
@@ -48,6 +44,9 @@
 #include "ntp_stdlib.h"
 #include "ntp_calendar.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 #include "jupiter.h"
 
 #include <sys/ppsclock.h>

diff --git a/ntpd/refclock_leitch.c b/ntpd/refclock_leitch.c
index edee3f805cefbfaf1ee8e991543a456e268b9899..42b02fce81d9e42c1d5d42b0ea0b0f7391cc8a2e 100644 (file)
--- a/ntpd/refclock_leitch.c
+++ b/ntpd/refclock_leitch.c
@@ -1,21 +1,21 @@
 /*
  * refclock_leitch - clock driver for the Leitch CSD-5300 Master Clock
  */
+
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #if defined(REFCLOCK) && defined(CLOCK_LEITCH)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_unixtime.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 #ifdef STREAM
 #include <stropts.h>
 #if defined(LEITCHCLK)

diff --git a/ntpd/refclock_local.c b/ntpd/refclock_local.c
index 90fe8c81edd5b30986239f758e61daff922a40fa..a3e577387258081aceb0a54a93071e6ee2e27281 100644 (file)
--- a/ntpd/refclock_local.c
+++ b/ntpd/refclock_local.c
@@ -8,14 +8,14 @@
 #endif
 
 #ifdef REFCLOCK
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
 
 #include "ntpd.h"
 #include "ntp_refclock.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 #ifdef KERNEL_PLL
 #include "ntp_syscall.h"
 #endif

diff --git a/ntpd/refclock_msfees.c b/ntpd/refclock_msfees.c
index db6c6b17a696c7a74207e42bcba9607e38f35c6a..dd1c06db16b7d13f8658c932f883c046f3bc7b9c 100644 (file)
--- a/ntpd/refclock_msfees.c
+++ b/ntpd/refclock_msfees.c
@@ -11,16 +11,13 @@
  * (hence probably didn't work).  Still in RCS file at cl.cam.ac.uk
  */
 
-#include <ctype.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"
+
+#include <ctype.h>
 #if defined(HAVE_BSD_TTYS)
 #include <sgtty.h>
 #endif /* HAVE_BSD_TTYS */

diff --git a/ntpd/refclock_mx4200.c b/ntpd/refclock_mx4200.c
index 6e85d21e4b19c331473d957a50e552f075fb28b5..e0e7618669d6e4cf51907fb937bca4c091c84218 100644 (file)
--- a/ntpd/refclock_mx4200.c
+++ b/ntpd/refclock_mx4200.c
@@ -49,21 +49,17 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_MX4200) && defined(HAVE_PPSAPI)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/types.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_unixtime.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 #include "mx4200.h"
 
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_TERMIOS_H
 # include <sys/termios.h>
 #endif

diff --git a/ntpd/refclock_nmea.c b/ntpd/refclock_nmea.c
index 119d0417c7c168b8905397ef650918a9c4f0fcaa..19f8eee15a05943d8d0d7332b5dba99a75304a2c 100644 (file)
--- a/ntpd/refclock_nmea.c
+++ b/ntpd/refclock_nmea.c
@@ -9,16 +9,14 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_NMEA)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 /*
  * This driver supports the NMEA GPS Receiver with
  *

diff --git a/ntpd/refclock_oncore.c b/ntpd/refclock_oncore.c
index 9c034335c023573cc9fb2dc69b6a0d4a266e7362..3a1de214a89b8168b131773ec767962d71dcd1fa 100644 (file)
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -85,10 +85,14 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_ONCORE) && defined(HAVE_PPSAPI) && 0
 
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_unixtime.h"
+#include "ntp_refclock.h"
+#include "ntp_stdlib.h"
+
 #include <stdio.h>
 #include <ctype.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #ifdef ONCORE_SHMEM_STATUS
 # ifdef HAVE_SYS_MMAN_H
@@ -100,11 +104,11 @@
 #endif /* ONCORE_SHMEM_STATUS */
 
 #ifdef HAVE_PPSAPI
-#  ifdef HAVE_TIMEPPS_H
-#    include <timepps.h>
+# ifdef HAVE_TIMEPPS_H
+#  include <timepps.h>
 # else
 #  ifdef HAVE_SYS_TIMEPPS_H
-#    include <sys/timepps.h>
+#   include <sys/timepps.h>
 #  endif
 # endif
 #endif
@@ -113,14 +117,8 @@
 # include <sys/sio.h>
 #endif
 
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_unixtime.h"
-#include "ntp_refclock.h"
-#include "ntp_stdlib.h"
-
 #ifdef HAVE_SYS_TERMIOS_H
-#include <sys/termios.h>
+# include <sys/termios.h>
 #endif
 
 #ifdef HAVE_SYS_PPSCLOCK_H

diff --git a/ntpd/refclock_pcf.c b/ntpd/refclock_pcf.c
index db6a0da463eba2ee03f8f59c4d3ee6028fdd8f3a..ff2b28ebeec5b900d31ca455fb0c3048031850c1 100644 (file)
--- a/ntpd/refclock_pcf.c
+++ b/ntpd/refclock_pcf.c
@@ -8,8 +8,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_PCF)
 
-#include <time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"

diff --git a/ntpd/refclock_pst.c b/ntpd/refclock_pst.c
index 6af43824795a550d0e9481bca723bd1e3b7097e1..b92a2e077ab9f3bc9feb969e5ebf5d3f7e0e344e 100644 (file)
--- a/ntpd/refclock_pst.c
+++ b/ntpd/refclock_pst.c
@@ -8,15 +8,14 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_PST)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 /*
  * This driver supports the PSTI 1010 and Traconex 1020 WWV/WWVH
  * Receivers. No specific claim of accuracy is made for these receiver,

diff --git a/ntpd/refclock_shm.c b/ntpd/refclock_shm.c
index a8094c86ec1e2e7c15710aa24723aa52b0bd890c..bf612848e4192e08608a531bb1e26a76046558f5 100644 (file)
--- a/ntpd/refclock_shm.c
+++ b/ntpd/refclock_shm.c
@@ -13,12 +13,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_SHM)
 
-#undef fileno   
-#include <ctype.h>
-#undef fileno   
-#include <sys/time.h>
-#undef fileno   
-
 #include "ntpd.h"
 #undef fileno   
 #include "ntp_io.h"
@@ -29,15 +23,16 @@
 #undef fileno   
 #include "ntp_stdlib.h"
 
+#undef fileno   
+#include <ctype.h>
+#undef fileno   
+
 #ifndef SYS_WINNT
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <assert.h>
-#include <time.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
+# include <sys/ipc.h>
+# include <sys/shm.h>
+# include <assert.h>
+# include <unistd.h>
+# include <stdio.h>
 #endif
 
 /*

diff --git a/ntpd/refclock_tpro.c b/ntpd/refclock_tpro.c
index a29383a222b218f6d600cefc1d65c812f7b934a0..159f81745f769ce7561013b3d506f79324dee9b7 100644 (file)
--- a/ntpd/refclock_tpro.c
+++ b/ntpd/refclock_tpro.c
@@ -8,10 +8,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_TPRO)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
@@ -19,6 +15,9 @@
 #include "sys/tpro.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 /*
  * This driver supports the KSI/Odetecs TPRO-S IRIG-B reader and TPRO-
  * SAT GPS receiver for the Sun Microsystems SBus. It requires that the

diff --git a/ntpd/refclock_trak.c b/ntpd/refclock_trak.c
index f9b01da9f58e9b75390959423fc59c7dd80b8e7f..326a8e92620e31777b6a824bc565c920585933fa 100644 (file)
--- a/ntpd/refclock_trak.c
+++ b/ntpd/refclock_trak.c
@@ -12,18 +12,15 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_TRAK) && defined(PPS)
 
-#include <stdio.h>
-#include <ctype.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_stdlib.h"
 #include "ntp_unixtime.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 #ifdef HAVE_SYS_TERMIOS_H
 # include <sys/termios.h>
 #endif

diff --git a/ntpd/refclock_true.c b/ntpd/refclock_true.c
index b841f72589b96ccd6898d4514d30647bc20b89ee..3aef785d40acadf7465d85257deeaee35ef07092 100644 (file)
--- a/ntpd/refclock_true.c
+++ b/ntpd/refclock_true.c
@@ -12,16 +12,15 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_TRUETIME)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_unixtime.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 /* This should be an atom clock but those are very hard to build.
  *
  * The PCL720 from P C Labs has an Intel 8253 lookalike, as well as a bunch

diff --git a/ntpd/refclock_ulink.c b/ntpd/refclock_ulink.c
index 01ed238d94756fcaa1f29bfdde397b4cb7405c5b..12923be75c0466b58e7e225fd6a4d27bb04508c8 100644 (file)
--- a/ntpd/refclock_ulink.c
+++ b/ntpd/refclock_ulink.c
@@ -28,8 +28,6 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include <sys/time.h>
-#include <time.h>
 
 #include "ntpd.h"
 #include "ntp_io.h"

diff --git a/ntpd/refclock_usno.c b/ntpd/refclock_usno.c
index b66e1606f445804233afac5ded3f53e4ae0d585a..30a13300bac5d004fd80ded71dfcba54fedbc3ed 100644 (file)
--- a/ntpd/refclock_usno.c
+++ b/ntpd/refclock_usno.c
@@ -9,13 +9,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_USNO)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-#endif /* HAVE_SYS_IOCTL_H */
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_unixtime.h"
@@ -23,6 +16,12 @@
 #include "ntp_stdlib.h"
 #include "ntp_control.h"
 
+#include <stdio.h>
+#include <ctype.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif /* HAVE_SYS_IOCTL_H */
+
 /*
  * This driver supports the Naval Observatory dialup at +1 202 653 0351.
  * It is a hacked-up version of the ACTS driver.

diff --git a/ntpd/refclock_wwv.c b/ntpd/refclock_wwv.c
index 2a6011003fdcbdf4853510473bb110072a5190e1..b1d05c7ca33f01e84eb3b118ee15c2459e44bb23 100644 (file)
--- a/ntpd/refclock_wwv.c
+++ b/ntpd/refclock_wwv.c
@@ -7,14 +7,6 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_WWV)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <math.h>
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif /* HAVE_SYS_IOCTL_H */
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
@@ -22,6 +14,13 @@
 #include "ntp_stdlib.h"
 #include "audio.h"
 
+#include <stdio.h>
+#include <ctype.h>
+#include <math.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif /* HAVE_SYS_IOCTL_H */
+
 #define ICOM   1               /* undefine to suppress ICOM code */
 
 #ifdef ICOM

diff --git a/ntpd/refclock_wwvb.c b/ntpd/refclock_wwvb.c
index b169914bfa263f959f41108e96853a79db0c5c3a..0ca9f75ab7b13548708a006cf8e0ade38120123f 100644 (file)
--- a/ntpd/refclock_wwvb.c
+++ b/ntpd/refclock_wwvb.c
@@ -8,17 +8,15 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_SPECTRACOM)
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <time.h>
-
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_refclock.h"
 #include "ntp_calendar.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+
 /*
  * This driver supports the Spectracom Model 8170 and Netclock/2 WWVB
  * Synchronized Clocks and the Netclock/GPS Master Clock. Both the WWVB

diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c
index 2b7fb5b7b2ec859c93ef3461aafa3d66022e7fe3..c8f6024a7c4c2e12fbd8aab277ad4837b6021b8e 100644 (file)
--- a/ntpdate/ntpdate.c
+++ b/ntpdate/ntpdate.c
@@ -6,9 +6,16 @@
 # include <config.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include "ntp_fp.h"
+#include "ntp.h"
+#include "ntp_io.h"
+#include "ntp_unixtime.h"
+#include "ntpdate.h"
+#include "ntp_string.h"
+#include "ntp_syslog.h"
+#include "ntp_select.h"
+#include "ntp_stdlib.h"
+
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -26,7 +33,6 @@
 #  include <sys/ioctl.h>
 # endif
 #endif /* SYS_WINNT */
-#include <sys/time.h>
 #ifdef HAVE_SYS_RESOURCE_H
 # include <sys/resource.h>
 #endif /* HAVE_SYS_RESOURCE_H */
@@ -42,24 +48,10 @@ struct timeval timeout = {0,0};
 struct timeval timeout = {60,0};
 #endif
 
-
-#if defined(SYS_HPUX)
-# include <utmp.h>
-#endif
-
 #ifdef HAVE_NETINFO
 #include <netinfo/ni.h>
 #endif
 
-#include "ntp_fp.h"
-#include "ntp.h"
-#include "ntp_io.h"
-#include "ntp_unixtime.h"
-#include "ntpdate.h"
-#include "ntp_string.h"
-#include "ntp_syslog.h"
-#include "ntp_select.h"
-#include "ntp_stdlib.h"
 #include "recvbuff.h"
 
 #ifdef SYS_WINNT

diff --git a/ntpdate/ntptime_config.c b/ntpdate/ntptime_config.c
index 56f653932c2dc7c3a5de88316760c7587ef07633..e784d28034f08f7f59a4e59c22d356e2df0f9f20 100644 (file)
--- a/ntpdate/ntptime_config.c
+++ b/ntpdate/ntptime_config.c
@@ -11,15 +11,6 @@
 # include <config.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#include <stdio.h>
-#include <signal.h>
-#include <ctype.h>
-#include <sys/time.h>
-
 #include "ntp_fp.h"
 #include "ntp.h"
 #include "ntp_io.h"
@@ -29,6 +20,10 @@
 #include "ntp_syslog.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <signal.h>
+#include <ctype.h>
+
 /*
  * These routines are used to read the configuration file at
  * startup time.  An entry in the file must fit on a single line.

diff --git a/ntpdate/ntptimeset.c b/ntpdate/ntptimeset.c
index 17cd72cbdb1abefcf5dae1ed01bb6ae214e02b62..0077b009a12b84e32cd14113d35d3fad18859160 100644 (file)
--- a/ntpdate/ntptimeset.c
+++ b/ntpdate/ntptimeset.c
@@ -121,9 +121,17 @@
 # include <config.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include "ntp_fp.h"
+#include "ntp.h"
+#include "ntp_io.h"
+#include "iosignal.h"
+#include "ntp_unixtime.h"
+#include "ntpdate.h"
+#include "ntp_string.h"
+#include "ntp_syslog.h"
+#include "ntp_select.h"
+#include "ntp_stdlib.h"
+
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -136,7 +144,7 @@
 # include <sys/signal.h>
 # include <sys/ioctl.h>
 #endif /* SYS_WINNT */
-#include <sys/time.h>
+
 #ifdef HAVE_SYS_RESOURCE_H
 # include <sys/resource.h>
 #endif /* HAVE_SYS_RESOURCE_H */
@@ -147,21 +155,6 @@
 # include "timers.h"
 #endif
 
-
-#if defined(SYS_HPUX)
-# include <utmp.h>
-#endif
-
-#include "ntp_fp.h"
-#include "ntp.h"
-#include "ntp_io.h"
-#include "iosignal.h"
-#include "ntp_unixtime.h"
-#include "ntpdate.h"
-#include "ntp_string.h"
-#include "ntp_syslog.h"
-#include "ntp_select.h"
-#include "ntp_stdlib.h"
 #include "recvbuff.h"
 
 #ifdef SYS_WINNT

diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index 416468fd5fd3cd2433732037fb41b7c325fb5e61..d5a24a4c57cbd8ffa593d0c708f5d1053f34c83c 100644 (file)
--- a/ntpdc/ntpdc.c
+++ b/ntpdc/ntpdc.c
@@ -1,12 +1,16 @@
 /*
  * ntpdc - control and monitor your ntpd daemon
  */
+
+#include "ntpdc.h"
+#include "ntp_select.h"
+#include "ntp_io.h"
+#include "ntp_stdlib.h"
+
 #include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
 #include <setjmp.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #include <netdb.h>
 
 #ifdef SYS_WINNT
@@ -20,11 +24,6 @@
 # include <readline/history.h>
 #endif /* HAVE_LIBREADLINE */
 
-#include "ntpdc.h"
-#include "ntp_select.h"
-#include "ntp_io.h"
-#include "ntp_stdlib.h"
-
 #ifdef SYS_VXWORKS
 /* vxWorks needs mode flag -casey*/
 #define open(name, flags)   open(name, flags, 0777)

diff --git a/ntpdc/ntpdc_ops.c b/ntpdc/ntpdc_ops.c
index 62bddd53ca62aaf7636606f81af85ee8e5593032..10c1e7896447d98ea547a906c13e8de77a6ce50c 100644 (file)
--- a/ntpdc/ntpdc_ops.c
+++ b/ntpdc/ntpdc_ops.c
@@ -6,10 +6,13 @@
 # include <config.h>
 #endif
 
+#include "ntpdc.h"
+#include "ntp_control.h"
+#include "ntp_refclock.h"
+#include "ntp_stdlib.h"
+
 #include <stdio.h>
 #include <ctype.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #ifdef HAVE_SYS_TIMEX_H
 # include <sys/timex.h>
 #endif
@@ -18,11 +21,6 @@
 #include <netinet/in.h>
 #endif
 
-#include "ntpdc.h"
-#include "ntp_control.h"
-#include "ntp_refclock.h"
-#include "ntp_stdlib.h"
-
 #include <arpa/inet.h>
 
 /*

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index f22f3ec4fc4b2baed4b2f3829311271eebff273a..d632f70fa8a30d1b44e1f76e5f4889283829dc20 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -1,12 +1,18 @@
 /*
  * ntpq - query an NTP server using mode 6 commands
  */
+
+#include "ntpq.h"
+#include "ntp_unixtime.h"
+#include "ntp_calendar.h"
+#include "ntp_io.h"
+#include "ntp_select.h"
+#include "ntp_stdlib.h"
+
 #include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
 #include <setjmp.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #include <netdb.h>
 #ifdef SYS_WINNT
 # include <io.h>
@@ -14,13 +20,6 @@
 #define closesocket close
 #endif /* SYS_WINNT */
 
-#include "ntpq.h"
-#include "ntp_unixtime.h"
-#include "ntp_calendar.h"
-#include "ntp_io.h"
-#include "ntp_select.h"
-#include "ntp_stdlib.h"
-
 #ifdef SYS_VXWORKS
 /* vxWorks needs mode flag -casey*/
 #define open(name, flags)   open(name, flags, 0777)

diff --git a/ntpq/ntpq_ops.c b/ntpq/ntpq_ops.c
index d05570a6ba2787671bab62d88c18d7e7daf5cacb..8cf1c531eab8459493e9619bd65aa2dcc194f02f 100644 (file)
--- a/ntpq/ntpq_ops.c
+++ b/ntpq/ntpq_ops.c
@@ -1,15 +1,14 @@
 /*
  * ntpdc_ops.c - subroutines which are called to perform operations by ntpdc
  */
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <netdb.h>
 
 #include "ntpq.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+#include <netdb.h>
+
 extern char *  chosts[];
 extern char currenthost[];
 extern int     numhosts;

diff --git a/ntptrace/ntptrace.c b/ntptrace/ntptrace.c
index ec1e93563254da297326157a8ffaffcafa72ad27..6fd9ed7b2d9d81c39cc72c43e2a7ee87392edc07 100644 (file)
--- a/ntptrace/ntptrace.c
+++ b/ntptrace/ntptrace.c
@@ -13,22 +13,6 @@
 # include <config.h>
 #endif
 
-#include <stdio.h>
-#include <signal.h>
-#include <ctype.h>
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/signal.h>
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-#endif
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#if defined(SYS_HPUX)
-#include <utmp.h>
-#endif
-
 #include "ntp_fp.h"
 #include "ntp.h"
 #include "ntp_io.h"
@@ -39,6 +23,17 @@
 #include "ntp_select.h"
 #include "ntp_stdlib.h"
 #include "recvbuff.h"
+
+#include <stdio.h>
+#include <signal.h>
+#include <ctype.h>
+#include <netdb.h>
+#include <sys/signal.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
+#include <sys/resource.h>
+
 /*
  * only 16 stratums, so this is more than enough.
  */

diff --git a/parseutil/testdcf.c b/parseutil/testdcf.c
index 754ff631fbdfd32f1edf322b9b23688a4851145b..afdc89db6a746d0ea1b8f7bc096bc2fad9448f7d 100644 (file)
--- a/parseutil/testdcf.c
+++ b/parseutil/testdcf.c
@@ -16,14 +16,12 @@
  * written consent of the author.
  */
 
+#include "ntp_stdlib.h"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <termios.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include "ntp_stdlib.h"
 
 /*
  * state flags

diff --git a/util/hist.c b/util/hist.c
index ee4e93ad6a271a45e4a479136f8103ef64af6d9d..5b11ff185193756a28fb79bff456b3669bf4de64 100644 (file)
--- a/util/hist.c
+++ b/util/hist.c
@@ -8,14 +8,14 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
-#include <sys/time.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "ntp_types.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #define NBUF 100001            /* size of basic histogram */
 #define NSRT 20000             /* size of overflow histogram */
 #define NCNT (600 * 1000000)   /* sample interval (us) */

diff --git a/util/jitter.c b/util/jitter.c
index 79f47573f5849f3e71b1bb5728700503f56643b4..462fe126c9d1dc4b2adb736f4bc74d4667945fde 100644 (file)
--- a/util/jitter.c
+++ b/util/jitter.c
@@ -6,8 +6,9 @@
  * analysis. From this you can determine the jitter and if the clock ever
  * runs backwards.
  */
-#include <sys/time.h>
+
 #include <stdio.h>
+#include <sys/time.h>
 
 #define NBUF 20002
 

diff --git a/util/kern.c b/util/kern.c
index 37d92572376184659df6fdb2fe05338f6b9fc701..b193d6f57c62452eb23714ec1b82e073fbb20734 100644 (file)
--- a/util/kern.c
+++ b/util/kern.c
@@ -3,6 +3,7 @@
  * actual code segments from modified kernel distributions for SunOS,
  * Ultrix and OSF/1 kernels. These segments do not use any licensed code.
  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

diff --git a/util/ntp-genkeys.c b/util/ntp-genkeys.c
index 4d1003088efdc9671d29c2580300a4bd0f5cba96..d7e44c436064a191bb79d64c45786bb9e729144b 100644 (file)
--- a/util/ntp-genkeys.c
+++ b/util/ntp-genkeys.c
@@ -6,24 +6,22 @@
 # include <config.h>
 #endif
 
+#include "ntpd.h"
+#include "ntp_stdlib.h"
+#include "ntp_string.h"
+#include "ntp_filegen.h"
+#include "ntp_unixtime.h"
+#include "ntp_config.h"
+
 #include <stdio.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <limits.h>            /* PATH_MAX */
-#include <sys/stat.h>          /* for umask() and stat() */
-#include <sys/time.h>
+#include <sys/stat.h>
 
 #ifdef HAVE_NETINFO
 #include <netinfo/ni.h>
 #endif
 
-#include "ntpd.h"
-#include "ntp_stdlib.h"
-#include "ntp_string.h"
-#include "ntp_filegen.h"
-#include "ntp_unixtime.h"
-#include "ntp_config.h"
-
 #ifdef PUBKEY
 # include "ntp_crypto.h"
 #endif

diff --git a/util/ntptime.c b/util/ntptime.c
index 2db763d7e15a976896f00d8e6612fc279a16673c..81bd2beee59ec72c920a96db1485ed3912630e61 100644 (file)
--- a/util/ntptime.c
+++ b/util/ntptime.c
@@ -9,21 +9,21 @@
  * For more information, see the README.kern file in the doc directory
  * of the xntp3 distribution.
  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif /* HAVE_CONFIG_H */
 
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <signal.h>
-#include <setjmp.h>
-
 #include "ntp_fp.h"
 #include "ntp_unixtime.h"
 #include "ntp_syscall.h"
 #include "ntp_stdlib.h"
 
+#include <stdio.h>
+#include <ctype.h>
+#include <signal.h>
+#include <setjmp.h>
+
 #ifdef NTP_SYSCALLS_STD
 # ifndef SYS_DECOSF1
 #  define BADCALL -1           /* this is supposed to be a bad syscall */

diff --git a/util/precision.c b/util/precision.c
index 0fd3c3a3a726dd9e37a1f8d4fd2ecd0ed2f4496f..b1516b34cac28eeaa796dc6cdb975d6fae16edb0 100644 (file)
--- a/util/precision.c
+++ b/util/precision.c
@@ -1,8 +1,7 @@
-#include <sys/types.h>
-#include <sys/time.h>
-#include <stdio.h>
 #include "ntp_unixtime.h"
 
+#include <stdio.h>
+
 #define        DEFAULT_SYS_PRECISION   -99
 
 int default_get_resolution();

diff --git a/util/tickadj.c b/util/tickadj.c
index 5ac812142dbcb2bfa5e2e0e9833a7143a6611dd5..4f524b129f2eecf8a3e3c79209948e2149ae9879 100644 (file)
--- a/util/tickadj.c
+++ b/util/tickadj.c
@@ -13,15 +13,14 @@
 # include <config.h>
 #endif
 
+#include "ntp_types.h"
+#include "l_stdlib.h"
+
 #include <stdio.h>
-#include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 
-#include "ntp_types.h"
-#include "l_stdlib.h"
-
 #ifdef HAVE___ADJTIMEX         /* Linux */
 
 #include <sys/timex.h>
@@ -178,7 +177,6 @@ main(
 #ifdef NLIST_STRUCT
 # include <nlist.h>
 #else /* not NLIST_STRUCT */ /* was defined(SYS_AUX3) || defined(SYS_AUX2) */
-# include <sys/time.h>
 # include <sys/resource.h>
 # include <sys/file.h>
 # include <a.out.h>