Index: modules/ipfw/Makefile
===================================================================
RCS file: /space2/ncvs/src/sys/modules/ipfw/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- modules/ipfw/Makefile	28 Jun 2002 08:10:07 -0000	1.16
+++ modules/ipfw/Makefile	4 Jan 2004 02:42:29 -0000
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../netinet
 
 KMOD=	ipfw
-SRCS=	ip_fw2.c
+SRCS=	ip_fw2.c opt_ipdn.h opt_ipdivert.h opt_ipfw.h opt_ipsec.h
 
 CFLAGS+= -DIPFIREWALL
 #
Index: netinet/ip_fw2.c
===================================================================
RCS file: /space2/ncvs/src/sys/netinet/ip_fw2.c,v
retrieving revision 1.53
diff -u -p -r1.53 ip_fw2.c
--- netinet/ip_fw2.c	24 Dec 2003 18:22:04 -0000	1.53
+++ netinet/ip_fw2.c	4 Jan 2004 02:42:39 -0000
@@ -32,17 +32,6 @@
  * Implement IP packet firewall (new version)
  */
 
-#if !defined(KLD_MODULE)
-#include "opt_ipfw.h"
-#include "opt_ipdn.h"
-#include "opt_ipdivert.h"
-#include "opt_inet.h"
-#include "opt_ipsec.h"
-#ifndef INET
-#error IPFIREWALL requires INET.
-#endif /* INET */
-#endif
-
 #define IPFW2	1
 #if IPFW2
 #include <sys/param.h>
@@ -81,6 +70,11 @@
 #include <netinet/if_ether.h> /* XXX for ETHERTYPE_IP */
 
 #include <machine/in_cksum.h>	/* XXX for in_cksum */
+
+#include "opt_ipdn.h"
+#include "opt_ipdivert.h"
+#include "opt_ipfw.h"
+#include "opt_ipsec.h"
 
 /*
  * This is used to avoid that a firewall-generated packet