--- nist/cerberus-0.4/sadb/sadb_ui.c.orig	Mon May  3 15:25:20 1999
+++ nist/cerberus-0.4/sadb/sadb_ui.c	Tue Jun 29 15:59:51 1999
@@ -1,9 +1,10 @@
 /* copyright 1997,1998,1999 - Rob Glenn */
 /* sadb_ui.c - Security Association Data Base User Interface routines */
-
 #ifdef REDHAT
 #define _SYS_TYPES_H 1
 #define _LINUX_IN_H 1
+#define _STDINT_H 1
+#define off_t off_t
 #endif
 #include <linux/types.h>
 #ifdef REDHAT
@@ -18,7 +19,6 @@
 #define __clock_t_defined 1
 #define __time_t_defined 1
 #define __timespec_defined 1
-#include <socketbits.h>
 #endif
 #include <time.h>
 #include <errno.h>
@@ -34,7 +34,6 @@
 #include <ipsec/sadb.h>
 #include <resolv.h>
 #include <linux/netlink.h>
-#include <linux/in6.h>
 #include <ipsec/ipsec.h>
 
 #define	K_SET	1
--- nist/cerberus-0.4/sadb/sadb-tcl/rkey-src/rkey.c.orig	Tue Jun 29 16:06:08 1999
+++ nist/cerberus-0.4/sadb/sadb-tcl/rkey-src/rkey.c	Fri Apr 30 12:05:20 1999
@@ -15,7 +15,7 @@
 }
 }
 
+int main(argc, argv)
-void main(argc, argv)
 int argc;
 char *argv[];
 {
--- nist/plutoplus-0.1/kernel_comm.c.orig	Mon May 10 14:25:08 1999
+++ nist/plutoplus-0.1/kernel_comm.c	Tue Jun 29 16:14:59 1999
@@ -12,6 +12,8 @@
 #ifdef REDHAT
 #define _SYS_TYPES_H 1
 #define _LINUX_IN_H 1
+#define _STDINT_H 1
+#define off_t off_t
 #include <linux/types.h>
 #undef __NFDBITS
 #undef __FDMASK
@@ -20,7 +22,6 @@
 #define __clock_t_defined 1
 #define __time_t_defined 1
 #define __timespec_defined 1
-#include <socketbits.h>
 #endif
 
 #include <stdio.h>