From d157e810aefb1bb63831ae8c6a41d0ccc7cbf406 Mon Sep 17 00:00:00 2001
From: zec <zec@FreeBSD.org>
Date: Wed, 6 May 2009 08:49:39 +0000
Subject: [PATCH] Unbreak options VIMAGE kernel builds.

Approved by:	julian (mentor)
---
 sys/netinet/sctp_crc32.c  | 7 +------
 sys/netinet/sctp_os_bsd.h | 1 +
 sys/sys/vimage.h          | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sys/netinet/sctp_crc32.c b/sys/netinet/sctp_crc32.c
index 92b1387325a..9594369a8b1 100644
--- a/sys/netinet/sctp_crc32.c
+++ b/sys/netinet/sctp_crc32.c
@@ -34,16 +34,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/uio.h>
-#include <sys/libkern.h>
+#include <netinet/sctp_os.h>
 #include <netinet/sctp.h>
 #include <netinet/sctp_crc32.h>
 #include <netinet/sctp_pcb.h>
 
-
 #if !defined(SCTP_WITH_NO_CSUM)
 
 static uint32_t
diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h
index 949f1181834..faab253b1a3 100644
--- a/sys/netinet/sctp_os_bsd.h
+++ b/sys/netinet/sctp_os_bsd.h
@@ -84,6 +84,7 @@ __FBSDID("$FreeBSD$");
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
 #include <netipsec/key.h>
+#include <netipsec/vipsec.h>
 #endif				/* IPSEC */
 
 #ifdef INET6
diff --git a/sys/sys/vimage.h b/sys/sys/vimage.h
index 0c8b8031777..ccd0c738445 100644
--- a/sys/sys/vimage.h
+++ b/sys/sys/vimage.h
@@ -33,6 +33,7 @@
 #ifndef	_SYS_VIMAGE_H_
 #define	_SYS_VIMAGE_H_
 
+#include <sys/proc.h>
 #include <sys/queue.h>
 
 #if defined(VIMAGE) && defined(VIMAGE_GLOBALS)
-- 
2.45.2