diff -Nru --exclude=config.h --exclude=config.status --exclude=version.h --exclude=.version --exclude='*.Po' --exclude=Makefile --exclude='*~' --exclude=version.c --exclude=stamp-h1 --exclude=libtool --exclude=config.log --exclude='*hint*' --exclude='*bash*' --exclude='*html*' --exclude='*gcc4*' ntp-4.2.0.origi/include/ntp_control.h ntp-4.2.0/include/ntp_control.h
--- ntp-4.2.0.origi/include/ntp_control.h	2003-08-14 09:31:47.000000000 +0200
+++ ntp-4.2.0/include/ntp_control.h	2005-07-22 20:08:49.000000000 +0200
@@ -2,6 +2,9 @@
  * ntp_control.h - definitions related to NTP mode 6 control messages
  */
 
+#ifndef _NTP_CONTROL_H
+#define _NTP_CONTROL_H
+
 #include "ntp_types.h"
 
 struct ntp_control {
@@ -281,3 +284,4 @@
 #define	TYPE_SYS	1
 #define	TYPE_PEER	2
 #define	TYPE_CLOCK	3
+#endif
diff -Nru --exclude=config.h --exclude=config.status --exclude=version.h --exclude=.version --exclude='*.Po' --exclude=Makefile --exclude='*~' --exclude=version.c --exclude=stamp-h1 --exclude=libtool --exclude=config.log --exclude='*hint*' --exclude='*bash*' --exclude='*html*' --exclude='*gcc4*' ntp-4.2.0.origi/include/ntp_refclock.h ntp-4.2.0/include/ntp_refclock.h
--- ntp-4.2.0.origi/include/ntp_refclock.h	2003-07-17 12:27:16.000000000 +0200
+++ ntp-4.2.0/include/ntp_refclock.h	2005-07-22 21:05:42.130599958 +0200
@@ -60,11 +60,6 @@
  * List of reference clock names and descriptions. These must agree with
  * lib/clocktypes.c and ntpd/refclock_conf.c.
  */
-struct clktype {
-	int code;		/* driver "major" number */
-	const char *clocktype;	/* long description */
-	const char *abbrev;	/* short description */
-};
 
 /*
  * Configuration flag values
diff -Nru --exclude=config.h --exclude=config.status --exclude=version.h --exclude=.version --exclude='*.Po' --exclude=Makefile --exclude='*~' --exclude=version.c --exclude=stamp-h1 --exclude=libtool --exclude=config.log --exclude='*hint*' --exclude='*bash*' --exclude='*html*' --exclude='*gcc4*' ntp-4.2.0.origi/include/ntp_stdlib.h ntp-4.2.0/include/ntp_stdlib.h
--- ntp-4.2.0.origi/include/ntp_stdlib.h	2003-07-17 12:27:16.000000000 +0200
+++ ntp-4.2.0/include/ntp_stdlib.h	2005-07-22 21:08:40.569720429 +0200
@@ -9,6 +9,12 @@
 #include "ntp_string.h"
 #include "l_stdlib.h"
 
+struct clktype {
+        int code;               /* driver "major" number */
+	const char *clocktype;  /* long description */
+        const char *abbrev;     /* short description */
+};
+
 /*
  * Handle gcc __attribute__ if available.
  */
@@ -134,7 +140,6 @@
 extern u_int	cache_keylen;		/* key length */
 
 /* clocktypes.c */
-struct clktype;
 extern struct clktype clktypes[];
 
 /* getopt.c */
diff -Nru --exclude=config.h --exclude=config.status --exclude=version.h --exclude=.version --exclude='*.Po' --exclude=Makefile --exclude='*~' --exclude=version.c --exclude=stamp-h1 --exclude=libtool --exclude=config.log --exclude='*hint*' --exclude='*bash*' --exclude='*html*' --exclude='*gcc4*' ntp-4.2.0.origi/include/ntpd.h ntp-4.2.0/include/ntpd.h
--- ntp-4.2.0.origi/include/ntpd.h	2005-07-21 22:13:22.000000000 +0200
+++ ntp-4.2.0/include/ntpd.h	2005-07-22 20:08:49.000000000 +0200
@@ -9,6 +9,7 @@
 #include "ntp_malloc.h"
 #include "ntp_refclock.h"
 #include "recvbuff.h"
+#include "ntp_control.h"
 
 #ifdef SYS_WINNT
 #define exit service_exit
Files ntp-4.2.0.origi/libntp/adjtime.o and ntp-4.2.0/libntp/adjtime.o differ
diff -Nru --exclude=config.h --exclude=config.status --exclude=version.h --exclude=.version --exclude='*.Po' --exclude=Makefile --exclude='*~' --exclude=version.c --exclude=stamp-h1 --exclude=libtool --exclude=config.log --exclude='*hint*' --exclude='*bash*' --exclude='*html*' --exclude='*gcc4*' ntp-4.2.0.origi/ntpd/refclock_datum.c ntp-4.2.0/ntpd/refclock_datum.c
--- ntp-4.2.0.origi/ntpd/refclock_datum.c	2003-07-17 12:27:28.000000000 +0200
+++ ntp-4.2.0/ntpd/refclock_datum.c	2005-07-22 21:10:32.426303394 +0200
@@ -44,7 +44,6 @@
 #endif /* WWVBCLK */
 #endif /* STREAM */
 
-#include "ntp_stdlib.h"
 
 /*
 ** This driver supports the Datum Programmable Time System (PTS) clock.
Files ntp-4.2.0.origi/ntpstat-0.2/ntpstat and ntp-4.2.0/ntpstat-0.2/ntpstat differ