--- ipsec-tools-0.8.1.orig/src/libipsec/ipsec_strerror.h
+++ ipsec-tools-0.8.1/src/libipsec/ipsec_strerror.h
@@ -34,6 +34,8 @@
 #ifndef _IPSEC_STRERROR_H
 #define _IPSEC_STRERROR_H
 
+#include <sys/cdefs.h>
+
 extern int __ipsec_errcode;
 extern void __ipsec_set_strerror __P((const char *));
 
--- ipsec-tools-0.8.1.orig/src/libipsec/libpfkey.h
+++ ipsec-tools-0.8.1/src/libipsec/libpfkey.h
@@ -34,6 +34,8 @@
 #ifndef _LIBPFKEY_H
 #define _LIBPFKEY_H
 
+#include <sys/cdefs.h>
+
 #ifndef KAME_LIBPFKEY_H
 #define KAME_LIBPFKEY_H
 
--- ipsec-tools-0.8.1.orig/src/racoon/cftoken.l
+++ ipsec-tools-0.8.1/src/racoon/cftoken.l
@@ -77,6 +77,10 @@
 
 #include "cfparse.h"
 
+#ifndef GLOB_TILDE
+#define GLOB_TILDE 0
+#endif
+
 int yyerrorcount = 0;
 
 #if defined(YIPS_DEBUG)
--- ipsec-tools-0.8.1.orig/src/racoon/logger.h
+++ ipsec-tools-0.8.1/src/racoon/logger.h
@@ -34,6 +34,8 @@
 #ifndef _LOGGER_H
 #define _LOGGER_H
 
+#include <sys/cdefs.h>
+
 struct log {
 	int head;
 	int siz;
Only in ipsec-tools-0.8.1: src/racoon/logger.o
Only in ipsec-tools-0.8.1: src/racoon/main.o
--- ipsec-tools-0.8.1.orig/src/racoon/misc.h
+++ ipsec-tools-0.8.1/src/racoon/misc.h
@@ -34,6 +34,8 @@
 #ifndef _MISC_H
 #define _MISC_H
 
+#include <sys/cdefs.h>
+
 #define BIT2STR(b) bit2str(b, sizeof(b)<<3)
 
 #ifdef HAVE_FUNC_MACRO
Only in ipsec-tools-0.8.1: src/racoon/misc.o
Only in ipsec-tools-0.8.1: src/racoon/misc_noplog.o
--- ipsec-tools-0.8.1.orig/src/racoon/missing/crypto/sha2/sha2.h
+++ ipsec-tools-0.8.1/src/racoon/missing/crypto/sha2/sha2.h
@@ -40,6 +40,8 @@
 #ifndef __SHA2_H__
 #define __SHA2_H__
 
+#include <sys/cdefs.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
Only in ipsec-tools-0.8.1: src/racoon/nattraversal.o
--- ipsec-tools-0.8.1.orig/src/racoon/netdb_dnssec.h
+++ ipsec-tools-0.8.1/src/racoon/netdb_dnssec.h
@@ -34,6 +34,8 @@
 #ifndef _NETDB_DNSSEC_H
 #define _NETDB_DNSSEC_H
 
+#include <sys/cdefs.h>
+
 #ifndef T_CERT
 #define T_CERT	37		/* defined by RFC2538 section 2 */
 #endif
Only in ipsec-tools-0.8.1: src/racoon/oakley.o
Only in ipsec-tools-0.8.1: src/racoon/pfkey.o
--- ipsec-tools-0.8.1.orig/src/racoon/plog.h
+++ ipsec-tools-0.8.1/src/racoon/plog.h
@@ -34,6 +34,7 @@
 #ifndef _PLOG_H
 #define _PLOG_H
 
+#include <sys/cdefs.h>
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>
 #else
Only in ipsec-tools-0.8.1: src/racoon/plog.o
Only in ipsec-tools-0.8.1: src/racoon/policy.o
Only in ipsec-tools-0.8.1: src/racoon/privsep.o
Only in ipsec-tools-0.8.1: src/racoon/proposal.o
Only in ipsec-tools-0.8.1: src/racoon/prsa_par.o
Only in ipsec-tools-0.8.1: src/racoon/prsa_tok.o
Only in ipsec-tools-0.8.1: src/racoon/remoteconf.o
Only in ipsec-tools-0.8.1: src/racoon/rsalist.o
Only in ipsec-tools-0.8.1: src/racoon/safefile.o
Only in ipsec-tools-0.8.1: src/racoon/sainfo.o
Only in ipsec-tools-0.8.1: src/racoon/schedule.o
Only in ipsec-tools-0.8.1: src/racoon/session.o
Only in ipsec-tools-0.8.1: src/racoon/sockmisc.o
--- ipsec-tools-0.8.1.orig/src/racoon/str2val.h
+++ ipsec-tools-0.8.1/src/racoon/str2val.h
@@ -34,6 +34,8 @@
 #ifndef _STR2VAL_H
 #define _STR2VAL_H
 
+#include <sys/cdefs.h>
+
 extern caddr_t val2str __P((const char *, size_t));
 extern char *str2val __P((const char *, int, size_t *));
 
--- ipsec-tools-0.8.1.orig/src/racoon/vmbuf.h
+++ ipsec-tools-0.8.1/src/racoon/vmbuf.h
@@ -34,6 +34,8 @@
 #ifndef _VMBUF_H
 #define _VMBUF_H
 
+#include <sys/cdefs.h>
+
 /*
  *	bp      v
  *	v       v
--- ipsec-tools-0.8.1.orig/src/setkey/extern.h
+++ ipsec-tools-0.8.1/src/setkey/extern.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: extern.h,v 1.5 2009/03/06 11:45:03 tteras Exp $	*/
 
-
+#include <sys/cdefs.h>
 
 void parse_init __P((void));
 int parse __P((FILE **));
--- ipsec-tools-0.8.1.orig/src/racoon/backupsa.c
+++ ipsec-tools-0.8.1/src/racoon/backupsa.c
@@ -276,9 +276,9 @@
 		GETNEXTNUM(sa_args.a_keylen, strtoul);
 		GETNEXTNUM(sa_args.flags, strtoul);
 		GETNEXTNUM(sa_args.l_alloc, strtoul);
-		GETNEXTNUM(sa_args.l_bytes, strtouq);
-		GETNEXTNUM(sa_args.l_addtime, strtouq);
-		GETNEXTNUM(sa_args.l_usetime, strtouq);
+		GETNEXTNUM(sa_args.l_bytes, strtoull);
+		GETNEXTNUM(sa_args.l_addtime, strtoull);
+		GETNEXTNUM(sa_args.l_usetime, strtoull);
 		GETNEXTNUM(sa_args.seq, strtoul);
 
 #undef GETNEXTNUM