--- linux/include/linux/skbuff.h	Sun Sep  8 14:11:22 2002
+++ linux/include/linux/skbuff.h.new	Sun Sep  8 14:09:38 2002
@@ -194,7 +194,7 @@
 	unsigned char 	*end;			/* End pointer					*/
 
 	void 		(*destructor)(struct sk_buff *);	/* Destruct function		*/
-#ifdef CONFIG_NETFILTER
+#if defined(CONFIG_NETFILTER) || defined(CONFIG_IPSEC) || defined(CONFIG_IPSEC_MODULE)
 	/* Can be used for communication between hooks. */
         unsigned long	nfmark;
 	/* Cache info */
--- linux-2.4.19-gentoo-r9/include/linux/netfilter_ipv4/ip_conntrack_core.h.o	Thu Sep 19 16:51:11 2002
+++ linux-2.4.19-gentoo-r9/include/linux/netfilter_ipv4/ip_conntrack_core.h	Thu Sep 19 16:51:19 2002
@@ -1,5 +1,7 @@
 #ifndef _IP_CONNTRACK_CORE_H
 #define _IP_CONNTRACK_CORE_H
+
+#include <linux/netfilter.h>
 #include <linux/netfilter_ipv4/lockhelp.h>
 
 /* This header is used to share core functionality between the
diff -Nru linux-diff/include/linux/brlock.h linux-2.4.20-lolo-r1_pre8/include/linux/brlock.h
--- linux-diff/include/linux/brlock.h	2002-12-25 14:05:12.000000000 -0600
+++ linux-2.4.20-lolo-r1_pre8/include/linux/brlock.h	2002-12-30 12:41:49.000000000 -0600
@@ -86,7 +86,7 @@
 	 * invalid index is used:
 	 */
 	if (idx >= __BR_END)
-		__br_lock_usage_bug();
+		BUG();
 
 	read_lock(&__brlock_array[smp_processor_id()][idx]);
 }
@@ -94,7 +94,7 @@
 static inline void br_read_unlock (enum brlock_indices idx)
 {
 	if (idx >= __BR_END)
-		__br_lock_usage_bug();
+		BUG();
 
 	read_unlock(&__brlock_array[smp_processor_id()][idx]);
 }
@@ -110,7 +110,7 @@
 	 * invalid index is used:
 	 */
 	if (idx >= __BR_END)
-		__br_lock_usage_bug();
+		BUG();
 
 	ctr = &__brlock_array[smp_processor_id()][idx];
 	lock = &__br_write_locks[idx].lock;
@@ -144,7 +144,7 @@
 	unsigned int *ctr;
 
 	if (idx >= __BR_END)
-		__br_lock_usage_bug();
+		BUG();
 
 	ctr = &__brlock_array[smp_processor_id()][idx];
 
@@ -161,14 +161,14 @@
 static inline void br_write_lock (enum brlock_indices idx)
 {
 	if (idx >= __BR_END)
-		__br_lock_usage_bug();
+		BUG();
 	__br_write_lock(idx);
 }
 
 static inline void br_write_unlock (enum brlock_indices idx)
 {
 	if (idx >= __BR_END)
-		__br_lock_usage_bug();
+		BUG();
 	__br_write_unlock(idx);
 }
 
--- linux/drivers/message/fusion/linux_compat.h	2002-12-30 14:11:08.000000000 -0600
+++ linux/drivers/message/fusion/linux_compat.h.new	2002-12-31 15:35:44.000000000 -0600
@@ -16,7 +16,7 @@
 #endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-#define SET_NICE(current,x)	do {(current)->nice = (x);} while (0)
+#define SET_NICE(current,x)	do {set_user_nice((current),(x));} while (0)
 #else
 #define SET_NICE(current,x)
 #endif
