--- linux/drivers/net/e1000/e1000_osdep.h.~1~	2003-04-19 19:29:38.000000000 -0700
+++ linux/drivers/net/e1000/e1000_osdep.h	2003-04-19 20:28:32.000000000 -0700
@@ -54,11 +54,15 @@
 #define PCI_COMMAND_REGISTER   PCI_COMMAND
 #define CMD_MEM_WRT_INVALIDATE PCI_COMMAND_INVALIDATE
 
+
 typedef enum {
+#undef FALSE
     FALSE = 0,
+#undef TRUE
     TRUE = 1
 } boolean_t;
 
+#undef ASSERT
 #define ASSERT(x)	if(!(x)) BUG()
 #define MSGOUT(S, A, B)	printk(KERN_DEBUG S "\n", A, B)
 
--- linux/include/linux/in.h.~1~	2003-04-19 19:29:38.000000000 -0700
+++ linux/include/linux/in.h	2003-04-20 13:50:18.000000000 -0700
@@ -19,6 +19,7 @@
 #define _LINUX_IN_H
 
 #include <linux/types.h>
+#include <linux/socket.h> /* for sa_family_t */
 
 /* Standard well-defined IP protocols.  */
 enum {
--- linux/net/ipv4/netfilter/ip_conntrack_tftp.c.~1~	2003-04-19 19:26:14.000000000 -0700
+++ linux/net/ipv4/netfilter/ip_conntrack_tftp.c	2003-04-20 14:00:43.000000000 -0700
@@ -8,6 +8,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/kernel.h>
 #include <linux/ip.h>
 #include <linux/udp.h>